@assistant-ui/react-google-adk 0.0.21 → 0.0.23

package/dist/server/adkEventStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adkEventStream.d.ts","names":[],"sources":["../../src/server/adkEventStream.ts"],"mappings":";;;;KAKK;EACH;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;IACE;IACA,QAAQ,MAAM;;EAEhB,UAAU;EACV;EACA;EACA;EACA;EACA;EACA;EACA,iBAAiB;;KAyEP;EACV,WAAW;;;;;;;;;;;;cAaA,iBACX,QAAQ,eAAe,+BACvB,UAAU,0BACT"}
+{"version":3,"file":"adkEventStream.d.ts","names":[],"sources":["../../src/server/adkEventStream.ts"],"mappings":";;;;KAKK;EACH;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;IACE;IACA,QAAQ,MAAM;;EAEhB,UAAU;EACV;EACA;EACA;EACA;EACA;EACA;EACA,iBAAiB;;KAyEP;EACV,WAAW;;;;;;;;;;;;cA4BA,iBACX,QAAQ,eAAe,+BACvB,UAAU,0BACT"}

package/dist/server/adkEventStream.js

@@ -48,6 +48,16 @@ const convertSdkEvent = (event) => {
 	if (event.customMetadata != null) result.customMetadata = event.customMetadata;
 	return result;
 };
+const reportCallbackError = (error) => {
+	console.error("[react-google-adk] onError callback threw an error", error);
+};
+const notifyError = (callback, error) => {
+	try {
+		Promise.resolve(callback?.(error)).catch(reportCallbackError);
+	} catch (callbackError) {
+		reportCallbackError(callbackError);
+	}
+};
 /**
 * Converts an AsyncGenerator of ADK SDK Events into an SSE Response.
 *
@@ -72,7 +82,7 @@ const adkEventStream = (events, options) => {
 				}
 			} catch (e) {
 				if (!cancelled) {
-					options?.onError?.(e);
+					notifyError(options?.onError, e);
 					const errorEvent = {
 						id: "",
 						errorCode: "STREAM_ERROR",

package/dist/server/adkEventStream.js.map

@@ -1 +1 @@
-{"version":3,"file":"adkEventStream.js","names":[],"sources":["../../src/server/adkEventStream.ts"],"sourcesContent":["import type { AdkEvent, AdkEventActions, AdkEventPart } from \"../types\";\n\n/**\n * The ADK SDK Event type. Intentionally loose to avoid requiring @google/adk.\n */\ntype AdkSdkEvent = {\n  id?: string;\n  invocationId?: string;\n  author?: string;\n  branch?: string;\n  partial?: boolean;\n  turnComplete?: boolean;\n  interrupted?: boolean;\n  finishReason?: string;\n  timestamp?: number;\n  content?: {\n    role?: string;\n    parts?: Array<Record<string, unknown>>;\n  };\n  actions?: Record<string, unknown>;\n  longRunningToolIds?: string[];\n  errorCode?: string;\n  errorMessage?: string;\n  groundingMetadata?: unknown;\n  citationMetadata?: unknown;\n  usageMetadata?: unknown;\n  customMetadata?: Record<string, unknown>;\n};\n\nconst convertSdkPart = (part: Record<string, unknown>): AdkEventPart => {\n  const result: Record<string, unknown> = {};\n  if (\"text\" in part && typeof part.text === \"string\") result.text = part.text;\n  if (\"thought\" in part && typeof part.thought === \"boolean\")\n    result.thought = part.thought;\n  if (\"functionCall\" in part && part.functionCall)\n    result.functionCall = part.functionCall;\n  if (\"functionResponse\" in part && part.functionResponse)\n    result.functionResponse = part.functionResponse;\n  if (\"executableCode\" in part && part.executableCode)\n    result.executableCode = part.executableCode;\n  if (\"codeExecutionResult\" in part && part.codeExecutionResult)\n    result.codeExecutionResult = part.codeExecutionResult;\n  if (\"inlineData\" in part && part.inlineData)\n    result.inlineData = part.inlineData;\n  if (\"fileData\" in part && part.fileData) result.fileData = part.fileData;\n  return result as AdkEventPart;\n};\n\nconst convertSdkActions = (\n  actions: Record<string, unknown>,\n): AdkEventActions => {\n  const result: Record<string, unknown> = {};\n  if (actions.stateDelta != null) result.stateDelta = actions.stateDelta;\n  if (actions.artifactDelta != null)\n    result.artifactDelta = actions.artifactDelta;\n  if (actions.transferToAgent != null)\n    result.transferToAgent = actions.transferToAgent;\n  if (actions.escalate != null) result.escalate = actions.escalate;\n  if (actions.skipSummarization != null)\n    result.skipSummarization = actions.skipSummarization;\n  if (actions.requestedAuthConfigs != null)\n    result.requestedAuthConfigs = actions.requestedAuthConfigs;\n  if (actions.requestedToolConfirmations != null)\n    result.requestedToolConfirmations = actions.requestedToolConfirmations;\n  return result as AdkEventActions;\n};\n\nconst convertSdkEvent = (event: AdkSdkEvent): AdkEvent => {\n  const result: Record<string, unknown> = { id: event.id ?? \"\" };\n  if (event.invocationId != null) result.invocationId = event.invocationId;\n  if (event.author != null) result.author = event.author;\n  if (event.branch != null) result.branch = event.branch;\n  if (event.partial != null) result.partial = event.partial;\n  if (event.turnComplete != null) result.turnComplete = event.turnComplete;\n  if (event.interrupted != null) result.interrupted = event.interrupted;\n  if (event.finishReason != null) result.finishReason = event.finishReason;\n  if (event.timestamp != null) result.timestamp = event.timestamp;\n  if (event.content) {\n    const content: Record<string, unknown> = {};\n    if (event.content.role != null) content.role = event.content.role;\n    if (event.content.parts)\n      content.parts = event.content.parts.map(convertSdkPart);\n    result.content = content;\n  }\n  if (event.actions) result.actions = convertSdkActions(event.actions);\n  if (event.longRunningToolIds)\n    result.longRunningToolIds = event.longRunningToolIds;\n  if (event.errorCode != null) result.errorCode = event.errorCode;\n  if (event.errorMessage != null) result.errorMessage = event.errorMessage;\n  if (event.groundingMetadata != null)\n    result.groundingMetadata = event.groundingMetadata;\n  if (event.citationMetadata != null)\n    result.citationMetadata = event.citationMetadata;\n  if (event.usageMetadata != null) result.usageMetadata = event.usageMetadata;\n  if (event.customMetadata != null)\n    result.customMetadata = event.customMetadata;\n  return result as AdkEvent;\n};\n\nexport type AdkEventStreamOptions = {\n  onError?: (error: unknown) => void;\n};\n\n/**\n * Converts an AsyncGenerator of ADK SDK Events into an SSE Response.\n *\n * @example\n * ```ts\n * import { adkEventStream } from '@assistant-ui/react-google-adk/server';\n * const events = runner.runAsync({ userId, sessionId, newMessage });\n * return adkEventStream(events);\n * ```\n */\nexport const adkEventStream = (\n  events: AsyncGenerator<AdkSdkEvent, void, undefined>,\n  options?: AdkEventStreamOptions,\n): Response => {\n  const encoder = new TextEncoder();\n  let cancelled = false;\n  const stream = new ReadableStream({\n    async start(controller) {\n      // Initial SSE comment to keep connection alive through proxies\n      controller.enqueue(encoder.encode(\":ok\\n\\n\"));\n      try {\n        for await (const event of events) {\n          if (cancelled) break;\n          const wireEvent = convertSdkEvent(event);\n          controller.enqueue(\n            encoder.encode(`data: ${JSON.stringify(wireEvent)}\\n\\n`),\n          );\n        }\n      } catch (e) {\n        if (!cancelled) {\n          options?.onError?.(e);\n          const errorEvent: AdkEvent = {\n            id: \"\",\n            errorCode: \"STREAM_ERROR\",\n            errorMessage:\n              e instanceof Error ? e.message : \"Unknown stream error\",\n          };\n          controller.enqueue(\n            encoder.encode(`data: ${JSON.stringify(errorEvent)}\\n\\n`),\n          );\n        }\n      } finally {\n        controller.close();\n      }\n    },\n    async cancel() {\n      cancelled = true;\n      await events.return?.(undefined as any);\n    },\n  });\n\n  return new Response(stream, {\n    headers: {\n      \"Content-Type\": \"text/event-stream\",\n      \"Cache-Control\": \"no-cache\",\n    },\n  });\n};\n"],"mappings":"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"}
+{"version":3,"file":"adkEventStream.js","names":[],"sources":["../../src/server/adkEventStream.ts"],"sourcesContent":["import type { AdkEvent, AdkEventActions, AdkEventPart } from \"../types\";\n\n/**\n * The ADK SDK Event type. Intentionally loose to avoid requiring @google/adk.\n */\ntype AdkSdkEvent = {\n  id?: string;\n  invocationId?: string;\n  author?: string;\n  branch?: string;\n  partial?: boolean;\n  turnComplete?: boolean;\n  interrupted?: boolean;\n  finishReason?: string;\n  timestamp?: number;\n  content?: {\n    role?: string;\n    parts?: Array<Record<string, unknown>>;\n  };\n  actions?: Record<string, unknown>;\n  longRunningToolIds?: string[];\n  errorCode?: string;\n  errorMessage?: string;\n  groundingMetadata?: unknown;\n  citationMetadata?: unknown;\n  usageMetadata?: unknown;\n  customMetadata?: Record<string, unknown>;\n};\n\nconst convertSdkPart = (part: Record<string, unknown>): AdkEventPart => {\n  const result: Record<string, unknown> = {};\n  if (\"text\" in part && typeof part.text === \"string\") result.text = part.text;\n  if (\"thought\" in part && typeof part.thought === \"boolean\")\n    result.thought = part.thought;\n  if (\"functionCall\" in part && part.functionCall)\n    result.functionCall = part.functionCall;\n  if (\"functionResponse\" in part && part.functionResponse)\n    result.functionResponse = part.functionResponse;\n  if (\"executableCode\" in part && part.executableCode)\n    result.executableCode = part.executableCode;\n  if (\"codeExecutionResult\" in part && part.codeExecutionResult)\n    result.codeExecutionResult = part.codeExecutionResult;\n  if (\"inlineData\" in part && part.inlineData)\n    result.inlineData = part.inlineData;\n  if (\"fileData\" in part && part.fileData) result.fileData = part.fileData;\n  return result as AdkEventPart;\n};\n\nconst convertSdkActions = (\n  actions: Record<string, unknown>,\n): AdkEventActions => {\n  const result: Record<string, unknown> = {};\n  if (actions.stateDelta != null) result.stateDelta = actions.stateDelta;\n  if (actions.artifactDelta != null)\n    result.artifactDelta = actions.artifactDelta;\n  if (actions.transferToAgent != null)\n    result.transferToAgent = actions.transferToAgent;\n  if (actions.escalate != null) result.escalate = actions.escalate;\n  if (actions.skipSummarization != null)\n    result.skipSummarization = actions.skipSummarization;\n  if (actions.requestedAuthConfigs != null)\n    result.requestedAuthConfigs = actions.requestedAuthConfigs;\n  if (actions.requestedToolConfirmations != null)\n    result.requestedToolConfirmations = actions.requestedToolConfirmations;\n  return result as AdkEventActions;\n};\n\nconst convertSdkEvent = (event: AdkSdkEvent): AdkEvent => {\n  const result: Record<string, unknown> = { id: event.id ?? \"\" };\n  if (event.invocationId != null) result.invocationId = event.invocationId;\n  if (event.author != null) result.author = event.author;\n  if (event.branch != null) result.branch = event.branch;\n  if (event.partial != null) result.partial = event.partial;\n  if (event.turnComplete != null) result.turnComplete = event.turnComplete;\n  if (event.interrupted != null) result.interrupted = event.interrupted;\n  if (event.finishReason != null) result.finishReason = event.finishReason;\n  if (event.timestamp != null) result.timestamp = event.timestamp;\n  if (event.content) {\n    const content: Record<string, unknown> = {};\n    if (event.content.role != null) content.role = event.content.role;\n    if (event.content.parts)\n      content.parts = event.content.parts.map(convertSdkPart);\n    result.content = content;\n  }\n  if (event.actions) result.actions = convertSdkActions(event.actions);\n  if (event.longRunningToolIds)\n    result.longRunningToolIds = event.longRunningToolIds;\n  if (event.errorCode != null) result.errorCode = event.errorCode;\n  if (event.errorMessage != null) result.errorMessage = event.errorMessage;\n  if (event.groundingMetadata != null)\n    result.groundingMetadata = event.groundingMetadata;\n  if (event.citationMetadata != null)\n    result.citationMetadata = event.citationMetadata;\n  if (event.usageMetadata != null) result.usageMetadata = event.usageMetadata;\n  if (event.customMetadata != null)\n    result.customMetadata = event.customMetadata;\n  return result as AdkEvent;\n};\n\nexport type AdkEventStreamOptions = {\n  onError?: (error: unknown) => void;\n};\n\nconst reportCallbackError = (error: unknown) => {\n  console.error(\"[react-google-adk] onError callback threw an error\", error);\n};\n\nconst notifyError = (\n  callback: AdkEventStreamOptions[\"onError\"],\n  error: unknown,\n) => {\n  try {\n    void Promise.resolve(callback?.(error)).catch(reportCallbackError);\n  } catch (callbackError) {\n    reportCallbackError(callbackError);\n  }\n};\n\n/**\n * Converts an AsyncGenerator of ADK SDK Events into an SSE Response.\n *\n * @example\n * ```ts\n * import { adkEventStream } from '@assistant-ui/react-google-adk/server';\n * const events = runner.runAsync({ userId, sessionId, newMessage });\n * return adkEventStream(events);\n * ```\n */\nexport const adkEventStream = (\n  events: AsyncGenerator<AdkSdkEvent, void, undefined>,\n  options?: AdkEventStreamOptions,\n): Response => {\n  const encoder = new TextEncoder();\n  let cancelled = false;\n  const stream = new ReadableStream({\n    async start(controller) {\n      // Initial SSE comment to keep connection alive through proxies\n      controller.enqueue(encoder.encode(\":ok\\n\\n\"));\n      try {\n        for await (const event of events) {\n          if (cancelled) break;\n          const wireEvent = convertSdkEvent(event);\n          controller.enqueue(\n            encoder.encode(`data: ${JSON.stringify(wireEvent)}\\n\\n`),\n          );\n        }\n      } catch (e) {\n        if (!cancelled) {\n          notifyError(options?.onError, e);\n          const errorEvent: AdkEvent = {\n            id: \"\",\n            errorCode: \"STREAM_ERROR\",\n            errorMessage:\n              e instanceof Error ? e.message : \"Unknown stream error\",\n          };\n          controller.enqueue(\n            encoder.encode(`data: ${JSON.stringify(errorEvent)}\\n\\n`),\n          );\n        }\n      } finally {\n        controller.close();\n      }\n    },\n    async cancel() {\n      cancelled = true;\n      await events.return?.(undefined as any);\n    },\n  });\n\n  return new Response(stream, {\n    headers: {\n      \"Content-Type\": \"text/event-stream\",\n      \"Cache-Control\": \"no-cache\",\n    },\n  });\n};\n"],"mappings":"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"}

package/dist/useAdkMessages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAdkMessages.d.ts","names":[],"sources":["../src/useAdkMessages.ts"],"mappings":";;KAmBY;EACV,QAAQ;EACR;IACE,UAAU;IACV,gBAAgB;IAChB,kBAAkB;;;cAIT,mBAAkB,QAAA,iBAG5B;;;;IAIQ;IACE;;;;;;;;EA2EW,cAAA,aAAA,cAAY,QAAU,yBAAoB;;EAnDhB,cAAA,MAAA;EA+BvC,kBAAA,MAAA;EAnBI,gBAAA,UAAA"}
+{"version":3,"file":"useAdkMessages.d.ts","names":[],"sources":["../src/useAdkMessages.ts"],"mappings":";;KAmBY;EACV,QAAQ;EACR;IACE,UAAU;IACV,gBAAgB;IAChB,kBAAkB;;;cA0BT,mBAAkB,QAAA,iBAG5B;;;;IAIQ;IACE;;;;;;;;EA2EW,cAAA,aAAA,cAAY,QAAU,yBAAoB;;EAnDhB,cAAA,MAAA;EA+BvC,kBAAA,MAAA;EAnBI,gBAAA,UAAA"}

package/dist/useAdkMessages.js

@@ -4,6 +4,19 @@ import { v4 } from "uuid";
 import { useAui } from "@assistant-ui/store";
 import { useCallback, useMemo, useRef, useState } from "react";
 //#region src/useAdkMessages.ts
+const reportCallbackError = (name, error) => {
+	console.error(`[react-google-adk] ${name} callback threw an error`, error);
+};
+const invokeAdkRuntimeCallback = (name, callback, ...args) => {
+	if (!callback) return;
+	try {
+		Promise.resolve(callback(...args)).catch((error) => {
+			reportCallbackError(name, error);
+		});
+	} catch (error) {
+		reportCallbackError(name, error);
+	}
+};
 const useAdkMessages = ({ stream, eventHandlers }) => {
 	const [messages, _setMessages] = useState([]);
 	const [stateDelta, setStateDelta] = useState({});
@@ -106,10 +119,10 @@ const useAdkMessages = ({ stream, eventHandlers }) => {
 					const transfer = accumulator.getLastTransferToAgent();
 					if (transfer && transfer !== lastTransferToAgentRef.current) {
 						lastTransferToAgentRef.current = transfer;
-						onAgentTransfer?.(transfer);
+						invokeAdkRuntimeCallback("onAgentTransfer", onAgentTransfer, transfer);
 					}
-					if (event.customMetadata && onCustomEvent) for (const [key, value] of Object.entries(event.customMetadata)) onCustomEvent(key, value);
-					if (event.errorCode || event.errorMessage) onError?.(event.errorMessage ?? event.errorCode);
+					if (event.customMetadata && onCustomEvent) for (const [key, value] of Object.entries(event.customMetadata)) invokeAdkRuntimeCallback("onCustomEvent", onCustomEvent, key, value);
+					if (event.errorCode || event.errorMessage) invokeAdkRuntimeCallback("onError", onError, event.errorMessage ?? event.errorCode);
 				}
 			} catch (error) {
 				if (!abortController.signal.aborted && !(error instanceof Error && error.name === "AbortError")) throw error;

package/dist/useAdkMessages.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAdkMessages.js","names":["uuidv4"],"sources":["../src/useAdkMessages.ts"],"sourcesContent":["import { useState, useCallback, useRef, useMemo } from \"react\";\nimport { v4 as uuidv4 } from \"uuid\";\nimport { useAui } from \"@assistant-ui/store\";\nimport { AdkEventAccumulator } from \"./AdkEventAccumulator\";\nimport { contentToParts } from \"./contentToParts\";\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\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  const messagesRef = useRef(messages);\n  messagesRef.current = messages;\n  const stateDeltaRef = useRef(stateDelta);\n  stateDeltaRef.current = stateDelta;\n  const artifactDeltaRef = useRef(artifactDelta);\n  artifactDeltaRef.current = artifactDelta;\n  const messageMetadataRef = useRef(messageMetadata);\n  messageMetadataRef.current = messageMetadata;\n\n  const setMessagesImmediate = useCallback((msgs: AdkMessage[]) => {\n    messagesRef.current = msgs;\n    _setMessages(msgs);\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    [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    [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: uuidv4() },\n      ) as AdkMessage[];\n\n      const accumulator = new AdkEventAccumulator(messagesRef.current);\n      for (const msg of newMessagesWithId) {\n        accumulator.processEvent(messageToEvent(msg));\n      }\n      setMessagesImmediate(accumulator.getMessages());\n\n      const abortController = new AbortController();\n      abortControllerRef.current = abortController;\n\n      try {\n        const response = await stream(newMessagesWithId, {\n          ...config,\n          abortSignal: abortController.signal,\n          initialize: async () => {\n            return await aui.threadListItem.initialize();\n          },\n        });\n\n        for await (const event of response) {\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            onAgentTransfer?.(transfer);\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              onCustomEvent(key, value);\n            }\n          }\n\n          if (event.errorCode || event.errorMessage) {\n            onError?.(event.errorMessage ?? event.errorCode);\n          }\n        }\n      } catch (error) {\n        if (\n          !abortController.signal.aborted &&\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      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  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/** @internal — exported for unit tests. */\nexport const messageToEvent = (msg: AdkMessage): AdkEvent => {\n  if (msg.type === \"human\") {\n    return {\n      id: msg.id ?? uuidv4(),\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 ?? uuidv4(),\n      content: {\n        role: \"user\",\n        parts: [\n          {\n            functionResponse: {\n              name: msg.name,\n              id: msg.tool_call_id,\n              response,\n            },\n          },\n        ],\n      },\n    };\n  }\n\n  const result: AdkEvent = { id: msg.id ?? uuidv4() };\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":";;;;;;AA4BA,MAAa,kBAAkB,EAC7B,QACA,oBAC2B;CAC3B,MAAM,CAAC,UAAU,gBAAgB,SAAuB,CAAC,CAAC;CAC1D,MAAM,CAAC,YAAY,iBAAiB,SAAkC,CAAC,CAAC;CACxE,MAAM,CAAC,WAAW,gBAAgB,SAG/B,CAAC,CAAC;CACL,MAAM,CAAC,oBAAoB,yBAAyB,SAAmB,CAAC,CAAC;CACzE,MAAM,CAAC,eAAe,oBAAoB,SACxC,CAAC,CACH;CACA,MAAM,CAAC,mBAAmB,wBAAwB,SAEhD,CAAC,CAAC;CACJ,MAAM,CAAC,cAAc,mBAAmB,SAA2B,CAAC,CAAC;CACrE,MAAM,CAAC,WAAW,gBAAgB,SAAS,KAAK;CAChD,MAAM,CAAC,iBAAiB,sBAAsB,yBAE5C,IAAI,IAAI,CAAC;CACX,MAAM,yBAAyB,OAA2B,KAAA,CAAS;CACnE,MAAM,cAAc,OAAO,QAAQ;CACnC,YAAY,UAAU;CACtB,MAAM,gBAAgB,OAAO,UAAU;CACvC,cAAc,UAAU;CACxB,MAAM,mBAAmB,OAAO,aAAa;CAC7C,iBAAiB,UAAU;CAC3B,MAAM,qBAAqB,OAAO,eAAe;CACjD,mBAAmB,UAAU;CAE7B,MAAM,uBAAuB,aAAa,SAAuB;EAC/D,YAAY,UAAU;EACtB,aAAa,IAAI;CACnB,GAAG,CAAC,CAAC;;;;;;;CAQL,MAAM,gBAAgB,aACnB,aAAgC;EAC/B,qBAAqB,SAAS,QAAQ;EACtC,sBAAsB,SAAS,sBAAsB,CAAC,CAAC;EACvD,qBAAqB,SAAS,qBAAqB,CAAC,CAAC;EACrD,gBAAgB,SAAS,gBAAgB,CAAC,CAAC;EAC3C,aAAa,SAAS,aAAa,KAAK;EACxC,mBAAmB,SAAS,mCAAmB,IAAI,IAAI,CAAC;EACxD,cAAc,SAAS,cAAc,CAAC,CAAC;EACvC,iBAAiB,SAAS,iBAAiB,CAAC,CAAC;EAC7C,aAAa,SAAS,aAAa,CAAC,CAAC;CACvC,GACA,CAAC,oBAAoB,CACvB;CAMA,MAAM,kBAAkB,aACrB,SAAuB;EACtB,qBAAqB,IAAI;EACzB,sBAAsB,CAAC,CAAC;EACxB,qBAAqB,CAAC,CAAC;EACvB,gBAAgB,CAAC,CAAC;EAClB,aAAa,KAAK;EAClB,mCAAmB,IAAI,IAAI,CAAC;CAC9B,GACA,CAAC,oBAAoB,CACvB;CAEA,MAAM,qBAAqB,OAA+B,IAAI;CAE9D,MAAM,EAAE,SAAS,eAAe,oBAAoB,cAC5C,iBAAiB,CAAC,GACxB,CAAC,aAAa,CAChB;CAEA,MAAM,MAAM,OAAO;CAgGnB,OAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,aAzGkB,YAClB,OAAO,aAA2B,WAAiC;GACjE,MAAM,oBAAoB,YAAY,KAAK,MACzC,EAAE,KAAK,IAAI;IAAE,GAAG;IAAG,IAAIA,GAAO;GAAE,CAClC;GAEA,MAAM,cAAc,IAAI,oBAAoB,YAAY,OAAO;GAC/D,KAAK,MAAM,OAAO,mBAChB,YAAY,aAAa,eAAe,GAAG,CAAC;GAE9C,qBAAqB,YAAY,YAAY,CAAC;GAE9C,MAAM,kBAAkB,IAAI,gBAAgB;GAC5C,mBAAmB,UAAU;GAE7B,IAAI;IACF,MAAM,WAAW,MAAM,OAAO,mBAAmB;KAC/C,GAAG;KACH,aAAa,gBAAgB;KAC7B,YAAY,YAAY;MACtB,OAAO,MAAM,IAAI,eAAe,WAAW;KAC7C;IACF,CAAC;IAED,WAAW,MAAM,SAAS,UAAU;KAClC,MAAM,kBAAkB,YAAY,aAAa,KAAK;KACtD,qBAAqB,eAAe;KACpC,cAAc;MACZ,GAAG,cAAc;MACjB,GAAG,YAAY,cAAc;KAC/B,CAAC;KACD,aAAa,YAAY,aAAa,CAAC;KACvC,sBAAsB,YAAY,sBAAsB,CAAC;KACzD,iBAAiB;MACf,GAAG,iBAAiB;MACpB,GAAG,YAAY,iBAAiB;KAClC,CAAC;KACD,qBAAqB,YAAY,qBAAqB,CAAC;KACvD,gBAAgB,YAAY,gBAAgB,CAAC;KAC7C,aAAa,YAAY,YAAY,CAAC;KACtC;MACE,MAAM,UAAU,YAAY,mBAAmB;MAC/C,IAAI,QAAQ,OAAO,GACjB,mBACE,IAAI,IAAI,CAAC,GAAG,mBAAmB,SAAS,GAAG,OAAO,CAAC,CACrD;KAEJ;KAEA,MAAM,WAAW,YAAY,uBAAuB;KACpD,IAAI,YAAY,aAAa,uBAAuB,SAAS;MAC3D,uBAAuB,UAAU;MACjC,kBAAkB,QAAQ;KAC5B;KAGA,IAAI,MAAM,kBAAkB,eAC1B,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,MAAM,cAAc,GAC5D,cAAc,KAAK,KAAK;KAI5B,IAAI,MAAM,aAAa,MAAM,cAC3B,UAAU,MAAM,gBAAgB,MAAM,SAAS;IAEnD;GACF,SAAS,OAAO;IACd,IACE,CAAC,gBAAgB,OAAO,WACxB,EAAE,iBAAiB,SAAS,MAAM,SAAS,eAE3C,MAAM;GAEV,UAAU;IACR,IAAI,mBAAmB,YAAY,iBACjC,mBAAmB,UAAU;GAEjC;EACF,GACA;GACE;GACA;GACA;GACA;GACA;GACA;EACF,CAmBU;EACV,QAjBa,kBAAkB;GAC/B,IAAI,mBAAmB,SACrB,mBAAmB,QAAQ,MAAM;EAErC,GAAG,CAAC,CAaG;EACL,aAAa;EACb;EACA;CACF;AACF;;AAGA,MAAa,kBAAkB,QAA8B;CAC3D,IAAI,IAAI,SAAS,SACf,OAAO;EACL,IAAI,IAAI,MAAMA,GAAO;EACrB,QAAQ;EACR,SAAS;GAAE,MAAM;GAAQ,OAAO,eAAe,IAAI,OAAO;EAAE;CAC9D;CAGF,IAAI,IAAI,SAAS,QAAQ;EACvB,IAAI;EACJ,IAAI;GACF,WAAW,KAAK,MAAM,IAAI,OAAO;EACnC,QAAQ;GACN,WAAW,IAAI;EACjB;EACA,OAAO;GACL,IAAI,IAAI,MAAMA,GAAO;GACrB,SAAS;IACP,MAAM;IACN,OAAO,CACL,EACE,kBAAkB;KAChB,MAAM,IAAI;KACV,IAAI,IAAI;KACR;IACF,EACF,CACF;GACF;EACF;CACF;CAEA,MAAM,SAAmB,EAAE,IAAI,IAAI,MAAMA,GAAO,EAAE;CAClD,IAAI,IAAI,UAAU,MAAM,OAAO,SAAS,IAAI;CAC5C,OAAO,UAAU;EACf,MAAM;EACN,OAAO,CACL,GAAG,eAAe,IAAI,OAAO,GAC7B,GAAI,IAAI,YAAY,KAAK,QAAQ,EAC/B,cAAc;GAAE,MAAM,GAAG;GAAM,IAAI,GAAG;GAAI,MAAM,EAAE,GAAG,GAAG,KAAK;EAAE,EACjE,EAAE,KAAK,CAAC,CACV;CACF;CACA,OAAO;AACT"}
+{"version":3,"file":"useAdkMessages.js","names":["uuidv4"],"sources":["../src/useAdkMessages.ts"],"sourcesContent":["import { useState, useCallback, useRef, useMemo } from \"react\";\nimport { v4 as uuidv4 } from \"uuid\";\nimport { useAui } from \"@assistant-ui/store\";\nimport { AdkEventAccumulator } from \"./AdkEventAccumulator\";\nimport { contentToParts } from \"./contentToParts\";\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 reportCallbackError = (name: AdkRuntimeCallbackName, error: unknown) => {\n  console.error(`[react-google-adk] ${name} callback threw an error`, error);\n};\n\nconst invokeAdkRuntimeCallback = <TArgs extends unknown[]>(\n  name: AdkRuntimeCallbackName,\n  callback: ((...args: TArgs) => void | Promise<void>) | undefined,\n  ...args: TArgs\n) => {\n  if (!callback) return;\n\n  try {\n    void Promise.resolve(callback(...args)).catch((error) => {\n      reportCallbackError(name, error);\n    });\n  } catch (error) {\n    reportCallbackError(name, error);\n  }\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  const messagesRef = useRef(messages);\n  messagesRef.current = messages;\n  const stateDeltaRef = useRef(stateDelta);\n  stateDeltaRef.current = stateDelta;\n  const artifactDeltaRef = useRef(artifactDelta);\n  artifactDeltaRef.current = artifactDelta;\n  const messageMetadataRef = useRef(messageMetadata);\n  messageMetadataRef.current = messageMetadata;\n\n  const setMessagesImmediate = useCallback((msgs: AdkMessage[]) => {\n    messagesRef.current = msgs;\n    _setMessages(msgs);\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    [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    [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: uuidv4() },\n      ) as AdkMessage[];\n\n      const accumulator = new AdkEventAccumulator(messagesRef.current);\n      for (const msg of newMessagesWithId) {\n        accumulator.processEvent(messageToEvent(msg));\n      }\n      setMessagesImmediate(accumulator.getMessages());\n\n      const abortController = new AbortController();\n      abortControllerRef.current = abortController;\n\n      try {\n        const response = await stream(newMessagesWithId, {\n          ...config,\n          abortSignal: abortController.signal,\n          initialize: async () => {\n            return await aui.threadListItem.initialize();\n          },\n        });\n\n        for await (const event of response) {\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          !(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      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  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/** @internal — exported for unit tests. */\nexport const messageToEvent = (msg: AdkMessage): AdkEvent => {\n  if (msg.type === \"human\") {\n    return {\n      id: msg.id ?? uuidv4(),\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 ?? uuidv4(),\n      content: {\n        role: \"user\",\n        parts: [\n          {\n            functionResponse: {\n              name: msg.name,\n              id: msg.tool_call_id,\n              response,\n            },\n          },\n        ],\n      },\n    };\n  }\n\n  const result: AdkEvent = { id: msg.id ?? uuidv4() };\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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-google-adk",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "Google ADK adapter for assistant-ui",
   "keywords": [
     "google-adk",
@@ -33,11 +33,16 @@
     "README.md"
   ],
   "sideEffects": false,
+  "scripts": {
+    "build": "aui-build",
+    "test": "vitest run",
+    "test:watch": "vitest"
+  },
   "dependencies": {
-    "@assistant-ui/core": "^0.3.4",
-    "@assistant-ui/store": "^0.3.3",
+    "@assistant-ui/core": "^0.3.7",
+    "@assistant-ui/store": "^0.3.5",
     "assistant-cloud": "*",
-    "assistant-stream": "^0.3.32",
+    "assistant-stream": "^0.3.34",
     "uuid": "^14.0.1"
   },
   "peerDependencies": {
@@ -54,14 +59,14 @@
     }
   },
   "devDependencies": {
+    "@assistant-ui/x-buildutils": "workspace:*",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/react": "^19.2.17",
     "@types/uuid": "^11.0.0",
     "jsdom": "^29.1.1",
     "react": "^19.2.8",
-    "vitest": "^4.1.10",
-    "@assistant-ui/x-buildutils": "0.0.20"
+    "vitest": "^4.1.10"
   },
   "publishConfig": {
     "access": "public",
@@ -75,10 +80,5 @@
   },
   "bugs": {
     "url": "https://github.com/assistant-ui/assistant-ui/issues"
-  },
-  "scripts": {
-    "build": "aui-build",
-    "test": "vitest run",
-    "test:watch": "vitest"
   }
-}
+}

package/src/server/adkEventStream.test.ts

@@ -73,4 +73,42 @@ describe("adkEventStream", () => {
     await readSSE(response);
     expect(onError).toHaveBeenCalledTimes(1);
   });
+
+  it.each([
+    [
+      "throws",
+      () => {
+        throw new Error("callback failed");
+      },
+    ],
+    [
+      "rejects",
+      async () => {
+        throw new Error("callback failed");
+      },
+    ],
+  ])(
+    "still emits the stream error when onError %s",
+    async (_behavior, onError) => {
+      const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+      async function* throwingGen() {
+        throw new Error("stream failed");
+      }
+
+      try {
+        const response = adkEventStream(throwingGen() as any, { onError });
+        const text = await readSSE(response);
+        await vi.waitFor(() => expect(errorSpy).toHaveBeenCalledTimes(1));
+
+        const lines = text.split("\n\n").filter((l) => l.startsWith("data: "));
+        expect(lines).toHaveLength(1);
+        expect(JSON.parse(lines[0]!.slice(6))).toMatchObject({
+          errorCode: "STREAM_ERROR",
+          errorMessage: "stream failed",
+        });
+      } finally {
+        errorSpy.mockRestore();
+      }
+    },
+  );
 });

package/src/server/adkEventStream.ts

@@ -101,6 +101,21 @@ export type AdkEventStreamOptions = {
   onError?: (error: unknown) => void;
 };
 
+const reportCallbackError = (error: unknown) => {
+  console.error("[react-google-adk] onError callback threw an error", error);
+};
+
+const notifyError = (
+  callback: AdkEventStreamOptions["onError"],
+  error: unknown,
+) => {
+  try {
+    void Promise.resolve(callback?.(error)).catch(reportCallbackError);
+  } catch (callbackError) {
+    reportCallbackError(callbackError);
+  }
+};
+
 /**
  * Converts an AsyncGenerator of ADK SDK Events into an SSE Response.
  *
@@ -131,7 +146,7 @@ export const adkEventStream = (
         }
       } catch (e) {
         if (!cancelled) {
-          options?.onError?.(e);
+          notifyError(options?.onError, e);
           const errorEvent: AdkEvent = {
             id: "",
             errorCode: "STREAM_ERROR",

package/src/useAdkMessages.test.ts

@@ -1,6 +1,129 @@
-import { describe, expect, it } from "vitest";
-import { messageToEvent } from "./useAdkMessages";
-import type { AdkMessage } from "./types";
+import { act, renderHook } from "@testing-library/react";
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  initialize: vi.fn(async () => ({
+    remoteId: "thread-1",
+    externalId: undefined,
+  })),
+}));
+
+vi.mock("@assistant-ui/store", async (importOriginal) => ({
+  ...(await importOriginal()),
+  useAui: () => ({ threadListItem: { initialize: mocks.initialize } }),
+}));
+
+import {
+  messageToEvent,
+  useAdkMessages,
+  type UseAdkMessagesOptions,
+} from "./useAdkMessages";
+import type { AdkEvent, AdkMessage, AdkStreamCallback } from "./types";
+
+afterEach(() => {
+  vi.restoreAllMocks();
+});
+
+describe("ADK runtime callbacks", () => {
+  it.each(["onAgentTransfer", "onCustomEvent", "onError"] as const)(
+    "continues streaming when %s throws",
+    async (callbackName) => {
+      const callbackError = new Error("telemetry failed");
+      const consoleError = vi
+        .spyOn(console, "error")
+        .mockImplementation(() => {});
+      const callback = vi.fn(() => {
+        throw callbackError;
+      });
+      const eventByCallback: Record<typeof callbackName, AdkEvent> = {
+        onAgentTransfer: {
+          id: "transfer",
+          actions: { transferToAgent: "researcher" },
+        },
+        onCustomEvent: {
+          id: "custom",
+          customMetadata: { progress: 1 },
+        },
+        onError: {
+          id: "error",
+          author: "agent",
+          errorMessage: "recoverable error",
+        },
+      };
+      const stream: AdkStreamCallback = async function* () {
+        yield eventByCallback[callbackName];
+        yield {
+          id: "answer",
+          author: "agent",
+          content: { role: "model", parts: [{ text: "done" }] },
+        };
+      };
+      const eventHandlers = {
+        [callbackName]: callback,
+      } as UseAdkMessagesOptions["eventHandlers"];
+      const { result } = renderHook(() =>
+        useAdkMessages({ stream, eventHandlers }),
+      );
+
+      await act(async () => {
+        await result.current.sendMessage(
+          [{ id: "user", type: "human", content: "hello" }],
+          {},
+        );
+      });
+
+      expect(result.current.messages.at(-1)).toMatchObject({
+        type: "ai",
+        content: [{ type: "text", text: "done" }],
+      });
+      expect(consoleError).toHaveBeenCalledWith(
+        `[react-google-adk] ${callbackName} callback threw an error`,
+        callbackError,
+      );
+    },
+  );
+
+  it("continues streaming when onCustomEvent rejects", async () => {
+    const callbackError = new Error("async telemetry failed");
+    const consoleError = vi
+      .spyOn(console, "error")
+      .mockImplementation(() => {});
+    const stream: AdkStreamCallback = async function* () {
+      yield { id: "custom", customMetadata: { progress: 1 } };
+      yield {
+        id: "answer",
+        author: "agent",
+        content: { role: "model", parts: [{ text: "done" }] },
+      };
+    };
+    const { result } = renderHook(() =>
+      useAdkMessages({
+        stream,
+        eventHandlers: {
+          onCustomEvent: () => Promise.reject(callbackError),
+        },
+      }),
+    );
+
+    await act(async () => {
+      await result.current.sendMessage(
+        [{ id: "user", type: "human", content: "hello" }],
+        {},
+      );
+    });
+
+    expect(result.current.messages.at(-1)).toMatchObject({
+      type: "ai",
+      content: [{ type: "text", text: "done" }],
+    });
+    await vi.waitFor(() => {
+      expect(consoleError).toHaveBeenCalledWith(
+        "[react-google-adk] onCustomEvent callback threw an error",
+        callbackError,
+      );
+    });
+  });
+});
 
 describe("messageToEvent (contentToParts)", () => {
   it("serializes a file content part as inlineData", () => {

package/src/useAdkMessages.ts

@@ -26,6 +26,28 @@ export type UseAdkMessagesOptions = {
   };
 };
 
+type AdkRuntimeCallbackName = "onError" | "onCustomEvent" | "onAgentTransfer";
+
+const reportCallbackError = (name: AdkRuntimeCallbackName, error: unknown) => {
+  console.error(`[react-google-adk] ${name} callback threw an error`, error);
+};
+
+const invokeAdkRuntimeCallback = <TArgs extends unknown[]>(
+  name: AdkRuntimeCallbackName,
+  callback: ((...args: TArgs) => void | Promise<void>) | undefined,
+  ...args: TArgs
+) => {
+  if (!callback) return;
+
+  try {
+    void Promise.resolve(callback(...args)).catch((error) => {
+      reportCallbackError(name, error);
+    });
+  } catch (error) {
+    reportCallbackError(name, error);
+  }
+};
+
 export const useAdkMessages = ({
   stream,
   eventHandlers,
@@ -160,18 +182,31 @@ export const useAdkMessages = ({
           const transfer = accumulator.getLastTransferToAgent();
           if (transfer && transfer !== lastTransferToAgentRef.current) {
             lastTransferToAgentRef.current = transfer;
-            onAgentTransfer?.(transfer);
+            invokeAdkRuntimeCallback(
+              "onAgentTransfer",
+              onAgentTransfer,
+              transfer,
+            );
           }
 
           // Fire custom event callback for events with customMetadata
           if (event.customMetadata && onCustomEvent) {
             for (const [key, value] of Object.entries(event.customMetadata)) {
-              onCustomEvent(key, value);
+              invokeAdkRuntimeCallback(
+                "onCustomEvent",
+                onCustomEvent,
+                key,
+                value,
+              );
             }
           }
 
           if (event.errorCode || event.errorMessage) {
-            onError?.(event.errorMessage ?? event.errorCode);
+            invokeAdkRuntimeCallback(
+              "onError",
+              onError,
+              event.errorMessage ?? event.errorCode,
+            );
           }
         }
       } catch (error) {

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2025 AgentbaseAI Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.