@assistant-ui/react-google-adk 0.0.31 → 0.0.33

package/dist/useAdkMessages.js

@@ -4,7 +4,8 @@ import { AdkEventAccumulator } from "./AdkEventAccumulator.js";
 import { abortableIterable, invokeUserCallback, openAbortableIterable } from "@assistant-ui/core/internal";
 import { generateId } from "@assistant-ui/core";
 import { useAui } from "@assistant-ui/store";
-import { useCallback, useEffect, useInsertionEffect, useMemo, useRef, useState } from "react";
+import { useReplaySafeEffect } from "@assistant-ui/store/internal";
+import { useCallback, useInsertionEffect, useMemo, useRef, useState } from "react";
 //#region src/useAdkMessages.ts
 const invokeAdkRuntimeCallback = (name, callback, ...args) => {
 	invokeUserCallback("react-google-adk", name, callback, ...args);
@@ -19,7 +20,6 @@ const useAdkMessages = ({ stream, eventHandlers }) => {
 	const [authRequests, setAuthRequests] = useState([]);
 	const [escalated, setEscalated] = useState(false);
 	const [messageMetadata, setMessageMetadata] = useState(/* @__PURE__ */ new Map());
-	const lastTransferToAgentRef = useRef(void 0);
 	const messagesRef = useRef(messages);
 	const longRunningToolIdsRef = useRef(longRunningToolIds);
 	const stateDeltaRef = useRef(stateDelta);
@@ -83,6 +83,7 @@ const useAdkMessages = ({ stream, eventHandlers }) => {
 		setLongRunningToolIds(accumulator.getLongRunningToolIds());
 		setToolConfirmations(accumulator.getToolConfirmations());
 		setAuthRequests(accumulator.getAuthRequests());
+		let lastTransferToAgent;
 		abortControllerRef.current?.abort();
 		const abortController = new AbortController();
 		abortControllerRef.current = abortController;
@@ -117,8 +118,8 @@ const useAdkMessages = ({ stream, eventHandlers }) => {
 					if (newMeta.size > 0) setMessageMetadata(new Map([...messageMetadataRef.current, ...newMeta]));
 				}
 				const transfer = accumulator.getLastTransferToAgent();
-				if (transfer && transfer !== lastTransferToAgentRef.current) {
-					lastTransferToAgentRef.current = transfer;
+				if (transfer && transfer !== lastTransferToAgent) {
+					lastTransferToAgent = transfer;
 					invokeAdkRuntimeCallback("onAgentTransfer", onAgentTransfer, transfer);
 				}
 				if (event.customMetadata && onCustomEvent) for (const [key, value] of Object.entries(event.customMetadata)) invokeAdkRuntimeCallback("onCustomEvent", onCustomEvent, key, value);
@@ -141,7 +142,7 @@ const useAdkMessages = ({ stream, eventHandlers }) => {
 	const cancel = useCallback(() => {
 		if (abortControllerRef.current) abortControllerRef.current.abort();
 	}, []);
-	useEffect(() => cancel, [cancel]);
+	useReplaySafeEffect(() => cancel, []);
 	return {
 		messages,
 		stateDelta,

package/dist/useAdkMessages.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAdkMessages.js","names":[],"sources":["../src/useAdkMessages.ts"],"sourcesContent":["import {\n  useState,\n  useCallback,\n  useEffect,\n  useInsertionEffect,\n  useRef,\n  useMemo,\n} from \"react\";\nimport { generateId } from \"@assistant-ui/core\";\nimport { useAui } from \"@assistant-ui/store\";\nimport {\n  abortableIterable,\n  invokeUserCallback,\n  openAbortableIterable,\n} from \"@assistant-ui/core/internal\";\nimport { AdkEventAccumulator } from \"./AdkEventAccumulator\";\nimport { contentToParts } from \"./contentToParts\";\nimport { toAdkFunctionResponse } from \"./toAdkFunctionResponse\";\nimport type {\n  AdkEvent,\n  AdkMessage,\n  AdkMessageMetadata,\n  AdkSendMessageConfig,\n  AdkStreamCallback,\n  AdkToolConfirmation,\n  AdkAuthRequest,\n  AdkThreadSnapshot,\n  OnAdkErrorCallback,\n  OnAdkCustomEventCallback,\n  OnAdkAgentTransferCallback,\n} from \"./types\";\n\nexport type UseAdkMessagesOptions = {\n  stream: AdkStreamCallback;\n  eventHandlers?: {\n    onError?: OnAdkErrorCallback;\n    onCustomEvent?: OnAdkCustomEventCallback;\n    onAgentTransfer?: OnAdkAgentTransferCallback;\n  };\n};\n\ntype AdkRuntimeCallbackName = \"onError\" | \"onCustomEvent\" | \"onAgentTransfer\";\n\nconst invokeAdkRuntimeCallback = <TArgs extends readonly unknown[]>(\n  name: AdkRuntimeCallbackName,\n  callback: ((...args: TArgs) => unknown) | undefined,\n  ...args: TArgs\n): void => {\n  void invokeUserCallback(\"react-google-adk\", name, callback, ...args);\n};\n\nexport const useAdkMessages = ({\n  stream,\n  eventHandlers,\n}: UseAdkMessagesOptions) => {\n  const [messages, _setMessages] = useState<AdkMessage[]>([]);\n  const [stateDelta, setStateDelta] = useState<Record<string, unknown>>({});\n  const [agentInfo, setAgentInfo] = useState<{\n    name?: string | undefined;\n    branch?: string | undefined;\n  }>({});\n  const [longRunningToolIds, _setLongRunningToolIds] = useState<string[]>([]);\n  const [artifactDelta, setArtifactDelta] = useState<Record<string, number>>(\n    {},\n  );\n  const [toolConfirmations, setToolConfirmations] = useState<\n    AdkToolConfirmation[]\n  >([]);\n  const [authRequests, setAuthRequests] = useState<AdkAuthRequest[]>([]);\n  const [escalated, setEscalated] = useState(false);\n  const [messageMetadata, setMessageMetadata] = useState<\n    Map<string, AdkMessageMetadata>\n  >(new Map());\n  const lastTransferToAgentRef = useRef<string | undefined>(undefined);\n  // setMessagesImmediate and setLongRunningToolIds are the only writers of their state and publish these refs with it, so neither ref trails a commit.\n  const messagesRef = useRef(messages);\n  const longRunningToolIdsRef = useRef(longRunningToolIds);\n  const stateDeltaRef = useRef(stateDelta);\n  useInsertionEffect(() => {\n    stateDeltaRef.current = stateDelta;\n  }, [stateDelta]);\n  const artifactDeltaRef = useRef(artifactDelta);\n  useInsertionEffect(() => {\n    artifactDeltaRef.current = artifactDelta;\n  }, [artifactDelta]);\n  const messageMetadataRef = useRef(messageMetadata);\n  useInsertionEffect(() => {\n    messageMetadataRef.current = messageMetadata;\n  }, [messageMetadata]);\n\n  const setMessagesImmediate = useCallback((msgs: AdkMessage[]) => {\n    messagesRef.current = msgs;\n    _setMessages(msgs);\n  }, []);\n  const setLongRunningToolIds = useCallback((ids: string[]) => {\n    longRunningToolIdsRef.current = ids;\n    _setLongRunningToolIds(ids);\n  }, []);\n\n  /**\n   * Swap the thread over to a loaded snapshot in one commit. Unlike\n   * {@link replaceMessages} this never passes through a cleared state, so a\n   * refetch that lands while a confirmation is on screen replaces it rather\n   * than blanking it first.\n   */\n  const applySnapshot = useCallback(\n    (snapshot: AdkThreadSnapshot) => {\n      setMessagesImmediate(snapshot.messages);\n      setLongRunningToolIds(snapshot.longRunningToolIds ?? []);\n      setToolConfirmations(snapshot.toolConfirmations ?? []);\n      setAuthRequests(snapshot.authRequests ?? []);\n      setEscalated(snapshot.escalated ?? false);\n      setMessageMetadata(snapshot.messageMetadata ?? new Map());\n      setStateDelta(snapshot.stateDelta ?? {});\n      setArtifactDelta(snapshot.artifactDelta ?? {});\n      setAgentInfo(snapshot.agentInfo ?? {});\n    },\n    [setLongRunningToolIds, setMessagesImmediate],\n  );\n\n  // Replace the message list AND reset derived per-turn HITL state.\n  // Used by truncation paths (edit, reload) so that stale interrupt\n  // markers and per-message metadata from the removed messages don't leak\n  // into the next turn.\n  const replaceMessages = useCallback(\n    (msgs: AdkMessage[]) => {\n      setMessagesImmediate(msgs);\n      setLongRunningToolIds([]);\n      setToolConfirmations([]);\n      setAuthRequests([]);\n      setEscalated(false);\n      setMessageMetadata(new Map());\n    },\n    [setLongRunningToolIds, setMessagesImmediate],\n  );\n\n  const abortControllerRef = useRef<AbortController | null>(null);\n\n  const { onError, onCustomEvent, onAgentTransfer } = useMemo(\n    () => eventHandlers ?? {},\n    [eventHandlers],\n  );\n\n  const aui = useAui();\n  const sendMessage = useCallback(\n    async (newMessages: AdkMessage[], config: AdkSendMessageConfig) => {\n      const newMessagesWithId = newMessages.map((m) =>\n        m.id ? m : { ...m, id: generateId() },\n      ) as AdkMessage[];\n\n      // A staged message is already in the thread under its own id, and the\n      // merged event below re-emits the whole batch under the first one. Seeding\n      // with the originals would leave every later staged id beside the merged\n      // copy of itself.\n      const resentIds = new Set(newMessagesWithId.map((m) => m.id));\n      // The optimistic event for a tool-only batch carries no author, so the accumulator cannot settle the calls this send answers.\n      const answeredToolCallIds = new Set(\n        newMessagesWithId.flatMap((m) =>\n          m.type === \"tool\" ? [m.tool_call_id] : [],\n        ),\n      );\n      const accumulator = new AdkEventAccumulator(\n        messagesRef.current.filter((m) => !resentIds.has(m.id)),\n        longRunningToolIdsRef.current.filter(\n          (id) => !answeredToolCallIds.has(id),\n        ),\n      );\n      for (const event of messagesToEvents(newMessagesWithId)) {\n        accumulator.processEvent(event);\n      }\n      setMessagesImmediate(accumulator.getMessages());\n      setLongRunningToolIds(accumulator.getLongRunningToolIds());\n      setToolConfirmations(accumulator.getToolConfirmations());\n      setAuthRequests(accumulator.getAuthRequests());\n\n      // Google ADK replaces active runs, while React LangGraph queues sends.\n      abortControllerRef.current?.abort();\n      const abortController = new AbortController();\n      abortControllerRef.current = abortController;\n\n      try {\n        const response = await openAbortableIterable(\n          stream(newMessagesWithId, {\n            ...config,\n            abortSignal: abortController.signal,\n            initialize: async () => {\n              return await aui.threadListItem.initialize();\n            },\n          }),\n          abortController.signal,\n        );\n        if (!response) return;\n\n        for await (const event of abortableIterable(\n          response,\n          abortController.signal,\n        )) {\n          if (\n            abortController.signal.aborted ||\n            abortControllerRef.current !== abortController\n          ) {\n            break;\n          }\n          const updatedMessages = accumulator.processEvent(event);\n          setMessagesImmediate(updatedMessages);\n          setStateDelta({\n            ...stateDeltaRef.current,\n            ...accumulator.getStateDelta(),\n          });\n          setAgentInfo(accumulator.getAgentInfo());\n          setLongRunningToolIds(accumulator.getLongRunningToolIds());\n          setArtifactDelta({\n            ...artifactDeltaRef.current,\n            ...accumulator.getArtifactDelta(),\n          });\n          setToolConfirmations(accumulator.getToolConfirmations());\n          setAuthRequests(accumulator.getAuthRequests());\n          setEscalated(accumulator.isEscalated());\n          {\n            const newMeta = accumulator.getMessageMetadata();\n            if (newMeta.size > 0) {\n              setMessageMetadata(\n                new Map([...messageMetadataRef.current, ...newMeta]),\n              );\n            }\n          }\n\n          const transfer = accumulator.getLastTransferToAgent();\n          if (transfer && transfer !== lastTransferToAgentRef.current) {\n            lastTransferToAgentRef.current = transfer;\n            invokeAdkRuntimeCallback(\n              \"onAgentTransfer\",\n              onAgentTransfer,\n              transfer,\n            );\n          }\n\n          // Fire custom event callback for events with customMetadata\n          if (event.customMetadata && onCustomEvent) {\n            for (const [key, value] of Object.entries(event.customMetadata)) {\n              invokeAdkRuntimeCallback(\n                \"onCustomEvent\",\n                onCustomEvent,\n                key,\n                value,\n              );\n            }\n          }\n\n          if (event.errorCode || event.errorMessage) {\n            invokeAdkRuntimeCallback(\n              \"onError\",\n              onError,\n              event.errorMessage ?? event.errorCode,\n            );\n          }\n        }\n      } catch (error) {\n        if (\n          !abortController.signal.aborted &&\n          abortControllerRef.current === abortController &&\n          !(error instanceof Error && error.name === \"AbortError\")\n        ) {\n          throw error;\n        }\n      } finally {\n        if (abortControllerRef.current === abortController) {\n          abortControllerRef.current = null;\n        }\n      }\n    },\n    [\n      aui,\n      setMessagesImmediate,\n      setLongRunningToolIds,\n      stream,\n      onError,\n      onCustomEvent,\n      onAgentTransfer,\n    ],\n  );\n\n  const cancel = useCallback(() => {\n    if (abortControllerRef.current) {\n      abortControllerRef.current.abort();\n    }\n  }, []);\n\n  useEffect(() => cancel, [cancel]);\n\n  return {\n    messages,\n    stateDelta,\n    agentInfo,\n    longRunningToolIds,\n    artifactDelta,\n    toolConfirmations,\n    authRequests,\n    escalated,\n    messageMetadata,\n    sendMessage,\n    cancel,\n    setMessages: setMessagesImmediate,\n    replaceMessages,\n    applySnapshot,\n  };\n};\n\n/**\n * Transport sends every human and tool message of one `send` call as a single\n * ADK `Content`, and ADK parses that event's function responses before running\n * any tool, so the batch runs whole or not at all. The optimistic projection\n * has to sit on the same boundary, so a run of those messages becomes one\n * synthetic event whose parts come from the same per-message conversion.\n *\n * The transport drops `ai` messages from that `Content`, so one interleaved\n * between two replies does not split the batch on the wire and must not split\n * it here either. It still becomes its own event, placed after the merged one,\n * so the optimistic projection keeps the assistant turn.\n *\n * @internal — exported for unit tests.\n */\nexport const messagesToEvents = (messages: AdkMessage[]): AdkEvent[] => {\n  // A reload sends no messages at all, and the empty user content the transport\n  // puts on the wire for it is not part of the optimistic view: projecting one\n  // would put an empty user bubble above every regenerated turn.\n  if (messages.length === 0) return [];\n\n  const events: AdkEvent[] = [];\n  const run: AdkMessage[] = [];\n  let runIndex = 0;\n\n  for (const msg of messages) {\n    if (msg.type === \"ai\") {\n      events.push(messageToEvent(msg));\n    } else {\n      if (run.length === 0) runIndex = events.length;\n      run.push(msg);\n    }\n  }\n\n  const parts = run.flatMap((m) => messageToEvent(m).content?.parts ?? []);\n  const human = run.find((m) => m.type === \"human\");\n\n  // A batch that contributes no part still reaches the wire: the transport\n  // sends an empty user `Content`, which a reload replays as an empty human\n  // message. Emitting it here keeps the optimistic view equal to that replay.\n  if (parts.length === 0) parts.push({ text: \"\" });\n\n  const event: AdkEvent = { id: (human ?? run[0])?.id ?? generateId() };\n  if (human || run.length === 0) event.author = \"user\";\n  event.content = { role: \"user\", parts };\n  events.splice(run.length > 0 ? runIndex : events.length, 0, event);\n\n  return events;\n};\n\n/** @internal — exported for unit tests. */\nexport const messageToEvent = (msg: AdkMessage): AdkEvent => {\n  if (msg.type === \"human\") {\n    return {\n      id: msg.id ?? generateId(),\n      author: \"user\",\n      content: { role: \"user\", parts: contentToParts(msg.content) },\n    };\n  }\n\n  if (msg.type === \"tool\") {\n    let response: unknown;\n    try {\n      response = JSON.parse(msg.content);\n    } catch {\n      response = msg.content;\n    }\n    return {\n      id: msg.id ?? generateId(),\n      content: {\n        role: \"user\",\n        parts: [\n          {\n            functionResponse: {\n              name: msg.name,\n              id: msg.tool_call_id,\n              response: toAdkFunctionResponse(response, msg.status === \"error\"),\n            },\n          },\n        ],\n      },\n    };\n  }\n\n  const result: AdkEvent = { id: msg.id ?? generateId() };\n  if (msg.author != null) result.author = msg.author;\n  result.content = {\n    role: \"model\",\n    parts: [\n      ...contentToParts(msg.content),\n      ...(msg.tool_calls?.map((tc) => ({\n        functionCall: { name: tc.name, id: tc.id, args: { ...tc.args } },\n      })) ?? []),\n    ],\n  };\n  return result;\n};\n"],"mappings":"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"}
+{"version":3,"file":"useAdkMessages.js","names":[],"sources":["../src/useAdkMessages.ts"],"sourcesContent":["import {\n  useState,\n  useCallback,\n  useInsertionEffect,\n  useRef,\n  useMemo,\n} from \"react\";\nimport { generateId } from \"@assistant-ui/core\";\nimport { useReplaySafeEffect } from \"@assistant-ui/store/internal\";\nimport { useAui } from \"@assistant-ui/store\";\nimport {\n  abortableIterable,\n  invokeUserCallback,\n  openAbortableIterable,\n} from \"@assistant-ui/core/internal\";\nimport { AdkEventAccumulator } from \"./AdkEventAccumulator\";\nimport { contentToParts } from \"./contentToParts\";\nimport { toAdkFunctionResponse } from \"./toAdkFunctionResponse\";\nimport type {\n  AdkEvent,\n  AdkMessage,\n  AdkMessageMetadata,\n  AdkSendMessageConfig,\n  AdkStreamCallback,\n  AdkToolConfirmation,\n  AdkAuthRequest,\n  AdkThreadSnapshot,\n  OnAdkErrorCallback,\n  OnAdkCustomEventCallback,\n  OnAdkAgentTransferCallback,\n} from \"./types\";\n\nexport type UseAdkMessagesOptions = {\n  stream: AdkStreamCallback;\n  eventHandlers?: {\n    onError?: OnAdkErrorCallback;\n    onCustomEvent?: OnAdkCustomEventCallback;\n    onAgentTransfer?: OnAdkAgentTransferCallback;\n  };\n};\n\ntype AdkRuntimeCallbackName = \"onError\" | \"onCustomEvent\" | \"onAgentTransfer\";\n\nconst invokeAdkRuntimeCallback = <TArgs extends readonly unknown[]>(\n  name: AdkRuntimeCallbackName,\n  callback: ((...args: TArgs) => unknown) | undefined,\n  ...args: TArgs\n): void => {\n  void invokeUserCallback(\"react-google-adk\", name, callback, ...args);\n};\n\nexport const useAdkMessages = ({\n  stream,\n  eventHandlers,\n}: UseAdkMessagesOptions) => {\n  const [messages, _setMessages] = useState<AdkMessage[]>([]);\n  const [stateDelta, setStateDelta] = useState<Record<string, unknown>>({});\n  const [agentInfo, setAgentInfo] = useState<{\n    name?: string | undefined;\n    branch?: string | undefined;\n  }>({});\n  const [longRunningToolIds, _setLongRunningToolIds] = useState<string[]>([]);\n  const [artifactDelta, setArtifactDelta] = useState<Record<string, number>>(\n    {},\n  );\n  const [toolConfirmations, setToolConfirmations] = useState<\n    AdkToolConfirmation[]\n  >([]);\n  const [authRequests, setAuthRequests] = useState<AdkAuthRequest[]>([]);\n  const [escalated, setEscalated] = useState(false);\n  const [messageMetadata, setMessageMetadata] = useState<\n    Map<string, AdkMessageMetadata>\n  >(new Map());\n  // setMessagesImmediate and setLongRunningToolIds are the only writers of their state and publish these refs with it, so neither ref trails a commit.\n  const messagesRef = useRef(messages);\n  const longRunningToolIdsRef = useRef(longRunningToolIds);\n  const stateDeltaRef = useRef(stateDelta);\n  useInsertionEffect(() => {\n    stateDeltaRef.current = stateDelta;\n  }, [stateDelta]);\n  const artifactDeltaRef = useRef(artifactDelta);\n  useInsertionEffect(() => {\n    artifactDeltaRef.current = artifactDelta;\n  }, [artifactDelta]);\n  const messageMetadataRef = useRef(messageMetadata);\n  useInsertionEffect(() => {\n    messageMetadataRef.current = messageMetadata;\n  }, [messageMetadata]);\n\n  const setMessagesImmediate = useCallback((msgs: AdkMessage[]) => {\n    messagesRef.current = msgs;\n    _setMessages(msgs);\n  }, []);\n  const setLongRunningToolIds = useCallback((ids: string[]) => {\n    longRunningToolIdsRef.current = ids;\n    _setLongRunningToolIds(ids);\n  }, []);\n\n  /**\n   * Swap the thread over to a loaded snapshot in one commit. Unlike\n   * {@link replaceMessages} this never passes through a cleared state, so a\n   * refetch that lands while a confirmation is on screen replaces it rather\n   * than blanking it first.\n   */\n  const applySnapshot = useCallback(\n    (snapshot: AdkThreadSnapshot) => {\n      setMessagesImmediate(snapshot.messages);\n      setLongRunningToolIds(snapshot.longRunningToolIds ?? []);\n      setToolConfirmations(snapshot.toolConfirmations ?? []);\n      setAuthRequests(snapshot.authRequests ?? []);\n      setEscalated(snapshot.escalated ?? false);\n      setMessageMetadata(snapshot.messageMetadata ?? new Map());\n      setStateDelta(snapshot.stateDelta ?? {});\n      setArtifactDelta(snapshot.artifactDelta ?? {});\n      setAgentInfo(snapshot.agentInfo ?? {});\n    },\n    [setLongRunningToolIds, setMessagesImmediate],\n  );\n\n  // Replace the message list AND reset derived per-turn HITL state.\n  // Used by truncation paths (edit, reload) so that stale interrupt\n  // markers and per-message metadata from the removed messages don't leak\n  // into the next turn.\n  const replaceMessages = useCallback(\n    (msgs: AdkMessage[]) => {\n      setMessagesImmediate(msgs);\n      setLongRunningToolIds([]);\n      setToolConfirmations([]);\n      setAuthRequests([]);\n      setEscalated(false);\n      setMessageMetadata(new Map());\n    },\n    [setLongRunningToolIds, setMessagesImmediate],\n  );\n\n  const abortControllerRef = useRef<AbortController | null>(null);\n\n  const { onError, onCustomEvent, onAgentTransfer } = useMemo(\n    () => eventHandlers ?? {},\n    [eventHandlers],\n  );\n\n  const aui = useAui();\n  const sendMessage = useCallback(\n    async (newMessages: AdkMessage[], config: AdkSendMessageConfig) => {\n      const newMessagesWithId = newMessages.map((m) =>\n        m.id ? m : { ...m, id: generateId() },\n      ) as AdkMessage[];\n\n      // A staged message is already in the thread under its own id, and the\n      // merged event below re-emits the whole batch under the first one. Seeding\n      // with the originals would leave every later staged id beside the merged\n      // copy of itself.\n      const resentIds = new Set(newMessagesWithId.map((m) => m.id));\n      // The optimistic event for a tool-only batch carries no author, so the accumulator cannot settle the calls this send answers.\n      const answeredToolCallIds = new Set(\n        newMessagesWithId.flatMap((m) =>\n          m.type === \"tool\" ? [m.tool_call_id] : [],\n        ),\n      );\n      const accumulator = new AdkEventAccumulator(\n        messagesRef.current.filter((m) => !resentIds.has(m.id)),\n        longRunningToolIdsRef.current.filter(\n          (id) => !answeredToolCallIds.has(id),\n        ),\n      );\n      for (const event of messagesToEvents(newMessagesWithId)) {\n        accumulator.processEvent(event);\n      }\n      setMessagesImmediate(accumulator.getMessages());\n      setLongRunningToolIds(accumulator.getLongRunningToolIds());\n      setToolConfirmations(accumulator.getToolConfirmations());\n      setAuthRequests(accumulator.getAuthRequests());\n      let lastTransferToAgent: string | undefined;\n\n      // Google ADK replaces active runs, while React LangGraph queues sends.\n      abortControllerRef.current?.abort();\n      const abortController = new AbortController();\n      abortControllerRef.current = abortController;\n\n      try {\n        const response = await openAbortableIterable(\n          stream(newMessagesWithId, {\n            ...config,\n            abortSignal: abortController.signal,\n            initialize: async () => {\n              return await aui.threadListItem.initialize();\n            },\n          }),\n          abortController.signal,\n        );\n        if (!response) return;\n\n        for await (const event of abortableIterable(\n          response,\n          abortController.signal,\n        )) {\n          if (\n            abortController.signal.aborted ||\n            abortControllerRef.current !== abortController\n          ) {\n            break;\n          }\n          const updatedMessages = accumulator.processEvent(event);\n          setMessagesImmediate(updatedMessages);\n          setStateDelta({\n            ...stateDeltaRef.current,\n            ...accumulator.getStateDelta(),\n          });\n          setAgentInfo(accumulator.getAgentInfo());\n          setLongRunningToolIds(accumulator.getLongRunningToolIds());\n          setArtifactDelta({\n            ...artifactDeltaRef.current,\n            ...accumulator.getArtifactDelta(),\n          });\n          setToolConfirmations(accumulator.getToolConfirmations());\n          setAuthRequests(accumulator.getAuthRequests());\n          setEscalated(accumulator.isEscalated());\n          {\n            const newMeta = accumulator.getMessageMetadata();\n            if (newMeta.size > 0) {\n              setMessageMetadata(\n                new Map([...messageMetadataRef.current, ...newMeta]),\n              );\n            }\n          }\n\n          const transfer = accumulator.getLastTransferToAgent();\n          if (transfer && transfer !== lastTransferToAgent) {\n            lastTransferToAgent = transfer;\n            invokeAdkRuntimeCallback(\n              \"onAgentTransfer\",\n              onAgentTransfer,\n              transfer,\n            );\n          }\n\n          // Fire custom event callback for events with customMetadata\n          if (event.customMetadata && onCustomEvent) {\n            for (const [key, value] of Object.entries(event.customMetadata)) {\n              invokeAdkRuntimeCallback(\n                \"onCustomEvent\",\n                onCustomEvent,\n                key,\n                value,\n              );\n            }\n          }\n\n          if (event.errorCode || event.errorMessage) {\n            invokeAdkRuntimeCallback(\n              \"onError\",\n              onError,\n              event.errorMessage ?? event.errorCode,\n            );\n          }\n        }\n      } catch (error) {\n        if (\n          !abortController.signal.aborted &&\n          abortControllerRef.current === abortController &&\n          !(error instanceof Error && error.name === \"AbortError\")\n        ) {\n          throw error;\n        }\n      } finally {\n        if (abortControllerRef.current === abortController) {\n          abortControllerRef.current = null;\n        }\n      }\n    },\n    [\n      aui,\n      setMessagesImmediate,\n      setLongRunningToolIds,\n      stream,\n      onError,\n      onCustomEvent,\n      onAgentTransfer,\n    ],\n  );\n\n  const cancel = useCallback(() => {\n    if (abortControllerRef.current) {\n      abortControllerRef.current.abort();\n    }\n  }, []);\n\n  useReplaySafeEffect(() => cancel, []);\n\n  return {\n    messages,\n    stateDelta,\n    agentInfo,\n    longRunningToolIds,\n    artifactDelta,\n    toolConfirmations,\n    authRequests,\n    escalated,\n    messageMetadata,\n    sendMessage,\n    cancel,\n    setMessages: setMessagesImmediate,\n    replaceMessages,\n    applySnapshot,\n  };\n};\n\n/**\n * Transport sends every human and tool message of one `send` call as a single\n * ADK `Content`, and ADK parses that event's function responses before running\n * any tool, so the batch runs whole or not at all. The optimistic projection\n * has to sit on the same boundary, so a run of those messages becomes one\n * synthetic event whose parts come from the same per-message conversion.\n *\n * The transport drops `ai` messages from that `Content`, so one interleaved\n * between two replies does not split the batch on the wire and must not split\n * it here either. It still becomes its own event, placed after the merged one,\n * so the optimistic projection keeps the assistant turn.\n *\n * @internal — exported for unit tests.\n */\nexport const messagesToEvents = (messages: AdkMessage[]): AdkEvent[] => {\n  // A reload sends no messages at all, and the empty user content the transport\n  // puts on the wire for it is not part of the optimistic view: projecting one\n  // would put an empty user bubble above every regenerated turn.\n  if (messages.length === 0) return [];\n\n  const events: AdkEvent[] = [];\n  const run: AdkMessage[] = [];\n  let runIndex = 0;\n\n  for (const msg of messages) {\n    if (msg.type === \"ai\") {\n      events.push(messageToEvent(msg));\n    } else {\n      if (run.length === 0) runIndex = events.length;\n      run.push(msg);\n    }\n  }\n\n  const parts = run.flatMap((m) => messageToEvent(m).content?.parts ?? []);\n  const human = run.find((m) => m.type === \"human\");\n\n  // A batch that contributes no part still reaches the wire: the transport\n  // sends an empty user `Content`, which a reload replays as an empty human\n  // message. Emitting it here keeps the optimistic view equal to that replay.\n  if (parts.length === 0) parts.push({ text: \"\" });\n\n  const event: AdkEvent = { id: (human ?? run[0])?.id ?? generateId() };\n  if (human || run.length === 0) event.author = \"user\";\n  event.content = { role: \"user\", parts };\n  events.splice(run.length > 0 ? runIndex : events.length, 0, event);\n\n  return events;\n};\n\n/** @internal — exported for unit tests. */\nexport const messageToEvent = (msg: AdkMessage): AdkEvent => {\n  if (msg.type === \"human\") {\n    return {\n      id: msg.id ?? generateId(),\n      author: \"user\",\n      content: { role: \"user\", parts: contentToParts(msg.content) },\n    };\n  }\n\n  if (msg.type === \"tool\") {\n    let response: unknown;\n    try {\n      response = JSON.parse(msg.content);\n    } catch {\n      response = msg.content;\n    }\n    return {\n      id: msg.id ?? generateId(),\n      content: {\n        role: \"user\",\n        parts: [\n          {\n            functionResponse: {\n              name: msg.name,\n              id: msg.tool_call_id,\n              response: toAdkFunctionResponse(response, msg.status === \"error\"),\n            },\n          },\n        ],\n      },\n    };\n  }\n\n  const result: AdkEvent = { id: msg.id ?? generateId() };\n  if (msg.author != null) result.author = msg.author;\n  result.content = {\n    role: \"model\",\n    parts: [\n      ...contentToParts(msg.content),\n      ...(msg.tool_calls?.map((tc) => ({\n        functionCall: { name: tc.name, id: tc.id, args: { ...tc.args } },\n      })) ?? []),\n    ],\n  };\n  return result;\n};\n"],"mappings":"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"}

package/dist/useAdkRuntime.d.ts

@@ -1,53 +1,52 @@
-import { AdkMessage, AdkStreamCallback, AdkThreadSnapshot, OnAdkAgentTransferCallback, OnAdkCustomEventCallback, OnAdkErrorCallback } from "./types.js";
-import { AttachmentAdapter, DictationAdapter, ExternalStoreSharedOptions, FeedbackAdapter, RealtimeVoiceAdapter, RemoteThreadListAdapter, SpeechSynthesisAdapter } from "@assistant-ui/core";
-import { AssistantCloud } from "assistant-cloud";
-//#region src/useAdkRuntime.d.ts
+import { type AttachmentAdapter, type DictationAdapter, type ExternalStoreSharedOptions, type FeedbackAdapter, type RealtimeVoiceAdapter, type SpeechSynthesisAdapter } from "@assistant-ui/core";
+import type { AssistantCloud } from "assistant-cloud";
+import type { RemoteThreadListAdapter } from "@assistant-ui/core";
+import type { AdkMessage, AdkThreadSnapshot, AdkStreamCallback, OnAdkErrorCallback, OnAdkCustomEventCallback, OnAdkAgentTransferCallback } from "./types.js";
 export type UseAdkRuntimeOptions = ExternalStoreSharedOptions & {
-  stream: AdkStreamCallback;
-  /**
-   * Called whenever the active thread's canonical (remote) ID changes, so the
-   * value can be treated as a managed/controlled variable (e.g. synced to a URL
-   * query param). Only the settled remote ID is emitted: while a freshly created
-   * thread is still optimistic the value is `undefined`, and the real ID is
-   * emitted once the thread is initialized; the transient local ID is never
-   * surfaced.
-   */
-  onThreadIdChange?: ((threadId: string | undefined) => void) | undefined;
-  autoCancelPendingToolCalls?: boolean | undefined;
-  unstable_allowCancellation?: boolean | undefined;
-  getCheckpointId?: (threadId: string, parentMessages: AdkMessage[]) => Promise<string | null>;
-  /**
-   * Loads a thread's stored state. Called when the thread opens, and again for
-   * `threads.reloadMainThread()`, which refetches in place rather than
-   * remounting the runtime; the signal aborts a load the runtime no longer
-   * needs.
-   */
-  load?: (threadId: string, options?: {
-    signal?: AbortSignal | undefined;
-  }) => Promise<AdkThreadSnapshot>;
-  create?: () => Promise<{
-    externalId: string;
-  }>;
-  delete?: (threadId: string) => Promise<void>;
-  adapters?: {
-    attachments?: AttachmentAdapter;
-    speech?: SpeechSynthesisAdapter;
-    dictation?: DictationAdapter;
-    voice?: RealtimeVoiceAdapter;
-    feedback?: FeedbackAdapter;
-  } | undefined;
-  eventHandlers?: {
-    onError?: OnAdkErrorCallback;
-    onCustomEvent?: OnAdkCustomEventCallback;
-    onAgentTransfer?: OnAdkAgentTransferCallback;
-  } | undefined;
-  cloud?: AssistantCloud | undefined;
-  /**
-   * A `RemoteThreadListAdapter` to use instead of the cloud adapter.
-   * Use with `createAdkSessionAdapter` for ADK session-backed persistence.
-   */
-  sessionAdapter?: RemoteThreadListAdapter | undefined;
+    stream: AdkStreamCallback;
+    /**
+     * Called whenever the active thread's canonical (remote) ID changes, so the
+     * value can be treated as a managed/controlled variable (e.g. synced to a URL
+     * query param). Only the settled remote ID is emitted: while a freshly created
+     * thread is still optimistic the value is `undefined`, and the real ID is
+     * emitted once the thread is initialized; the transient local ID is never
+     * surfaced.
+     */
+    onThreadIdChange?: ((threadId: string | undefined) => void) | undefined;
+    autoCancelPendingToolCalls?: boolean | undefined;
+    unstable_allowCancellation?: boolean | undefined;
+    getCheckpointId?: (threadId: string, parentMessages: AdkMessage[]) => Promise<string | null>;
+    /**
+     * Loads a thread's stored state. Called when the thread opens, and again for
+     * `threads.reloadMainThread()`, which refetches in place rather than
+     * remounting the runtime; the signal aborts a load the runtime no longer
+     * needs.
+     */
+    load?: (threadId: string, options?: {
+        signal?: AbortSignal | undefined;
+    }) => Promise<AdkThreadSnapshot>;
+    create?: () => Promise<{
+        externalId: string;
+    }>;
+    delete?: (threadId: string) => Promise<void>;
+    adapters?: {
+        attachments?: AttachmentAdapter;
+        speech?: SpeechSynthesisAdapter;
+        dictation?: DictationAdapter;
+        voice?: RealtimeVoiceAdapter;
+        feedback?: FeedbackAdapter;
+    } | undefined;
+    eventHandlers?: {
+        onError?: OnAdkErrorCallback;
+        onCustomEvent?: OnAdkCustomEventCallback;
+        onAgentTransfer?: OnAdkAgentTransferCallback;
+    } | undefined;
+    cloud?: AssistantCloud | undefined;
+    /**
+     * A `RemoteThreadListAdapter` to use instead of the cloud adapter.
+     * Use with `createAdkSessionAdapter` for ADK session-backed persistence.
+     */
+    sessionAdapter?: RemoteThreadListAdapter | undefined;
 };
 export declare const useAdkRuntime: ({ cloud, sessionAdapter, create, delete: deleteFn, onThreadIdChange, ...options }: UseAdkRuntimeOptions) => import("@assistant-ui/core").AssistantRuntime;
-//#endregion
 //# sourceMappingURL=useAdkRuntime.d.ts.map

package/dist/useAdkRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAdkRuntime.d.ts","names":[],"sources":["../src/useAdkRuntime.ts"],"mappings":";;;;YA6DY,uBAAuB;EACjC,QAAQ;;;;;;;;;EASR,qBAAqB;EACrB;EACA;EACA,mBACE,kBACA,gBAAgB,iBACb;;;;;;;EAOL,QACE,kBACA;IAAY,SAAS;QAClB,QAAQ;EACb,eAAe;IAAU;;EACzB,UAAU,qBAAqB;EAC/B;IAEM,cAAc;IACd,SAAS;IACT,YAAY;IACZ,QAAQ;IACR,WAAW;;EAGjB;IAEM,UAAU;IACV,gBAAgB;IAChB,kBAAkB;;EAGxB,QAAQ;;;;;EAKR,iBAAiB;;qBAkYN,kBAAiB,OAAA,gBAAA,QAAA,QAAA,UAAA,qBAAA,WAO3B,sDAAoB"}
+{"version":3,"file":"useAdkRuntime.d.ts","sourceRoot":"","sources":["../src/useAdkRuntime.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,0BAA0B,EAC/B,KAAK,eAAe,EACpB,KAAK,oBAAoB,EACzB,KAAK,sBAAsB,EAK5B,MAAM,oBAAoB,CAAC;AAY5B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,KAAK,EACV,UAAU,EACV,iBAAiB,EAEjB,iBAAiB,EACjB,kBAAkB,EAClB,wBAAwB,EACxB,0BAA0B,EAC3B,mBAAgB;AAmBjB,MAAM,MAAM,oBAAoB,GAAG,0BAA0B,GAAG;IAC9D,MAAM,EAAE,iBAAiB,CAAC;IAC1B;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACxE,0BAA0B,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjD,0BAA0B,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjD,eAAe,CAAC,EAAE,CAChB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,UAAU,EAAE,KACzB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC5B;;;;;OAKG;IACH,IAAI,CAAC,EAAE,CACL,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAA;KAAE,KAC3C,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,QAAQ,CAAC,EACL;QACE,WAAW,CAAC,EAAE,iBAAiB,CAAC;QAChC,MAAM,CAAC,EAAE,sBAAsB,CAAC;QAChC,SAAS,CAAC,EAAE,gBAAgB,CAAC;QAC7B,KAAK,CAAC,EAAE,oBAAoB,CAAC;QAC7B,QAAQ,CAAC,EAAE,eAAe,CAAC;KAC5B,GACD,SAAS,CAAC;IACd,aAAa,CAAC,EACV;QACE,OAAO,CAAC,EAAE,kBAAkB,CAAC;QAC7B,aAAa,CAAC,EAAE,wBAAwB,CAAC;QACzC,eAAe,CAAC,EAAE,0BAA0B,CAAC;KAC9C,GACD,SAAS,CAAC;IACd,KAAK,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACnC;;;OAGG;IACH,cAAc,CAAC,EAAE,uBAAuB,GAAG,SAAS,CAAC;CACtD,CAAC;AAiYF,eAAO,MAAM,aAAa,GAAI,mFAO3B,oBAAoB,kDAsBtB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-google-adk",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "Google ADK adapter for assistant-ui",
   "keywords": [
     "google-adk",
@@ -34,10 +34,10 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/core": "^0.3.20",
-    "@assistant-ui/store": "^0.3.14",
+    "@assistant-ui/core": "^0.3.22",
+    "@assistant-ui/store": "^0.3.16",
     "assistant-cloud": "*",
-    "assistant-stream": "^0.3.44"
+    "assistant-stream": "^0.3.46"
   },
   "peerDependencies": {
     "@google/adk": ">=0.5.0",
@@ -53,7 +53,8 @@
     }
   },
   "devDependencies": {
-    "@assistant-ui/x-buildutils": "0.0.28",
+    "@assistant-ui/x-buildutils": "0.0.29",
+    "@assistant-ui/x-react18": "0.0.0",
     "@testing-library/dom": "^10.4.2",
     "@testing-library/react": "^16.3.3",
     "@types/react": "^19.3.0",
@@ -78,6 +79,8 @@
     "build": "aui-build",
     "test": "vitest run",
     "typecheck": "tsc --noEmit",
+    "test:peer-react18": "vitest run --config vitest.peer-react18.config.ts",
+    "test:types:peer-react18": "aui-react18-types",
     "test:watch": "vitest"
   }
 }

package/src/AdkClient.test.ts

@@ -124,6 +124,24 @@ describe.each(["direct", "proxy", "proxy batch"] as const)(
 // ── Proxy mode ──
 
 describe("createAdkStream - proxy mode", () => {
+  it("aborts while dynamic headers are pending", async () => {
+    const controller = new AbortController();
+    const stream = createAdkStream({
+      api: "/api/adk",
+      headers: () => new Promise<Record<string, string>>(() => {}),
+    });
+    const events = await stream(
+      [{ id: "m1", type: "human", content: "Hello" }],
+      makeConfig({ abortSignal: controller.signal }),
+    );
+
+    const next = events.next();
+    controller.abort();
+
+    await expect(next).rejects.toBe(controller.signal.reason);
+    expect(mockFetch).not.toHaveBeenCalled();
+  });
+
   it("accumulates snake_case image and file parts from SSE", async () => {
     const event = {
       id: "media",
@@ -1077,6 +1095,38 @@ describe("createAdkStream - error handling", () => {
       'Expected ADK stream response Content-Type "text/event-stream", received no Content-Type header',
     );
   });
+
+  it("rejects event-stream responses without a body", async () => {
+    mockFetch.mockResolvedValueOnce(sseResponse(null));
+
+    const stream = createAdkStream({ api: "/api/adk" });
+    await expect(async () => {
+      const gen = await stream(
+        [{ id: "m1", type: "human", content: "Hi" }],
+        makeConfig(),
+      );
+      for await (const _ of gen) {
+        /* noop */
+      }
+    }).rejects.toThrow("Expected ADK stream response body, received no body");
+  });
+
+  it("rejects non-standard responses with an undefined body", async () => {
+    const response = sseResponse(null);
+    Object.defineProperty(response, "body", { value: undefined });
+    mockFetch.mockResolvedValueOnce(response);
+
+    const stream = createAdkStream({ api: "/api/adk" });
+    await expect(async () => {
+      const gen = await stream(
+        [{ id: "m1", type: "human", content: "Hi" }],
+        makeConfig(),
+      );
+      for await (const _ of gen) {
+        /* noop */
+      }
+    }).rejects.toThrow("Expected ADK stream response body, received no body");
+  });
 });
 
 // ── Headers ──

package/src/AdkClient.ts

@@ -1,6 +1,7 @@
 import { SSEEventDecoder } from "assistant-stream/utils";
 import { contentToParts } from "./contentToParts";
 import { parseAdkEventValue } from "./parseAdkEvent";
+import { raceWithAbortSignal } from "./raceWithAbortSignal";
 import { toAdkFunctionResponse } from "./toAdkFunctionResponse";
 import { trimTrailingSlashes } from "./trimTrailingSlashes";
 import type {
@@ -76,7 +77,7 @@ export function createAdkStream(
   }
 
   return async function* (messages, config) {
-    const headers = await resolveHeaders(options.headers);
+    const headers = await resolveHeaders(options.headers, config.abortSignal);
 
     let url: string;
     let body: unknown;
@@ -149,9 +150,12 @@ async function resolveHeaders(
     | Record<string, string>
     | (() => Record<string, string> | Promise<Record<string, string>>)
     | undefined,
+  signal?: AbortSignal,
 ): Promise<Record<string, string>> {
   if (!headers) return {};
-  if (typeof headers === "function") return await headers();
+  if (typeof headers === "function") {
+    return await raceWithAbortSignal(signal, headers);
+  }
   return headers;
 }
 
@@ -252,7 +256,10 @@ function messagesToProxyBody(
 }
 
 async function* parseSSEResponse(response: Response): AsyncGenerator<AdkEvent> {
-  const reader = response.body!.getReader();
+  if (!response.body) {
+    throw new Error("Expected ADK stream response body, received no body");
+  }
+  const reader = response.body.getReader();
   const decoder = new TextDecoder();
   const sseDecoder = new SSEEventDecoder({ trailing: "dispatch" });
 

package/src/AdkSessionAdapter.test.ts

@@ -22,6 +22,23 @@ const baseOptions = {
 const expectedBaseUrl =
   "http://localhost:8000/apps/my-app/users/user-1/sessions";
 
+describe("createAdkSessionAdapter - load cancellation", () => {
+  it("aborts while dynamic headers are pending", async () => {
+    const controller = new AbortController();
+    const reason = new Error("cancelled");
+    const { load } = createAdkSessionAdapter({
+      ...baseOptions,
+      headers: () => new Promise<Record<string, string>>(() => {}),
+    });
+
+    const result = load("session-1", { signal: controller.signal });
+    controller.abort(reason);
+
+    await expect(result).rejects.toBe(reason);
+    expect(mockFetch).not.toHaveBeenCalled();
+  });
+});
+
 // ── adapter.list() ──
 
 describe("createAdkSessionAdapter - list", () => {

package/src/AdkSessionAdapter.ts

@@ -10,6 +10,7 @@ import { normalizeAdkPart } from "./normalizeAdkPart";
 import { parseAdkEventValue } from "./parseAdkEvent";
 import type { AdkMessage, AdkThreadSnapshot } from "./types";
 import { trimTrailingSlashes } from "./trimTrailingSlashes";
+import { raceWithAbortSignal } from "./raceWithAbortSignal";
 
 export type AdkSessionAdapterOptions = {
   /**
@@ -230,9 +231,13 @@ export function createAdkSessionAdapter(
   const normalizedApiUrl = trimTrailingSlashes(apiUrl);
   const baseUrl = `${normalizedApiUrl}/apps/${encodeURIComponent(appName)}/users/${encodeURIComponent(userId)}/sessions`;
 
-  const getHeaders = async (): Promise<Record<string, string>> => {
+  const getHeaders = async (
+    signal?: AbortSignal,
+  ): Promise<Record<string, string>> => {
     if (!options.headers) return {};
-    if (typeof options.headers === "function") return await options.headers();
+    if (typeof options.headers === "function") {
+      return await raceWithAbortSignal(signal, options.headers);
+    }
     return options.headers;
   };
 
@@ -327,7 +332,7 @@ export function createAdkSessionAdapter(
     sessionId: string,
     options?: { signal?: AbortSignal | undefined },
   ): Promise<AdkThreadSnapshot> => {
-    const headers = await getHeaders();
+    const headers = await getHeaders(options?.signal);
     const res = await fetch(`${baseUrl}/${encodeURIComponent(sessionId)}`, {
       headers,
       ...(options?.signal ? { signal: options.signal } : {}),

package/src/adkAuthRequest.test.ts

@@ -0,0 +1,101 @@
+import { describe, expect, it } from "vitest";
+import { toAdkAuthReply } from "./adkAuthRequest";
+import type { AdkAuthRequest } from "./types";
+
+const CREDENTIAL_CALL = "adk-credential-1";
+
+const apiKeyScheme = { type: "apiKey", in: "header", name: "x-api-key" };
+
+const request = (authConfig: unknown): AdkAuthRequest => ({
+  toolCallId: CREDENTIAL_CALL,
+  authConfig,
+});
+
+const wire = (content: string) => JSON.parse(content);
+
+describe("toAdkAuthReply", () => {
+  it("answers the credential call with the request's config carrying the credential", () => {
+    const reply = toAdkAuthReply(
+      CREDENTIAL_CALL,
+      { authType: "apiKey", apiKey: "secret" },
+      [request({ authScheme: apiKeyScheme, credentialKey: "weather" })],
+    );
+
+    expect(reply).toMatchObject({
+      type: "tool",
+      tool_call_id: CREDENTIAL_CALL,
+      name: "adk_request_credential",
+      status: "success",
+    });
+    expect(wire(reply.content)).toEqual({
+      authScheme: apiKeyScheme,
+      credentialKey: "weather",
+      exchangedAuthCredential: { authType: "apiKey", apiKey: "secret" },
+    });
+  });
+
+  it("lays the OAuth2 answer over the exchanged credential the request issued", () => {
+    const oauth2Scheme = { type: "oauth2", flows: {} };
+    const reply = toAdkAuthReply(
+      CREDENTIAL_CALL,
+      {
+        authType: "oauth2",
+        oauth2: { authResponseUri: "https://app/cb?code=c&state=s" },
+      },
+      [
+        request({
+          authScheme: oauth2Scheme,
+          credentialKey: "calendar",
+          rawAuthCredential: { authType: "oauth2", oauth2: { clientId: "id" } },
+          exchangedAuthCredential: {
+            authType: "oauth2",
+            oauth2: {
+              clientId: "id",
+              authUri: "https://idp/authorize?state=s",
+              state: "s",
+              redirectUri: "https://app/cb",
+            },
+          },
+        }),
+      ],
+    );
+
+    expect(wire(reply.content)).toEqual({
+      authScheme: oauth2Scheme,
+      credentialKey: "calendar",
+      rawAuthCredential: { authType: "oauth2", oauth2: { clientId: "id" } },
+      exchangedAuthCredential: {
+        authType: "oauth2",
+        oauth2: {
+          clientId: "id",
+          authUri: "https://idp/authorize?state=s",
+          state: "s",
+          redirectUri: "https://app/cb",
+          authResponseUri: "https://app/cb?code=c&state=s",
+        },
+      },
+    });
+  });
+
+  it("sends the credential alone when the request carried no config", () => {
+    const reply = toAdkAuthReply(
+      CREDENTIAL_CALL,
+      { authType: "apiKey", apiKey: "secret" },
+      [request(undefined)],
+    );
+
+    expect(wire(reply.content)).toEqual({
+      exchangedAuthCredential: { authType: "apiKey", apiKey: "secret" },
+    });
+  });
+
+  it("throws for an id that is not a pending request", () => {
+    expect(() =>
+      toAdkAuthReply("adk-credential-2", { authType: "apiKey", apiKey: "x" }, [
+        request({ authScheme: apiKeyScheme, credentialKey: "weather" }),
+      ]),
+    ).toThrow(
+      'No pending ADK auth request for tool call id "adk-credential-2"',
+    );
+  });
+});

package/src/adkAuthRequest.ts

@@ -0,0 +1,50 @@
+import { generateId } from "@assistant-ui/core";
+import { isRecord } from "@assistant-ui/core/internal";
+import type { AdkAuthCredential, AdkAuthRequest, AdkMessage } from "./types";
+
+export const ADK_REQUEST_CREDENTIAL = "adk_request_credential";
+
+const recordOf = (value: unknown): Record<string, unknown> =>
+  isRecord(value) ? value : {};
+
+/**
+ * ADK binds a credential reply to the `adk_request_credential` call it issued
+ * and takes only `exchangedAuthCredential` off the response, so the reply is
+ * the request's own auth config with the credential filled in, as ADK's
+ * reference client sends it: adk-python validates the response as a whole auth
+ * config, and it exchanges an OAuth2 code with the client id, redirect uri and
+ * state the request carried, so the caller's fields land over the request's
+ * exchanged credential rather than replacing it. An id that is not a pending
+ * request would send a reply adk-js ignores and adk-python answers by
+ * requesting again, so it throws instead.
+ */
+export const toAdkAuthReply = (
+  toolCallId: string,
+  credential: AdkAuthCredential,
+  requests: readonly AdkAuthRequest[],
+): AdkMessage & { type: "tool" } => {
+  const request = requests.find((r) => r.toolCallId === toolCallId);
+  if (request === undefined)
+    throw new Error(
+      `No pending ADK auth request for tool call id "${toolCallId}"`,
+    );
+
+  const authConfig = recordOf(request.authConfig);
+  const requested = recordOf(authConfig.exchangedAuthCredential);
+  const oauth2 = { ...recordOf(requested.oauth2), ...credential.oauth2 };
+  return {
+    id: generateId(),
+    type: "tool",
+    tool_call_id: toolCallId,
+    name: ADK_REQUEST_CREDENTIAL,
+    content: JSON.stringify({
+      ...authConfig,
+      exchangedAuthCredential: {
+        ...requested,
+        ...credential,
+        ...(Object.keys(oauth2).length > 0 && { oauth2 }),
+      },
+    }),
+    status: "success",
+  };
+};

package/src/contentToParts.ts

@@ -31,6 +31,8 @@ export const contentToParts = (
         return {
           codeExecutionResult: { output: part.output, outcome: part.outcome },
         };
+      case "activity":
+        return { text: part.message };
       default:
         return { text: "" };
     }