@assistant-ui/react-google-adk 0.0.18 → 0.0.20

package/dist/AdkClient.js

@@ -136,10 +136,19 @@ async function* parseSSEResponse(response) {
 	const reader = response.body.getReader();
 	const decoder = new TextDecoder();
 	const sseDecoder = new SSEEventDecoder({ trailing: "dispatch" });
+	let shouldCancel = true;
 	try {
 		while (true) {
-			const { done, value } = await reader.read();
+			let result;
+			try {
+				result = await reader.read();
+			} catch (error) {
+				shouldCancel = false;
+				throw error;
+			}
+			const { done, value } = result;
 			if (done) {
+				shouldCancel = false;
 				for (const event of sseDecoder.push(decoder.decode())) yield JSON.parse(event.data);
 				break;
 			}
@@ -148,7 +157,11 @@ async function* parseSSEResponse(response) {
 		const trailing = sseDecoder.flush();
 		if (trailing !== null) yield JSON.parse(trailing.data);
 	} finally {
-		reader.releaseLock();
+		try {
+			if (shouldCancel) await reader.cancel().catch(() => void 0);
+		} finally {
+			reader.releaseLock();
+		}
 	}
 }
 //#endregion

package/dist/AdkClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"AdkClient.js","names":[],"sources":["../src/AdkClient.ts"],"sourcesContent":["import { SSEEventDecoder } from \"assistant-stream/utils\";\nimport { contentToParts } from \"./contentToParts\";\nimport { trimTrailingSlashes } from \"./trimTrailingSlashes\";\nimport type {\n  AdkEvent,\n  AdkEventPart,\n  AdkMessage,\n  AdkStreamCallback,\n} from \"./types\";\n\nexport type CreateAdkStreamOptions = {\n  /**\n   * URL to POST to. Either a proxy route (e.g. \"/api/adk\") or\n   * an ADK server base URL (e.g. \"http://localhost:8000\").\n   *\n   * When `appName` and `userId` are provided, POSTs to `${api}/run_sse`\n   * in ADK-native format. Otherwise POSTs directly to `api` in proxy format\n   * (compatible with `parseAdkRequest`).\n   */\n  api: string;\n\n  /**\n   * ADK application name. When provided along with `userId`,\n   * enables direct connection to an ADK server.\n   */\n  appName?: string | undefined;\n\n  /**\n   * ADK user ID. Required when `appName` is provided.\n   */\n  userId?: string | undefined;\n\n  /**\n   * Extra headers to send with every request.\n   * Can be a static object or an async function for dynamic auth tokens.\n   */\n  headers?:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>)\n    | undefined;\n};\n\n/**\n * Creates an `AdkStreamCallback` that connects to an ADK endpoint.\n *\n * @example Proxy mode (with a Next.js API route)\n * ```ts\n * const stream = createAdkStream({ api: \"/api/adk\" });\n * ```\n *\n * @example Direct mode (connecting to ADK server)\n * ```ts\n * const stream = createAdkStream({\n *   api: \"http://localhost:8000\",\n *   appName: \"my-app\",\n *   userId: \"user-1\",\n * });\n * ```\n */\nexport function createAdkStream(\n  options: CreateAdkStreamOptions,\n): AdkStreamCallback {\n  if (options.appName === \"\") {\n    throw new Error(\n      'createAdkStream direct mode requires a non-empty \"appName\".',\n    );\n  }\n\n  const isDirect = options.appName != null;\n  if (isDirect && (options.userId == null || options.userId === \"\")) {\n    throw new Error(\n      'createAdkStream direct mode requires \"userId\" when \"appName\" is provided.',\n    );\n  }\n\n  return async function* (messages, config) {\n    const headers = await resolveHeaders(options.headers);\n\n    let url: string;\n    let body: unknown;\n\n    if (isDirect) {\n      // Direct mode: POST to ADK server's /run_sse\n      url = `${trimTrailingSlashes(options.api)}/run_sse`;\n      const { externalId } = await config.initialize();\n      body = {\n        appName: options.appName,\n        userId: options.userId,\n        sessionId: externalId,\n        newMessage: messagesToContent(messages),\n        streaming: true,\n        ...(config.stateDelta != null && { stateDelta: config.stateDelta }),\n      };\n    } else {\n      // Proxy mode: POST in parseAdkRequest-compatible format\n      url = options.api;\n      body = messagesToProxyBody(messages, config);\n    }\n\n    const response = await fetch(url, {\n      method: \"POST\",\n      headers: { \"Content-Type\": \"application/json\", ...headers },\n      body: JSON.stringify(body),\n      signal: config.abortSignal,\n    });\n\n    if (!response.ok) {\n      throw new Error(\n        `ADK request failed: ${response.status} ${response.statusText}`,\n      );\n    }\n\n    validateEventStreamContentType(response);\n    yield* parseSSEResponse(response);\n  };\n}\n\n// ── Internal helpers ──\n\nfunction validateEventStreamContentType(response: Response): void {\n  const contentType = response.headers.get(\"Content-Type\");\n  const mediaType = contentType?.split(\";\", 1)[0]?.trim().toLowerCase();\n  if (mediaType !== \"text/event-stream\") {\n    const received = contentType\n      ? `\"${contentType}\"`\n      : \"no Content-Type header\";\n    void response.body?.cancel().catch(() => undefined);\n    throw new Error(\n      `Expected ADK stream response Content-Type \"text/event-stream\", received ${received}`,\n    );\n  }\n}\n\nasync function resolveHeaders(\n  headers:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>)\n    | undefined,\n): Promise<Record<string, string>> {\n  if (!headers) return {};\n  if (typeof headers === \"function\") return await headers();\n  return headers;\n}\n\n/**\n * Converts AdkMessage[] (new messages) into ADK Content format\n * for the direct `/run_sse` endpoint.\n */\nfunction messagesToContent(messages: AdkMessage[]): {\n  role: string;\n  parts: AdkEventPart[];\n} {\n  const parts: AdkEventPart[] = [];\n\n  for (const msg of messages) {\n    if (msg.type === \"human\") {\n      for (const part of contentToParts(msg.content)) {\n        parts.push(part);\n      }\n    } else if (msg.type === \"tool\") {\n      let response: unknown;\n      try {\n        response = JSON.parse(msg.content);\n      } catch {\n        response = msg.content;\n      }\n      parts.push({\n        functionResponse: {\n          name: msg.name,\n          id: msg.tool_call_id,\n          response,\n        },\n      });\n    }\n  }\n\n  if (parts.length === 0) {\n    parts.push({ text: \"\" });\n  }\n\n  return { role: \"user\", parts };\n}\n\n/**\n * Converts AdkMessage[] into the proxy request body format\n * (compatible with `parseAdkRequest`).\n */\nfunction messagesToProxyBody(\n  messages: AdkMessage[],\n  config: {\n    runConfig?: unknown;\n    checkpointId?: string | undefined;\n    stateDelta?: Record<string, unknown> | undefined;\n  },\n): Record<string, unknown> {\n  const body: Record<string, unknown> = {};\n\n  if (config.runConfig != null) body.runConfig = config.runConfig;\n  if (config.checkpointId != null) body.checkpointId = config.checkpointId;\n  if (config.stateDelta != null) body.stateDelta = config.stateDelta;\n\n  // Check if there's a tool result\n  const toolMsg = messages.find((m) => m.type === \"tool\");\n  if (toolMsg && toolMsg.type === \"tool\") {\n    // If there are also other messages (e.g. cancellations), send as parts\n    if (messages.length > 1) {\n      body.parts = messagesToContent(messages).parts;\n      return body;\n    }\n\n    let result: unknown;\n    try {\n      result = JSON.parse(toolMsg.content);\n    } catch {\n      result = toolMsg.content;\n    }\n    body.type = \"tool-result\";\n    body.toolCallId = toolMsg.tool_call_id;\n    body.toolName = toolMsg.name;\n    body.result = result;\n    body.isError = toolMsg.status === \"error\";\n    return body;\n  }\n\n  // Human message(s) - possibly with cancellation tool results prepended\n  if (messages.length === 1 && messages[0]!.type === \"human\") {\n    const msg = messages[0]!;\n    if (typeof msg.content === \"string\") {\n      body.message = msg.content;\n    } else {\n      body.parts = contentToParts(msg.content);\n    }\n    return body;\n  }\n\n  // Multiple messages (e.g. cancellations + human): send as parts array\n  body.parts = messagesToContent(messages).parts;\n  return body;\n}\n\nasync function* parseSSEResponse(response: Response): AsyncGenerator<AdkEvent> {\n  const reader = response.body!.getReader();\n  const decoder = new TextDecoder();\n  const sseDecoder = new SSEEventDecoder({ trailing: \"dispatch\" });\n\n  try {\n    while (true) {\n      const { done, value } = await reader.read();\n      if (done) {\n        for (const event of sseDecoder.push(decoder.decode())) {\n          yield JSON.parse(event.data) as AdkEvent;\n        }\n        break;\n      }\n\n      for (const event of sseDecoder.push(\n        decoder.decode(value, { stream: true }),\n      )) {\n        yield JSON.parse(event.data) as AdkEvent;\n      }\n    }\n\n    const trailing = sseDecoder.flush();\n    if (trailing !== null) yield JSON.parse(trailing.data) as AdkEvent;\n  } finally {\n    reader.releaseLock();\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"AdkClient.js","names":[],"sources":["../src/AdkClient.ts"],"sourcesContent":["import { SSEEventDecoder } from \"assistant-stream/utils\";\nimport { contentToParts } from \"./contentToParts\";\nimport { trimTrailingSlashes } from \"./trimTrailingSlashes\";\nimport type {\n  AdkEvent,\n  AdkEventPart,\n  AdkMessage,\n  AdkStreamCallback,\n} from \"./types\";\n\nexport type CreateAdkStreamOptions = {\n  /**\n   * URL to POST to. Either a proxy route (e.g. \"/api/adk\") or\n   * an ADK server base URL (e.g. \"http://localhost:8000\").\n   *\n   * When `appName` and `userId` are provided, POSTs to `${api}/run_sse`\n   * in ADK-native format. Otherwise POSTs directly to `api` in proxy format\n   * (compatible with `parseAdkRequest`).\n   */\n  api: string;\n\n  /**\n   * ADK application name. When provided along with `userId`,\n   * enables direct connection to an ADK server.\n   */\n  appName?: string | undefined;\n\n  /**\n   * ADK user ID. Required when `appName` is provided.\n   */\n  userId?: string | undefined;\n\n  /**\n   * Extra headers to send with every request.\n   * Can be a static object or an async function for dynamic auth tokens.\n   */\n  headers?:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>)\n    | undefined;\n};\n\n/**\n * Creates an `AdkStreamCallback` that connects to an ADK endpoint.\n *\n * @example Proxy mode (with a Next.js API route)\n * ```ts\n * const stream = createAdkStream({ api: \"/api/adk\" });\n * ```\n *\n * @example Direct mode (connecting to ADK server)\n * ```ts\n * const stream = createAdkStream({\n *   api: \"http://localhost:8000\",\n *   appName: \"my-app\",\n *   userId: \"user-1\",\n * });\n * ```\n */\nexport function createAdkStream(\n  options: CreateAdkStreamOptions,\n): AdkStreamCallback {\n  if (options.appName === \"\") {\n    throw new Error(\n      'createAdkStream direct mode requires a non-empty \"appName\".',\n    );\n  }\n\n  const isDirect = options.appName != null;\n  if (isDirect && (options.userId == null || options.userId === \"\")) {\n    throw new Error(\n      'createAdkStream direct mode requires \"userId\" when \"appName\" is provided.',\n    );\n  }\n\n  return async function* (messages, config) {\n    const headers = await resolveHeaders(options.headers);\n\n    let url: string;\n    let body: unknown;\n\n    if (isDirect) {\n      // Direct mode: POST to ADK server's /run_sse\n      url = `${trimTrailingSlashes(options.api)}/run_sse`;\n      const { externalId } = await config.initialize();\n      body = {\n        appName: options.appName,\n        userId: options.userId,\n        sessionId: externalId,\n        newMessage: messagesToContent(messages),\n        streaming: true,\n        ...(config.stateDelta != null && { stateDelta: config.stateDelta }),\n      };\n    } else {\n      // Proxy mode: POST in parseAdkRequest-compatible format\n      url = options.api;\n      body = messagesToProxyBody(messages, config);\n    }\n\n    const response = await fetch(url, {\n      method: \"POST\",\n      headers: { \"Content-Type\": \"application/json\", ...headers },\n      body: JSON.stringify(body),\n      signal: config.abortSignal,\n    });\n\n    if (!response.ok) {\n      throw new Error(\n        `ADK request failed: ${response.status} ${response.statusText}`,\n      );\n    }\n\n    validateEventStreamContentType(response);\n    yield* parseSSEResponse(response);\n  };\n}\n\n// ── Internal helpers ──\n\nfunction validateEventStreamContentType(response: Response): void {\n  const contentType = response.headers.get(\"Content-Type\");\n  const mediaType = contentType?.split(\";\", 1)[0]?.trim().toLowerCase();\n  if (mediaType !== \"text/event-stream\") {\n    const received = contentType\n      ? `\"${contentType}\"`\n      : \"no Content-Type header\";\n    void response.body?.cancel().catch(() => undefined);\n    throw new Error(\n      `Expected ADK stream response Content-Type \"text/event-stream\", received ${received}`,\n    );\n  }\n}\n\nasync function resolveHeaders(\n  headers:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>)\n    | undefined,\n): Promise<Record<string, string>> {\n  if (!headers) return {};\n  if (typeof headers === \"function\") return await headers();\n  return headers;\n}\n\n/**\n * Converts AdkMessage[] (new messages) into ADK Content format\n * for the direct `/run_sse` endpoint.\n */\nfunction messagesToContent(messages: AdkMessage[]): {\n  role: string;\n  parts: AdkEventPart[];\n} {\n  const parts: AdkEventPart[] = [];\n\n  for (const msg of messages) {\n    if (msg.type === \"human\") {\n      for (const part of contentToParts(msg.content)) {\n        parts.push(part);\n      }\n    } else if (msg.type === \"tool\") {\n      let response: unknown;\n      try {\n        response = JSON.parse(msg.content);\n      } catch {\n        response = msg.content;\n      }\n      parts.push({\n        functionResponse: {\n          name: msg.name,\n          id: msg.tool_call_id,\n          response,\n        },\n      });\n    }\n  }\n\n  if (parts.length === 0) {\n    parts.push({ text: \"\" });\n  }\n\n  return { role: \"user\", parts };\n}\n\n/**\n * Converts AdkMessage[] into the proxy request body format\n * (compatible with `parseAdkRequest`).\n */\nfunction messagesToProxyBody(\n  messages: AdkMessage[],\n  config: {\n    runConfig?: unknown;\n    checkpointId?: string | undefined;\n    stateDelta?: Record<string, unknown> | undefined;\n  },\n): Record<string, unknown> {\n  const body: Record<string, unknown> = {};\n\n  if (config.runConfig != null) body.runConfig = config.runConfig;\n  if (config.checkpointId != null) body.checkpointId = config.checkpointId;\n  if (config.stateDelta != null) body.stateDelta = config.stateDelta;\n\n  // Check if there's a tool result\n  const toolMsg = messages.find((m) => m.type === \"tool\");\n  if (toolMsg && toolMsg.type === \"tool\") {\n    // If there are also other messages (e.g. cancellations), send as parts\n    if (messages.length > 1) {\n      body.parts = messagesToContent(messages).parts;\n      return body;\n    }\n\n    let result: unknown;\n    try {\n      result = JSON.parse(toolMsg.content);\n    } catch {\n      result = toolMsg.content;\n    }\n    body.type = \"tool-result\";\n    body.toolCallId = toolMsg.tool_call_id;\n    body.toolName = toolMsg.name;\n    body.result = result;\n    body.isError = toolMsg.status === \"error\";\n    return body;\n  }\n\n  // Human message(s) - possibly with cancellation tool results prepended\n  if (messages.length === 1 && messages[0]!.type === \"human\") {\n    const msg = messages[0]!;\n    if (typeof msg.content === \"string\") {\n      body.message = msg.content;\n    } else {\n      body.parts = contentToParts(msg.content);\n    }\n    return body;\n  }\n\n  // Multiple messages (e.g. cancellations + human): send as parts array\n  body.parts = messagesToContent(messages).parts;\n  return body;\n}\n\nasync function* parseSSEResponse(response: Response): AsyncGenerator<AdkEvent> {\n  const reader = response.body!.getReader();\n  const decoder = new TextDecoder();\n  const sseDecoder = new SSEEventDecoder({ trailing: \"dispatch\" });\n\n  let shouldCancel = true;\n  try {\n    while (true) {\n      let result: ReadableStreamReadResult<Uint8Array>;\n      try {\n        result = await reader.read();\n      } catch (error) {\n        shouldCancel = false;\n        throw error;\n      }\n\n      const { done, value } = result;\n      if (done) {\n        shouldCancel = false;\n        for (const event of sseDecoder.push(decoder.decode())) {\n          yield JSON.parse(event.data) as AdkEvent;\n        }\n        break;\n      }\n\n      for (const event of sseDecoder.push(\n        decoder.decode(value, { stream: true }),\n      )) {\n        yield JSON.parse(event.data) as AdkEvent;\n      }\n    }\n\n    const trailing = sseDecoder.flush();\n    if (trailing !== null) yield JSON.parse(trailing.data) as AdkEvent;\n  } finally {\n    try {\n      if (shouldCancel) await reader.cancel().catch(() => undefined);\n    } finally {\n      reader.releaseLock();\n    }\n  }\n}\n"],"mappings":"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"}

package/dist/adkExtras.d.ts

@@ -1,6 +1,6 @@
 import { AdkRuntimeExtras } from "./types.js";
 //#region src/adkExtras.d.ts
-declare const adkExtras: import("@assistant-ui/core/internal").RuntimeExtras<AdkRuntimeExtras>;
+declare const adkExtras: import("@assistant-ui/core/react").RuntimeExtras<AdkRuntimeExtras>;
 //#endregion
 export { adkExtras };
 //# sourceMappingURL=adkExtras.d.ts.map

package/dist/adkExtras.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adkExtras.d.ts","names":[],"sources":["../src/adkExtras.ts"],"mappings":";;cAGa,iDAAS,cAAA"}
+{"version":3,"file":"adkExtras.d.ts","names":[],"sources":["../src/adkExtras.ts"],"mappings":";;cAGa,8CAAS,cAAA"}

package/dist/adkExtras.js

@@ -1,4 +1,4 @@
-import { createRuntimeExtras } from "@assistant-ui/core/internal";
+import { createRuntimeExtras } from "@assistant-ui/core/react";
 //#region src/adkExtras.ts
 const adkExtras = createRuntimeExtras("useAdkRuntime");
 //#endregion

package/dist/adkExtras.js.map

@@ -1 +1 @@
-{"version":3,"file":"adkExtras.js","names":[],"sources":["../src/adkExtras.ts"],"sourcesContent":["import { createRuntimeExtras } from \"@assistant-ui/core/internal\";\nimport type { AdkRuntimeExtras } from \"./types\";\n\nexport const adkExtras = createRuntimeExtras<AdkRuntimeExtras>(\"useAdkRuntime\");\n"],"mappings":";;AAGA,MAAa,YAAY,oBAAsC,eAAe"}
+{"version":3,"file":"adkExtras.js","names":[],"sources":["../src/adkExtras.ts"],"sourcesContent":["import { createRuntimeExtras } from \"@assistant-ui/core/react\";\nimport type { AdkRuntimeExtras } from \"./types\";\n\nexport const adkExtras = createRuntimeExtras<AdkRuntimeExtras>(\"useAdkRuntime\");\n"],"mappings":";;AAGA,MAAa,YAAY,oBAAsC,eAAe"}

package/dist/convertAdkMessages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convertAdkMessages.d.ts","names":[],"sources":["../src/convertAdkMessages.ts"],"mappings":";;;cAkEa,mBAAmB,4BAA4B,SAC1D"}
+{"version":3,"file":"convertAdkMessages.d.ts","names":[],"sources":["../src/convertAdkMessages.ts"],"mappings":";;;cAkFa,mBAAmB,4BAA4B,SAC1D"}

package/dist/convertAdkMessages.js

@@ -1,6 +1,6 @@
 "use client";
 //#region src/convertAdkMessages.ts
-const contentToParts = (content) => {
+const contentToParts = (content, role) => {
 	if (typeof content === "string") return [{
 		type: "text",
 		text: content
@@ -23,12 +23,22 @@ const contentToParts = (content) => {
 				type: "image",
 				image: part.url
 			};
-			case "file": return {
-				type: "file",
-				data: part.data,
-				mimeType: part.mimeType,
-				...part.filename != null && { filename: part.filename }
-			};
+			case "file": {
+				const format = role === "user" && part.filename == null ? part.mimeType === "audio/wav" ? "wav" : part.mimeType === "audio/mp3" ? "mp3" : null : null;
+				if (format) return {
+					type: "audio",
+					audio: {
+						data: part.data,
+						format
+					}
+				};
+				return {
+					type: "file",
+					data: part.data,
+					mimeType: part.mimeType,
+					...part.filename != null && { filename: part.filename }
+				};
+			}
 			case "file_url": return {
 				type: "data",
 				name: "file_url",
@@ -62,7 +72,7 @@ const convertAdkMessage = (message) => {
 		case "human": return {
 			role: "user",
 			id: message.id,
-			content: contentToParts(message.content)
+			content: contentToParts(message.content, "user")
 		};
 		case "ai": {
 			const toolCallParts = message.tool_calls?.map((tc) => ({
@@ -75,7 +85,7 @@ const convertAdkMessage = (message) => {
 			return {
 				role: "assistant",
 				id: message.id,
-				content: [...contentToParts(message.content), ...toolCallParts],
+				content: [...contentToParts(message.content, "assistant"), ...toolCallParts],
 				...message.status && { status: message.status },
 				...message.author && { metadata: { custom: {
 					author: message.author,

package/dist/convertAdkMessages.js.map

@@ -1 +1 @@
-{"version":3,"file":"convertAdkMessages.js","names":[],"sources":["../src/convertAdkMessages.ts"],"sourcesContent":["\"use client\";\n\nimport type { ToolCallMessagePart } from \"@assistant-ui/core\";\nimport type { useExternalMessageConverter } from \"@assistant-ui/core/react\";\nimport type { AdkMessage, AdkMessageContentPart } from \"./types\";\n\ntype ContentPart =\n  | { type: \"text\"; text: string }\n  | { type: \"reasoning\"; text: string }\n  | { type: \"image\"; image: string }\n  | { type: \"file\"; data: string; mimeType: string; filename?: string }\n  | { type: \"data\"; name: string; data: unknown };\n\nconst contentToParts = (content: AdkMessage[\"content\"]): ContentPart[] => {\n  if (typeof content === \"string\")\n    return [{ type: \"text\" as const, text: content }];\n\n  return (content as AdkMessageContentPart[])\n    .map((part): ContentPart | null => {\n      switch (part.type) {\n        case \"text\":\n          return { type: \"text\", text: part.text };\n        case \"reasoning\":\n          return { type: \"reasoning\", text: part.text };\n        case \"image\":\n          return {\n            type: \"image\",\n            image: `data:${part.mimeType};base64,${part.data}`,\n          };\n        case \"image_url\":\n          return { type: \"image\", image: part.url };\n        case \"file\":\n          return {\n            type: \"file\",\n            data: part.data,\n            mimeType: part.mimeType,\n            ...(part.filename != null && { filename: part.filename }),\n          };\n        case \"file_url\":\n          return {\n            type: \"data\",\n            name: \"file_url\",\n            data: {\n              url: part.url,\n              ...(part.mimeType != null && { mimeType: part.mimeType }),\n            },\n          };\n        case \"code\":\n          return {\n            type: \"data\",\n            name: \"executable_code\",\n            data: { code: part.code, language: part.language },\n          };\n        case \"code_result\":\n          return {\n            type: \"data\",\n            name: \"code_execution_result\",\n            data: { output: part.output, outcome: part.outcome },\n          };\n        default:\n          return null;\n      }\n    })\n    .filter((p): p is NonNullable<typeof p> => p !== null);\n};\n\nexport const convertAdkMessage: useExternalMessageConverter.Callback<\n  AdkMessage\n> = (message) => {\n  switch (message.type) {\n    case \"human\":\n      return {\n        role: \"user\",\n        id: message.id,\n        content: contentToParts(message.content),\n      };\n\n    case \"ai\": {\n      const toolCallParts: ToolCallMessagePart[] =\n        message.tool_calls?.map((tc) => ({\n          type: \"tool-call\",\n          toolCallId: tc.id,\n          toolName: tc.name,\n          args: tc.args,\n          argsText: tc.argsText ?? JSON.stringify(tc.args),\n        })) ?? [];\n\n      return {\n        role: \"assistant\",\n        id: message.id,\n        content: [...contentToParts(message.content), ...toolCallParts],\n        ...(message.status && { status: message.status }),\n        ...(message.author && {\n          metadata: {\n            custom: { author: message.author, branch: message.branch },\n          },\n        }),\n      };\n    }\n\n    case \"tool\":\n      return {\n        role: \"tool\",\n        toolCallId: message.tool_call_id,\n        toolName: message.name,\n        result: message.content,\n        isError: message.status === \"error\",\n      };\n  }\n};\n"],"mappings":";;AAaA,MAAM,kBAAkB,YAAkD;CACxE,IAAI,OAAO,YAAY,UACrB,OAAO,CAAC;EAAE,MAAM;EAAiB,MAAM;CAAQ,CAAC;CAElD,OAAQ,QACL,KAAK,SAA6B;EACjC,QAAQ,KAAK,MAAb;GACE,KAAK,QACH,OAAO;IAAE,MAAM;IAAQ,MAAM,KAAK;GAAK;GACzC,KAAK,aACH,OAAO;IAAE,MAAM;IAAa,MAAM,KAAK;GAAK;GAC9C,KAAK,SACH,OAAO;IACL,MAAM;IACN,OAAO,QAAQ,KAAK,SAAS,UAAU,KAAK;GAC9C;GACF,KAAK,aACH,OAAO;IAAE,MAAM;IAAS,OAAO,KAAK;GAAI;GAC1C,KAAK,QACH,OAAO;IACL,MAAM;IACN,MAAM,KAAK;IACX,UAAU,KAAK;IACf,GAAI,KAAK,YAAY,QAAQ,EAAE,UAAU,KAAK,SAAS;GACzD;GACF,KAAK,YACH,OAAO;IACL,MAAM;IACN,MAAM;IACN,MAAM;KACJ,KAAK,KAAK;KACV,GAAI,KAAK,YAAY,QAAQ,EAAE,UAAU,KAAK,SAAS;IACzD;GACF;GACF,KAAK,QACH,OAAO;IACL,MAAM;IACN,MAAM;IACN,MAAM;KAAE,MAAM,KAAK;KAAM,UAAU,KAAK;IAAS;GACnD;GACF,KAAK,eACH,OAAO;IACL,MAAM;IACN,MAAM;IACN,MAAM;KAAE,QAAQ,KAAK;KAAQ,SAAS,KAAK;IAAQ;GACrD;GACF,SACE,OAAO;EACX;CACF,CAAC,CAAC,CACD,QAAQ,MAAkC,MAAM,IAAI;AACzD;AAEA,MAAa,qBAER,YAAY;CACf,QAAQ,QAAQ,MAAhB;EACE,KAAK,SACH,OAAO;GACL,MAAM;GACN,IAAI,QAAQ;GACZ,SAAS,eAAe,QAAQ,OAAO;EACzC;EAEF,KAAK,MAAM;GACT,MAAM,gBACJ,QAAQ,YAAY,KAAK,QAAQ;IAC/B,MAAM;IACN,YAAY,GAAG;IACf,UAAU,GAAG;IACb,MAAM,GAAG;IACT,UAAU,GAAG,YAAY,KAAK,UAAU,GAAG,IAAI;GACjD,EAAE,KAAK,CAAC;GAEV,OAAO;IACL,MAAM;IACN,IAAI,QAAQ;IACZ,SAAS,CAAC,GAAG,eAAe,QAAQ,OAAO,GAAG,GAAG,aAAa;IAC9D,GAAI,QAAQ,UAAU,EAAE,QAAQ,QAAQ,OAAO;IAC/C,GAAI,QAAQ,UAAU,EACpB,UAAU,EACR,QAAQ;KAAE,QAAQ,QAAQ;KAAQ,QAAQ,QAAQ;IAAO,EAC3D,EACF;GACF;EACF;EAEA,KAAK,QACH,OAAO;GACL,MAAM;GACN,YAAY,QAAQ;GACpB,UAAU,QAAQ;GAClB,QAAQ,QAAQ;GAChB,SAAS,QAAQ,WAAW;EAC9B;CACJ;AACF"}
+{"version":3,"file":"convertAdkMessages.js","names":[],"sources":["../src/convertAdkMessages.ts"],"sourcesContent":["\"use client\";\n\nimport type { ToolCallMessagePart } from \"@assistant-ui/core\";\nimport type { useExternalMessageConverter } from \"@assistant-ui/core/react\";\nimport type { AdkMessage, AdkMessageContentPart } from \"./types\";\n\ntype ContentPart =\n  | { type: \"text\"; text: string }\n  | { type: \"reasoning\"; text: string }\n  | { type: \"image\"; image: string }\n  | { type: \"file\"; data: string; mimeType: string; filename?: string }\n  | { type: \"audio\"; audio: { data: string; format: \"mp3\" | \"wav\" } }\n  | { type: \"data\"; name: string; data: unknown };\n\nconst contentToParts = (\n  content: AdkMessage[\"content\"],\n  role: \"user\" | \"assistant\",\n): ContentPart[] => {\n  if (typeof content === \"string\")\n    return [{ type: \"text\" as const, text: content }];\n\n  return (content as AdkMessageContentPart[])\n    .map((part): ContentPart | null => {\n      switch (part.type) {\n        case \"text\":\n          return { type: \"text\", text: part.text };\n        case \"reasoning\":\n          return { type: \"reasoning\", text: part.text };\n        case \"image\":\n          return {\n            type: \"image\",\n            image: `data:${part.mimeType};base64,${part.data}`,\n          };\n        case \"image_url\":\n          return { type: \"image\", image: part.url };\n        case \"file\": {\n          const format =\n            role === \"user\" && part.filename == null\n              ? part.mimeType === \"audio/wav\"\n                ? (\"wav\" as const)\n                : part.mimeType === \"audio/mp3\"\n                  ? (\"mp3\" as const)\n                  : null\n              : null;\n          if (format) {\n            return { type: \"audio\", audio: { data: part.data, format } };\n          }\n          return {\n            type: \"file\",\n            data: part.data,\n            mimeType: part.mimeType,\n            ...(part.filename != null && { filename: part.filename }),\n          };\n        }\n        case \"file_url\":\n          return {\n            type: \"data\",\n            name: \"file_url\",\n            data: {\n              url: part.url,\n              ...(part.mimeType != null && { mimeType: part.mimeType }),\n            },\n          };\n        case \"code\":\n          return {\n            type: \"data\",\n            name: \"executable_code\",\n            data: { code: part.code, language: part.language },\n          };\n        case \"code_result\":\n          return {\n            type: \"data\",\n            name: \"code_execution_result\",\n            data: { output: part.output, outcome: part.outcome },\n          };\n        default:\n          return null;\n      }\n    })\n    .filter((p): p is NonNullable<typeof p> => p !== null);\n};\n\nexport const convertAdkMessage: useExternalMessageConverter.Callback<\n  AdkMessage\n> = (message) => {\n  switch (message.type) {\n    case \"human\":\n      return {\n        role: \"user\",\n        id: message.id,\n        content: contentToParts(message.content, \"user\"),\n      };\n\n    case \"ai\": {\n      const toolCallParts: ToolCallMessagePart[] =\n        message.tool_calls?.map((tc) => ({\n          type: \"tool-call\",\n          toolCallId: tc.id,\n          toolName: tc.name,\n          args: tc.args,\n          argsText: tc.argsText ?? JSON.stringify(tc.args),\n        })) ?? [];\n\n      return {\n        role: \"assistant\",\n        id: message.id,\n        content: [\n          ...contentToParts(message.content, \"assistant\"),\n          ...toolCallParts,\n        ],\n        ...(message.status && { status: message.status }),\n        ...(message.author && {\n          metadata: {\n            custom: { author: message.author, branch: message.branch },\n          },\n        }),\n      };\n    }\n\n    case \"tool\":\n      return {\n        role: \"tool\",\n        toolCallId: message.tool_call_id,\n        toolName: message.name,\n        result: message.content,\n        isError: message.status === \"error\",\n      };\n  }\n};\n"],"mappings":";;AAcA,MAAM,kBACJ,SACA,SACkB;CAClB,IAAI,OAAO,YAAY,UACrB,OAAO,CAAC;EAAE,MAAM;EAAiB,MAAM;CAAQ,CAAC;CAElD,OAAQ,QACL,KAAK,SAA6B;EACjC,QAAQ,KAAK,MAAb;GACE,KAAK,QACH,OAAO;IAAE,MAAM;IAAQ,MAAM,KAAK;GAAK;GACzC,KAAK,aACH,OAAO;IAAE,MAAM;IAAa,MAAM,KAAK;GAAK;GAC9C,KAAK,SACH,OAAO;IACL,MAAM;IACN,OAAO,QAAQ,KAAK,SAAS,UAAU,KAAK;GAC9C;GACF,KAAK,aACH,OAAO;IAAE,MAAM;IAAS,OAAO,KAAK;GAAI;GAC1C,KAAK,QAAQ;IACX,MAAM,SACJ,SAAS,UAAU,KAAK,YAAY,OAChC,KAAK,aAAa,cACf,QACD,KAAK,aAAa,cACf,QACD,OACJ;IACN,IAAI,QACF,OAAO;KAAE,MAAM;KAAS,OAAO;MAAE,MAAM,KAAK;MAAM;KAAO;IAAE;IAE7D,OAAO;KACL,MAAM;KACN,MAAM,KAAK;KACX,UAAU,KAAK;KACf,GAAI,KAAK,YAAY,QAAQ,EAAE,UAAU,KAAK,SAAS;IACzD;GACF;GACA,KAAK,YACH,OAAO;IACL,MAAM;IACN,MAAM;IACN,MAAM;KACJ,KAAK,KAAK;KACV,GAAI,KAAK,YAAY,QAAQ,EAAE,UAAU,KAAK,SAAS;IACzD;GACF;GACF,KAAK,QACH,OAAO;IACL,MAAM;IACN,MAAM;IACN,MAAM;KAAE,MAAM,KAAK;KAAM,UAAU,KAAK;IAAS;GACnD;GACF,KAAK,eACH,OAAO;IACL,MAAM;IACN,MAAM;IACN,MAAM;KAAE,QAAQ,KAAK;KAAQ,SAAS,KAAK;IAAQ;GACrD;GACF,SACE,OAAO;EACX;CACF,CAAC,CAAC,CACD,QAAQ,MAAkC,MAAM,IAAI;AACzD;AAEA,MAAa,qBAER,YAAY;CACf,QAAQ,QAAQ,MAAhB;EACE,KAAK,SACH,OAAO;GACL,MAAM;GACN,IAAI,QAAQ;GACZ,SAAS,eAAe,QAAQ,SAAS,MAAM;EACjD;EAEF,KAAK,MAAM;GACT,MAAM,gBACJ,QAAQ,YAAY,KAAK,QAAQ;IAC/B,MAAM;IACN,YAAY,GAAG;IACf,UAAU,GAAG;IACb,MAAM,GAAG;IACT,UAAU,GAAG,YAAY,KAAK,UAAU,GAAG,IAAI;GACjD,EAAE,KAAK,CAAC;GAEV,OAAO;IACL,MAAM;IACN,IAAI,QAAQ;IACZ,SAAS,CACP,GAAG,eAAe,QAAQ,SAAS,WAAW,GAC9C,GAAG,aACL;IACA,GAAI,QAAQ,UAAU,EAAE,QAAQ,QAAQ,OAAO;IAC/C,GAAI,QAAQ,UAAU,EACpB,UAAU,EACR,QAAQ;KAAE,QAAQ,QAAQ;KAAQ,QAAQ,QAAQ;IAAO,EAC3D,EACF;GACF;EACF;EAEA,KAAK,QACH,OAAO;GACL,MAAM;GACN,YAAY,QAAQ;GACpB,UAAU,QAAQ;GAClB,QAAQ,QAAQ;GAChB,SAAS,QAAQ,WAAW;EAC9B;CACJ;AACF"}

package/dist/useAdkMessages.js

@@ -63,7 +63,7 @@ const useAdkMessages = ({ stream, eventHandlers }) => {
 					...config,
 					abortSignal: abortController.signal,
 					initialize: async () => {
-						return await aui.threadListItem().initialize();
+						return await aui.threadListItem.initialize();
 					}
 				});
 				for await (const event of response) {

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  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  // Replace the message list AND reset derived per-turn HITL state.\n  // Used by truncation paths (edit, reload, load) 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  };\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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"}
+{"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  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  // Replace the message list AND reset derived per-turn HITL state.\n  // Used by truncation paths (edit, reload, load) 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  };\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":";;;;;;AA2BA,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;CAML,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;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"}

package/dist/useAdkRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAdkRuntime.d.ts","names":[],"sources":["../src/useAdkRuntime.ts"],"mappings":";;;;KAsJY,uBAAuB;EACjC,QAAQ;;;;;;;;;EASR,qBAAqB;EACrB;EACA;EACA,mBACE,kBACA,gBAAgB,iBACb;EACL,QAAQ,qBAAqB;IAAU,UAAU;;EACjD,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;;cAmRN,kBAAiB,OAAA,gBAAA,QAAA,QAAA,UAAA,qBAAA,WAO3B,sDAAoB"}
+{"version":3,"file":"useAdkRuntime.d.ts","names":[],"sources":["../src/useAdkRuntime.ts"],"mappings":";;;;KA4JY,uBAAuB;EACjC,QAAQ;;;;;;;;;EASR,qBAAqB;EACrB;EACA;EACA,mBACE,kBACA,gBAAgB,iBACb;EACL,QAAQ,qBAAqB;IAAU,UAAU;;EACjD,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;;cAmRN,kBAAiB,OAAA,gBAAA,QAAA,QAAA,UAAA,qBAAA,WAO3B,sDAAoB"}

package/dist/useAdkRuntime.js

@@ -2,14 +2,15 @@ import { adkExtras } from "./adkExtras.js";
 import { convertAdkMessage } from "./convertAdkMessages.js";
 import { useAdkMessages } from "./useAdkMessages.js";
 import { v4 } from "uuid";
+import { useCloudThreadListAdapter, useExternalMessageConverter, useExternalStoreRuntime, useRemoteThreadListRuntime } from "@assistant-ui/core/react";
 import { useAui } from "@assistant-ui/store";
 import { useEffect, useRef, useState } from "react";
 import { generateId, getExternalStoreMessages, pickExternalStoreSharedOptions } from "@assistant-ui/core";
-import { useCloudThreadListAdapter, useExternalMessageConverter, useExternalStoreRuntime, useRemoteThreadListRuntime } from "@assistant-ui/core/react";
+import { parseDataUrl } from "@assistant-ui/core/internal";
 //#region src/useAdkRuntime.ts
 /** @internal — exported for unit tests. */
 const getMessageContent = (msg) => {
-	const content = [...msg.content, ...msg.attachments?.flatMap((a) => a.content) ?? []].map((part) => {
+	const content = [...msg.content, ...msg.attachments?.flatMap((a) => a.content) ?? []].flatMap((part) => {
 		const type = part.type;
 		switch (type) {
 			case "text": return {
@@ -26,6 +27,15 @@ const getMessageContent = (msg) => {
 				data: part.data,
 				...part.filename != null && { filename: part.filename }
 			};
+			case "audio": {
+				const parsed = parseDataUrl(part.audio.data);
+				return {
+					type: "file",
+					mimeType: `audio/${part.audio.format}`,
+					data: parsed?.data ?? part.audio.data
+				};
+			}
+			case "data": return [];
 			case "tool-call": throw new Error("Tool call appends are not supported.");
 			default: throw new Error(`Unsupported append message part type: ${type}`);
 		}
@@ -180,7 +190,7 @@ const useAdkRuntimeImpl = (options) => {
 				setMessages(nextMessages);
 				return;
 			}
-			const externalId = aui.threadListItem().getState().externalId;
+			const externalId = aui.threadListItem.getState().externalId;
 			const checkpointId = externalId ? await getCheckpointId(externalId, truncated) : null;
 			return handleSendMessage([{
 				id: v4(),
@@ -201,7 +211,7 @@ const useAdkRuntimeImpl = (options) => {
 			if (!getCheckpointId) throw new Error("Runtime does not support reloading messages.");
 			const truncated = truncateAdkMessages(threadMessagesRef.current, parentId);
 			replaceMessages(truncated);
-			const externalId = aui.threadListItem().getState().externalId;
+			const externalId = aui.threadListItem.getState().externalId;
 			const checkpointId = externalId ? await getCheckpointId(externalId, truncated) : null;
 			return handleSendMessage([], {
 				runConfig: config.runConfig,
@@ -231,7 +241,7 @@ const useAdkRuntimeImpl = (options) => {
 		useEffect(() => {
 			const loadFn = loadRef.current;
 			if (!loadFn) return;
-			const externalId = aui.threadListItem().getState().externalId;
+			const externalId = aui.threadListItem.getState().externalId;
 			if (externalId == null) return;
 			loadFn(externalId).then(({ messages: msgs }) => {
 				replaceMessages(msgs);
@@ -248,7 +258,7 @@ const useAdkRuntime = ({ cloud, sessionAdapter, create, delete: deleteFn, onThre
 		cloud,
 		create: async () => {
 			if (create) return create();
-			if (aui.threadListItem.source) return aui.threadListItem().initialize();
+			if (aui.threadListItem.source) return aui.threadListItem.initialize();
 			return { externalId: void 0 };
 		},
 		delete: deleteFn

package/dist/useAdkRuntime.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAdkRuntime.js","names":["_exhaustiveCheck","uuidv4"],"sources":["../src/useAdkRuntime.ts"],"sourcesContent":["import { useEffect, useRef, useState } from \"react\";\nimport {\n  getExternalStoreMessages,\n  pickExternalStoreSharedOptions,\n  type AttachmentAdapter,\n  type DictationAdapter,\n  type ExternalStoreSharedOptions,\n  type FeedbackAdapter,\n  type RealtimeVoiceAdapter,\n  type SpeechSynthesisAdapter,\n  type AppendMessage,\n  type ThreadMessage,\n  type ToolExecutionStatus,\n  generateId,\n} from \"@assistant-ui/core\";\nimport {\n  useCloudThreadListAdapter,\n  useRemoteThreadListRuntime,\n  useExternalMessageConverter,\n  useExternalStoreRuntime,\n} from \"@assistant-ui/core/react\";\nimport { useAui } from \"@assistant-ui/store\";\nimport type { AssistantCloud } from \"assistant-cloud\";\nimport type { RemoteThreadListAdapter } from \"@assistant-ui/core\";\nimport type {\n  AdkMessage,\n  AdkSendMessageConfig,\n  AdkStreamCallback,\n  OnAdkErrorCallback,\n  OnAdkCustomEventCallback,\n  OnAdkAgentTransferCallback,\n} from \"./types\";\nimport { useAdkMessages } from \"./useAdkMessages\";\nimport { convertAdkMessage } from \"./convertAdkMessages\";\nimport { adkExtras } from \"./adkExtras\";\nimport { v4 as uuidv4 } from \"uuid\";\n\n/** @internal — exported for unit tests. */\nexport const getMessageContent = (msg: AppendMessage) => {\n  const allContent = [\n    ...msg.content,\n    ...(msg.attachments?.flatMap((a) => a.content) ?? []),\n  ];\n  const content = allContent.map((part) => {\n    const type = part.type;\n    switch (type) {\n      case \"text\":\n        return { type: \"text\" as const, text: part.text };\n      case \"image\":\n        return { type: \"image_url\" as const, url: part.image };\n      case \"file\":\n        return {\n          type: \"file\" as const,\n          mimeType: part.mimeType,\n          data: part.data,\n          ...(part.filename != null && { filename: part.filename }),\n        };\n\n      case \"tool-call\":\n        throw new Error(\"Tool call appends are not supported.\");\n\n      default: {\n        const _exhaustiveCheck:\n          | \"reasoning\"\n          | \"source\"\n          | \"audio\"\n          | \"data\"\n          | \"generative-ui\" = type;\n        throw new Error(\n          `Unsupported append message part type: ${_exhaustiveCheck}`,\n        );\n      }\n    }\n  });\n\n  if (content.length === 1 && content[0]?.type === \"text\") {\n    return content[0].text ?? \"\";\n  }\n\n  return content;\n};\n\n/** @internal — exported for unit tests. */\nexport const getPendingToolCalls = (messages: AdkMessage[]) => {\n  const pending = new Map<string, { id: string; name: string }>();\n  for (const msg of messages) {\n    if (msg.type === \"ai\" && msg.tool_calls) {\n      for (const tc of msg.tool_calls) {\n        pending.set(tc.id, tc);\n      }\n    }\n    if (msg.type === \"tool\") {\n      pending.delete(msg.tool_call_id);\n    }\n  }\n  return [...pending.values()];\n};\n\n/**\n * @internal — exported for unit tests.\n *\n * Returns `{cancelled: true}` tool responses for pending tool calls when the\n * user sends a new turn, EXCEPT for HITL interrupts marked via\n * `long_running_tool_ids` (`adk_request_input`, `adk_request_confirmation`,\n * `adk_request_credential`). Those must be answered through a dedicated tool\n * UI + submit helper, not auto-cancelled.\n */\nexport const getPendingCancellations = (\n  messages: AdkMessage[],\n  longRunningToolIds: readonly string[],\n): Array<AdkMessage & { type: \"tool\" }> => {\n  const longRunningSet = new Set(longRunningToolIds);\n  return getPendingToolCalls(messages)\n    .filter((t) => !longRunningSet.has(t.id))\n    .map(\n      (t) =>\n        ({\n          id: uuidv4(),\n          type: \"tool\",\n          name: t.name,\n          tool_call_id: t.id,\n          content: JSON.stringify({ cancelled: true }),\n          status: \"error\",\n        }) satisfies AdkMessage & { type: \"tool\" },\n    );\n};\n\nconst truncateAdkMessages = (\n  threadMessages: readonly ThreadMessage[],\n  parentId: string | null,\n): AdkMessage[] => {\n  if (parentId === null) return [];\n  const parentIndex = threadMessages.findIndex((m) => m.id === parentId);\n  if (parentIndex === -1) return [];\n  const truncated: AdkMessage[] = [];\n  for (let i = 0; i <= parentIndex && i < threadMessages.length; i++) {\n    truncated.push(...getExternalStoreMessages<AdkMessage>(threadMessages[i]!));\n  }\n  return truncated;\n};\n\nconst toAdkUserMessage = (\n  msg: AppendMessage,\n  id = generateId(),\n): AdkMessage & { type: \"human\"; id: string } => ({\n  id,\n  type: \"human\",\n  content: getMessageContent(msg),\n});\n\nexport type UseAdkRuntimeOptions = ExternalStoreSharedOptions & {\n  stream: AdkStreamCallback;\n  /**\n   * Called whenever the active thread's canonical (remote) ID changes, so the\n   * value can be treated as a managed/controlled variable (e.g. synced to a URL\n   * query param). Only the settled remote ID is emitted: while a freshly created\n   * thread is still optimistic the value is `undefined`, and the real ID is\n   * emitted once the thread is initialized; the transient local ID is never\n   * surfaced.\n   */\n  onThreadIdChange?: ((threadId: string | undefined) => void) | undefined;\n  autoCancelPendingToolCalls?: boolean | undefined;\n  unstable_allowCancellation?: boolean | undefined;\n  getCheckpointId?: (\n    threadId: string,\n    parentMessages: AdkMessage[],\n  ) => Promise<string | null>;\n  load?: (threadId: string) => Promise<{ messages: AdkMessage[] }>;\n  create?: () => Promise<{ externalId: string }>;\n  delete?: (threadId: string) => Promise<void>;\n  adapters?:\n    | {\n        attachments?: AttachmentAdapter;\n        speech?: SpeechSynthesisAdapter;\n        dictation?: DictationAdapter;\n        voice?: RealtimeVoiceAdapter;\n        feedback?: FeedbackAdapter;\n      }\n    | undefined;\n  eventHandlers?:\n    | {\n        onError?: OnAdkErrorCallback;\n        onCustomEvent?: OnAdkCustomEventCallback;\n        onAgentTransfer?: OnAdkAgentTransferCallback;\n      }\n    | undefined;\n  cloud?: AssistantCloud | undefined;\n  /**\n   * A `RemoteThreadListAdapter` to use instead of the cloud adapter.\n   * Use with `createAdkSessionAdapter` for ADK session-backed persistence.\n   */\n  sessionAdapter?: RemoteThreadListAdapter | undefined;\n};\n\nconst useAdkRuntimeImpl = (options: UseAdkRuntimeOptions) => {\n  const {\n    autoCancelPendingToolCalls,\n    adapters: { attachments, dictation, feedback, speech, voice } = {},\n    unstable_allowCancellation,\n    stream,\n    load,\n    getCheckpointId,\n    eventHandlers,\n  } = options;\n  const aui = useAui();\n  const {\n    messages,\n    stateDelta,\n    agentInfo,\n    longRunningToolIds,\n    artifactDelta,\n    toolConfirmations,\n    authRequests,\n    escalated,\n    messageMetadata,\n    sendMessage,\n    cancel,\n    setMessages,\n    replaceMessages,\n  } = useAdkMessages({\n    stream,\n    ...(eventHandlers && { eventHandlers }),\n  });\n\n  const [isRunning, setIsRunning] = useState(false);\n  const [toolStatuses, setToolStatuses] = useState<\n    Record<string, ToolExecutionStatus>\n  >({});\n  const hasExecutingTools = Object.values(toolStatuses).some(\n    (s) => s?.type === \"executing\",\n  );\n  const effectiveIsRunning = isRunning || hasExecutingTools;\n\n  const handleSendMessage = async (\n    msgs: AdkMessage[],\n    config: AdkSendMessageConfig,\n  ) => {\n    try {\n      setIsRunning(true);\n      await sendMessage(msgs, config);\n    } finally {\n      setIsRunning(false);\n    }\n  };\n\n  const threadMessages = useExternalMessageConverter({\n    callback: convertAdkMessage,\n    messages,\n    isRunning: effectiveIsRunning,\n  });\n\n  const threadMessagesRef = useRef(threadMessages);\n  threadMessagesRef.current = threadMessages;\n\n  const adkMessagesRef = useRef(messages);\n  adkMessagesRef.current = messages;\n\n  const stagedMessagesRef = useRef(\n    new Map<\n      string,\n      {\n        message: AdkMessage & { id: string };\n        runConfig: AppendMessage[\"runConfig\"];\n      }\n    >(),\n  );\n  const [stagedMessageCount, setStagedMessageCount] = useState(0);\n  const hasStagedMessages = stagedMessageCount > 0;\n\n  const getStagedRun = (parentId: string | null) => {\n    if (!parentId || !stagedMessagesRef.current.has(parentId)) return null;\n\n    const staged: AdkMessage[] = [];\n    for (const message of adkMessagesRef.current) {\n      if (message.id && stagedMessagesRef.current.has(message.id)) {\n        staged.push(stagedMessagesRef.current.get(message.id)!.message);\n      }\n      if (message.id === parentId) break;\n    }\n\n    return {\n      messages: staged,\n      runConfig: stagedMessagesRef.current.get(parentId)!.runConfig,\n    };\n  };\n\n  const stageUserMessage = (msg: AppendMessage) => {\n    const stagedMessage = toAdkUserMessage(msg);\n    stagedMessagesRef.current.set(stagedMessage.id, {\n      message: stagedMessage,\n      runConfig: msg.runConfig,\n    });\n    setStagedMessageCount(stagedMessagesRef.current.size);\n    const nextMessages = [...adkMessagesRef.current, stagedMessage];\n    adkMessagesRef.current = nextMessages;\n    setMessages(nextMessages);\n  };\n\n  const runtime = useExternalStoreRuntime({\n    ...pickExternalStoreSharedOptions(options),\n    isRunning: effectiveIsRunning,\n    messages: threadMessages,\n    unstable_enableToolInvocations: true,\n    setToolStatuses,\n    adapters: { attachments, dictation, feedback, speech, voice },\n    extras: adkExtras.provide({\n      agentInfo,\n      stateDelta,\n      artifactDelta,\n      longRunningToolIds,\n      toolConfirmations,\n      authRequests,\n      escalated,\n      messageMetadata,\n      send: handleSendMessage,\n    }),\n    onNew: async (msg) => {\n      if (!(msg.startRun ?? msg.role === \"user\")) {\n        stageUserMessage(msg);\n        return;\n      }\n\n      const cancellations =\n        autoCancelPendingToolCalls !== false\n          ? getPendingCancellations(messages, longRunningToolIds)\n          : [];\n\n      return handleSendMessage(\n        [\n          ...cancellations,\n          {\n            id: uuidv4(),\n            type: \"human\",\n            content: getMessageContent(msg),\n          },\n        ],\n        { runConfig: msg.runConfig },\n      );\n    },\n    onEdit: getCheckpointId\n      ? async (msg) => {\n          const truncated = truncateAdkMessages(\n            threadMessagesRef.current,\n            msg.parentId,\n          );\n          replaceMessages(truncated);\n          if (!(msg.startRun ?? msg.role === \"user\")) {\n            const stagedMessage = toAdkUserMessage(msg);\n            stagedMessagesRef.current.set(stagedMessage.id, {\n              message: stagedMessage,\n              runConfig: msg.runConfig,\n            });\n            setStagedMessageCount(stagedMessagesRef.current.size);\n            const nextMessages = [...truncated, stagedMessage];\n            adkMessagesRef.current = nextMessages;\n            setMessages(nextMessages);\n            return;\n          }\n          const externalId = aui.threadListItem().getState().externalId;\n          const checkpointId = externalId\n            ? await getCheckpointId(externalId, truncated)\n            : null;\n          return handleSendMessage(\n            [\n              {\n                id: uuidv4(),\n                type: \"human\",\n                content: getMessageContent(msg),\n              },\n            ],\n            {\n              runConfig: msg.runConfig,\n              ...(checkpointId && { checkpointId }),\n            },\n          );\n        }\n      : undefined,\n    ...(getCheckpointId || hasStagedMessages\n      ? {\n          onReload: async (parentId, config) => {\n            const stagedRun = getStagedRun(parentId);\n            if (stagedRun) {\n              for (const message of stagedRun.messages) {\n                stagedMessagesRef.current.delete(message.id);\n              }\n              setStagedMessageCount(stagedMessagesRef.current.size);\n              return handleSendMessage(stagedRun.messages, {\n                runConfig: config.runConfig ?? stagedRun.runConfig,\n              });\n            }\n\n            if (!getCheckpointId)\n              throw new Error(\"Runtime does not support reloading messages.\");\n\n            const truncated = truncateAdkMessages(\n              threadMessagesRef.current,\n              parentId,\n            );\n            replaceMessages(truncated);\n            const externalId = aui.threadListItem().getState().externalId;\n            const checkpointId = externalId\n              ? await getCheckpointId(externalId, truncated)\n              : null;\n            return handleSendMessage([], {\n              runConfig: config.runConfig,\n              ...(checkpointId && { checkpointId }),\n            });\n          },\n        }\n      : {}),\n    onAddToolResult: async ({\n      toolCallId,\n      toolName,\n      result,\n      isError,\n      artifact,\n    }) => {\n      await handleSendMessage(\n        [\n          {\n            id: uuidv4(),\n            type: \"tool\",\n            name: toolName,\n            tool_call_id: toolCallId,\n            content: JSON.stringify(result),\n            artifact,\n            status: isError ? \"error\" : \"success\",\n          },\n        ],\n        {},\n      );\n    },\n    onCancel: unstable_allowCancellation\n      ? async () => {\n          cancel();\n        }\n      : undefined,\n  });\n\n  {\n    const loadRef = useRef(load);\n    useEffect(() => {\n      loadRef.current = load;\n    });\n\n    useEffect(() => {\n      const loadFn = loadRef.current;\n      if (!loadFn) return;\n\n      const externalId = aui.threadListItem().getState().externalId;\n      if (externalId == null) return;\n\n      loadFn(externalId).then(\n        ({ messages: msgs }) => {\n          replaceMessages(msgs);\n        },\n        (e) => {\n          console.warn(\"Failed to load ADK session:\", e);\n        },\n      );\n    }, [aui, replaceMessages]);\n  }\n\n  return runtime;\n};\n\nexport const useAdkRuntime = ({\n  cloud,\n  sessionAdapter,\n  create,\n  delete: deleteFn,\n  onThreadIdChange,\n  ...options\n}: UseAdkRuntimeOptions) => {\n  const aui = useAui();\n  const cloudAdapter = useCloudThreadListAdapter({\n    cloud,\n    create: async () => {\n      if (create) return create();\n      if (aui.threadListItem.source) return aui.threadListItem().initialize();\n      return { externalId: undefined };\n    },\n    delete: deleteFn,\n  });\n\n  const adapter = sessionAdapter ?? cloudAdapter;\n\n  return useRemoteThreadListRuntime({\n    runtimeHook: function RuntimeHook() {\n      return useAdkRuntimeImpl(options);\n    },\n    adapter,\n    allowNesting: true,\n    onThreadIdChange,\n  });\n};\n"],"mappings":"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"}
+{"version":3,"file":"useAdkRuntime.js","names":["_exhaustiveCheck","uuidv4"],"sources":["../src/useAdkRuntime.ts"],"sourcesContent":["import { useEffect, useRef, useState } from \"react\";\nimport {\n  getExternalStoreMessages,\n  pickExternalStoreSharedOptions,\n  type AttachmentAdapter,\n  type DictationAdapter,\n  type ExternalStoreSharedOptions,\n  type FeedbackAdapter,\n  type RealtimeVoiceAdapter,\n  type SpeechSynthesisAdapter,\n  type AppendMessage,\n  type ThreadMessage,\n  type ToolExecutionStatus,\n  generateId,\n} from \"@assistant-ui/core\";\nimport { parseDataUrl } from \"@assistant-ui/core/internal\";\nimport {\n  useCloudThreadListAdapter,\n  useRemoteThreadListRuntime,\n  useExternalMessageConverter,\n  useExternalStoreRuntime,\n} from \"@assistant-ui/core/react\";\nimport { useAui } from \"@assistant-ui/store\";\nimport type { AssistantCloud } from \"assistant-cloud\";\nimport type { RemoteThreadListAdapter } from \"@assistant-ui/core\";\nimport type {\n  AdkMessage,\n  AdkSendMessageConfig,\n  AdkStreamCallback,\n  OnAdkErrorCallback,\n  OnAdkCustomEventCallback,\n  OnAdkAgentTransferCallback,\n} from \"./types\";\nimport { useAdkMessages } from \"./useAdkMessages\";\nimport { convertAdkMessage } from \"./convertAdkMessages\";\nimport { adkExtras } from \"./adkExtras\";\nimport { v4 as uuidv4 } from \"uuid\";\n\n/** @internal — exported for unit tests. */\nexport const getMessageContent = (msg: AppendMessage) => {\n  const allContent = [\n    ...msg.content,\n    ...(msg.attachments?.flatMap((a) => a.content) ?? []),\n  ];\n  const content = allContent.flatMap((part) => {\n    const type = part.type;\n    switch (type) {\n      case \"text\":\n        return { type: \"text\" as const, text: part.text };\n      case \"image\":\n        return { type: \"image_url\" as const, url: part.image };\n      case \"file\":\n        return {\n          type: \"file\" as const,\n          mimeType: part.mimeType,\n          data: part.data,\n          ...(part.filename != null && { filename: part.filename }),\n        };\n      case \"audio\": {\n        const parsed = parseDataUrl(part.audio.data);\n        return {\n          type: \"file\" as const,\n          mimeType: `audio/${part.audio.format}`,\n          data: parsed?.data ?? part.audio.data,\n        };\n      }\n      case \"data\":\n        return [];\n\n      case \"tool-call\":\n        throw new Error(\"Tool call appends are not supported.\");\n\n      default: {\n        const _exhaustiveCheck: \"reasoning\" | \"source\" | \"generative-ui\" = type;\n        throw new Error(\n          `Unsupported append message part type: ${_exhaustiveCheck}`,\n        );\n      }\n    }\n  });\n\n  if (content.length === 1 && content[0]?.type === \"text\") {\n    return content[0].text ?? \"\";\n  }\n\n  return content;\n};\n\n/** @internal — exported for unit tests. */\nexport const getPendingToolCalls = (messages: AdkMessage[]) => {\n  const pending = new Map<string, { id: string; name: string }>();\n  for (const msg of messages) {\n    if (msg.type === \"ai\" && msg.tool_calls) {\n      for (const tc of msg.tool_calls) {\n        pending.set(tc.id, tc);\n      }\n    }\n    if (msg.type === \"tool\") {\n      pending.delete(msg.tool_call_id);\n    }\n  }\n  return [...pending.values()];\n};\n\n/**\n * @internal — exported for unit tests.\n *\n * Returns `{cancelled: true}` tool responses for pending tool calls when the\n * user sends a new turn, EXCEPT for HITL interrupts marked via\n * `long_running_tool_ids` (`adk_request_input`, `adk_request_confirmation`,\n * `adk_request_credential`). Those must be answered through a dedicated tool\n * UI + submit helper, not auto-cancelled.\n */\nexport const getPendingCancellations = (\n  messages: AdkMessage[],\n  longRunningToolIds: readonly string[],\n): Array<AdkMessage & { type: \"tool\" }> => {\n  const longRunningSet = new Set(longRunningToolIds);\n  return getPendingToolCalls(messages)\n    .filter((t) => !longRunningSet.has(t.id))\n    .map(\n      (t) =>\n        ({\n          id: uuidv4(),\n          type: \"tool\",\n          name: t.name,\n          tool_call_id: t.id,\n          content: JSON.stringify({ cancelled: true }),\n          status: \"error\",\n        }) satisfies AdkMessage & { type: \"tool\" },\n    );\n};\n\nconst truncateAdkMessages = (\n  threadMessages: readonly ThreadMessage[],\n  parentId: string | null,\n): AdkMessage[] => {\n  if (parentId === null) return [];\n  const parentIndex = threadMessages.findIndex((m) => m.id === parentId);\n  if (parentIndex === -1) return [];\n  const truncated: AdkMessage[] = [];\n  for (let i = 0; i <= parentIndex && i < threadMessages.length; i++) {\n    truncated.push(...getExternalStoreMessages<AdkMessage>(threadMessages[i]!));\n  }\n  return truncated;\n};\n\nconst toAdkUserMessage = (\n  msg: AppendMessage,\n  id = generateId(),\n): AdkMessage & { type: \"human\"; id: string } => ({\n  id,\n  type: \"human\",\n  content: getMessageContent(msg),\n});\n\nexport type UseAdkRuntimeOptions = ExternalStoreSharedOptions & {\n  stream: AdkStreamCallback;\n  /**\n   * Called whenever the active thread's canonical (remote) ID changes, so the\n   * value can be treated as a managed/controlled variable (e.g. synced to a URL\n   * query param). Only the settled remote ID is emitted: while a freshly created\n   * thread is still optimistic the value is `undefined`, and the real ID is\n   * emitted once the thread is initialized; the transient local ID is never\n   * surfaced.\n   */\n  onThreadIdChange?: ((threadId: string | undefined) => void) | undefined;\n  autoCancelPendingToolCalls?: boolean | undefined;\n  unstable_allowCancellation?: boolean | undefined;\n  getCheckpointId?: (\n    threadId: string,\n    parentMessages: AdkMessage[],\n  ) => Promise<string | null>;\n  load?: (threadId: string) => Promise<{ messages: AdkMessage[] }>;\n  create?: () => Promise<{ externalId: string }>;\n  delete?: (threadId: string) => Promise<void>;\n  adapters?:\n    | {\n        attachments?: AttachmentAdapter;\n        speech?: SpeechSynthesisAdapter;\n        dictation?: DictationAdapter;\n        voice?: RealtimeVoiceAdapter;\n        feedback?: FeedbackAdapter;\n      }\n    | undefined;\n  eventHandlers?:\n    | {\n        onError?: OnAdkErrorCallback;\n        onCustomEvent?: OnAdkCustomEventCallback;\n        onAgentTransfer?: OnAdkAgentTransferCallback;\n      }\n    | undefined;\n  cloud?: AssistantCloud | undefined;\n  /**\n   * A `RemoteThreadListAdapter` to use instead of the cloud adapter.\n   * Use with `createAdkSessionAdapter` for ADK session-backed persistence.\n   */\n  sessionAdapter?: RemoteThreadListAdapter | undefined;\n};\n\nconst useAdkRuntimeImpl = (options: UseAdkRuntimeOptions) => {\n  const {\n    autoCancelPendingToolCalls,\n    adapters: { attachments, dictation, feedback, speech, voice } = {},\n    unstable_allowCancellation,\n    stream,\n    load,\n    getCheckpointId,\n    eventHandlers,\n  } = options;\n  const aui = useAui();\n  const {\n    messages,\n    stateDelta,\n    agentInfo,\n    longRunningToolIds,\n    artifactDelta,\n    toolConfirmations,\n    authRequests,\n    escalated,\n    messageMetadata,\n    sendMessage,\n    cancel,\n    setMessages,\n    replaceMessages,\n  } = useAdkMessages({\n    stream,\n    ...(eventHandlers && { eventHandlers }),\n  });\n\n  const [isRunning, setIsRunning] = useState(false);\n  const [toolStatuses, setToolStatuses] = useState<\n    Record<string, ToolExecutionStatus>\n  >({});\n  const hasExecutingTools = Object.values(toolStatuses).some(\n    (s) => s?.type === \"executing\",\n  );\n  const effectiveIsRunning = isRunning || hasExecutingTools;\n\n  const handleSendMessage = async (\n    msgs: AdkMessage[],\n    config: AdkSendMessageConfig,\n  ) => {\n    try {\n      setIsRunning(true);\n      await sendMessage(msgs, config);\n    } finally {\n      setIsRunning(false);\n    }\n  };\n\n  const threadMessages = useExternalMessageConverter({\n    callback: convertAdkMessage,\n    messages,\n    isRunning: effectiveIsRunning,\n  });\n\n  const threadMessagesRef = useRef(threadMessages);\n  threadMessagesRef.current = threadMessages;\n\n  const adkMessagesRef = useRef(messages);\n  adkMessagesRef.current = messages;\n\n  const stagedMessagesRef = useRef(\n    new Map<\n      string,\n      {\n        message: AdkMessage & { id: string };\n        runConfig: AppendMessage[\"runConfig\"];\n      }\n    >(),\n  );\n  const [stagedMessageCount, setStagedMessageCount] = useState(0);\n  const hasStagedMessages = stagedMessageCount > 0;\n\n  const getStagedRun = (parentId: string | null) => {\n    if (!parentId || !stagedMessagesRef.current.has(parentId)) return null;\n\n    const staged: AdkMessage[] = [];\n    for (const message of adkMessagesRef.current) {\n      if (message.id && stagedMessagesRef.current.has(message.id)) {\n        staged.push(stagedMessagesRef.current.get(message.id)!.message);\n      }\n      if (message.id === parentId) break;\n    }\n\n    return {\n      messages: staged,\n      runConfig: stagedMessagesRef.current.get(parentId)!.runConfig,\n    };\n  };\n\n  const stageUserMessage = (msg: AppendMessage) => {\n    const stagedMessage = toAdkUserMessage(msg);\n    stagedMessagesRef.current.set(stagedMessage.id, {\n      message: stagedMessage,\n      runConfig: msg.runConfig,\n    });\n    setStagedMessageCount(stagedMessagesRef.current.size);\n    const nextMessages = [...adkMessagesRef.current, stagedMessage];\n    adkMessagesRef.current = nextMessages;\n    setMessages(nextMessages);\n  };\n\n  const runtime = useExternalStoreRuntime({\n    ...pickExternalStoreSharedOptions(options),\n    isRunning: effectiveIsRunning,\n    messages: threadMessages,\n    unstable_enableToolInvocations: true,\n    setToolStatuses,\n    adapters: { attachments, dictation, feedback, speech, voice },\n    extras: adkExtras.provide({\n      agentInfo,\n      stateDelta,\n      artifactDelta,\n      longRunningToolIds,\n      toolConfirmations,\n      authRequests,\n      escalated,\n      messageMetadata,\n      send: handleSendMessage,\n    }),\n    onNew: async (msg) => {\n      if (!(msg.startRun ?? msg.role === \"user\")) {\n        stageUserMessage(msg);\n        return;\n      }\n\n      const cancellations =\n        autoCancelPendingToolCalls !== false\n          ? getPendingCancellations(messages, longRunningToolIds)\n          : [];\n\n      return handleSendMessage(\n        [\n          ...cancellations,\n          {\n            id: uuidv4(),\n            type: \"human\",\n            content: getMessageContent(msg),\n          },\n        ],\n        { runConfig: msg.runConfig },\n      );\n    },\n    onEdit: getCheckpointId\n      ? async (msg) => {\n          const truncated = truncateAdkMessages(\n            threadMessagesRef.current,\n            msg.parentId,\n          );\n          replaceMessages(truncated);\n          if (!(msg.startRun ?? msg.role === \"user\")) {\n            const stagedMessage = toAdkUserMessage(msg);\n            stagedMessagesRef.current.set(stagedMessage.id, {\n              message: stagedMessage,\n              runConfig: msg.runConfig,\n            });\n            setStagedMessageCount(stagedMessagesRef.current.size);\n            const nextMessages = [...truncated, stagedMessage];\n            adkMessagesRef.current = nextMessages;\n            setMessages(nextMessages);\n            return;\n          }\n          const externalId = aui.threadListItem.getState().externalId;\n          const checkpointId = externalId\n            ? await getCheckpointId(externalId, truncated)\n            : null;\n          return handleSendMessage(\n            [\n              {\n                id: uuidv4(),\n                type: \"human\",\n                content: getMessageContent(msg),\n              },\n            ],\n            {\n              runConfig: msg.runConfig,\n              ...(checkpointId && { checkpointId }),\n            },\n          );\n        }\n      : undefined,\n    ...(getCheckpointId || hasStagedMessages\n      ? {\n          onReload: async (parentId, config) => {\n            const stagedRun = getStagedRun(parentId);\n            if (stagedRun) {\n              for (const message of stagedRun.messages) {\n                stagedMessagesRef.current.delete(message.id);\n              }\n              setStagedMessageCount(stagedMessagesRef.current.size);\n              return handleSendMessage(stagedRun.messages, {\n                runConfig: config.runConfig ?? stagedRun.runConfig,\n              });\n            }\n\n            if (!getCheckpointId)\n              throw new Error(\"Runtime does not support reloading messages.\");\n\n            const truncated = truncateAdkMessages(\n              threadMessagesRef.current,\n              parentId,\n            );\n            replaceMessages(truncated);\n            const externalId = aui.threadListItem.getState().externalId;\n            const checkpointId = externalId\n              ? await getCheckpointId(externalId, truncated)\n              : null;\n            return handleSendMessage([], {\n              runConfig: config.runConfig,\n              ...(checkpointId && { checkpointId }),\n            });\n          },\n        }\n      : {}),\n    onAddToolResult: async ({\n      toolCallId,\n      toolName,\n      result,\n      isError,\n      artifact,\n    }) => {\n      await handleSendMessage(\n        [\n          {\n            id: uuidv4(),\n            type: \"tool\",\n            name: toolName,\n            tool_call_id: toolCallId,\n            content: JSON.stringify(result),\n            artifact,\n            status: isError ? \"error\" : \"success\",\n          },\n        ],\n        {},\n      );\n    },\n    onCancel: unstable_allowCancellation\n      ? async () => {\n          cancel();\n        }\n      : undefined,\n  });\n\n  {\n    const loadRef = useRef(load);\n    useEffect(() => {\n      loadRef.current = load;\n    });\n\n    useEffect(() => {\n      const loadFn = loadRef.current;\n      if (!loadFn) return;\n\n      const externalId = aui.threadListItem.getState().externalId;\n      if (externalId == null) return;\n\n      loadFn(externalId).then(\n        ({ messages: msgs }) => {\n          replaceMessages(msgs);\n        },\n        (e) => {\n          console.warn(\"Failed to load ADK session:\", e);\n        },\n      );\n    }, [aui, replaceMessages]);\n  }\n\n  return runtime;\n};\n\nexport const useAdkRuntime = ({\n  cloud,\n  sessionAdapter,\n  create,\n  delete: deleteFn,\n  onThreadIdChange,\n  ...options\n}: UseAdkRuntimeOptions) => {\n  const aui = useAui();\n  const cloudAdapter = useCloudThreadListAdapter({\n    cloud,\n    create: async () => {\n      if (create) return create();\n      if (aui.threadListItem.source) return aui.threadListItem.initialize();\n      return { externalId: undefined };\n    },\n    delete: deleteFn,\n  });\n\n  const adapter = sessionAdapter ?? cloudAdapter;\n\n  return useRemoteThreadListRuntime({\n    runtimeHook: function RuntimeHook() {\n      return useAdkRuntimeImpl(options);\n    },\n    adapter,\n    allowNesting: true,\n    onThreadIdChange,\n  });\n};\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-google-adk",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "Google ADK adapter for assistant-ui",
   "keywords": [
     "google-adk",
@@ -34,10 +34,10 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/core": "^0.2.22",
-    "@assistant-ui/store": "^0.2.21",
+    "@assistant-ui/core": "^0.3.2",
+    "@assistant-ui/store": "^0.3.2",
     "assistant-cloud": "*",
-    "assistant-stream": "^0.3.27",
+    "assistant-stream": "^0.3.31",
     "uuid": "^14.0.1"
   },
   "peerDependencies": {
@@ -58,7 +58,7 @@
     "@types/uuid": "^11.0.0",
     "react": "^19.2.8",
     "vitest": "^4.1.10",
-    "@assistant-ui/x-buildutils": "0.0.19"
+    "@assistant-ui/x-buildutils": "0.0.20"
   },
   "publishConfig": {
     "access": "public",

package/src/AdkClient.test.ts

@@ -630,6 +630,61 @@ describe("createAdkStream - SSE parsing", () => {
     expect(collected).toHaveLength(1);
     expect(collected[0]!.id).toBe("e1");
   });
+
+  it("cancels the response body when iteration stops early", async () => {
+    const cancel = vi.fn();
+    const encoder = new TextEncoder();
+    const body = new ReadableStream<Uint8Array>({
+      start(controller) {
+        controller.enqueue(
+          encoder.encode(`data: ${JSON.stringify({ id: "e1" })}\n\n`),
+        );
+      },
+      cancel,
+    });
+    mockFetch.mockResolvedValueOnce(sseResponse(body));
+
+    const stream = createAdkStream({ api: "/api/adk" });
+    const gen = await stream(
+      [{ id: "m1", type: "human", content: "Hi" }],
+      makeConfig(),
+    );
+
+    for await (const _event of gen) {
+      break;
+    }
+
+    expect(cancel).toHaveBeenCalledOnce();
+  });
+
+  it("does not surface cancellation errors on early exit", async () => {
+    const encoder = new TextEncoder();
+    let controller!: ReadableStreamDefaultController<Uint8Array>;
+    const body = new ReadableStream<Uint8Array>({
+      start(streamController) {
+        controller = streamController;
+        controller.enqueue(
+          encoder.encode(`data: ${JSON.stringify({ id: "e1" })}\n\n`),
+        );
+      },
+    });
+    mockFetch.mockResolvedValueOnce(sseResponse(body));
+
+    const stream = createAdkStream({ api: "/api/adk" });
+    const gen = await stream(
+      [{ id: "m1", type: "human", content: "Hi" }],
+      makeConfig(),
+    );
+
+    const consume = async () => {
+      for await (const _event of gen) {
+        controller.error(new Error("stream failed"));
+        break;
+      }
+    };
+
+    await expect(consume()).resolves.toBeUndefined();
+  });
 });
 
 // ── Error handling ──
@@ -723,28 +778,6 @@ describe("createAdkStream - headers", () => {
     expect(headers["Content-Type"]).toBe("application/json");
   });
 
-  it("resolves dynamic headers from a function", async () => {
-    mockFetch.mockResolvedValueOnce(sseResponse(sseBody("")));
-
-    const stream = createAdkStream({
-      api: "/api/adk",
-      headers: () => ({ "X-Custom": "dynamic" }),
-    });
-    const gen = await stream(
-      [{ id: "m1", type: "human", content: "Hi" }],
-      makeConfig(),
-    );
-    for await (const _ of gen) {
-      /* noop */
-    }
-
-    const headers = mockFetch.mock.calls[0]![1]?.headers as Record<
-      string,
-      string
-    >;
-    expect(headers["X-Custom"]).toBe("dynamic");
-  });
-
   it("resolves async dynamic headers", async () => {
     mockFetch.mockResolvedValueOnce(sseResponse(sseBody("")));
 

package/src/AdkClient.ts

@@ -243,10 +243,20 @@ async function* parseSSEResponse(response: Response): AsyncGenerator<AdkEvent> {
   const decoder = new TextDecoder();
   const sseDecoder = new SSEEventDecoder({ trailing: "dispatch" });
 
+  let shouldCancel = true;
   try {
     while (true) {
-      const { done, value } = await reader.read();
+      let result: ReadableStreamReadResult<Uint8Array>;
+      try {
+        result = await reader.read();
+      } catch (error) {
+        shouldCancel = false;
+        throw error;
+      }
+
+      const { done, value } = result;
       if (done) {
+        shouldCancel = false;
         for (const event of sseDecoder.push(decoder.decode())) {
           yield JSON.parse(event.data) as AdkEvent;
         }
@@ -263,6 +273,10 @@ async function* parseSSEResponse(response: Response): AsyncGenerator<AdkEvent> {
     const trailing = sseDecoder.flush();
     if (trailing !== null) yield JSON.parse(trailing.data) as AdkEvent;
   } finally {
-    reader.releaseLock();
+    try {
+      if (shouldCancel) await reader.cancel().catch(() => undefined);
+    } finally {
+      reader.releaseLock();
+    }
   }
 }