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

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 AgentbaseAI Inc.
+Copyright (c) 2026 AgentbaseAI Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/contentToParts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contentToParts.d.ts","sourceRoot":"","sources":["../src/contentToParts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAyB,mBAAgB;AAE/E,eAAO,MAAM,cAAc,GACzB,SAAS,UAAU,CAAC,SAAS,CAAC,KAC7B,YAAY,EAiCd,CAAC"}
+{"version":3,"file":"contentToParts.d.ts","sourceRoot":"","sources":["../src/contentToParts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAyB,mBAAgB;AAE/E,eAAO,MAAM,cAAc,GACzB,SAAS,UAAU,CAAC,SAAS,CAAC,KAC7B,YAAY,EAmCd,CAAC"}

package/dist/contentToParts.js

@@ -29,6 +29,7 @@ const contentToParts = (content) => {
 				output: part.output,
 				outcome: part.outcome
 			} };
+			case "activity": return { text: part.message };
 			default: return { text: "" };
 		}
 	});

package/dist/contentToParts.js.map

@@ -1 +1 @@
-{"version":3,"file":"contentToParts.js","names":[],"sources":["../src/contentToParts.ts"],"sourcesContent":["import type { AdkEventPart, AdkMessage, AdkMessageContentPart } from \"./types\";\n\nexport const contentToParts = (\n  content: AdkMessage[\"content\"],\n): AdkEventPart[] => {\n  if (typeof content === \"string\") return [{ text: content }];\n  return (content as AdkMessageContentPart[]).map((part): AdkEventPart => {\n    switch (part.type) {\n      case \"text\":\n        return { text: part.text };\n      case \"reasoning\":\n        return { text: part.text, thought: true };\n      case \"image\":\n        return { inlineData: { mimeType: part.mimeType, data: part.data } };\n      case \"image_url\":\n        return { fileData: { fileUri: part.url } };\n      case \"file\":\n        return { inlineData: { mimeType: part.mimeType, data: part.data } };\n      case \"file_url\":\n        return {\n          fileData: {\n            fileUri: part.url,\n            ...(part.mimeType != null && { mimeType: part.mimeType }),\n          },\n        };\n      case \"code\":\n        return {\n          executableCode: { code: part.code, language: part.language },\n        };\n      case \"code_result\":\n        return {\n          codeExecutionResult: { output: part.output, outcome: part.outcome },\n        };\n      default:\n        return { text: \"\" };\n    }\n  });\n};\n"],"mappings":";AAEA,MAAa,kBACX,YACmB;CACnB,IAAI,OAAO,YAAY,UAAU,OAAO,CAAC,EAAE,MAAM,QAAQ,CAAC;CAC1D,OAAQ,QAAoC,KAAK,SAAuB;EACtE,QAAQ,KAAK,MAAb;GACE,KAAK,QACH,OAAO,EAAE,MAAM,KAAK,KAAK;GAC3B,KAAK,aACH,OAAO;IAAE,MAAM,KAAK;IAAM,SAAS;GAAK;GAC1C,KAAK,SACH,OAAO,EAAE,YAAY;IAAE,UAAU,KAAK;IAAU,MAAM,KAAK;GAAK,EAAE;GACpE,KAAK,aACH,OAAO,EAAE,UAAU,EAAE,SAAS,KAAK,IAAI,EAAE;GAC3C,KAAK,QACH,OAAO,EAAE,YAAY;IAAE,UAAU,KAAK;IAAU,MAAM,KAAK;GAAK,EAAE;GACpE,KAAK,YACH,OAAO,EACL,UAAU;IACR,SAAS,KAAK;IACd,GAAI,KAAK,YAAY,QAAQ,EAAE,UAAU,KAAK,SAAS;GACzD,EACF;GACF,KAAK,QACH,OAAO,EACL,gBAAgB;IAAE,MAAM,KAAK;IAAM,UAAU,KAAK;GAAS,EAC7D;GACF,KAAK,eACH,OAAO,EACL,qBAAqB;IAAE,QAAQ,KAAK;IAAQ,SAAS,KAAK;GAAQ,EACpE;GACF,SACE,OAAO,EAAE,MAAM,GAAG;EACtB;CACF,CAAC;AACH"}
+{"version":3,"file":"contentToParts.js","names":[],"sources":["../src/contentToParts.ts"],"sourcesContent":["import type { AdkEventPart, AdkMessage, AdkMessageContentPart } from \"./types\";\n\nexport const contentToParts = (\n  content: AdkMessage[\"content\"],\n): AdkEventPart[] => {\n  if (typeof content === \"string\") return [{ text: content }];\n  return (content as AdkMessageContentPart[]).map((part): AdkEventPart => {\n    switch (part.type) {\n      case \"text\":\n        return { text: part.text };\n      case \"reasoning\":\n        return { text: part.text, thought: true };\n      case \"image\":\n        return { inlineData: { mimeType: part.mimeType, data: part.data } };\n      case \"image_url\":\n        return { fileData: { fileUri: part.url } };\n      case \"file\":\n        return { inlineData: { mimeType: part.mimeType, data: part.data } };\n      case \"file_url\":\n        return {\n          fileData: {\n            fileUri: part.url,\n            ...(part.mimeType != null && { mimeType: part.mimeType }),\n          },\n        };\n      case \"code\":\n        return {\n          executableCode: { code: part.code, language: part.language },\n        };\n      case \"code_result\":\n        return {\n          codeExecutionResult: { output: part.output, outcome: part.outcome },\n        };\n      case \"activity\":\n        return { text: part.message };\n      default:\n        return { text: \"\" };\n    }\n  });\n};\n"],"mappings":";AAEA,MAAa,kBACX,YACmB;CACnB,IAAI,OAAO,YAAY,UAAU,OAAO,CAAC,EAAE,MAAM,QAAQ,CAAC;CAC1D,OAAQ,QAAoC,KAAK,SAAuB;EACtE,QAAQ,KAAK,MAAb;GACE,KAAK,QACH,OAAO,EAAE,MAAM,KAAK,KAAK;GAC3B,KAAK,aACH,OAAO;IAAE,MAAM,KAAK;IAAM,SAAS;GAAK;GAC1C,KAAK,SACH,OAAO,EAAE,YAAY;IAAE,UAAU,KAAK;IAAU,MAAM,KAAK;GAAK,EAAE;GACpE,KAAK,aACH,OAAO,EAAE,UAAU,EAAE,SAAS,KAAK,IAAI,EAAE;GAC3C,KAAK,QACH,OAAO,EAAE,YAAY;IAAE,UAAU,KAAK;IAAU,MAAM,KAAK;GAAK,EAAE;GACpE,KAAK,YACH,OAAO,EACL,UAAU;IACR,SAAS,KAAK;IACd,GAAI,KAAK,YAAY,QAAQ,EAAE,UAAU,KAAK,SAAS;GACzD,EACF;GACF,KAAK,QACH,OAAO,EACL,gBAAgB;IAAE,MAAM,KAAK;IAAM,UAAU,KAAK;GAAS,EAC7D;GACF,KAAK,eACH,OAAO,EACL,qBAAqB;IAAE,QAAQ,KAAK;IAAQ,SAAS,KAAK;GAAQ,EACpE;GACF,KAAK,YACH,OAAO,EAAE,MAAM,KAAK,QAAQ;GAC9B,SACE,OAAO,EAAE,MAAM,GAAG;EACtB;CACF,CAAC;AACH"}

package/dist/convertAdkMessages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convertAdkMessages.d.ts","sourceRoot":"","sources":["../src/convertAdkMessages.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAEL,KAAK,eAAe,EACrB,6BAA0B;AAC3B,OAAO,KAAK,EAAE,UAAU,EAAyB,mBAAgB;AA4FjE,eAAO,MAAM,yBAAyB,GAElC,WAAW,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,KAC9C,2BAA2B,CAAC,QAAQ,CAAC,UAAU,CAgEjD,CAAC;AAEJ,eAAO,MAAM,iBAAiB,EAAE,2BAA2B,CAAC,QAAQ,CAAC,UAAU,CACnC,CAAC"}
+{"version":3,"file":"convertAdkMessages.d.ts","sourceRoot":"","sources":["../src/convertAdkMessages.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAEL,KAAK,eAAe,EACrB,6BAA0B;AAC3B,OAAO,KAAK,EAAE,UAAU,EAAyB,mBAAgB;AAiGjE,eAAO,MAAM,yBAAyB,GAElC,WAAW,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,KAC9C,2BAA2B,CAAC,QAAQ,CAAC,UAAU,CAgEjD,CAAC;AAEJ,eAAO,MAAM,iBAAiB,EAAE,2BAA2B,CAAC,QAAQ,CAAC,UAAU,CACnC,CAAC"}

package/dist/convertAdkMessages.js

@@ -62,6 +62,10 @@ const contentToParts = (content, role) => {
 					outcome: part.outcome
 				}
 			};
+			case "activity": return {
+				type: "text",
+				text: typeof part.message === "string" ? part.message : ""
+			};
 			default: return null;
 		}
 	}).filter((p) => p !== null);

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 {\n  ADK_REQUEST_CONFIRMATION,\n  type AdkToolApproval,\n} from \"./adkToolApproval\";\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  | {\n      type: \"file\";\n      data: string;\n      mimeType: string;\n      filename?: string;\n      sourceType?: \"url\";\n    }\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  if (!Array.isArray(content)) return [];\n\n  return content\n    .filter(\n      (part): part is AdkMessageContentPart =>\n        typeof part === \"object\" && part !== null,\n    )\n    .map((part): ContentPart | null => {\n      switch (part.type) {\n        case \"text\":\n          return {\n            type: \"text\",\n            text: typeof part.text === \"string\" ? part.text : \"\",\n          };\n        case \"reasoning\":\n          return {\n            type: \"reasoning\",\n            text: typeof part.text === \"string\" ? part.text : \"\",\n          };\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          if (role === \"user\") {\n            return {\n              type: \"file\",\n              data: part.url,\n              mimeType: part.mimeType ?? \"application/octet-stream\",\n              sourceType: \"url\",\n            };\n          }\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\nconst EMPTY_APPROVALS: ReadonlyMap<string, AdkToolApproval> = new Map();\n\nexport const createAdkMessageConverter =\n  (\n    approvals: ReadonlyMap<string, AdkToolApproval>,\n  ): useExternalMessageConverter.Callback<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            const approval = approvals.get(tc.id);\n            return {\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              ...(approval && { approval }),\n            };\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        // A confirmation reply ADK could not read leaves its gate undecided.\n        // The reply is not the agent's output, so it is dropped rather than\n        // shown as the call's result while the gate waits to be answered again.\n        // Only a reply to the confirmation itself is dropped: the gated call\n        // carries the same approval, and its own result is the agent's real\n        // output.\n        const approval = approvals.get(message.tool_call_id);\n        if (\n          message.name === ADK_REQUEST_CONFIRMATION &&\n          approval !== undefined &&\n          approval.approved === undefined\n        )\n          return [];\n\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  };\n\nexport const convertAdkMessage: useExternalMessageConverter.Callback<AdkMessage> =\n  createAdkMessageConverter(EMPTY_APPROVALS);\n"],"mappings":";;;AAuBA,MAAM,kBACJ,SACA,SACkB;CAClB,IAAI,OAAO,YAAY,UACrB,OAAO,CAAC;EAAE,MAAM;EAAiB,MAAM;CAAQ,CAAC;CAClD,IAAI,CAAC,MAAM,QAAQ,OAAO,GAAG,OAAO,CAAC;CAErC,OAAO,QACJ,QACE,SACC,OAAO,SAAS,YAAY,SAAS,IACzC,CAAC,CACA,KAAK,SAA6B;EACjC,QAAQ,KAAK,MAAb;GACE,KAAK,QACH,OAAO;IACL,MAAM;IACN,MAAM,OAAO,KAAK,SAAS,WAAW,KAAK,OAAO;GACpD;GACF,KAAK,aACH,OAAO;IACL,MAAM;IACN,MAAM,OAAO,KAAK,SAAS,WAAW,KAAK,OAAO;GACpD;GACF,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;IACH,IAAI,SAAS,QACX,OAAO;KACL,MAAM;KACN,MAAM,KAAK;KACX,UAAU,KAAK,YAAY;KAC3B,YAAY;IACd;IAEF,OAAO;KACL,MAAM;KACN,MAAM;KACN,MAAM;MACJ,KAAK,KAAK;MACV,GAAI,KAAK,YAAY,QAAQ,EAAE,UAAU,KAAK,SAAS;KACzD;IACF;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,MAAM,kCAAwD,IAAI,IAAI;AAEtE,MAAa,6BAET,eAED,YAAY;CACX,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,OAAO;IAC9B,MAAM,WAAW,UAAU,IAAI,GAAG,EAAE;IACpC,OAAO;KACL,MAAM;KACN,YAAY,GAAG;KACf,UAAU,GAAG;KACb,MAAM,GAAG;KACT,UAAU,GAAG,YAAY,KAAK,UAAU,GAAG,IAAI;KAC/C,GAAI,YAAY,EAAE,SAAS;IAC7B;GACF,CAAC,KAAK,CAAC;GAET,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,QAAQ;GAOX,MAAM,WAAW,UAAU,IAAI,QAAQ,YAAY;GACnD,IACE,QAAQ,SAAA,8BACR,aAAa,KAAA,KACb,SAAS,aAAa,KAAA,GAEtB,OAAO,CAAC;GAEV,OAAO;IACL,MAAM;IACN,YAAY,QAAQ;IACpB,UAAU,QAAQ;IAClB,QAAQ,QAAQ;IAChB,SAAS,QAAQ,WAAW;GAC9B;EACF;CACF;AACF;AAEF,MAAa,oBACX,0BAA0B,eAAe"}
+{"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 {\n  ADK_REQUEST_CONFIRMATION,\n  type AdkToolApproval,\n} from \"./adkToolApproval\";\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  | {\n      type: \"file\";\n      data: string;\n      mimeType: string;\n      filename?: string;\n      sourceType?: \"url\";\n    }\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  if (!Array.isArray(content)) return [];\n\n  return content\n    .filter(\n      (part): part is AdkMessageContentPart =>\n        typeof part === \"object\" && part !== null,\n    )\n    .map((part): ContentPart | null => {\n      switch (part.type) {\n        case \"text\":\n          return {\n            type: \"text\",\n            text: typeof part.text === \"string\" ? part.text : \"\",\n          };\n        case \"reasoning\":\n          return {\n            type: \"reasoning\",\n            text: typeof part.text === \"string\" ? part.text : \"\",\n          };\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          if (role === \"user\") {\n            return {\n              type: \"file\",\n              data: part.url,\n              mimeType: part.mimeType ?? \"application/octet-stream\",\n              sourceType: \"url\",\n            };\n          }\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        case \"activity\":\n          return {\n            type: \"text\",\n            text: typeof part.message === \"string\" ? part.message : \"\",\n          };\n        default:\n          return null;\n      }\n    })\n    .filter((p): p is NonNullable<typeof p> => p !== null);\n};\n\nconst EMPTY_APPROVALS: ReadonlyMap<string, AdkToolApproval> = new Map();\n\nexport const createAdkMessageConverter =\n  (\n    approvals: ReadonlyMap<string, AdkToolApproval>,\n  ): useExternalMessageConverter.Callback<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            const approval = approvals.get(tc.id);\n            return {\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              ...(approval && { approval }),\n            };\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        // A confirmation reply ADK could not read leaves its gate undecided.\n        // The reply is not the agent's output, so it is dropped rather than\n        // shown as the call's result while the gate waits to be answered again.\n        // Only a reply to the confirmation itself is dropped: the gated call\n        // carries the same approval, and its own result is the agent's real\n        // output.\n        const approval = approvals.get(message.tool_call_id);\n        if (\n          message.name === ADK_REQUEST_CONFIRMATION &&\n          approval !== undefined &&\n          approval.approved === undefined\n        )\n          return [];\n\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  };\n\nexport const convertAdkMessage: useExternalMessageConverter.Callback<AdkMessage> =\n  createAdkMessageConverter(EMPTY_APPROVALS);\n"],"mappings":"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"}

package/dist/sdkIdentity.js

@@ -1,7 +1,7 @@
 //#region src/sdkIdentity.ts
 const ADK_SDK = {
 	name: "@assistant-ui/react-google-adk",
-	version: "0.0.32"
+	version: "0.0.33"
 };
 //#endregion
 export { ADK_SDK };

package/dist/useAdkMessages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAdkMessages.d.ts","sourceRoot":"","sources":["../src/useAdkMessages.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAEV,UAAU,EACV,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,wBAAwB,EACxB,0BAA0B,EAC3B,mBAAgB;AAEjB,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,iBAAiB,CAAC;IAC1B,aAAa,CAAC,EAAE;QACd,OAAO,CAAC,EAAE,kBAAkB,CAAC;QAC7B,aAAa,CAAC,EAAE,wBAAwB,CAAC;QACzC,eAAe,CAAC,EAAE,0BAA0B,CAAC;KAC9C,CAAC;CACH,CAAC;AAYF,eAAO,MAAM,cAAc,GAAI,4BAG5B,qBAAqB;;;;eAIb,MAAM,GAAG,SAAS;iBAChB,MAAM,GAAG,SAAS;;;;;;;;+BAsFP,UAAU,EAAE,UAAU,oBAAoB;;wBAvDhB,UAAU,EAAE;4BAmCnD,UAAU,EAAE;8BAnBR,iBAAiB;CAwM/B,CAAC"}
+{"version":3,"file":"useAdkMessages.d.ts","sourceRoot":"","sources":["../src/useAdkMessages.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAEV,UAAU,EACV,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,wBAAwB,EACxB,0BAA0B,EAC3B,mBAAgB;AAEjB,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,iBAAiB,CAAC;IAC1B,aAAa,CAAC,EAAE;QACd,OAAO,CAAC,EAAE,kBAAkB,CAAC;QAC7B,aAAa,CAAC,EAAE,wBAAwB,CAAC;QACzC,eAAe,CAAC,EAAE,0BAA0B,CAAC;KAC9C,CAAC;CACH,CAAC;AAYF,eAAO,MAAM,cAAc,GAAI,4BAG5B,qBAAqB;;;;eAIb,MAAM,GAAG,SAAS;iBAChB,MAAM,GAAG,SAAS;;;;;;;;+BAqFP,UAAU,EAAE,UAAU,oBAAoB;;wBAvDhB,UAAU,EAAE;4BAmCnD,UAAU,EAAE;8BAnBR,iBAAiB;CAyM/B,CAAC"}

package/dist/useAdkMessages.js

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

package/dist/useAdkMessages.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAdkMessages.js","names":[],"sources":["../src/useAdkMessages.ts"],"sourcesContent":["import {\n  useState,\n  useCallback,\n  useEffect,\n  useInsertionEffect,\n  useRef,\n  useMemo,\n} from \"react\";\nimport { generateId } from \"@assistant-ui/core\";\nimport { useAui } from \"@assistant-ui/store\";\nimport {\n  abortableIterable,\n  invokeUserCallback,\n  openAbortableIterable,\n} from \"@assistant-ui/core/internal\";\nimport { AdkEventAccumulator } from \"./AdkEventAccumulator\";\nimport { contentToParts } from \"./contentToParts\";\nimport { toAdkFunctionResponse } from \"./toAdkFunctionResponse\";\nimport type {\n  AdkEvent,\n  AdkMessage,\n  AdkMessageMetadata,\n  AdkSendMessageConfig,\n  AdkStreamCallback,\n  AdkToolConfirmation,\n  AdkAuthRequest,\n  AdkThreadSnapshot,\n  OnAdkErrorCallback,\n  OnAdkCustomEventCallback,\n  OnAdkAgentTransferCallback,\n} from \"./types\";\n\nexport type UseAdkMessagesOptions = {\n  stream: AdkStreamCallback;\n  eventHandlers?: {\n    onError?: OnAdkErrorCallback;\n    onCustomEvent?: OnAdkCustomEventCallback;\n    onAgentTransfer?: OnAdkAgentTransferCallback;\n  };\n};\n\ntype AdkRuntimeCallbackName = \"onError\" | \"onCustomEvent\" | \"onAgentTransfer\";\n\nconst invokeAdkRuntimeCallback = <TArgs extends readonly unknown[]>(\n  name: AdkRuntimeCallbackName,\n  callback: ((...args: TArgs) => unknown) | undefined,\n  ...args: TArgs\n): void => {\n  void invokeUserCallback(\"react-google-adk\", name, callback, ...args);\n};\n\nexport const useAdkMessages = ({\n  stream,\n  eventHandlers,\n}: UseAdkMessagesOptions) => {\n  const [messages, _setMessages] = useState<AdkMessage[]>([]);\n  const [stateDelta, setStateDelta] = useState<Record<string, unknown>>({});\n  const [agentInfo, setAgentInfo] = useState<{\n    name?: string | undefined;\n    branch?: string | undefined;\n  }>({});\n  const [longRunningToolIds, _setLongRunningToolIds] = useState<string[]>([]);\n  const [artifactDelta, setArtifactDelta] = useState<Record<string, number>>(\n    {},\n  );\n  const [toolConfirmations, setToolConfirmations] = useState<\n    AdkToolConfirmation[]\n  >([]);\n  const [authRequests, setAuthRequests] = useState<AdkAuthRequest[]>([]);\n  const [escalated, setEscalated] = useState(false);\n  const [messageMetadata, setMessageMetadata] = useState<\n    Map<string, AdkMessageMetadata>\n  >(new Map());\n  const lastTransferToAgentRef = useRef<string | undefined>(undefined);\n  // setMessagesImmediate and setLongRunningToolIds are the only writers of their state and publish these refs with it, so neither ref trails a commit.\n  const messagesRef = useRef(messages);\n  const longRunningToolIdsRef = useRef(longRunningToolIds);\n  const stateDeltaRef = useRef(stateDelta);\n  useInsertionEffect(() => {\n    stateDeltaRef.current = stateDelta;\n  }, [stateDelta]);\n  const artifactDeltaRef = useRef(artifactDelta);\n  useInsertionEffect(() => {\n    artifactDeltaRef.current = artifactDelta;\n  }, [artifactDelta]);\n  const messageMetadataRef = useRef(messageMetadata);\n  useInsertionEffect(() => {\n    messageMetadataRef.current = messageMetadata;\n  }, [messageMetadata]);\n\n  const setMessagesImmediate = useCallback((msgs: AdkMessage[]) => {\n    messagesRef.current = msgs;\n    _setMessages(msgs);\n  }, []);\n  const setLongRunningToolIds = useCallback((ids: string[]) => {\n    longRunningToolIdsRef.current = ids;\n    _setLongRunningToolIds(ids);\n  }, []);\n\n  /**\n   * Swap the thread over to a loaded snapshot in one commit. Unlike\n   * {@link replaceMessages} this never passes through a cleared state, so a\n   * refetch that lands while a confirmation is on screen replaces it rather\n   * than blanking it first.\n   */\n  const applySnapshot = useCallback(\n    (snapshot: AdkThreadSnapshot) => {\n      setMessagesImmediate(snapshot.messages);\n      setLongRunningToolIds(snapshot.longRunningToolIds ?? []);\n      setToolConfirmations(snapshot.toolConfirmations ?? []);\n      setAuthRequests(snapshot.authRequests ?? []);\n      setEscalated(snapshot.escalated ?? false);\n      setMessageMetadata(snapshot.messageMetadata ?? new Map());\n      setStateDelta(snapshot.stateDelta ?? {});\n      setArtifactDelta(snapshot.artifactDelta ?? {});\n      setAgentInfo(snapshot.agentInfo ?? {});\n    },\n    [setLongRunningToolIds, setMessagesImmediate],\n  );\n\n  // Replace the message list AND reset derived per-turn HITL state.\n  // Used by truncation paths (edit, reload) so that stale interrupt\n  // markers and per-message metadata from the removed messages don't leak\n  // into the next turn.\n  const replaceMessages = useCallback(\n    (msgs: AdkMessage[]) => {\n      setMessagesImmediate(msgs);\n      setLongRunningToolIds([]);\n      setToolConfirmations([]);\n      setAuthRequests([]);\n      setEscalated(false);\n      setMessageMetadata(new Map());\n    },\n    [setLongRunningToolIds, setMessagesImmediate],\n  );\n\n  const abortControllerRef = useRef<AbortController | null>(null);\n\n  const { onError, onCustomEvent, onAgentTransfer } = useMemo(\n    () => eventHandlers ?? {},\n    [eventHandlers],\n  );\n\n  const aui = useAui();\n  const sendMessage = useCallback(\n    async (newMessages: AdkMessage[], config: AdkSendMessageConfig) => {\n      const newMessagesWithId = newMessages.map((m) =>\n        m.id ? m : { ...m, id: generateId() },\n      ) as AdkMessage[];\n\n      // A staged message is already in the thread under its own id, and the\n      // merged event below re-emits the whole batch under the first one. Seeding\n      // with the originals would leave every later staged id beside the merged\n      // copy of itself.\n      const resentIds = new Set(newMessagesWithId.map((m) => m.id));\n      // The optimistic event for a tool-only batch carries no author, so the accumulator cannot settle the calls this send answers.\n      const answeredToolCallIds = new Set(\n        newMessagesWithId.flatMap((m) =>\n          m.type === \"tool\" ? [m.tool_call_id] : [],\n        ),\n      );\n      const accumulator = new AdkEventAccumulator(\n        messagesRef.current.filter((m) => !resentIds.has(m.id)),\n        longRunningToolIdsRef.current.filter(\n          (id) => !answeredToolCallIds.has(id),\n        ),\n      );\n      for (const event of messagesToEvents(newMessagesWithId)) {\n        accumulator.processEvent(event);\n      }\n      setMessagesImmediate(accumulator.getMessages());\n      setLongRunningToolIds(accumulator.getLongRunningToolIds());\n      setToolConfirmations(accumulator.getToolConfirmations());\n      setAuthRequests(accumulator.getAuthRequests());\n\n      // Google ADK replaces active runs, while React LangGraph queues sends.\n      abortControllerRef.current?.abort();\n      const abortController = new AbortController();\n      abortControllerRef.current = abortController;\n\n      try {\n        const response = await openAbortableIterable(\n          stream(newMessagesWithId, {\n            ...config,\n            abortSignal: abortController.signal,\n            initialize: async () => {\n              return await aui.threadListItem.initialize();\n            },\n          }),\n          abortController.signal,\n        );\n        if (!response) return;\n\n        for await (const event of abortableIterable(\n          response,\n          abortController.signal,\n        )) {\n          if (\n            abortController.signal.aborted ||\n            abortControllerRef.current !== abortController\n          ) {\n            break;\n          }\n          const updatedMessages = accumulator.processEvent(event);\n          setMessagesImmediate(updatedMessages);\n          setStateDelta({\n            ...stateDeltaRef.current,\n            ...accumulator.getStateDelta(),\n          });\n          setAgentInfo(accumulator.getAgentInfo());\n          setLongRunningToolIds(accumulator.getLongRunningToolIds());\n          setArtifactDelta({\n            ...artifactDeltaRef.current,\n            ...accumulator.getArtifactDelta(),\n          });\n          setToolConfirmations(accumulator.getToolConfirmations());\n          setAuthRequests(accumulator.getAuthRequests());\n          setEscalated(accumulator.isEscalated());\n          {\n            const newMeta = accumulator.getMessageMetadata();\n            if (newMeta.size > 0) {\n              setMessageMetadata(\n                new Map([...messageMetadataRef.current, ...newMeta]),\n              );\n            }\n          }\n\n          const transfer = accumulator.getLastTransferToAgent();\n          if (transfer && transfer !== lastTransferToAgentRef.current) {\n            lastTransferToAgentRef.current = transfer;\n            invokeAdkRuntimeCallback(\n              \"onAgentTransfer\",\n              onAgentTransfer,\n              transfer,\n            );\n          }\n\n          // Fire custom event callback for events with customMetadata\n          if (event.customMetadata && onCustomEvent) {\n            for (const [key, value] of Object.entries(event.customMetadata)) {\n              invokeAdkRuntimeCallback(\n                \"onCustomEvent\",\n                onCustomEvent,\n                key,\n                value,\n              );\n            }\n          }\n\n          if (event.errorCode || event.errorMessage) {\n            invokeAdkRuntimeCallback(\n              \"onError\",\n              onError,\n              event.errorMessage ?? event.errorCode,\n            );\n          }\n        }\n      } catch (error) {\n        if (\n          !abortController.signal.aborted &&\n          abortControllerRef.current === abortController &&\n          !(error instanceof Error && error.name === \"AbortError\")\n        ) {\n          throw error;\n        }\n      } finally {\n        if (abortControllerRef.current === abortController) {\n          abortControllerRef.current = null;\n        }\n      }\n    },\n    [\n      aui,\n      setMessagesImmediate,\n      setLongRunningToolIds,\n      stream,\n      onError,\n      onCustomEvent,\n      onAgentTransfer,\n    ],\n  );\n\n  const cancel = useCallback(() => {\n    if (abortControllerRef.current) {\n      abortControllerRef.current.abort();\n    }\n  }, []);\n\n  useEffect(() => cancel, [cancel]);\n\n  return {\n    messages,\n    stateDelta,\n    agentInfo,\n    longRunningToolIds,\n    artifactDelta,\n    toolConfirmations,\n    authRequests,\n    escalated,\n    messageMetadata,\n    sendMessage,\n    cancel,\n    setMessages: setMessagesImmediate,\n    replaceMessages,\n    applySnapshot,\n  };\n};\n\n/**\n * Transport sends every human and tool message of one `send` call as a single\n * ADK `Content`, and ADK parses that event's function responses before running\n * any tool, so the batch runs whole or not at all. The optimistic projection\n * has to sit on the same boundary, so a run of those messages becomes one\n * synthetic event whose parts come from the same per-message conversion.\n *\n * The transport drops `ai` messages from that `Content`, so one interleaved\n * between two replies does not split the batch on the wire and must not split\n * it here either. It still becomes its own event, placed after the merged one,\n * so the optimistic projection keeps the assistant turn.\n *\n * @internal — exported for unit tests.\n */\nexport const messagesToEvents = (messages: AdkMessage[]): AdkEvent[] => {\n  // A reload sends no messages at all, and the empty user content the transport\n  // puts on the wire for it is not part of the optimistic view: projecting one\n  // would put an empty user bubble above every regenerated turn.\n  if (messages.length === 0) return [];\n\n  const events: AdkEvent[] = [];\n  const run: AdkMessage[] = [];\n  let runIndex = 0;\n\n  for (const msg of messages) {\n    if (msg.type === \"ai\") {\n      events.push(messageToEvent(msg));\n    } else {\n      if (run.length === 0) runIndex = events.length;\n      run.push(msg);\n    }\n  }\n\n  const parts = run.flatMap((m) => messageToEvent(m).content?.parts ?? []);\n  const human = run.find((m) => m.type === \"human\");\n\n  // A batch that contributes no part still reaches the wire: the transport\n  // sends an empty user `Content`, which a reload replays as an empty human\n  // message. Emitting it here keeps the optimistic view equal to that replay.\n  if (parts.length === 0) parts.push({ text: \"\" });\n\n  const event: AdkEvent = { id: (human ?? run[0])?.id ?? generateId() };\n  if (human || run.length === 0) event.author = \"user\";\n  event.content = { role: \"user\", parts };\n  events.splice(run.length > 0 ? runIndex : events.length, 0, event);\n\n  return events;\n};\n\n/** @internal — exported for unit tests. */\nexport const messageToEvent = (msg: AdkMessage): AdkEvent => {\n  if (msg.type === \"human\") {\n    return {\n      id: msg.id ?? generateId(),\n      author: \"user\",\n      content: { role: \"user\", parts: contentToParts(msg.content) },\n    };\n  }\n\n  if (msg.type === \"tool\") {\n    let response: unknown;\n    try {\n      response = JSON.parse(msg.content);\n    } catch {\n      response = msg.content;\n    }\n    return {\n      id: msg.id ?? generateId(),\n      content: {\n        role: \"user\",\n        parts: [\n          {\n            functionResponse: {\n              name: msg.name,\n              id: msg.tool_call_id,\n              response: toAdkFunctionResponse(response, msg.status === \"error\"),\n            },\n          },\n        ],\n      },\n    };\n  }\n\n  const result: AdkEvent = { id: msg.id ?? generateId() };\n  if (msg.author != null) result.author = msg.author;\n  result.content = {\n    role: \"model\",\n    parts: [\n      ...contentToParts(msg.content),\n      ...(msg.tool_calls?.map((tc) => ({\n        functionCall: { name: tc.name, id: tc.id, args: { ...tc.args } },\n      })) ?? []),\n    ],\n  };\n  return result;\n};\n"],"mappings":"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"}
+{"version":3,"file":"useAdkMessages.js","names":[],"sources":["../src/useAdkMessages.ts"],"sourcesContent":["import {\n  useState,\n  useCallback,\n  useInsertionEffect,\n  useRef,\n  useMemo,\n} from \"react\";\nimport { generateId } from \"@assistant-ui/core\";\nimport { useReplaySafeEffect } from \"@assistant-ui/store/internal\";\nimport { useAui } from \"@assistant-ui/store\";\nimport {\n  abortableIterable,\n  invokeUserCallback,\n  openAbortableIterable,\n} from \"@assistant-ui/core/internal\";\nimport { AdkEventAccumulator } from \"./AdkEventAccumulator\";\nimport { contentToParts } from \"./contentToParts\";\nimport { toAdkFunctionResponse } from \"./toAdkFunctionResponse\";\nimport type {\n  AdkEvent,\n  AdkMessage,\n  AdkMessageMetadata,\n  AdkSendMessageConfig,\n  AdkStreamCallback,\n  AdkToolConfirmation,\n  AdkAuthRequest,\n  AdkThreadSnapshot,\n  OnAdkErrorCallback,\n  OnAdkCustomEventCallback,\n  OnAdkAgentTransferCallback,\n} from \"./types\";\n\nexport type UseAdkMessagesOptions = {\n  stream: AdkStreamCallback;\n  eventHandlers?: {\n    onError?: OnAdkErrorCallback;\n    onCustomEvent?: OnAdkCustomEventCallback;\n    onAgentTransfer?: OnAdkAgentTransferCallback;\n  };\n};\n\ntype AdkRuntimeCallbackName = \"onError\" | \"onCustomEvent\" | \"onAgentTransfer\";\n\nconst invokeAdkRuntimeCallback = <TArgs extends readonly unknown[]>(\n  name: AdkRuntimeCallbackName,\n  callback: ((...args: TArgs) => unknown) | undefined,\n  ...args: TArgs\n): void => {\n  void invokeUserCallback(\"react-google-adk\", name, callback, ...args);\n};\n\nexport const useAdkMessages = ({\n  stream,\n  eventHandlers,\n}: UseAdkMessagesOptions) => {\n  const [messages, _setMessages] = useState<AdkMessage[]>([]);\n  const [stateDelta, setStateDelta] = useState<Record<string, unknown>>({});\n  const [agentInfo, setAgentInfo] = useState<{\n    name?: string | undefined;\n    branch?: string | undefined;\n  }>({});\n  const [longRunningToolIds, _setLongRunningToolIds] = useState<string[]>([]);\n  const [artifactDelta, setArtifactDelta] = useState<Record<string, number>>(\n    {},\n  );\n  const [toolConfirmations, setToolConfirmations] = useState<\n    AdkToolConfirmation[]\n  >([]);\n  const [authRequests, setAuthRequests] = useState<AdkAuthRequest[]>([]);\n  const [escalated, setEscalated] = useState(false);\n  const [messageMetadata, setMessageMetadata] = useState<\n    Map<string, AdkMessageMetadata>\n  >(new Map());\n  // setMessagesImmediate and setLongRunningToolIds are the only writers of their state and publish these refs with it, so neither ref trails a commit.\n  const messagesRef = useRef(messages);\n  const longRunningToolIdsRef = useRef(longRunningToolIds);\n  const stateDeltaRef = useRef(stateDelta);\n  useInsertionEffect(() => {\n    stateDeltaRef.current = stateDelta;\n  }, [stateDelta]);\n  const artifactDeltaRef = useRef(artifactDelta);\n  useInsertionEffect(() => {\n    artifactDeltaRef.current = artifactDelta;\n  }, [artifactDelta]);\n  const messageMetadataRef = useRef(messageMetadata);\n  useInsertionEffect(() => {\n    messageMetadataRef.current = messageMetadata;\n  }, [messageMetadata]);\n\n  const setMessagesImmediate = useCallback((msgs: AdkMessage[]) => {\n    messagesRef.current = msgs;\n    _setMessages(msgs);\n  }, []);\n  const setLongRunningToolIds = useCallback((ids: string[]) => {\n    longRunningToolIdsRef.current = ids;\n    _setLongRunningToolIds(ids);\n  }, []);\n\n  /**\n   * Swap the thread over to a loaded snapshot in one commit. Unlike\n   * {@link replaceMessages} this never passes through a cleared state, so a\n   * refetch that lands while a confirmation is on screen replaces it rather\n   * than blanking it first.\n   */\n  const applySnapshot = useCallback(\n    (snapshot: AdkThreadSnapshot) => {\n      setMessagesImmediate(snapshot.messages);\n      setLongRunningToolIds(snapshot.longRunningToolIds ?? []);\n      setToolConfirmations(snapshot.toolConfirmations ?? []);\n      setAuthRequests(snapshot.authRequests ?? []);\n      setEscalated(snapshot.escalated ?? false);\n      setMessageMetadata(snapshot.messageMetadata ?? new Map());\n      setStateDelta(snapshot.stateDelta ?? {});\n      setArtifactDelta(snapshot.artifactDelta ?? {});\n      setAgentInfo(snapshot.agentInfo ?? {});\n    },\n    [setLongRunningToolIds, setMessagesImmediate],\n  );\n\n  // Replace the message list AND reset derived per-turn HITL state.\n  // Used by truncation paths (edit, reload) so that stale interrupt\n  // markers and per-message metadata from the removed messages don't leak\n  // into the next turn.\n  const replaceMessages = useCallback(\n    (msgs: AdkMessage[]) => {\n      setMessagesImmediate(msgs);\n      setLongRunningToolIds([]);\n      setToolConfirmations([]);\n      setAuthRequests([]);\n      setEscalated(false);\n      setMessageMetadata(new Map());\n    },\n    [setLongRunningToolIds, setMessagesImmediate],\n  );\n\n  const abortControllerRef = useRef<AbortController | null>(null);\n\n  const { onError, onCustomEvent, onAgentTransfer } = useMemo(\n    () => eventHandlers ?? {},\n    [eventHandlers],\n  );\n\n  const aui = useAui();\n  const sendMessage = useCallback(\n    async (newMessages: AdkMessage[], config: AdkSendMessageConfig) => {\n      const newMessagesWithId = newMessages.map((m) =>\n        m.id ? m : { ...m, id: generateId() },\n      ) as AdkMessage[];\n\n      // A staged message is already in the thread under its own id, and the\n      // merged event below re-emits the whole batch under the first one. Seeding\n      // with the originals would leave every later staged id beside the merged\n      // copy of itself.\n      const resentIds = new Set(newMessagesWithId.map((m) => m.id));\n      // The optimistic event for a tool-only batch carries no author, so the accumulator cannot settle the calls this send answers.\n      const answeredToolCallIds = new Set(\n        newMessagesWithId.flatMap((m) =>\n          m.type === \"tool\" ? [m.tool_call_id] : [],\n        ),\n      );\n      const accumulator = new AdkEventAccumulator(\n        messagesRef.current.filter((m) => !resentIds.has(m.id)),\n        longRunningToolIdsRef.current.filter(\n          (id) => !answeredToolCallIds.has(id),\n        ),\n      );\n      for (const event of messagesToEvents(newMessagesWithId)) {\n        accumulator.processEvent(event);\n      }\n      setMessagesImmediate(accumulator.getMessages());\n      setLongRunningToolIds(accumulator.getLongRunningToolIds());\n      setToolConfirmations(accumulator.getToolConfirmations());\n      setAuthRequests(accumulator.getAuthRequests());\n      let lastTransferToAgent: string | undefined;\n\n      // Google ADK replaces active runs, while React LangGraph queues sends.\n      abortControllerRef.current?.abort();\n      const abortController = new AbortController();\n      abortControllerRef.current = abortController;\n\n      try {\n        const response = await openAbortableIterable(\n          stream(newMessagesWithId, {\n            ...config,\n            abortSignal: abortController.signal,\n            initialize: async () => {\n              return await aui.threadListItem.initialize();\n            },\n          }),\n          abortController.signal,\n        );\n        if (!response) return;\n\n        for await (const event of abortableIterable(\n          response,\n          abortController.signal,\n        )) {\n          if (\n            abortController.signal.aborted ||\n            abortControllerRef.current !== abortController\n          ) {\n            break;\n          }\n          const updatedMessages = accumulator.processEvent(event);\n          setMessagesImmediate(updatedMessages);\n          setStateDelta({\n            ...stateDeltaRef.current,\n            ...accumulator.getStateDelta(),\n          });\n          setAgentInfo(accumulator.getAgentInfo());\n          setLongRunningToolIds(accumulator.getLongRunningToolIds());\n          setArtifactDelta({\n            ...artifactDeltaRef.current,\n            ...accumulator.getArtifactDelta(),\n          });\n          setToolConfirmations(accumulator.getToolConfirmations());\n          setAuthRequests(accumulator.getAuthRequests());\n          setEscalated(accumulator.isEscalated());\n          {\n            const newMeta = accumulator.getMessageMetadata();\n            if (newMeta.size > 0) {\n              setMessageMetadata(\n                new Map([...messageMetadataRef.current, ...newMeta]),\n              );\n            }\n          }\n\n          const transfer = accumulator.getLastTransferToAgent();\n          if (transfer && transfer !== lastTransferToAgent) {\n            lastTransferToAgent = transfer;\n            invokeAdkRuntimeCallback(\n              \"onAgentTransfer\",\n              onAgentTransfer,\n              transfer,\n            );\n          }\n\n          // Fire custom event callback for events with customMetadata\n          if (event.customMetadata && onCustomEvent) {\n            for (const [key, value] of Object.entries(event.customMetadata)) {\n              invokeAdkRuntimeCallback(\n                \"onCustomEvent\",\n                onCustomEvent,\n                key,\n                value,\n              );\n            }\n          }\n\n          if (event.errorCode || event.errorMessage) {\n            invokeAdkRuntimeCallback(\n              \"onError\",\n              onError,\n              event.errorMessage ?? event.errorCode,\n            );\n          }\n        }\n      } catch (error) {\n        if (\n          !abortController.signal.aborted &&\n          abortControllerRef.current === abortController &&\n          !(error instanceof Error && error.name === \"AbortError\")\n        ) {\n          throw error;\n        }\n      } finally {\n        if (abortControllerRef.current === abortController) {\n          abortControllerRef.current = null;\n        }\n      }\n    },\n    [\n      aui,\n      setMessagesImmediate,\n      setLongRunningToolIds,\n      stream,\n      onError,\n      onCustomEvent,\n      onAgentTransfer,\n    ],\n  );\n\n  const cancel = useCallback(() => {\n    if (abortControllerRef.current) {\n      abortControllerRef.current.abort();\n    }\n  }, []);\n\n  useReplaySafeEffect(() => cancel, []);\n\n  return {\n    messages,\n    stateDelta,\n    agentInfo,\n    longRunningToolIds,\n    artifactDelta,\n    toolConfirmations,\n    authRequests,\n    escalated,\n    messageMetadata,\n    sendMessage,\n    cancel,\n    setMessages: setMessagesImmediate,\n    replaceMessages,\n    applySnapshot,\n  };\n};\n\n/**\n * Transport sends every human and tool message of one `send` call as a single\n * ADK `Content`, and ADK parses that event's function responses before running\n * any tool, so the batch runs whole or not at all. The optimistic projection\n * has to sit on the same boundary, so a run of those messages becomes one\n * synthetic event whose parts come from the same per-message conversion.\n *\n * The transport drops `ai` messages from that `Content`, so one interleaved\n * between two replies does not split the batch on the wire and must not split\n * it here either. It still becomes its own event, placed after the merged one,\n * so the optimistic projection keeps the assistant turn.\n *\n * @internal — exported for unit tests.\n */\nexport const messagesToEvents = (messages: AdkMessage[]): AdkEvent[] => {\n  // A reload sends no messages at all, and the empty user content the transport\n  // puts on the wire for it is not part of the optimistic view: projecting one\n  // would put an empty user bubble above every regenerated turn.\n  if (messages.length === 0) return [];\n\n  const events: AdkEvent[] = [];\n  const run: AdkMessage[] = [];\n  let runIndex = 0;\n\n  for (const msg of messages) {\n    if (msg.type === \"ai\") {\n      events.push(messageToEvent(msg));\n    } else {\n      if (run.length === 0) runIndex = events.length;\n      run.push(msg);\n    }\n  }\n\n  const parts = run.flatMap((m) => messageToEvent(m).content?.parts ?? []);\n  const human = run.find((m) => m.type === \"human\");\n\n  // A batch that contributes no part still reaches the wire: the transport\n  // sends an empty user `Content`, which a reload replays as an empty human\n  // message. Emitting it here keeps the optimistic view equal to that replay.\n  if (parts.length === 0) parts.push({ text: \"\" });\n\n  const event: AdkEvent = { id: (human ?? run[0])?.id ?? generateId() };\n  if (human || run.length === 0) event.author = \"user\";\n  event.content = { role: \"user\", parts };\n  events.splice(run.length > 0 ? runIndex : events.length, 0, event);\n\n  return events;\n};\n\n/** @internal — exported for unit tests. */\nexport const messageToEvent = (msg: AdkMessage): AdkEvent => {\n  if (msg.type === \"human\") {\n    return {\n      id: msg.id ?? generateId(),\n      author: \"user\",\n      content: { role: \"user\", parts: contentToParts(msg.content) },\n    };\n  }\n\n  if (msg.type === \"tool\") {\n    let response: unknown;\n    try {\n      response = JSON.parse(msg.content);\n    } catch {\n      response = msg.content;\n    }\n    return {\n      id: msg.id ?? generateId(),\n      content: {\n        role: \"user\",\n        parts: [\n          {\n            functionResponse: {\n              name: msg.name,\n              id: msg.tool_call_id,\n              response: toAdkFunctionResponse(response, msg.status === \"error\"),\n            },\n          },\n        ],\n      },\n    };\n  }\n\n  const result: AdkEvent = { id: msg.id ?? generateId() };\n  if (msg.author != null) result.author = msg.author;\n  result.content = {\n    role: \"model\",\n    parts: [\n      ...contentToParts(msg.content),\n      ...(msg.tool_calls?.map((tc) => ({\n        functionCall: { name: tc.name, id: tc.id, args: { ...tc.args } },\n      })) ?? []),\n    ],\n  };\n  return result;\n};\n"],"mappings":";;;;;;;;;AA2CA,MAAM,4BACJ,MACA,UACA,GAAG,SACM;CACT,mBAAwB,oBAAoB,MAAM,UAAU,GAAG,IAAI;AACrE;AAEA,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,0BAA0B,SAAmB,CAAC,CAAC;CAC1E,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;CAEX,MAAM,cAAc,OAAO,QAAQ;CACnC,MAAM,wBAAwB,OAAO,kBAAkB;CACvD,MAAM,gBAAgB,OAAO,UAAU;CACvC,yBAAyB;EACvB,cAAc,UAAU;CAC1B,GAAG,CAAC,UAAU,CAAC;CACf,MAAM,mBAAmB,OAAO,aAAa;CAC7C,yBAAyB;EACvB,iBAAiB,UAAU;CAC7B,GAAG,CAAC,aAAa,CAAC;CAClB,MAAM,qBAAqB,OAAO,eAAe;CACjD,yBAAyB;EACvB,mBAAmB,UAAU;CAC/B,GAAG,CAAC,eAAe,CAAC;CAEpB,MAAM,uBAAuB,aAAa,SAAuB;EAC/D,YAAY,UAAU;EACtB,aAAa,IAAI;CACnB,GAAG,CAAC,CAAC;CACL,MAAM,wBAAwB,aAAa,QAAkB;EAC3D,sBAAsB,UAAU;EAChC,uBAAuB,GAAG;CAC5B,GAAG,CAAC,CAAC;;;;;;;CAQL,MAAM,gBAAgB,aACnB,aAAgC;EAC/B,qBAAqB,SAAS,QAAQ;EACtC,sBAAsB,SAAS,sBAAsB,CAAC,CAAC;EACvD,qBAAqB,SAAS,qBAAqB,CAAC,CAAC;EACrD,gBAAgB,SAAS,gBAAgB,CAAC,CAAC;EAC3C,aAAa,SAAS,aAAa,KAAK;EACxC,mBAAmB,SAAS,mCAAmB,IAAI,IAAI,CAAC;EACxD,cAAc,SAAS,cAAc,CAAC,CAAC;EACvC,iBAAiB,SAAS,iBAAiB,CAAC,CAAC;EAC7C,aAAa,SAAS,aAAa,CAAC,CAAC;CACvC,GACA,CAAC,uBAAuB,oBAAoB,CAC9C;CAMA,MAAM,kBAAkB,aACrB,SAAuB;EACtB,qBAAqB,IAAI;EACzB,sBAAsB,CAAC,CAAC;EACxB,qBAAqB,CAAC,CAAC;EACvB,gBAAgB,CAAC,CAAC;EAClB,aAAa,KAAK;EAClB,mCAAmB,IAAI,IAAI,CAAC;CAC9B,GACA,CAAC,uBAAuB,oBAAoB,CAC9C;CAEA,MAAM,qBAAqB,OAA+B,IAAI;CAE9D,MAAM,EAAE,SAAS,eAAe,oBAAoB,cAC5C,iBAAiB,CAAC,GACxB,CAAC,aAAa,CAChB;CAEA,MAAM,MAAM,OAAO;CACnB,MAAM,cAAc,YAClB,OAAO,aAA2B,WAAiC;EACjE,MAAM,oBAAoB,YAAY,KAAK,MACzC,EAAE,KAAK,IAAI;GAAE,GAAG;GAAG,IAAI,WAAW;EAAE,CACtC;EAMA,MAAM,YAAY,IAAI,IAAI,kBAAkB,KAAK,MAAM,EAAE,EAAE,CAAC;EAE5D,MAAM,sBAAsB,IAAI,IAC9B,kBAAkB,SAAS,MACzB,EAAE,SAAS,SAAS,CAAC,EAAE,YAAY,IAAI,CAAC,CAC1C,CACF;EACA,MAAM,cAAc,IAAI,oBACtB,YAAY,QAAQ,QAAQ,MAAM,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC,GACtD,sBAAsB,QAAQ,QAC3B,OAAO,CAAC,oBAAoB,IAAI,EAAE,CACrC,CACF;EACA,KAAK,MAAM,SAAS,iBAAiB,iBAAiB,GACpD,YAAY,aAAa,KAAK;EAEhC,qBAAqB,YAAY,YAAY,CAAC;EAC9C,sBAAsB,YAAY,sBAAsB,CAAC;EACzD,qBAAqB,YAAY,qBAAqB,CAAC;EACvD,gBAAgB,YAAY,gBAAgB,CAAC;EAC7C,IAAI;EAGJ,mBAAmB,SAAS,MAAM;EAClC,MAAM,kBAAkB,IAAI,gBAAgB;EAC5C,mBAAmB,UAAU;EAE7B,IAAI;GACF,MAAM,WAAW,MAAM,sBACrB,OAAO,mBAAmB;IACxB,GAAG;IACH,aAAa,gBAAgB;IAC7B,YAAY,YAAY;KACtB,OAAO,MAAM,IAAI,eAAe,WAAW;IAC7C;GACF,CAAC,GACD,gBAAgB,MAClB;GACA,IAAI,CAAC,UAAU;GAEf,WAAW,MAAM,SAAS,kBACxB,UACA,gBAAgB,MAClB,GAAG;IACD,IACE,gBAAgB,OAAO,WACvB,mBAAmB,YAAY,iBAE/B;IAEF,MAAM,kBAAkB,YAAY,aAAa,KAAK;IACtD,qBAAqB,eAAe;IACpC,cAAc;KACZ,GAAG,cAAc;KACjB,GAAG,YAAY,cAAc;IAC/B,CAAC;IACD,aAAa,YAAY,aAAa,CAAC;IACvC,sBAAsB,YAAY,sBAAsB,CAAC;IACzD,iBAAiB;KACf,GAAG,iBAAiB;KACpB,GAAG,YAAY,iBAAiB;IAClC,CAAC;IACD,qBAAqB,YAAY,qBAAqB,CAAC;IACvD,gBAAgB,YAAY,gBAAgB,CAAC;IAC7C,aAAa,YAAY,YAAY,CAAC;IACtC;KACE,MAAM,UAAU,YAAY,mBAAmB;KAC/C,IAAI,QAAQ,OAAO,GACjB,mBACE,IAAI,IAAI,CAAC,GAAG,mBAAmB,SAAS,GAAG,OAAO,CAAC,CACrD;IAEJ;IAEA,MAAM,WAAW,YAAY,uBAAuB;IACpD,IAAI,YAAY,aAAa,qBAAqB;KAChD,sBAAsB;KACtB,yBACE,mBACA,iBACA,QACF;IACF;IAGA,IAAI,MAAM,kBAAkB,eAC1B,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,MAAM,cAAc,GAC5D,yBACE,iBACA,eACA,KACA,KACF;IAIJ,IAAI,MAAM,aAAa,MAAM,cAC3B,yBACE,WACA,SACA,MAAM,gBAAgB,MAAM,SAC9B;GAEJ;EACF,SAAS,OAAO;GACd,IACE,CAAC,gBAAgB,OAAO,WACxB,mBAAmB,YAAY,mBAC/B,EAAE,iBAAiB,SAAS,MAAM,SAAS,eAE3C,MAAM;EAEV,UAAU;GACR,IAAI,mBAAmB,YAAY,iBACjC,mBAAmB,UAAU;EAEjC;CACF,GACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;CACF,CACF;CAEA,MAAM,SAAS,kBAAkB;EAC/B,IAAI,mBAAmB,SACrB,mBAAmB,QAAQ,MAAM;CAErC,GAAG,CAAC,CAAC;CAEL,0BAA0B,QAAQ,CAAC,CAAC;CAEpC,OAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,aAAa;EACb;EACA;CACF;AACF;;;;;;;;;;;;;;;AAgBA,MAAa,oBAAoB,aAAuC;CAItE,IAAI,SAAS,WAAW,GAAG,OAAO,CAAC;CAEnC,MAAM,SAAqB,CAAC;CAC5B,MAAM,MAAoB,CAAC;CAC3B,IAAI,WAAW;CAEf,KAAK,MAAM,OAAO,UAChB,IAAI,IAAI,SAAS,MACf,OAAO,KAAK,eAAe,GAAG,CAAC;MAC1B;EACL,IAAI,IAAI,WAAW,GAAG,WAAW,OAAO;EACxC,IAAI,KAAK,GAAG;CACd;CAGF,MAAM,QAAQ,IAAI,SAAS,MAAM,eAAe,CAAC,CAAC,CAAC,SAAS,SAAS,CAAC,CAAC;CACvE,MAAM,QAAQ,IAAI,MAAM,MAAM,EAAE,SAAS,OAAO;CAKhD,IAAI,MAAM,WAAW,GAAG,MAAM,KAAK,EAAE,MAAM,GAAG,CAAC;CAE/C,MAAM,QAAkB,EAAE,KAAK,SAAS,IAAI,GAAA,EAAK,MAAM,WAAW,EAAE;CACpE,IAAI,SAAS,IAAI,WAAW,GAAG,MAAM,SAAS;CAC9C,MAAM,UAAU;EAAE,MAAM;EAAQ;CAAM;CACtC,OAAO,OAAO,IAAI,SAAS,IAAI,WAAW,OAAO,QAAQ,GAAG,KAAK;CAEjE,OAAO;AACT;;AAGA,MAAa,kBAAkB,QAA8B;CAC3D,IAAI,IAAI,SAAS,SACf,OAAO;EACL,IAAI,IAAI,MAAM,WAAW;EACzB,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,MAAM,WAAW;GACzB,SAAS;IACP,MAAM;IACN,OAAO,CACL,EACE,kBAAkB;KAChB,MAAM,IAAI;KACV,IAAI,IAAI;KACR,UAAU,sBAAsB,UAAU,IAAI,WAAW,OAAO;IAClE,EACF,CACF;GACF;EACF;CACF;CAEA,MAAM,SAAmB,EAAE,IAAI,IAAI,MAAM,WAAW,EAAE;CACtD,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/package.json

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

package/src/contentToParts.ts

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

package/src/convertAdkMessages.test.ts

@@ -40,6 +40,19 @@ describe("convertAdkMessage - human messages", () => {
     });
   });
 
+  it("preserves activity messages as visible text", () => {
+    const msg: AdkMessage = {
+      id: "m1",
+      type: "human",
+      content: [{ type: "activity", message: "Working on it" }],
+    };
+
+    expect(convertAdkMessage(msg, {})).toMatchObject({
+      role: "user",
+      content: [{ type: "text", text: "Working on it" }],
+    });
+  });
+
   it("restores a file_url part as a file part stamped with sourceType url", () => {
     const msg: AdkMessage = {
       id: "m1",

package/src/convertAdkMessages.ts

@@ -89,6 +89,11 @@ const contentToParts = (
             name: "code_execution_result",
             data: { output: part.output, outcome: part.outcome },
           };
+        case "activity":
+          return {
+            type: "text",
+            text: typeof part.message === "string" ? part.message : "",
+          };
         default:
           return null;
       }

package/src/convertToAdkMessages.test.ts

@@ -156,6 +156,12 @@ describe("getPendingCancellations", () => {
 });
 
 describe("getMessageContent", () => {
+  it("sends activity messages as text parts", () => {
+    expect(
+      contentToParts([{ type: "activity", message: "Working on it" }]),
+    ).toEqual([{ text: "Working on it" }]);
+  });
+
   it("serializes data URL images as inline data", () => {
     const content = getMessageContent(
       makeAppendMessage([

package/src/tests/settleOutsideAct.ts

@@ -0,0 +1,15 @@
+import { act, waitFor } from "@testing-library/react";
+
+// React 18's act holds renders until its callback settles, so a task that waits on a render starts inside act and settles outside it, where React can commit what the task waits on.
+export async function settleOutsideAct<T>(task: () => Promise<T>): Promise<T> {
+  let pending!: Promise<T>;
+  await act(async () => {
+    pending = task();
+    pending.catch(() => {});
+  });
+  await waitFor(() => pending.then(settled, settled));
+  await act(async () => {});
+  return pending;
+}
+
+const settled = () => {};

package/src/useAdkMessages.fast-refresh.test.tsx

@@ -0,0 +1,114 @@
+// @vitest-environment jsdom
+
+import { act, StrictMode, useEffect } from "react";
+import { afterAll, afterEach, expect, it, vi } from "vitest";
+
+type Family = { current: unknown };
+type RendererInternals = {
+  setRefreshHandler: (resolve: (type: unknown) => Family | undefined) => void;
+  scheduleRefresh: (
+    root: unknown,
+    update: { staleFamilies: Set<Family>; updatedFamilies: Set<Family> },
+  ) => void;
+};
+
+let renderer: RendererInternals | undefined;
+const fiberRoots = new Set<unknown>();
+vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+vi.stubGlobal("__REACT_DEVTOOLS_GLOBAL_HOOK__", {
+  supportsFiber: true,
+  inject: (internals: RendererInternals) => {
+    renderer = internals;
+    return 1;
+  },
+  onScheduleFiberRoot: () => {},
+  onCommitFiberRoot: (_id: number, root: unknown) => fiberRoots.add(root),
+  onCommitFiberUnmount: () => {},
+});
+const { cleanup, render, waitFor } = await import("@testing-library/react");
+const { useAdkMessages } = await import("./useAdkMessages");
+
+afterEach(() => {
+  cleanup();
+  renderer?.setRefreshHandler(() => undefined);
+  fiberRoots.clear();
+});
+afterAll(() => vi.unstubAllGlobals());
+
+const refresh = async (Before: unknown, After: unknown) => {
+  const family: Family = { current: After };
+  renderer!.setRefreshHandler((type) =>
+    type === Before || type === After ? family : undefined,
+  );
+  await act(async () => {
+    for (const root of fiberRoots) {
+      renderer!.scheduleRefresh(root, {
+        staleFamilies: new Set(),
+        updatedFamilies: new Set([family]),
+      });
+    }
+  });
+  await act(async () => {});
+};
+
+it("keeps a direct useAdkMessages stream through Fast Refresh and cancels on unmount", async () => {
+  let signal: AbortSignal | undefined;
+  let send: (() => void) | undefined;
+  let rendered: string | undefined;
+  const stream = vi.fn((_messages, config: { abortSignal: AbortSignal }) => {
+    signal = config.abortSignal;
+    return new Promise<never>(() => {});
+  });
+  const host = (name: string) => () => {
+    rendered = name;
+    const { sendMessage } = useAdkMessages({ stream: stream as never });
+    send = () => {
+      void sendMessage([{ id: "user", type: "human", content: "hello" }], {});
+    };
+    return null;
+  };
+  const Before = host("before");
+  const After = host("after");
+  const view = render(<Before />);
+
+  act(() => send!());
+  await waitFor(() => expect(stream).toHaveBeenCalledTimes(1));
+  expect(signal!.aborted).toBe(false);
+
+  await refresh(Before, After);
+  expect(rendered).toBe("after");
+  expect(signal!.aborted).toBe(false);
+  expect(stream).toHaveBeenCalledTimes(1);
+
+  view.unmount();
+  await act(async () => {});
+  expect(signal!.aborted).toBe(true);
+});
+
+it("keeps a stream started during StrictMode's effect replay", async () => {
+  let signal: AbortSignal | undefined;
+  let launched = false;
+  const stream = vi.fn((_messages, config: { abortSignal: AbortSignal }) => {
+    signal = config.abortSignal;
+    return new Promise<never>(() => {});
+  });
+  const Host = () => {
+    const { sendMessage } = useAdkMessages({ stream: stream as never });
+    useEffect(() => {
+      if (launched) return;
+      launched = true;
+      void sendMessage([{ id: "user", type: "human", content: "hello" }], {});
+    }, [sendMessage]);
+    return null;
+  };
+  const view = render(
+    <StrictMode>
+      <Host />
+    </StrictMode>,
+  );
+  await waitFor(() => expect(stream).toHaveBeenCalledTimes(1));
+  expect(signal!.aborted).toBe(false);
+  view.unmount();
+  await act(async () => {});
+  expect(signal!.aborted).toBe(true);
+});

package/src/useAdkMessages.test.ts

@@ -77,6 +77,40 @@ describe("optimistic tool outcomes", () => {
 });
 
 describe("ADK runtime callbacks", () => {
+  it("reports the same agent transfer again in a later run", async () => {
+    const onAgentTransfer = vi.fn();
+    const stream: AdkStreamCallback = async function* () {
+      yield {
+        id: "transfer",
+        actions: { transferToAgent: "researcher" },
+      };
+      yield {
+        id: "transfer-duplicate",
+        actions: { transferToAgent: "researcher" },
+      };
+    };
+    const { result } = renderHook(() =>
+      useAdkMessages({ stream, eventHandlers: { onAgentTransfer } }),
+    );
+
+    await act(async () => {
+      await result.current.sendMessage(
+        [{ id: "user-1", type: "human", content: "first" }],
+        {},
+      );
+      expect(onAgentTransfer).toHaveBeenCalledTimes(1);
+
+      await result.current.sendMessage(
+        [{ id: "user-2", type: "human", content: "second" }],
+        {},
+      );
+    });
+
+    expect(onAgentTransfer).toHaveBeenCalledTimes(2);
+    expect(onAgentTransfer).toHaveBeenNthCalledWith(1, "researcher");
+    expect(onAgentTransfer).toHaveBeenNthCalledWith(2, "researcher");
+  });
+
   it.each(["onAgentTransfer", "onCustomEvent", "onError"] as const)(
     "continues streaming when %s throws",
     async (callbackName) => {
@@ -305,6 +339,7 @@ describe("ADK stream lifecycle", () => {
     await started;
 
     unmount();
+    await act(async () => {});
 
     expect(runSignal?.aborted).toBe(true);
     await expect(sendPromise).resolves.toBeUndefined();

package/src/useAdkMessages.ts

@@ -1,12 +1,12 @@
 import {
   useState,
   useCallback,
-  useEffect,
   useInsertionEffect,
   useRef,
   useMemo,
 } from "react";
 import { generateId } from "@assistant-ui/core";
+import { useReplaySafeEffect } from "@assistant-ui/store/internal";
 import { useAui } from "@assistant-ui/store";
 import {
   abortableIterable,
@@ -71,7 +71,6 @@ export const useAdkMessages = ({
   const [messageMetadata, setMessageMetadata] = useState<
     Map<string, AdkMessageMetadata>
   >(new Map());
-  const lastTransferToAgentRef = useRef<string | undefined>(undefined);
   // setMessagesImmediate and setLongRunningToolIds are the only writers of their state and publish these refs with it, so neither ref trails a commit.
   const messagesRef = useRef(messages);
   const longRunningToolIdsRef = useRef(longRunningToolIds);
@@ -172,6 +171,7 @@ export const useAdkMessages = ({
       setLongRunningToolIds(accumulator.getLongRunningToolIds());
       setToolConfirmations(accumulator.getToolConfirmations());
       setAuthRequests(accumulator.getAuthRequests());
+      let lastTransferToAgent: string | undefined;
 
       // Google ADK replaces active runs, while React LangGraph queues sends.
       abortControllerRef.current?.abort();
@@ -226,8 +226,8 @@ export const useAdkMessages = ({
           }
 
           const transfer = accumulator.getLastTransferToAgent();
-          if (transfer && transfer !== lastTransferToAgentRef.current) {
-            lastTransferToAgentRef.current = transfer;
+          if (transfer && transfer !== lastTransferToAgent) {
+            lastTransferToAgent = transfer;
             invokeAdkRuntimeCallback(
               "onAgentTransfer",
               onAgentTransfer,
@@ -286,7 +286,7 @@ export const useAdkMessages = ({
     }
   }, []);
 
-  useEffect(() => cancel, [cancel]);
+  useReplaySafeEffect(() => cancel, []);
 
   return {
     messages,

package/src/useAdkRuntime.refetch.test.tsx

@@ -11,6 +11,7 @@ import type {
 import { useAui } from "@assistant-ui/store";
 import { useAdkRuntime } from "./useAdkRuntime";
 import type { AdkMessage, AdkThreadSnapshot } from "./types";
+import { settleOutsideAct } from "./tests/settleOutsideAct";
 
 const deferred = <T,>() => {
   let resolve!: (value: T) => void;
@@ -97,9 +98,9 @@ const renderAdk = async (
   });
   await waitFor(() => expect(capture.runtime).not.toBeNull());
 
-  await act(async () => {
-    await capture.runtime!.threads.switchToThread("adk-1");
-  });
+  await settleOutsideAct(() =>
+    capture.runtime!.threads.switchToThread("adk-1"),
+  );
 
   return { capture, streamMock, unmount };
 };
@@ -250,9 +251,9 @@ describe("useAdkRuntime refetch", () => {
     await act(async () => {
       render(<Inner />);
     });
-    await act(async () => {
-      await capture.runtime!.threads.switchToThread("adk-1");
-    });
+    await settleOutsideAct(() =>
+      capture.runtime!.threads.switchToThread("adk-1"),
+    );
     await waitFor(() => expect(load).toHaveBeenCalledTimes(1));
 
     let settled = false;

package/src/useAdkRuntime.replacement.test.tsx

@@ -10,6 +10,7 @@ import type {
 } from "@assistant-ui/core";
 import { useAdkRuntime } from "./useAdkRuntime";
 import type { AdkEvent } from "./types";
+import { settleOutsideAct } from "./tests/settleOutsideAct";
 
 const makeThreadListAdapter = (): RemoteThreadListAdapter => ({
   list: vi.fn(async () => ({
@@ -97,9 +98,9 @@ describe("useAdkRuntime replacement runs", () => {
       render(<Inner />);
     });
     await waitFor(() => expect(capture.runtime).not.toBeNull());
-    await act(async () => {
-      await capture.runtime!.threads.switchToThread("adk-1");
-    });
+    await settleOutsideAct(() =>
+      capture.runtime!.threads.switchToThread("adk-1"),
+    );
 
     act(() => {
       capture.runtime!.thread.append({

package/src/useAdkRuntime.toolOwnership.test.tsx

@@ -14,6 +14,7 @@ import type {
 } from "@assistant-ui/core";
 import { useAdkRuntime } from "./useAdkRuntime";
 import type { AdkEvent } from "./types";
+import { settleOutsideAct } from "./tests/settleOutsideAct";
 
 const makeThreadListAdapter = (): RemoteThreadListAdapter => ({
   list: vi.fn(async () => ({
@@ -153,9 +154,9 @@ const renderStreamingAdk = async (first: AdkEvent, second: AdkEvent) => {
     render(<Inner />);
   });
   await waitFor(() => expect(capture.runtime).not.toBeNull());
-  await act(async () => {
-    await capture.runtime!.threads.switchToThread("adk-1");
-  });
+  await settleOutsideAct(() =>
+    capture.runtime!.threads.switchToThread("adk-1"),
+  );
   await act(async () => {
     await new Promise((r) => setTimeout(r, 0));
   });