@assistant-ui/ai-sdk 0.0.6 → 0.0.7

package/dist/transport/resumable.d.ts

@@ -1,7 +1,7 @@
 //#region src/transport/resumable.d.ts
 /** Response header used by the [Resumable Streams](/docs/guides/resumable-streams) server and client wiring. */
-declare const RESUMABLE_STREAM_ID_HEADER = "x-resumable-stream-id";
-type ResumableClientStorage = {
+export declare const RESUMABLE_STREAM_ID_HEADER = "x-resumable-stream-id";
+export type ResumableClientStorage = {
   getStreamId(threadId?: string): string | null;
   setStreamId(id: string, threadId?: string): void;
   clear(threadId?: string): void;
@@ -9,7 +9,7 @@ type ResumableClientStorage = {
   subscribe?(listener: () => void, threadId?: string): () => void;
 };
 /** `sessionStorage`-backed storage for the pending resumable stream id. See the [Resumable Streams](/docs/guides/resumable-streams) guide for end-to-end wiring. */
-declare function createResumableSessionStorage(options?: {
+export declare function createResumableSessionStorage(options?: {
   /**
    * Storage key for the pending stream id. A static string namespaces per route
    * or chat surface. A getter is read lazily on every access, so the key can be
@@ -24,7 +24,7 @@ declare function createResumableSessionStorage(options?: {
    */
   key?: string | (() => string | undefined);
 }): ResumableClientStorage;
-type AssistantChatResumableOptions = {
+export type AssistantChatResumableOptions = {
   storage: ResumableClientStorage;
   resumeApi: string | ((streamId: string) => string);
   /**
@@ -34,5 +34,4 @@ type AssistantChatResumableOptions = {
   isFinishEvent?: (chunk: Uint8Array, accumulator: string) => boolean;
 };
 //#endregion
-export { AssistantChatResumableOptions, RESUMABLE_STREAM_ID_HEADER, ResumableClientStorage, createResumableSessionStorage };
 //# sourceMappingURL=resumable.d.ts.map

package/dist/transport/resumable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resumable.d.ts","names":[],"sources":["../../src/transport/resumable.ts"],"mappings":";;cAKa;KAID;EACV,YAAY;EACZ,YAAY,YAAY;EACxB,MAAM;;EAEN,WAAW,sBAAsB;;;iBAkBnB,8BAA8B;;;;;;;;;;;;;EAa5C;IACE;KA0GQ;EACV,SAAS;EACT,sBAAsB;;;;;EAKtB,iBAAiB,OAAO,YAAY"}
+{"version":3,"file":"resumable.d.ts","names":[],"sources":["../../src/transport/resumable.ts"],"mappings":";;qBAKa;YAID;EACV,YAAY;EACZ,YAAY,YAAY;EACxB,MAAM;;EAEN,WAAW,sBAAsB;;;wBAkBnB,8BAA8B;;;;;;;;;;;;;EAa5C;IACE;YA0GQ;EACV,SAAS;EACT,sBAAsB;;;;;EAKtB,iBAAiB,OAAO,YAAY"}

package/dist/usage.d.ts

@@ -1,17 +1,17 @@
 /// <reference types="@assistant-ui/core/react" />
 //#region src/usage.d.ts
-type ThreadTokenUsage = {
+export type ThreadTokenUsage = {
   totalTokens?: number;
   inputTokens?: number;
   outputTokens?: number;
   reasoningTokens?: number;
   cachedInputTokens?: number;
 };
-interface TokenUsageExtractableMessage {
+export interface TokenUsageExtractableMessage {
   role?: string;
   metadata?: unknown;
 }
-declare function getThreadMessageTokenUsage(message: TokenUsageExtractableMessage | undefined): ThreadTokenUsage | undefined;
+export declare function getThreadMessageTokenUsage(message: TokenUsageExtractableMessage | undefined): ThreadTokenUsage | undefined;
 /**
  * Reads token usage from the newest assistant message that reports any.
  *
@@ -20,7 +20,6 @@ declare function getThreadMessageTokenUsage(message: TokenUsageExtractableMessag
  * other key the route returns into `metadata.custom`, which is where this hook
  * looks.
  */
-declare function useThreadTokenUsage(): ThreadTokenUsage | undefined;
+export declare function useThreadTokenUsage(): ThreadTokenUsage | undefined;
 //#endregion
-export { ThreadTokenUsage, TokenUsageExtractableMessage, getThreadMessageTokenUsage, useThreadTokenUsage };
 //# sourceMappingURL=usage.d.ts.map

package/dist/usage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage.d.ts","names":[],"sources":["../src/usage.ts"],"mappings":";KAIY;EACV;EACA;EACA;EACA;EACA;;UAGe;EACf;EACA;;iBAuHc,2BACd,SAAS,2CACR;;;;;;;;;iBAsCa,uBAAuB"}
+{"version":3,"file":"usage.d.ts","names":[],"sources":["../src/usage.ts"],"mappings":";YAIY;EACV;EACA;EACA;EACA;EACA;;iBAGe;EACf;EACA;;wBAuHc,2BACd,SAAS,2CACR;;;;;;;;;wBAsCa,uBAAuB"}

package/dist/utils/getVercelAIMessages.d.ts

@@ -1,7 +1,6 @@
 import { UIMessage } from "ai";
 import { ThreadMessage } from "@assistant-ui/core";
 //#region src/utils/getVercelAIMessages.d.ts
-declare const getVercelAIMessages: <UI_MESSAGE extends UIMessage = UIMessage>(message: ThreadMessage) => UI_MESSAGE[];
+export declare const getVercelAIMessages: <UI_MESSAGE extends UIMessage = UIMessage>(message: ThreadMessage) => UI_MESSAGE[];
 //#endregion
-export { getVercelAIMessages };
 //# sourceMappingURL=getVercelAIMessages.d.ts.map

package/dist/utils/getVercelAIMessages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getVercelAIMessages.d.ts","names":[],"sources":["../../src/utils/getVercelAIMessages.ts"],"mappings":";;;cAMa,sBAAuB,mBAAmB,YAAY,WACjE,SAAS,kBAEmC"}
+{"version":3,"file":"getVercelAIMessages.d.ts","names":[],"sources":["../../src/utils/getVercelAIMessages.ts"],"mappings":";;;qBAMa,sBAAuB,mBAAmB,YAAY,WACjE,SAAS,kBAEmC"}

package/dist/utils/sliceMessagesUntil.d.ts

@@ -1,6 +1,5 @@
 import { UIMessage } from "ai";
 //#region src/utils/sliceMessagesUntil.d.ts
-declare const sliceMessagesUntil: <UI_MESSAGE extends UIMessage = UIMessage>(messages: UI_MESSAGE[], messageId: string | null) => UI_MESSAGE[];
+export declare const sliceMessagesUntil: <UI_MESSAGE extends UIMessage = UIMessage>(messages: UI_MESSAGE[], messageId: string | null) => UI_MESSAGE[];
 //#endregion
-export { sliceMessagesUntil };
 //# sourceMappingURL=sliceMessagesUntil.d.ts.map

package/dist/utils/sliceMessagesUntil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sliceMessagesUntil.d.ts","names":[],"sources":["../../src/utils/sliceMessagesUntil.ts"],"mappings":";;cAEa,qBAAsB,mBAAmB,YAAY,WAChE,UAAU,cACV,6BAAwB"}
+{"version":3,"file":"sliceMessagesUntil.d.ts","names":[],"sources":["../../src/utils/sliceMessagesUntil.ts"],"mappings":";;qBAEa,qBAAsB,mBAAmB,YAAY,WAChE,UAAU,cACV,6BAAwB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/ai-sdk",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Vercel AI SDK adapter for assistant-ui",
   "keywords": [
     "ai-sdk",
@@ -46,14 +46,14 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@ai-sdk/mcp": "^2.0.45",
-    "@ai-sdk/react": "^4.0.96",
-    "@assistant-ui/core": "^0.3.19",
-    "@assistant-ui/store": "^0.3.13",
-    "@assistant-ui/tap": "^0.9.17",
-    "ai": "^7.0.93",
-    "assistant-cloud": "^0.2.1",
-    "assistant-stream": "^0.3.43"
+    "@ai-sdk/mcp": "^2.0.49",
+    "@ai-sdk/react": "^4.0.104",
+    "@assistant-ui/core": "^0.3.20",
+    "@assistant-ui/store": "^0.3.14",
+    "@assistant-ui/tap": "^0.9.18",
+    "ai": "^7.0.101",
+    "assistant-cloud": "^0.2.2",
+    "assistant-stream": "^0.3.44"
   },
   "peerDependencies": {
     "@types/react": "*",
@@ -68,14 +68,14 @@
     }
   },
   "devDependencies": {
-    "@assistant-ui/x-buildutils": "0.0.27",
+    "@assistant-ui/x-buildutils": "0.0.28",
     "@testing-library/react": "^16.3.3",
     "@types/json-schema": "^7.0.15",
-    "@types/react": "^19.2.18",
-    "@types/react-dom": "^19.2.7",
+    "@types/react": "^19.3.0",
+    "@types/react-dom": "^19.3.0",
     "jsdom": "^30.0.1",
-    "react": "^19.2.8",
-    "vitest": "^5.0.0"
+    "react": "^19.3.0",
+    "vitest": "^5.0.1"
   },
   "publishConfig": {
     "access": "public",
@@ -93,6 +93,7 @@
   "scripts": {
     "build": "aui-build",
     "test": "vitest run",
+    "typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.test.json",
     "test:react-compiler": "vitest run --config vitest.react-compiler.config.ts",
     "test:standalone": "vitest run --project standalone",
     "test:watch": "vitest"

package/src/converters/convertMessage.test.ts

@@ -487,6 +487,144 @@ describe("AISDKMessageConverter", () => {
     });
   });
 
+  it("preserves rich approval fields for a custom response channel", () => {
+    const metadata: AISDKMessageConverterMetadata = {
+      supportsRichToolApprovalResponses: true,
+    };
+    const converted = AISDKMessageConverter.toThreadMessages(
+      [
+        {
+          id: "a1",
+          role: "assistant",
+          parts: [
+            {
+              type: "tool-deploy",
+              toolCallId: "tc-1",
+              state: "approval-responded",
+              input: {},
+              approval: {
+                id: "approval-1",
+                display: "select",
+                allowFreeform: true,
+                options: [
+                  {
+                    id: "once",
+                    kind: "allow-once",
+                    label: "Only once",
+                    grants: ["repository", 42],
+                    confirm: {
+                      title: "Confirm access",
+                      description: { invalid: true },
+                    },
+                  },
+                  "invalid",
+                  { id: 1, kind: "allow-always" },
+                  { id: "always", kind: 2 },
+                ],
+                optionId: "once",
+                text: "an answer",
+              },
+            },
+          ],
+        } as any,
+      ],
+      false,
+      metadata,
+    );
+
+    const toolCall = converted[0]?.content.find(
+      (part): part is any => part.type === "tool-call",
+    );
+    expect(toolCall?.approval).toEqual({
+      id: "approval-1",
+      display: "select",
+      allowFreeform: true,
+      options: [
+        {
+          id: "once",
+          kind: "allow-once",
+          label: "Only once",
+          grants: ["repository"],
+          confirm: { title: "Confirm access" },
+        },
+      ],
+      optionId: "once",
+      text: "an answer",
+    });
+  });
+
+  it("applies a host answer to an approval the message has not recorded", () => {
+    const metadata: AISDKMessageConverterMetadata = {
+      supportsRichToolApprovalResponses: true,
+      toolApprovalResponses: new Map([
+        [
+          "approval-1",
+          {
+            approvalId: "approval-1",
+            approved: true,
+            optionId: "staging",
+            text: "only staging",
+          },
+        ],
+        ["approval-2", { approvalId: "approval-2", approved: true }],
+        ["approval-3", { approvalId: "approval-3", approved: true }],
+      ]),
+    };
+    const converted = AISDKMessageConverter.toThreadMessages(
+      [
+        {
+          id: "a1",
+          role: "assistant",
+          parts: [
+            {
+              type: "tool-deploy",
+              toolCallId: "tc-1",
+              state: "approval-requested",
+              input: {},
+              approval: {
+                id: "approval-1",
+                display: "select",
+                options: [{ id: "staging", kind: "_target" }],
+              },
+            },
+            {
+              type: "tool-deploy",
+              toolCallId: "tc-2",
+              state: "approval-responded",
+              input: {},
+              approval: { id: "approval-2", approved: false, reason: "no" },
+            },
+            {
+              type: "tool-deploy",
+              toolCallId: "tc-3",
+              state: "approval-requested",
+              input: {},
+              approval: { id: "approval-3", resolution: "expired" },
+            },
+          ],
+        } as any,
+      ],
+      false,
+      metadata,
+    );
+
+    const approvals = converted[0]?.content.map(
+      (part) => (part as { approval?: unknown }).approval,
+    );
+    expect(approvals).toEqual([
+      {
+        id: "approval-1",
+        display: "select",
+        options: [{ id: "staging", kind: "_target" }],
+        approved: true,
+        optionId: "staging",
+        text: "only staging",
+      },
+      { id: "approval-2", approved: false, reason: "no" },
+      { id: "approval-3", resolution: "expired" },
+    ]);
+  });
+
   it("drops a resolution the core contract does not declare", () => {
     const converted = AISDKMessageConverter.toThreadMessages([
       {

package/src/converters/convertMessage.ts

@@ -12,6 +12,7 @@ import {
 import {
   isMcpAppUri,
   type ReasoningMessagePart,
+  type ToolApprovalOption,
   type ToolCallMessagePart,
   type TextMessagePart,
   type DataMessagePart,
@@ -22,6 +23,7 @@ import {
   type ThreadMessageLike,
   type McpAppMetadata,
   type MessagePartStreamStatus,
+  type RespondToToolApprovalOptions,
 } from "@assistant-ui/core";
 import { stableStringifyToolArgs } from "@assistant-ui/core/internal";
 import {
@@ -61,6 +63,8 @@ export type AISDKMessageConverterMetadata =
     toolArgsKeyOrderCache?: Map<string, Map<string, string[]>>;
     toolLastInputCache?: Map<string, ReadonlyJSONObject>;
     mcpAppMetadataCache?: Map<string, McpAppMetadata>;
+    supportsRichToolApprovalResponses?: boolean;
+    toolApprovalResponses?: ReadonlyMap<string, RespondToToolApprovalOptions>;
     /** Id of the currently-streaming message, flagged optimistic (#4037). */
     optimisticMessageId?: string | undefined;
   };
@@ -153,19 +157,79 @@ function extractMcpAppMetadata(
   return out;
 }
 
+const normalizeToolApprovalOptions = (
+  options: unknown,
+): readonly ToolApprovalOption[] | undefined => {
+  if (!Array.isArray(options)) return undefined;
+
+  return options.flatMap<ToolApprovalOption>((value) => {
+    if (!value || typeof value !== "object" || Array.isArray(value)) return [];
+    const option = value as Record<string, unknown>;
+    if (typeof option.id !== "string" || typeof option.kind !== "string")
+      return [];
+
+    const confirm = option.confirm;
+    const confirmDetails =
+      confirm && typeof confirm === "object" && !Array.isArray(confirm)
+        ? (confirm as Record<string, unknown>)
+        : undefined;
+
+    return [
+      {
+        id: option.id,
+        kind: option.kind,
+        ...(typeof option.label === "string" && { label: option.label }),
+        ...(typeof option.description === "string" && {
+          description: option.description,
+        }),
+        ...(Array.isArray(option.grants) && {
+          grants: option.grants.filter(
+            (grant): grant is string => typeof grant === "string",
+          ),
+        }),
+        ...(typeof confirm === "boolean"
+          ? { confirm }
+          : confirmDetails
+            ? {
+                confirm: {
+                  ...(typeof confirmDetails.title === "string" && {
+                    title: confirmDetails.title,
+                  }),
+                  ...(typeof confirmDetails.description === "string" && {
+                    description: confirmDetails.description,
+                  }),
+                },
+              }
+            : {}),
+      },
+    ];
+  });
+};
+
 function getToolApprovalAndInterrupt(
   part: {
     approval?: Record<string, unknown> | undefined;
   },
   toolStatus: { type: string; payload?: unknown } | undefined,
+  supportsRichToolApprovalResponses: boolean,
+  toolApprovalResponses:
+    | ReadonlyMap<string, RespondToToolApprovalOptions>
+    | undefined,
 ): {
   approval?: NonNullable<ToolCallMessagePart["approval"]>;
   interrupt?: NonNullable<ToolCallMessagePart["interrupt"]>;
 } {
   if (part.approval) {
-    // The AI SDK sends only id, approved and reason back to the server, so a
-    // request shape promising any other answer would render controls whose
-    // response cannot travel.
+    const response =
+      typeof part.approval.id === "string" &&
+      part.approval.approved === undefined &&
+      part.approval.resolution !== "cancelled" &&
+      part.approval.resolution !== "expired"
+        ? toolApprovalResponses?.get(part.approval.id)
+        : undefined;
+    // The built-in AI SDK channel sends only id, approved and reason back to
+    // the server, so a request shape promising any other answer would render
+    // controls whose response cannot travel.
     const {
       id,
       prompt,
@@ -179,7 +243,18 @@ function getToolApprovalAndInterrupt(
       optionId,
       text,
       ...additionalApprovalFields
-    } = part.approval;
+    } = response
+      ? {
+          ...part.approval,
+          approved: response.approved,
+          ...(response.reason != null && { reason: response.reason }),
+          ...(response.optionId != null && { optionId: response.optionId }),
+          ...(response.text != null && { text: response.text }),
+        }
+      : part.approval;
+    const normalizedOptions = supportsRichToolApprovalResponses
+      ? normalizeToolApprovalOptions(options)
+      : undefined;
     const requestReason = additionalApprovalFields.requestReason;
     if (typeof id === "string")
       return {
@@ -194,6 +269,15 @@ function getToolApprovalAndInterrupt(
           ...(typeof approved === "boolean" && { approved }),
           ...(typeof reason === "string" && { reason }),
           ...(isAutomatic === true && { isAutomatic: true }),
+          ...(supportsRichToolApprovalResponses && {
+            ...((display === "decision" ||
+              display === "select" ||
+              display === "text") && { display }),
+            ...(typeof allowFreeform === "boolean" && { allowFreeform }),
+            ...(normalizedOptions && { options: normalizedOptions }),
+            ...(typeof optionId === "string" && { optionId }),
+            ...(typeof text === "string" && { text }),
+          }),
           ...((resolution === "cancelled" || resolution === "expired") && {
             resolution,
           }),
@@ -348,7 +432,12 @@ function convertParts(
                   part.callProviderMetadata as PartProviderMetadata,
               }
             : undefined),
-          ...getToolApprovalAndInterrupt(part, toolStatus),
+          ...getToolApprovalAndInterrupt(
+            part,
+            toolStatus,
+            metadata.supportsRichToolApprovalResponses === true,
+            metadata.toolApprovalResponses,
+          ),
         } satisfies ToolCallMessagePart;
       }
 

package/src/runtime/AISDKChat.test.ts

@@ -153,7 +153,9 @@ describe("AISDKChat as a standalone client config entry", () => {
     ]
       .map((chunk) => `data: ${JSON.stringify(chunk)}\n\n`)
       .join("");
-    const fetchMock = vi.fn(
+    const fetchMock = vi.fn<
+      (input: RequestInfo | URL, init: RequestInit) => Promise<Response>
+    >(
       async () =>
         new Response(sse, {
           headers: { "content-type": "text/event-stream" },
@@ -178,10 +180,7 @@ describe("AISDKChat as a standalone client config entry", () => {
         expect(state.messages).toHaveLength(2);
       });
 
-      const [url, init] = fetchMock.mock.calls[0]! as [
-        RequestInfo,
-        RequestInit,
-      ];
+      const [url, init] = fetchMock.mock.calls[0]!;
       expect(String(url)).toContain("/api/chat");
       const body = JSON.parse(init.body as string);
       expect(body.id).toBe("test-thread-1");

package/src/runtime/AISDKThreads.test.ts

@@ -455,7 +455,9 @@ describe("AISDKThreads", () => {
     const list = vi.fn(async () => ({
       threads: [cloudThread("cloud-1"), cloudThread("cloud-2")],
     }));
-    const create = vi.fn(async () => ({ thread_id: "cloud-created" }));
+    const create = vi.fn<AssistantCloud["threads"]["create"]>(async () => ({
+      thread_id: "cloud-created",
+    }));
     const deleteThread = vi.fn(async () => {});
     const cloud = {
       threads: {
@@ -521,7 +523,9 @@ describe("AISDKThreads", () => {
       external_id: null,
       metadata: null,
     });
-    const create = vi.fn(async () => ({ message_id: "remote-message-1" }));
+    const create = vi.fn<AssistantCloud["threads"]["messages"]["create"]>(
+      async () => ({ message_id: "remote-message-1" }),
+    );
     const cloud = {
       threads: {
         list: vi.fn(async () => ({
@@ -602,9 +606,9 @@ describe("AISDKThreads", () => {
       external_id: null,
       metadata: null,
     });
-    const createMessage = vi.fn(async () => ({
-      message_id: "remote-message-1",
-    }));
+    const createMessage = vi.fn<
+      AssistantCloud["threads"]["messages"]["create"]
+    >(async () => ({ message_id: "remote-message-1" }));
     const cloud = {
       threads: {
         list: vi.fn(async () => ({ threads: [cloudThread("t1")] })),

package/src/runtime/AISDKThreads.ts

@@ -2,7 +2,7 @@
 
 import { resource, useResource, withKey } from "@assistant-ui/tap";
 import { useEffect, useMemo, useState } from "react";
-import { Chat, type UIMessage } from "@ai-sdk/react";
+import type { Chat, UIMessage } from "@ai-sdk/react";
 import type { ChatTransport } from "ai";
 import type { AssistantCloud } from "assistant-cloud";
 import {
@@ -20,6 +20,7 @@ import {
 import { useAui } from "@assistant-ui/store";
 import { AssistantChatTransport } from "../transport/AssistantChatTransport";
 import {
+  createChat,
   splitChatThreadOptions,
   useChatThread,
   type ChatThreadOptions,
@@ -91,17 +92,7 @@ const createChatEntry = <UI_MESSAGE extends UIMessage>(
           ? options.transport.__internal_clone()
           : options.transport;
   return {
-    chat: new Chat<UI_MESSAGE>({
-      ...chatInit,
-      id: threadId,
-      transport,
-      onToolCall: (arg) => optionsRef.current?.onToolCall?.(arg),
-      onData: (arg) => optionsRef.current?.onData?.(arg),
-      onFinish: (arg) => optionsRef.current?.onFinish?.(arg),
-      onError: (arg) => optionsRef.current?.onError?.(arg),
-      sendAutomaticallyWhen: (arg) =>
-        optionsRef.current?.sendAutomaticallyWhen?.(arg) ?? false,
-    }),
+    chat: createChat({ ...chatInit, id: threadId, transport }, optionsRef),
     transport,
     repository: new MessageRepository(),
     optionsRef,