@assistant-ui/react-google-adk 0.0.10 → 0.0.12

package/src/AdkSessionAdapter.test.ts

@@ -84,8 +84,8 @@ describe("createAdkSessionAdapter - list", () => {
     });
     await adapter.list();
 
-    const init = mockFetch.mock.calls[0]![1];
-    expect((init?.headers as Record<string, string>).Authorization).toBe(
+    const init = mockFetch.mock.calls[0]![1]!;
+    expect((init.headers as Record<string, string>).Authorization).toBe(
       "Bearer tok",
     );
   });
@@ -101,8 +101,8 @@ describe("createAdkSessionAdapter - list", () => {
     });
     await adapter.list();
 
-    const init = mockFetch.mock.calls[0]![1];
-    expect((init?.headers as Record<string, string>)["X-Dynamic"]).toBe("val");
+    const init = mockFetch.mock.calls[0]![1]!;
+    expect((init.headers as Record<string, string>)["X-Dynamic"]).toBe("val");
   });
 });
 
@@ -212,7 +212,7 @@ describe("createAdkSessionAdapter - no-op methods", () => {
 describe("createAdkSessionAdapter - generateTitle", () => {
   it("returns an empty ReadableStream", async () => {
     const { adapter } = createAdkSessionAdapter(baseOptions);
-    const result = await adapter.generateTitle("s1");
+    const result = await adapter.generateTitle("s1", []);
     expect(result).toBeInstanceOf(ReadableStream);
   });
 });
@@ -332,8 +332,8 @@ describe("createAdkSessionAdapter - load", () => {
     });
     await load("s1");
 
-    const init = mockFetch.mock.calls[0]![1];
-    expect((init?.headers as Record<string, string>).Authorization).toBe(
+    const init = mockFetch.mock.calls[0]![1]!;
+    expect((init.headers as Record<string, string>).Authorization).toBe(
       "Bearer tok",
     );
   });

package/src/convertAdkMessages.test.ts

@@ -5,7 +5,7 @@ import type { AdkMessage } from "./types";
 describe("convertAdkMessage - human messages", () => {
   it("converts a human message with string content to user role", () => {
     const msg: AdkMessage = { id: "m1", type: "human", content: "Hello" };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).toMatchObject({
       role: "user",
       id: "m1",
@@ -19,7 +19,7 @@ describe("convertAdkMessage - human messages", () => {
       type: "human",
       content: [{ type: "text", text: "Hello" }],
     };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).toMatchObject({
       role: "user",
       content: [{ type: "text", text: "Hello" }],
@@ -34,7 +34,7 @@ describe("convertAdkMessage - ai messages", () => {
       type: "ai",
       content: [{ type: "text", text: "Hi there" }],
     };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).toMatchObject({
       role: "assistant",
       id: "m1",
@@ -48,7 +48,7 @@ describe("convertAdkMessage - ai messages", () => {
       type: "ai",
       content: [{ type: "reasoning", text: "Let me think..." }],
     };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).toMatchObject({
       content: [{ type: "reasoning", text: "Let me think..." }],
     });
@@ -60,7 +60,7 @@ describe("convertAdkMessage - ai messages", () => {
       type: "ai",
       content: [{ type: "image", mimeType: "image/png", data: "abc123" }],
     };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).toMatchObject({
       content: [{ type: "image", image: "data:image/png;base64,abc123" }],
     });
@@ -72,7 +72,7 @@ describe("convertAdkMessage - ai messages", () => {
       type: "ai",
       content: [{ type: "image_url", url: "https://example.com/img.png" }],
     };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).toMatchObject({
       content: [{ type: "image", image: "https://example.com/img.png" }],
     });
@@ -91,7 +91,7 @@ describe("convertAdkMessage - ai messages", () => {
         },
       ],
     };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).toMatchObject({
       content: [
         {
@@ -116,7 +116,7 @@ describe("convertAdkMessage - ai messages", () => {
         },
       ],
     };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).toMatchObject({
       content: [
         {
@@ -137,7 +137,7 @@ describe("convertAdkMessage - ai messages", () => {
       type: "ai",
       content: [{ type: "code", code: "print(1)", language: "python" }],
     };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).toMatchObject({
       content: [
         {
@@ -155,7 +155,7 @@ describe("convertAdkMessage - ai messages", () => {
       type: "ai",
       content: [{ type: "code_result", output: "1", outcome: "OUTCOME_OK" }],
     };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).toMatchObject({
       content: [
         {
@@ -174,7 +174,7 @@ describe("convertAdkMessage - ai messages", () => {
       content: [],
       tool_calls: [{ id: "tc-1", name: "search", args: { q: "test" } }],
     };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).toMatchObject({
       content: [
         {
@@ -194,7 +194,7 @@ describe("convertAdkMessage - ai messages", () => {
       content: [{ type: "text", text: "done" }],
       status: { type: "complete", reason: "stop" },
     };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).toMatchObject({
       status: { type: "complete", reason: "stop" },
     });
@@ -208,7 +208,7 @@ describe("convertAdkMessage - ai messages", () => {
       author: "search_agent",
       branch: "root.search_agent",
     };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).toMatchObject({
       metadata: {
         custom: { author: "search_agent", branch: "root.search_agent" },
@@ -222,7 +222,7 @@ describe("convertAdkMessage - ai messages", () => {
       type: "ai",
       content: [{ type: "text", text: "hi" }],
     };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).not.toHaveProperty("metadata");
   });
 });
@@ -237,7 +237,7 @@ describe("convertAdkMessage - tool messages", () => {
       content: '{"results":[]}',
       status: "success",
     };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).toMatchObject({
       role: "tool",
       toolCallId: "tc-1",
@@ -256,7 +256,7 @@ describe("convertAdkMessage - tool messages", () => {
       content: "Failed",
       status: "error",
     };
-    const result = convertAdkMessage(msg);
+    const result = convertAdkMessage(msg, {});
     expect(result).toMatchObject({ isError: true });
   });
 });

package/src/hooks.ts

@@ -1,5 +1,3 @@
-/// <reference types="@assistant-ui/core/store" />
-
 import { useAui, useAuiState } from "@assistant-ui/store";
 import { v4 as uuidv4 } from "uuid";
 import type { ReadonlyJSONValue } from "assistant-stream/utils";

package/src/index.ts

@@ -1,12 +1,6 @@
-export {
-  useAdkRuntime,
-  type UseAdkRuntimeOptions,
-} from "./useAdkRuntime";
+export { useAdkRuntime, type UseAdkRuntimeOptions } from "./useAdkRuntime";
 
-export {
-  useAdkMessages,
-  type UseAdkMessagesOptions,
-} from "./useAdkMessages";
+export { useAdkMessages, type UseAdkMessagesOptions } from "./useAdkMessages";
 
 export { convertAdkMessage } from "./convertAdkMessages";
 
@@ -37,10 +31,7 @@ export { toAdkStructuredEvents } from "./structuredEvents";
 
 export { AdkEventAccumulator } from "./AdkEventAccumulator";
 
-export {
-  createAdkStream,
-  type CreateAdkStreamOptions,
-} from "./AdkClient";
+export { createAdkStream, type CreateAdkStreamOptions } from "./AdkClient";
 
 export {
   createAdkSessionAdapter,

package/src/useAdkMessages.ts

@@ -1,4 +1,3 @@
-/// <reference types="@assistant-ui/core/store" />
 import { useState, useCallback, useRef, useMemo } from "react";
 import { v4 as uuidv4 } from "uuid";
 import { useAui } from "@assistant-ui/store";

package/src/useAdkRuntime.ts

@@ -1,4 +1,3 @@
-/// <reference types="@assistant-ui/core/store" />
 import { useEffect, useRef, useState } from "react";
 import {
   getExternalStoreMessages,
@@ -8,14 +7,13 @@ import {
   type SpeechSynthesisAdapter,
   type AppendMessage,
   type ThreadMessage,
+  type ToolExecutionStatus,
 } from "@assistant-ui/core";
 import {
-  type ToolExecutionStatus,
   useCloudThreadListAdapter,
   useRemoteThreadListRuntime,
   useExternalMessageConverter,
   useExternalStoreRuntime,
-  useToolInvocations,
 } from "@assistant-ui/core/react";
 import { useAui } from "@assistant-ui/store";
 import type { AssistantCloud } from "assistant-cloud";
@@ -58,8 +56,12 @@ export const getMessageContent = (msg: AppendMessage) => {
         throw new Error("Tool call appends are not supported.");
 
       default: {
-        const _exhaustiveCheck: "reasoning" | "source" | "audio" | "data" =
-          type;
+        const _exhaustiveCheck:
+          | "reasoning"
+          | "source"
+          | "audio"
+          | "data"
+          | "generative-ui" = type;
         throw new Error(
           `Unsupported append message part type: ${_exhaustiveCheck}`,
         );
@@ -231,41 +233,12 @@ const useAdkRuntimeImpl = ({
   const threadMessagesRef = useRef(threadMessages);
   threadMessagesRef.current = threadMessages;
 
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
-  const [runtimeRef] = useState(() => ({
-    get current() {
-      return runtime;
-    },
-  }));
-
-  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
-  const toolInvocations = useToolInvocations({
-    state: { messages: threadMessages, isRunning: effectiveIsRunning },
-    getTools: () => runtimeRef.current.thread.getModelContext().tools,
-    onResult: (command) => {
-      if (command.type === "add-tool-result") {
-        void handleSendMessage(
-          [
-            {
-              id: uuidv4(),
-              type: "tool",
-              name: command.toolName,
-              tool_call_id: command.toolCallId,
-              content: JSON.stringify(command.result),
-              status: command.isError ? "error" : "success",
-            },
-          ],
-          {},
-        );
-      }
-    },
-    setToolStatuses,
-  });
-
   // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const runtime = useExternalStoreRuntime({
     isRunning: effectiveIsRunning,
     messages: threadMessages,
+    unstable_enableToolInvocations: true,
+    setToolStatuses,
     adapters: { attachments, dictation, feedback, speech },
     extras: {
       [symbolAdkRuntimeExtras]: true,
@@ -280,8 +253,6 @@ const useAdkRuntimeImpl = ({
       send: handleSendMessage,
     } satisfies AdkRuntimeExtras,
     onNew: async (msg) => {
-      await toolInvocations.abort();
-
       const cancellations =
         autoCancelPendingToolCalls !== false
           ? getPendingCancellations(messages, longRunningToolIds)
@@ -301,7 +272,6 @@ const useAdkRuntimeImpl = ({
     },
     onEdit: getCheckpointId
       ? async (msg) => {
-          await toolInvocations.abort();
           const truncated = truncateAdkMessages(
             threadMessagesRef.current,
             msg.parentId,
@@ -328,7 +298,6 @@ const useAdkRuntimeImpl = ({
       : undefined,
     onReload: getCheckpointId
       ? async (parentId, config) => {
-          await toolInvocations.abort();
           const truncated = truncateAdkMessages(
             threadMessagesRef.current,
             parentId,
@@ -366,12 +335,9 @@ const useAdkRuntimeImpl = ({
         {},
       );
     },
-    onResumeToolCall: (options) =>
-      toolInvocations.resume(options.toolCallId, options.payload),
     onCancel: unstable_allowCancellation
       ? async () => {
           cancel();
-          await toolInvocations.abort();
         }
       : undefined,
   });

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,KAAK,oBAAoB,GAC1B,2BAAwB;AAEzB,OAAO,EACL,cAAc,EACd,KAAK,qBAAqB,GAC3B,4BAAyB;AAE1B,OAAO,EAAE,iBAAiB,EAAE,gCAA6B;AAEzD,YAAY,EACV,QAAQ,EACR,YAAY,EACZ,eAAe,EACf,UAAU,EACV,qBAAqB,EACrB,WAAW,EACX,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,kBAAkB,EAClB,YAAY,EACZ,oBAAoB,EACpB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,wBAAwB,EACxB,0BAA0B,GAC3B,mBAAgB;AAEjB,OAAO,EAAE,YAAY,EAAE,mBAAgB;AAEvC,OAAO,EAAE,qBAAqB,EAAE,8BAA2B;AAE3D,OAAO,EAAE,mBAAmB,EAAE,iCAA8B;AAE5D,OAAO,EACL,eAAe,EACf,KAAK,sBAAsB,GAC5B,uBAAoB;AAErB,OAAO,EACL,uBAAuB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,eAAe,GACrB,+BAA4B;AAE7B,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACvB,kBAAkB,EAClB,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACrB,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,eAAe,EACf,eAAe,GAChB,mBAAgB"}

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,GAEd,2BAAwB;AAEzB,OAAO,EACL,cAAc,GAEf,4BAAyB;AAE1B,OAAO,EAAE,iBAAiB,EAAE,gCAA6B;AAuBzD,OAAO,EAAE,YAAY,EAAE,mBAAgB;AAEvC,OAAO,EAAE,qBAAqB,EAAE,8BAA2B;AAE3D,OAAO,EAAE,mBAAmB,EAAE,iCAA8B;AAE5D,OAAO,EACL,eAAe,GAEhB,uBAAoB;AAErB,OAAO,EACL,uBAAuB,GAGxB,+BAA4B;AAE7B,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACvB,kBAAkB,EAClB,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACrB,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,eAAe,EACf,eAAe,GAChB,mBAAgB"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,4BAAyB;AAC9E,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,6BAA0B;AAClE,OAAO,EACL,iBAAiB,EACjB,KAAK,wBAAwB,GAC9B,+BAA4B"}

package/dist/server/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA8B,4BAAyB;AAC9E,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,6BAA0B;AAClE,OAAO,EACL,iBAAiB,GAElB,+BAA4B"}