@assistant-ui/ai-sdk 0.0.10 → 0.0.12

package/src/converters/convertMessage.ts

@@ -3,6 +3,7 @@ import {
   isReasoningFileUIPart,
   isCustomContentUIPart,
   getToolName,
+  type FileUIPart,
   type UIMessage,
 } from "ai";
 import {
@@ -13,6 +14,8 @@ import {
   isMcpAppUri,
   type ReasoningMessagePart,
   type ToolApprovalOption,
+  type ToolApprovalQuestion,
+  type ToolApprovalQuestionOption,
   type ToolCallMessagePart,
   type TextMessagePart,
   type DataMessagePart,
@@ -26,12 +29,14 @@ import {
   type RespondToToolApprovalOptions,
   type Unstable_ToolInteractionLog,
 } from "@assistant-ui/core";
+import { normalizeToolApprovalAnswers } from "./toolApprovalAnswers";
 import { stableStringifyToolArgs } from "@assistant-ui/core/internal";
+import { markPartialJsonObjectComplete } from "assistant-stream/internal";
 import {
   parsePartialJsonObject,
   type ReadonlyJSONObject,
 } from "assistant-stream/utils";
-import { unwrapModelContentEnvelope } from "./modelContentEnvelope";
+import { unwrapModelContentEnvelope } from "assistant-stream/internal";
 
 type MessageMetadata = ThreadMessageLike["metadata"];
 
@@ -63,13 +68,15 @@ export type AISDKMessageConverterMetadata =
   useExternalMessageConverter.Metadata & {
     toolArgsKeyOrderCache?: Map<string, Map<string, string[]>>;
     /**
-     * Frozen `argsText` keyed weakly by a settled tool call's input object, then
-     * by call, since the text carries the call's streamed key order. A known
-     * call/input pair skips serialization; the entries become collectible once
-     * the input is unreachable. A fresh input object re-serializes in its own
-     * deterministic key order.
+     * Frozen text and completion-marked args keyed weakly by a settled tool
+     * call's input object, then by call, since the text carries its streamed key
+     * order. A known call/input pair skips serialization and parsing; entries
+     * become collectible once the input is unreachable.
      */
-    toolArgsTextCache?: WeakMap<ReadonlyJSONObject, Map<string, string>>;
+    toolArgsTextCache?: WeakMap<
+      ReadonlyJSONObject,
+      Map<string, { argsText: string; args: ReadonlyJSONObject }>
+    >;
     toolLastInputCache?: Map<string, ReadonlyJSONObject>;
     mcpAppMetadataCache?: Map<string, McpAppMetadata>;
     toolArtifacts?: ReadonlyMap<string, unknown>;
@@ -95,17 +102,45 @@ function extractMcpAppMetadata(
   cache: Map<string, McpAppMetadata> | undefined,
 ): McpAppMetadata | undefined {
   if (!part || typeof part !== "object") return undefined;
+  const toolMetadata = (part as { toolMetadata?: unknown }).toolMetadata;
+  const toolApp =
+    toolMetadata && typeof toolMetadata === "object"
+      ? (toolMetadata as { app?: unknown }).app
+      : undefined;
   const meta = (part as { callProviderMetadata?: unknown })
     .callProviderMetadata;
   const mcp =
     meta && typeof meta === "object"
       ? (meta as { mcp?: unknown }).mcp
       : undefined;
-  const app =
+  const providerApp =
     mcp && typeof mcp === "object" ? (mcp as { app?: unknown }).app : undefined;
+
+  const apps: Record<string, unknown>[] = [];
+  for (const candidate of [toolApp, providerApp]) {
+    if (!candidate || typeof candidate !== "object") continue;
+    const candidateApp = candidate as Record<string, unknown>;
+    const resourceUri = candidateApp["resourceUri"];
+    if (typeof resourceUri !== "string" || !isMcpAppUri(resourceUri)) continue;
+    apps.push({
+      resourceUri,
+      ...(typeof candidateApp["mimeType"] === "string" && {
+        mimeType: candidateApp["mimeType"],
+      }),
+      ...(Array.isArray(candidateApp["visibility"]) && {
+        visibility: candidateApp["visibility"],
+      }),
+      ...(candidate === providerApp &&
+        typeof candidateApp["serverId"] === "string" &&
+        candidateApp["serverId"].length > 0 && {
+          serverId: candidateApp["serverId"],
+        }),
+    });
+  }
+
   let a: Record<string, unknown>;
-  if (app && typeof app === "object") {
-    a = app as Record<string, unknown>;
+  if (apps.length > 0) {
+    a = { ...(apps[1] ?? {}), ...apps[0]! };
   } else {
     // MCP-UI tools surface the pointer on result._meta: canonical nested
     // `ui.resourceUri`, or the deprecated flat `"ui/resourceUri"` key.
@@ -221,6 +256,51 @@ const normalizeToolApprovalOptions = (
   });
 };
 
+const normalizeToolApprovalQuestions = (
+  questions: unknown,
+): readonly ToolApprovalQuestion[] | undefined => {
+  if (!Array.isArray(questions)) return undefined;
+
+  return questions.flatMap<ToolApprovalQuestion>((value) => {
+    if (!value || typeof value !== "object" || Array.isArray(value)) return [];
+    const question = value as Record<string, unknown>;
+    if (typeof question.id !== "string" || typeof question.prompt !== "string")
+      return [];
+    const options = Array.isArray(question.options)
+      ? question.options.flatMap<ToolApprovalQuestionOption>((option) => {
+          if (!option || typeof option !== "object" || Array.isArray(option))
+            return [];
+          const { id, label, description } = option as Record<string, unknown>;
+          if (typeof id !== "string" || typeof label !== "string") return [];
+          return [
+            {
+              id,
+              label,
+              ...(typeof description === "string" && { description }),
+            },
+          ];
+        })
+      : undefined;
+
+    return [
+      {
+        id: question.id,
+        prompt: question.prompt,
+        ...(typeof question.header === "string" && {
+          header: question.header,
+        }),
+        ...(options && { options }),
+        ...(typeof question.multiple === "boolean" && {
+          multiple: question.multiple,
+        }),
+        ...(typeof question.allowFreeform === "boolean" && {
+          allowFreeform: question.allowFreeform,
+        }),
+      },
+    ];
+  });
+};
+
 const APPROVAL_DESCRIPTOR_FIELDS = [
   "prompt",
   "display",
@@ -229,6 +309,8 @@ const APPROVAL_DESCRIPTOR_FIELDS = [
   "options",
   "optionId",
   "text",
+  "questions",
+  "answers",
   "resolution",
 ] as const;
 
@@ -302,6 +384,8 @@ function getToolApprovalAndInterrupt(
       options,
       optionId,
       text,
+      questions,
+      answers,
       ...additionalApprovalFields
     } = response
       ? {
@@ -310,11 +394,18 @@ function getToolApprovalAndInterrupt(
           ...(response.reason != null && { reason: response.reason }),
           ...(response.optionId != null && { optionId: response.optionId }),
           ...(response.text != null && { text: response.text }),
+          ...(response.answers != null && { answers: response.answers }),
         }
       : approval;
     const normalizedOptions = supportsRichToolApprovalResponses
       ? normalizeToolApprovalOptions(options)
       : undefined;
+    const normalizedQuestions = supportsRichToolApprovalResponses
+      ? normalizeToolApprovalQuestions(questions)
+      : undefined;
+    const normalizedAnswers = supportsRichToolApprovalResponses
+      ? normalizeToolApprovalAnswers(answers)
+      : undefined;
     const requestReason = additionalApprovalFields.requestReason;
     if (typeof id === "string")
       return {
@@ -332,12 +423,15 @@ function getToolApprovalAndInterrupt(
           ...(supportsRichToolApprovalResponses && {
             ...((display === "decision" ||
               display === "select" ||
-              display === "text") && { display }),
+              display === "text" ||
+              display === "questions") && { display }),
             ...(typeof allowFreeform === "boolean" && { allowFreeform }),
             ...(typeof dismissible === "boolean" && { dismissible }),
             ...(normalizedOptions && { options: normalizedOptions }),
             ...(typeof optionId === "string" && { optionId }),
             ...(typeof text === "string" && { text }),
+            ...(normalizedQuestions && { questions: normalizedQuestions }),
+            ...(normalizedAnswers && { answers: normalizedAnswers }),
           }),
           ...((resolution === "cancelled" || resolution === "expired") && {
             resolution,
@@ -367,6 +461,25 @@ const uiPartStateToStatus = (
   return undefined;
 };
 
+const toSystemContent = (content: MessageContent): MessageContent => {
+  const text = content.filter((part) => part.type === "text");
+  if (text.length === 1) return text;
+  const providerMetadata = text.reduce<PartProviderMetadata>(
+    (merged, part) =>
+      part.providerMetadata != null
+        ? { ...merged, ...part.providerMetadata }
+        : merged,
+    {},
+  );
+  return [
+    {
+      type: "text",
+      text: text.map((part) => part.text).join(""),
+      ...(Object.keys(providerMetadata).length > 0 && { providerMetadata }),
+    },
+  ];
+};
+
 function convertParts(
   message: UIMessage,
   metadata: AISDKMessageConverterMetadata,
@@ -378,6 +491,7 @@ function convertParts(
   const converted = message.parts
     .filter(
       (p) =>
+        typeof p?.type === "string" &&
         p.type !== "step-start" &&
         (message.role !== "user" || p.type !== "file"),
     )
@@ -386,7 +500,7 @@ function convertParts(
         const status = uiPartStateToStatus(part.state);
         return {
           type: "text",
-          text: part.text,
+          text: part.text ?? "",
           ...(status != null ? { status } : undefined),
           ...(part.providerMetadata != null
             ? {
@@ -411,7 +525,7 @@ function convertParts(
       }
 
       if (isToolUIPart(part)) {
-        const toolName = getToolName(part);
+        const toolName = getToolName(part) ?? "";
         const toolCallId = part.toolCallId;
         const argsKeyOrderCacheKey = `${message.id}:${toolCallId}`;
 
@@ -475,20 +589,31 @@ function convertParts(
           // re-serializing large args while the call keeps that input. Arrival
           // order only matters while args stream, so the key-order entry is
           // released.
+          const inputArgs = args;
           const frozen =
-            metadata.toolArgsTextCache?.get(args) ?? new Map<string, string>();
-          const frozenText = frozen.get(argsKeyOrderCacheKey);
-          if (frozenText !== undefined) {
-            argsText = frozenText;
+            metadata.toolArgsTextCache?.get(inputArgs) ??
+            new Map<string, { argsText: string; args: ReadonlyJSONObject }>();
+          const frozenEntry = frozen.get(argsKeyOrderCacheKey);
+          if (frozenEntry !== undefined) {
+            argsText = frozenEntry.argsText;
+            args = frozenEntry.args;
           } else {
             argsText = stableStringifyToolArgs(
               metadata.toolArgsKeyOrderCache,
               argsKeyOrderCacheKey,
               args,
             );
+            // The input is final even while execution keeps the part running.
+            // Other runtimes can synthesize complete JSON text from an
+            // accumulating snapshot, so only this converter supplies the
+            // completion signal it knows from the AI SDK part state.
+            // A complete root marker settles every field without parsing the
+            // serialized text again. Keep the SDK input's nested identities
+            // and own fields, including prototype-named JSON keys.
+            args = markPartialJsonObjectComplete(args);
             metadata.toolArgsTextCache?.set(
-              args,
-              frozen.set(argsKeyOrderCacheKey, argsText),
+              inputArgs,
+              frozen.set(argsKeyOrderCacheKey, { argsText, args }),
             );
           }
           metadata.toolArgsKeyOrderCache?.delete(argsKeyOrderCacheKey);
@@ -557,10 +682,11 @@ function convertParts(
       }
 
       if (part.type === "file") {
+        if (typeof part.url !== "string") return null;
         return {
           type: "file",
           data: part.url,
-          mimeType: part.mediaType,
+          mimeType: part.mediaType ?? "unknown/unknown",
           ...(part.filename != null && { filename: part.filename }),
         } satisfies FileMessagePart;
       }
@@ -594,10 +720,11 @@ function convertParts(
       }
 
       if (isReasoningFileUIPart(part)) {
+        if (typeof part.url !== "string") return null;
         return {
           type: "file",
           data: part.url,
-          mimeType: part.mediaType,
+          mimeType: part.mediaType ?? "unknown/unknown",
         } satisfies FileMessagePart;
       }
 
@@ -637,7 +764,10 @@ export const AISDKMessageConverter = unstable_createMessageConverter(
           createdAt,
           content,
           attachments: message.parts
-            ?.filter((p) => p.type === "file")
+            ?.filter(
+              (p): p is FileUIPart =>
+                p?.type === "file" && typeof p.url === "string",
+            )
             .map((part, idx) => {
               const mediaType = part.mediaType ?? "unknown/unknown";
               const isImage = mediaType.startsWith("image/");
@@ -676,7 +806,8 @@ export const AISDKMessageConverter = unstable_createMessageConverter(
           role: message.role,
           id: message.id,
           createdAt,
-          content,
+          content:
+            message.role === "system" ? toSystemContent(content) : content,
           ...(message.role === "assistant" &&
           metadata.cancelledStatusMessageIds?.has(message.id)
             ? {

package/src/converters/toCreateMessage.test.ts

@@ -11,6 +11,33 @@ const baseMessage = {
 } as const;
 
 describe("toCreateMessage", () => {
+  it.each([
+    [
+      "data:;base64,SGVsbG8=",
+      "data:application/octet-stream;base64,SGVsbG8=",
+      "application/octet-stream",
+    ],
+    [
+      "data:;charset=utf-8,hello",
+      "data:text/plain;charset=utf-8,hello",
+      "text/plain",
+    ],
+    [
+      "data:;base64,",
+      "data:application/octet-stream;base64,",
+      "application/octet-stream",
+    ],
+  ])("uses the resolved media type for %s", (data, url, mediaType) => {
+    const message = {
+      ...baseMessage,
+      content: [{ type: "file", data, mimeType: "" }],
+    } as unknown as AppendMessage;
+
+    expect(toCreateMessage(message).parts).toEqual([
+      { type: "file", url, mediaType },
+    ]);
+  });
+
   it("converts a direct file part in message content", () => {
     const message = {
       ...baseMessage,

package/src/converters/toolApprovalAnswers.ts

@@ -0,0 +1,27 @@
+import type { ToolApprovalAnswer } from "@assistant-ui/core";
+
+export const normalizeToolApprovalAnswers = (
+  answers: unknown,
+): Readonly<Record<string, ToolApprovalAnswer>> | undefined => {
+  if (!answers || typeof answers !== "object" || Array.isArray(answers))
+    return undefined;
+
+  return Object.fromEntries(
+    Object.entries(answers).flatMap(([id, value]) => {
+      if (!value || typeof value !== "object" || Array.isArray(value))
+        return [];
+      const { optionIds, text } = value as Record<string, unknown>;
+      const answer: ToolApprovalAnswer = {
+        ...(Array.isArray(optionIds) && {
+          optionIds: optionIds.filter(
+            (optionId): optionId is string => typeof optionId === "string",
+          ),
+        }),
+        ...(typeof text === "string" && { text }),
+      };
+      return answer.optionIds?.length || answer.text !== undefined
+        ? [[id, answer]]
+        : [];
+    }),
+  );
+};

package/src/index.native.ts

@@ -12,7 +12,7 @@ export type {
   AssistantChatResumableOptions,
   ResumableClientStorage,
 } from "./transport/resumable";
-export { frontendTools, type FrontendTools } from "./tools/frontendTools";
+export { frontendTools, type FrontendTools } from "assistant-stream/ai-sdk";
 export { injectQuoteContext } from "./model-context/injectQuoteContext";
 export { unstable_injectInteractableContext } from "./model-context/injectInteractableContext";
 export type { ThreadTokenUsage, TokenUsageExtractableMessage } from "./usage";

package/src/index.ts

@@ -12,7 +12,7 @@ export type {
   AssistantChatResumableOptions,
   ResumableClientStorage,
 } from "./transport/resumable";
-export { frontendTools, type FrontendTools } from "./tools/frontendTools";
+export { frontendTools, type FrontendTools } from "assistant-stream/ai-sdk";
 export { injectQuoteContext } from "./model-context/injectQuoteContext";
 export { unstable_injectInteractableContext } from "./model-context/injectInteractableContext";
 export type { ThreadTokenUsage, TokenUsageExtractableMessage } from "./usage";

package/src/model-context/injectInteractableContext.ts

@@ -20,6 +20,8 @@ import {
  * `format` must also handle entries with `partial: true`, whose `state` carries
  * only the fields that changed since the model's last known state.
  *
+ * @deprecated Experimental since 2026-06-23. Not scheduled for removal; the API may change in any release.
+ *
  * @example
  * ```ts
  * import { convertToModelMessages, streamText } from "ai";
@@ -28,6 +30,7 @@ import {
  * export async function POST(req: Request) {
  *   const { messages } = await req.json();
  *   const result = streamText({
+ *     abortSignal: req.signal,
  *     model: myModel,
  *     messages: await convertToModelMessages(unstable_injectInteractableContext(messages)),
  *   });

package/src/model-context/injectQuoteContext.ts

@@ -27,6 +27,7 @@ const getQuoteText = (metadata: unknown): string | undefined => {
  * export async function POST(req: Request) {
  *   const { messages } = await req.json();
  *   const result = streamText({
+ *     abortSignal: req.signal,
  *     model: myModel,
  *     messages: await convertToModelMessages(injectQuoteContext(messages)),
  *   });

package/src/runtime/AISDKChat.integration.test.tsx

@@ -1,10 +1,11 @@
+import { flushTapSync } from "@assistant-ui/tap";
 // @vitest-environment jsdom
 
-import { StrictMode, type ReactNode } from "react";
+import { StrictMode, useLayoutEffect, type ReactNode } from "react";
 import { act, render, waitFor } from "@testing-library/react";
 import { AuiConfig, AuiProvider, useAui } from "@assistant-ui/store";
 import type { ChatTransport, UIMessage } from "ai";
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 import { AISDKChat } from "./AISDKChat";
 import {
   createCancellableTransport,
@@ -66,3 +67,57 @@ describe("AISDKChat legacy useAui host integration", () => {
     await waitFor(() => expect(getCancelCount()).toBe(1));
   });
 });
+
+describe("replacement transports", () => {
+  it("routes sends through a replacement transport", async () => {
+    const emptyStream = () =>
+      new ReadableStream({ start: (controller) => controller.close() });
+    const sendA = vi.fn(async () => emptyStream());
+    const sendB = vi.fn(async () => emptyStream());
+    const transportA: ChatTransport<UIMessage> = {
+      sendMessages: sendA,
+      reconnectToStream: vi.fn(),
+    };
+    const transportB: ChatTransport<UIMessage> = {
+      sendMessages: sendB,
+      reconnectToStream: vi.fn(),
+    };
+    let initialClient: ReturnType<typeof useAui> | undefined;
+    let currentClient: ReturnType<typeof useAui> | undefined;
+    const CaptureClient = () => {
+      const aui = useAui();
+      initialClient ??= aui;
+      currentClient = aui;
+      return null;
+    };
+    const SendOnLayout = () => {
+      const aui = useAui();
+      useLayoutEffect(() => {
+        flushTapSync(() => {
+          aui.composer.setText("hello");
+          aui.composer.send();
+        });
+      }, [aui]);
+      return null;
+    };
+    const App = ({
+      transport,
+      send = false,
+    }: {
+      transport: ChatTransport<UIMessage>;
+      send?: boolean;
+    }) => (
+      <AuiProvider config={AuiConfig({ threads: AISDKChat({ transport }) })}>
+        <CaptureClient />
+        {send && <SendOnLayout />}
+      </AuiProvider>
+    );
+
+    const view = render(<App transport={transportA} />);
+    view.rerender(<App transport={transportB} send />);
+
+    await waitFor(() => expect(sendB).toHaveBeenCalledOnce());
+    expect(sendA).not.toHaveBeenCalled();
+    expect(currentClient).toBe(initialClient);
+  });
+});

package/src/runtime/AISDKThreads.cloud.test.ts

@@ -79,10 +79,12 @@ import { AI_SDK_SDK } from "./sdkIdentity";
 describe("AISDKThreads cloud", () => {
   it("reloads history when switching a keyed cloud thread", async () => {
     const cloud = {} as AssistantCloud;
+    const scopeId = "workspace-1";
     const handle = createAssistantClient(
       AuiConfig({
         threads: AISDKThreads({
           cloud,
+          scopeId,
           threadId: "t1",
         }),
       }),
@@ -98,6 +100,7 @@ describe("AISDKThreads cloud", () => {
     });
     expect(mocks.useCloudThreadListAdapter).toHaveBeenCalledWith({
       cloud,
+      scopeId,
       sdk: AI_SDK_SDK,
     });
     const afterFirst = load.mock.calls.length;