@assistant-ui/react-google-adk 0.0.15 → 0.0.17

package/dist/useAdkRuntime.js

@@ -1,10 +1,10 @@
+import { adkExtras } from "./adkExtras.js";
 import { convertAdkMessage } from "./convertAdkMessages.js";
-import { symbolAdkRuntimeExtras } from "./hooks.js";
 import { useAdkMessages } from "./useAdkMessages.js";
 import { v4 } from "uuid";
 import { useAui } from "@assistant-ui/store";
 import { useEffect, useRef, useState } from "react";
-import { getExternalStoreMessages, pickExternalStoreSharedOptions } from "@assistant-ui/core";
+import { generateId, getExternalStoreMessages, pickExternalStoreSharedOptions } from "@assistant-ui/core";
 import { useCloudThreadListAdapter, useExternalMessageConverter, useExternalStoreRuntime, useRemoteThreadListRuntime } from "@assistant-ui/core/react";
 //#region src/useAdkRuntime.ts
 /** @internal — exported for unit tests. */
@@ -70,10 +70,15 @@ const truncateAdkMessages = (threadMessages, parentId) => {
 	for (let i = 0; i <= parentIndex && i < threadMessages.length; i++) truncated.push(...getExternalStoreMessages(threadMessages[i]));
 	return truncated;
 };
+const toAdkUserMessage = (msg, id = generateId()) => ({
+	id,
+	type: "human",
+	content: getMessageContent(msg)
+});
 const useAdkRuntimeImpl = (options) => {
 	const { autoCancelPendingToolCalls, adapters: { attachments, dictation, feedback, speech, voice } = {}, unstable_allowCancellation, stream, load, getCheckpointId, eventHandlers } = options;
 	const aui = useAui();
-	const { messages, stateDelta, agentInfo, longRunningToolIds, artifactDelta, toolConfirmations, authRequests, escalated, messageMetadata, sendMessage, cancel, replaceMessages } = useAdkMessages({
+	const { messages, stateDelta, agentInfo, longRunningToolIds, artifactDelta, toolConfirmations, authRequests, escalated, messageMetadata, sendMessage, cancel, setMessages, replaceMessages } = useAdkMessages({
 		stream,
 		...eventHandlers && { eventHandlers }
 	});
@@ -96,6 +101,34 @@ const useAdkRuntimeImpl = (options) => {
 	});
 	const threadMessagesRef = useRef(threadMessages);
 	threadMessagesRef.current = threadMessages;
+	const adkMessagesRef = useRef(messages);
+	adkMessagesRef.current = messages;
+	const stagedMessagesRef = useRef(/* @__PURE__ */ new Map());
+	const [stagedMessageCount, setStagedMessageCount] = useState(0);
+	const hasStagedMessages = stagedMessageCount > 0;
+	const getStagedRun = (parentId) => {
+		if (!parentId || !stagedMessagesRef.current.has(parentId)) return null;
+		const staged = [];
+		for (const message of adkMessagesRef.current) {
+			if (message.id && stagedMessagesRef.current.has(message.id)) staged.push(stagedMessagesRef.current.get(message.id).message);
+			if (message.id === parentId) break;
+		}
+		return {
+			messages: staged,
+			runConfig: stagedMessagesRef.current.get(parentId).runConfig
+		};
+	};
+	const stageUserMessage = (msg) => {
+		const stagedMessage = toAdkUserMessage(msg);
+		stagedMessagesRef.current.set(stagedMessage.id, {
+			message: stagedMessage,
+			runConfig: msg.runConfig
+		});
+		setStagedMessageCount(stagedMessagesRef.current.size);
+		const nextMessages = [...adkMessagesRef.current, stagedMessage];
+		adkMessagesRef.current = nextMessages;
+		setMessages(nextMessages);
+	};
 	const runtime = useExternalStoreRuntime({
 		...pickExternalStoreSharedOptions(options),
 		isRunning: effectiveIsRunning,
@@ -109,8 +142,7 @@ const useAdkRuntimeImpl = (options) => {
 			speech,
 			voice
 		},
-		extras: {
-			[symbolAdkRuntimeExtras]: true,
+		extras: adkExtras.provide({
 			agentInfo,
 			stateDelta,
 			artifactDelta,
@@ -120,9 +152,14 @@ const useAdkRuntimeImpl = (options) => {
 			escalated,
 			messageMetadata,
 			send: handleSendMessage
-		},
+		}),
 		onNew: async (msg) => {
-			return handleSendMessage([...autoCancelPendingToolCalls !== false ? getPendingCancellations(messages, longRunningToolIds) : [], {
+			if (!(msg.startRun ?? msg.role === "user")) {
+				stageUserMessage(msg);
+				return;
+			}
+			const cancellations = autoCancelPendingToolCalls !== false ? getPendingCancellations(messages, longRunningToolIds) : [];
+			return handleSendMessage([...cancellations, {
 				id: v4(),
 				type: "human",
 				content: getMessageContent(msg)
@@ -131,6 +168,18 @@ const useAdkRuntimeImpl = (options) => {
 		onEdit: getCheckpointId ? async (msg) => {
 			const truncated = truncateAdkMessages(threadMessagesRef.current, msg.parentId);
 			replaceMessages(truncated);
+			if (!(msg.startRun ?? msg.role === "user")) {
+				const stagedMessage = toAdkUserMessage(msg);
+				stagedMessagesRef.current.set(stagedMessage.id, {
+					message: stagedMessage,
+					runConfig: msg.runConfig
+				});
+				setStagedMessageCount(stagedMessagesRef.current.size);
+				const nextMessages = [...truncated, stagedMessage];
+				adkMessagesRef.current = nextMessages;
+				setMessages(nextMessages);
+				return;
+			}
 			const externalId = aui.threadListItem().getState().externalId;
 			const checkpointId = externalId ? await getCheckpointId(externalId, truncated) : null;
 			return handleSendMessage([{
@@ -142,7 +191,14 @@ const useAdkRuntimeImpl = (options) => {
 				...checkpointId && { checkpointId }
 			});
 		} : void 0,
-		onReload: getCheckpointId ? async (parentId, config) => {
+		...getCheckpointId || hasStagedMessages ? { onReload: async (parentId, config) => {
+			const stagedRun = getStagedRun(parentId);
+			if (stagedRun) {
+				for (const message of stagedRun.messages) stagedMessagesRef.current.delete(message.id);
+				setStagedMessageCount(stagedMessagesRef.current.size);
+				return handleSendMessage(stagedRun.messages, { runConfig: config.runConfig ?? stagedRun.runConfig });
+			}
+			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;
@@ -151,7 +207,7 @@ const useAdkRuntimeImpl = (options) => {
 				runConfig: config.runConfig,
 				...checkpointId && { checkpointId }
 			});
-		} : void 0,
+		} } : {},
 		onAddToolResult: async ({ toolCallId, toolName, result, isError, artifact }) => {
 			await handleSendMessage([{
 				id: v4(),
@@ -186,7 +242,7 @@ const useAdkRuntimeImpl = (options) => {
 	}
 	return runtime;
 };
-const useAdkRuntime = ({ cloud, sessionAdapter, create, delete: deleteFn, ...options }) => {
+const useAdkRuntime = ({ cloud, sessionAdapter, create, delete: deleteFn, onThreadIdChange, ...options }) => {
 	const aui = useAui();
 	const cloudAdapter = useCloudThreadListAdapter({
 		cloud,
@@ -202,7 +258,8 @@ const useAdkRuntime = ({ cloud, sessionAdapter, create, delete: deleteFn, ...opt
 			return useAdkRuntimeImpl(options);
 		},
 		adapter: sessionAdapter ?? cloudAdapter,
-		allowNesting: true
+		allowNesting: true,
+		onThreadIdChange
 	});
 };
 //#endregion

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} 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 { symbolAdkRuntimeExtras, type AdkRuntimeExtras } from \"./hooks\";\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\nexport type UseAdkRuntimeOptions = ExternalStoreSharedOptions & {\n  stream: AdkStreamCallback;\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    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 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: {\n      [symbolAdkRuntimeExtras]: true,\n      agentInfo,\n      stateDelta,\n      artifactDelta,\n      longRunningToolIds,\n      toolConfirmations,\n      authRequests,\n      escalated,\n      messageMetadata,\n      send: handleSendMessage,\n    } satisfies AdkRuntimeExtras,\n    onNew: async (msg) => {\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          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    onReload: getCheckpointId\n      ? async (parentId, config) => {\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      : undefined,\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  ...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  });\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 {\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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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-google-adk",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "Google ADK adapter for assistant-ui",
   "keywords": [
     "google-adk",
@@ -34,11 +34,11 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/core": "^0.2.11",
-    "@assistant-ui/store": "^0.2.14",
+    "@assistant-ui/core": "^0.2.21",
+    "@assistant-ui/store": "^0.2.20",
     "assistant-cloud": "*",
-    "assistant-stream": "^0.3.21",
-    "uuid": "^14.0.0"
+    "assistant-stream": "^0.3.26",
+    "uuid": "^14.0.1"
   },
   "peerDependencies": {
     "@google/adk": ">=0.5.0",
@@ -57,8 +57,8 @@
     "@types/react": "^19.2.17",
     "@types/uuid": "^11.0.0",
     "react": "^19.2.7",
-    "vitest": "^4.1.8",
-    "@assistant-ui/x-buildutils": "0.0.12"
+    "vitest": "^4.1.10",
+    "@assistant-ui/x-buildutils": "0.0.18"
   },
   "publishConfig": {
     "access": "public",

package/src/AdkClient.test.ts

@@ -34,6 +34,17 @@ const sseBody = (text: string): ReadableStream<Uint8Array> => {
   });
 };
 
+const nextWithTimeout = async <T>(
+  promise: Promise<IteratorResult<T>>,
+): Promise<IteratorResult<T> | "timeout"> => {
+  return Promise.race([
+    promise,
+    new Promise<"timeout">((resolve) => {
+      setTimeout(() => resolve("timeout"), 100);
+    }),
+  ]);
+};
+
 const mockFetch =
   vi.fn<(input: RequestInfo | URL, init?: RequestInit) => Promise<Response>>();
 
@@ -250,6 +261,30 @@ describe("createAdkStream - direct mode", () => {
     });
   });
 
+  it.each(["http://localhost:8000/", "http://localhost:8000//"])(
+    "normalizes trailing slashes in the api URL: %s",
+    async (api) => {
+      mockFetch.mockResolvedValueOnce(
+        new Response(sseBody(""), { status: 200 }),
+      );
+
+      const stream = createAdkStream({
+        api,
+        appName: "my-app",
+        userId: "user-1",
+      });
+      const gen = await stream(
+        [{ id: "m1", type: "human", content: "Hello" }],
+        makeConfig(),
+      );
+      for await (const _ of gen) {
+        /* noop */
+      }
+
+      expect(mockFetch.mock.calls[0]![0]).toBe("http://localhost:8000/run_sse");
+    },
+  );
+
   it("calls config.initialize() to get the sessionId", async () => {
     const initialize = vi
       .fn()
@@ -398,6 +433,78 @@ describe("createAdkStream - SSE parsing", () => {
     expect(collected[0]!.id).toBe("e1");
   });
 
+  it("parses data fields without a space after the colon", async () => {
+    const text = `data:${JSON.stringify({ id: "e1" })}\n\n`;
+    mockFetch.mockResolvedValueOnce(
+      new Response(sseBody(text), { status: 200 }),
+    );
+
+    const stream = createAdkStream({ api: "/api/adk" });
+    const gen = await stream(
+      [{ id: "m1", type: "human", content: "Hi" }],
+      makeConfig(),
+    );
+    const collected: AdkEvent[] = [];
+    for await (const evt of gen) {
+      collected.push(evt);
+    }
+
+    expect(collected).toHaveLength(1);
+    expect(collected[0]!.id).toBe("e1");
+  });
+
+  it("parses CR-delimited SSE events", async () => {
+    const events: AdkEvent[] = [{ id: "e1" }, { id: "e2" }];
+    const text = events.map((e) => `data: ${JSON.stringify(e)}\r\r`).join("");
+    mockFetch.mockResolvedValueOnce(
+      new Response(sseBody(text), { status: 200 }),
+    );
+
+    const stream = createAdkStream({ api: "/api/adk" });
+    const gen = await stream(
+      [{ id: "m1", type: "human", content: "Hi" }],
+      makeConfig(),
+    );
+    const collected: AdkEvent[] = [];
+    for await (const evt of gen) {
+      collected.push(evt);
+    }
+
+    expect(collected).toHaveLength(2);
+    expect(collected[0]!.id).toBe("e1");
+    expect(collected[1]!.id).toBe("e2");
+  });
+
+  it("emits CRLF-delimited SSE events before the response closes", async () => {
+    const encoder = new TextEncoder();
+    let controller!: ReadableStreamDefaultController<Uint8Array>;
+    const body = new ReadableStream<Uint8Array>({
+      start(nextController) {
+        controller = nextController;
+      },
+    });
+    mockFetch.mockResolvedValueOnce(new Response(body, { status: 200 }));
+
+    const stream = createAdkStream({ api: "/api/adk" });
+    const gen = await stream(
+      [{ id: "m1", type: "human", content: "Hi" }],
+      makeConfig(),
+    );
+
+    const first = gen.next();
+    controller.enqueue(
+      encoder.encode(`data: ${JSON.stringify({ id: "e1" })}\r`),
+    );
+    controller.enqueue(encoder.encode("\n\r\n"));
+
+    await expect(nextWithTimeout(first)).resolves.toMatchObject({
+      done: false,
+      value: { id: "e1" },
+    });
+
+    controller.close();
+  });
+
   it("handles partial chunks that split across reads", async () => {
     const event = { id: "e1", content: { parts: [{ text: "split" }] } };
     const fullText = `data: ${JSON.stringify(event)}\n\n`;
@@ -429,6 +536,33 @@ describe("createAdkStream - SSE parsing", () => {
     expect(collected[0]!.id).toBe("e1");
   });
 
+  it("parses CR-delimited events split across chunks", async () => {
+    const encoder = new TextEncoder();
+    const body = new ReadableStream<Uint8Array>({
+      start(controller) {
+        controller.enqueue(
+          encoder.encode(`data: ${JSON.stringify({ id: "e1" })}\r`),
+        );
+        controller.enqueue(encoder.encode("\r"));
+        controller.close();
+      },
+    });
+    mockFetch.mockResolvedValueOnce(new Response(body, { status: 200 }));
+
+    const stream = createAdkStream({ api: "/api/adk" });
+    const gen = await stream(
+      [{ id: "m1", type: "human", content: "Hi" }],
+      makeConfig(),
+    );
+    const collected: AdkEvent[] = [];
+    for await (const evt of gen) {
+      collected.push(evt);
+    }
+
+    expect(collected).toHaveLength(1);
+    expect(collected[0]!.id).toBe("e1");
+  });
+
   it("handles remaining buffer at end of stream", async () => {
     // No trailing \n\n
     const event = { id: "e1" };

package/src/AdkClient.ts

@@ -1,4 +1,6 @@
+import { SSEEventDecoder } from "assistant-stream/utils";
 import { contentToParts } from "./contentToParts";
+import { trimTrailingSlashes } from "./trimTrailingSlashes";
 import type {
   AdkEvent,
   AdkEventPart,
@@ -68,7 +70,7 @@ export function createAdkStream(
 
     if (isDirect) {
       // Direct mode: POST to ADK server's /run_sse
-      url = `${options.api}/run_sse`;
+      url = `${trimTrailingSlashes(options.api)}/run_sse`;
       const { externalId } = await config.initialize();
       body = {
         appName: options.appName,
@@ -213,34 +215,27 @@ function messagesToProxyBody(
 async function* parseSSEResponse(response: Response): AsyncGenerator<AdkEvent> {
   const reader = response.body!.getReader();
   const decoder = new TextDecoder();
-  let buffer = "";
+  const sseDecoder = new SSEEventDecoder({ trailing: "dispatch" });
 
   try {
     while (true) {
       const { done, value } = await reader.read();
-      if (done) break;
-
-      buffer += decoder.decode(value, { stream: true });
-      const parts = buffer.split("\n\n");
-      buffer = parts.pop() ?? "";
-
-      for (const part of parts) {
-        for (const line of part.split("\n")) {
-          if (line.startsWith("data: ")) {
-            yield JSON.parse(line.slice(6)) as AdkEvent;
-          }
+      if (done) {
+        for (const event of sseDecoder.push(decoder.decode())) {
+          yield JSON.parse(event.data) as AdkEvent;
         }
+        break;
       }
-    }
 
-    // Handle remaining buffer
-    if (buffer.trim()) {
-      for (const line of buffer.split("\n")) {
-        if (line.startsWith("data: ")) {
-          yield JSON.parse(line.slice(6)) as AdkEvent;
-        }
+      for (const event of sseDecoder.push(
+        decoder.decode(value, { stream: true }),
+      )) {
+        yield JSON.parse(event.data) as AdkEvent;
       }
     }
+
+    const trailing = sseDecoder.flush();
+    if (trailing !== null) yield JSON.parse(trailing.data) as AdkEvent;
   } finally {
     reader.releaseLock();
   }

package/src/AdkSessionAdapter.test.ts

@@ -210,10 +210,14 @@ describe("createAdkSessionAdapter - no-op methods", () => {
 // ── adapter.generateTitle ──
 
 describe("createAdkSessionAdapter - generateTitle", () => {
-  it("returns an empty ReadableStream", async () => {
+  it("closes its title stream when title generation is unsupported", async () => {
     const { adapter } = createAdkSessionAdapter(baseOptions);
-    const result = await adapter.generateTitle("s1", []);
-    expect(result).toBeInstanceOf(ReadableStream);
+    const stream = await adapter.generateTitle("s1", []);
+
+    await expect(stream.getReader().read()).resolves.toEqual({
+      done: true,
+      value: undefined,
+    });
   });
 });
 
@@ -339,9 +343,26 @@ describe("createAdkSessionAdapter - load", () => {
   });
 });
 
-// ── URL encoding ──
+// ── URL construction ──
+
+describe("createAdkSessionAdapter - URL construction", () => {
+  it.each(["http://localhost:8000/", "http://localhost:8000//"])(
+    "normalizes trailing slashes in apiUrl: %s",
+    async (apiUrl) => {
+      mockFetch.mockResolvedValueOnce(
+        new Response(JSON.stringify([]), { status: 200 }),
+      );
+
+      const { adapter } = createAdkSessionAdapter({
+        ...baseOptions,
+        apiUrl,
+      });
+      await adapter.list();
+
+      expect(mockFetch.mock.calls[0]![0]).toBe(expectedBaseUrl);
+    },
+  );
 
-describe("createAdkSessionAdapter - URL encoding", () => {
   it("encodes special characters in appName and userId", async () => {
     mockFetch.mockResolvedValueOnce(
       new Response(JSON.stringify([]), { status: 200 }),

package/src/AdkSessionAdapter.ts

@@ -7,6 +7,7 @@ import type {
 } from "@assistant-ui/core";
 import { AdkEventAccumulator } from "./AdkEventAccumulator";
 import type { AdkEvent, AdkMessage } from "./types";
+import { trimTrailingSlashes } from "./trimTrailingSlashes";
 
 export type AdkSessionAdapterOptions = {
   /**
@@ -79,7 +80,8 @@ export function createAdkSessionAdapter(
   options: AdkSessionAdapterOptions,
 ): AdkSessionAdapterResult {
   const { apiUrl, appName, userId } = options;
-  const baseUrl = `${apiUrl}/apps/${encodeURIComponent(appName)}/users/${encodeURIComponent(userId)}/sessions`;
+  const normalizedApiUrl = trimTrailingSlashes(apiUrl);
+  const baseUrl = `${normalizedApiUrl}/apps/${encodeURIComponent(appName)}/users/${encodeURIComponent(userId)}/sessions`;
 
   const getHeaders = async (): Promise<Record<string, string>> => {
     if (!options.headers) return {};
@@ -152,7 +154,13 @@ export function createAdkSessionAdapter(
 
     generateTitle(): Promise<AssistantStream> {
       // Title generation not supported without assistant-cloud
-      return Promise.resolve(new ReadableStream<AssistantStreamChunk>());
+      return Promise.resolve(
+        new ReadableStream<AssistantStreamChunk>({
+          start(controller) {
+            controller.close();
+          },
+        }),
+      );
     },
 
     async fetch(threadId: string): Promise<RemoteThreadMetadata> {

package/src/adkExtras.ts

@@ -0,0 +1,4 @@
+import { createRuntimeExtras } from "@assistant-ui/core/internal";
+import type { AdkRuntimeExtras } from "./types";
+
+export const adkExtras = createRuntimeExtras<AdkRuntimeExtras>("useAdkRuntime");