@assistant-ui/react-ai-sdk 1.3.31 → 1.3.33

package/dist/usage.js.map

@@ -1 +1 @@
-{"version":3,"file":"usage.js","names":[],"sources":["../src/usage.ts"],"sourcesContent":["/// <reference types=\"@assistant-ui/core/react\" />\nimport { useAuiState } from \"@assistant-ui/store\";\n\nexport type ThreadTokenUsage = {\n  totalTokens?: number;\n  inputTokens?: number;\n  outputTokens?: number;\n  reasoningTokens?: number;\n  cachedInputTokens?: number;\n};\n\nexport interface TokenUsageExtractableMessage {\n  role?: string;\n  metadata?: unknown;\n}\n\ntype UsageRecord = Record<string, unknown>;\n\nconst USAGE_KEYS = [\n  \"inputTokens\",\n  \"outputTokens\",\n  \"reasoningTokens\",\n  \"cachedInputTokens\",\n  \"totalTokens\",\n] as const satisfies (keyof ThreadTokenUsage)[];\n\nfunction asRecord(value: unknown): UsageRecord | undefined {\n  if (!value || typeof value !== \"object\" || Array.isArray(value))\n    return undefined;\n  return value as UsageRecord;\n}\n\nfunction asPositiveTokenCount(value: unknown): number | undefined {\n  if (typeof value !== \"number\" || !Number.isFinite(value) || value < 0) {\n    return undefined;\n  }\n  return value;\n}\n\nfunction computeTotalTokens(usage: ThreadTokenUsage): number | undefined {\n  if (usage.totalTokens !== undefined) return usage.totalTokens;\n  if (usage.inputTokens !== undefined && usage.outputTokens !== undefined) {\n    return usage.inputTokens + usage.outputTokens;\n  }\n  return undefined;\n}\n\nfunction normalizeUsage(value: unknown): ThreadTokenUsage | undefined {\n  const record = asRecord(value);\n  if (!record) return undefined;\n\n  const result: ThreadTokenUsage = {};\n  let hasFields = false;\n  for (const key of USAGE_KEYS) {\n    const count = asPositiveTokenCount(record[key]);\n    if (count !== undefined) {\n      result[key] = count;\n      hasFields = true;\n    }\n  }\n  return hasFields ? result : undefined;\n}\n\nfunction withComputedTotal(\n  usage: ThreadTokenUsage,\n): ThreadTokenUsage | undefined {\n  const totalTokens = computeTotalTokens(usage);\n  return { ...usage, ...(totalTokens !== undefined && { totalTokens }) };\n}\n\nfunction usageFromSteps(value: unknown): ThreadTokenUsage | undefined {\n  const steps = Array.isArray(value) ? value : [];\n\n  const sums: Record<string, number> = {};\n  const present: Record<string, boolean> = {};\n  let stepsWithUsage = 0;\n  let stepsWithComputableTotal = 0;\n\n  for (const step of steps) {\n    const usage = normalizeUsage(asRecord(step)?.usage);\n    if (!usage) continue;\n    stepsWithUsage++;\n\n    const stepTotal = computeTotalTokens(usage);\n    if (stepTotal !== undefined) {\n      sums.totalTokens = (sums.totalTokens ?? 0) + stepTotal;\n      stepsWithComputableTotal++;\n    }\n\n    for (const key of USAGE_KEYS) {\n      if (key === \"totalTokens\") continue;\n      if (usage[key] !== undefined) {\n        sums[key] = (sums[key] ?? 0) + usage[key];\n        present[key] = true;\n      }\n    }\n  }\n\n  if (stepsWithUsage === 0) return undefined;\n\n  const result: ThreadTokenUsage = {};\n  if (stepsWithComputableTotal === stepsWithUsage) {\n    result.totalTokens = sums.totalTokens!;\n  }\n  for (const key of USAGE_KEYS) {\n    if (key === \"totalTokens\") continue;\n    if (present[key]) {\n      result[key] = sums[key]!;\n    }\n  }\n  return result;\n}\n\nexport function getThreadMessageTokenUsage(\n  message: TokenUsageExtractableMessage | undefined,\n): ThreadTokenUsage | undefined {\n  if (!message || message.role !== \"assistant\") return undefined;\n\n  const metadata = asRecord(message.metadata);\n  if (!metadata) return undefined;\n\n  const topLevelUsage = normalizeUsage(metadata.usage);\n  if (topLevelUsage) return withComputedTotal(topLevelUsage);\n\n  const legacyUsage = normalizeUsage(asRecord(metadata.custom)?.usage);\n  if (legacyUsage) return withComputedTotal(legacyUsage);\n\n  return usageFromSteps(metadata.steps);\n}\n\nexport function getLatestThreadTokenUsage(\n  messages: readonly TokenUsageExtractableMessage[] | undefined,\n): ThreadTokenUsage | undefined {\n  return getThreadMessageTokenUsage(findLatestMessageWithUsage(messages));\n}\n\nfunction findLatestMessageWithUsage(\n  messages: readonly TokenUsageExtractableMessage[] | undefined,\n): TokenUsageExtractableMessage | undefined {\n  if (!messages) return undefined;\n\n  for (let idx = messages.length - 1; idx >= 0; idx -= 1) {\n    const message = messages[idx];\n    if (getThreadMessageTokenUsage(message)) {\n      return message;\n    }\n  }\n\n  return undefined;\n}\n\nexport function useThreadTokenUsage(): ThreadTokenUsage | undefined {\n  const msg = useAuiState((s) => findLatestMessageWithUsage(s.thread.messages));\n  return getThreadMessageTokenUsage(msg);\n}\n"],"mappings":"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"}
+{"version":3,"file":"usage.js","names":[],"sources":["../src/usage.ts"],"sourcesContent":["/// <reference types=\"@assistant-ui/core/react\" />\nimport { useAuiState } from \"@assistant-ui/store\";\n\nexport type ThreadTokenUsage = {\n  totalTokens?: number;\n  inputTokens?: number;\n  outputTokens?: number;\n  reasoningTokens?: number;\n  cachedInputTokens?: number;\n};\n\nexport interface TokenUsageExtractableMessage {\n  role?: string;\n  metadata?: unknown;\n}\n\ntype UsageRecord = Record<string, unknown>;\n\nconst USAGE_KEYS = [\n  \"inputTokens\",\n  \"outputTokens\",\n  \"reasoningTokens\",\n  \"cachedInputTokens\",\n  \"totalTokens\",\n] as const satisfies (keyof ThreadTokenUsage)[];\n\nfunction asRecord(value: unknown): UsageRecord | undefined {\n  if (!value || typeof value !== \"object\" || Array.isArray(value))\n    return undefined;\n  return value as UsageRecord;\n}\n\nfunction asPositiveTokenCount(value: unknown): number | undefined {\n  if (typeof value !== \"number\" || !Number.isFinite(value) || value < 0) {\n    return undefined;\n  }\n  return value;\n}\n\nfunction computeTotalTokens(usage: ThreadTokenUsage): number | undefined {\n  if (usage.totalTokens !== undefined) return usage.totalTokens;\n  if (usage.inputTokens !== undefined && usage.outputTokens !== undefined) {\n    return usage.inputTokens + usage.outputTokens;\n  }\n  return undefined;\n}\n\nfunction normalizeUsage(value: unknown): ThreadTokenUsage | undefined {\n  const record = asRecord(value);\n  if (!record) return undefined;\n\n  const result: ThreadTokenUsage = {};\n  let hasFields = false;\n  for (const key of USAGE_KEYS) {\n    const count = asPositiveTokenCount(record[key]);\n    if (count !== undefined) {\n      result[key] = count;\n      hasFields = true;\n    }\n  }\n  return hasFields ? result : undefined;\n}\n\nfunction withComputedTotal(\n  usage: ThreadTokenUsage,\n): ThreadTokenUsage | undefined {\n  const totalTokens = computeTotalTokens(usage);\n  return { ...usage, ...(totalTokens !== undefined && { totalTokens }) };\n}\n\nfunction usageFromSteps(value: unknown): ThreadTokenUsage | undefined {\n  const steps = Array.isArray(value) ? value : [];\n\n  const sums: Record<string, number> = {};\n  const present: Record<string, boolean> = {};\n  let stepsWithUsage = 0;\n  let stepsWithComputableTotal = 0;\n\n  for (const step of steps) {\n    const usage = normalizeUsage(asRecord(step)?.usage);\n    if (!usage) continue;\n    stepsWithUsage++;\n\n    const stepTotal = computeTotalTokens(usage);\n    if (stepTotal !== undefined) {\n      sums.totalTokens = (sums.totalTokens ?? 0) + stepTotal;\n      stepsWithComputableTotal++;\n    }\n\n    for (const key of USAGE_KEYS) {\n      if (key === \"totalTokens\") continue;\n      if (usage[key] !== undefined) {\n        sums[key] = (sums[key] ?? 0) + usage[key];\n        present[key] = true;\n      }\n    }\n  }\n\n  if (stepsWithUsage === 0) return undefined;\n\n  const result: ThreadTokenUsage = {};\n  if (stepsWithComputableTotal === stepsWithUsage) {\n    result.totalTokens = sums.totalTokens!;\n  }\n  for (const key of USAGE_KEYS) {\n    if (key === \"totalTokens\") continue;\n    if (present[key]) {\n      result[key] = sums[key]!;\n    }\n  }\n  return result;\n}\n\nexport function getThreadMessageTokenUsage(\n  message: TokenUsageExtractableMessage | undefined,\n): ThreadTokenUsage | undefined {\n  if (!message || message.role !== \"assistant\") return undefined;\n\n  const metadata = asRecord(message.metadata);\n  if (!metadata) return undefined;\n\n  const topLevelUsage = normalizeUsage(metadata.usage);\n  if (topLevelUsage) return withComputedTotal(topLevelUsage);\n\n  const legacyUsage = normalizeUsage(asRecord(metadata.custom)?.usage);\n  if (legacyUsage) return withComputedTotal(legacyUsage);\n\n  return usageFromSteps(metadata.steps);\n}\n\nexport function getLatestThreadTokenUsage(\n  messages: readonly TokenUsageExtractableMessage[] | undefined,\n): ThreadTokenUsage | undefined {\n  return getThreadMessageTokenUsage(findLatestMessageWithUsage(messages));\n}\n\nfunction findLatestMessageWithUsage(\n  messages: readonly TokenUsageExtractableMessage[] | undefined,\n): TokenUsageExtractableMessage | undefined {\n  if (!messages) return undefined;\n\n  for (let idx = messages.length - 1; idx >= 0; idx -= 1) {\n    const message = messages[idx];\n    if (getThreadMessageTokenUsage(message)) {\n      return message;\n    }\n  }\n\n  return undefined;\n}\n\nexport function useThreadTokenUsage(): ThreadTokenUsage | undefined {\n  const msg = useAuiState((s) => findLatestMessageWithUsage(s.thread.messages));\n  return getThreadMessageTokenUsage(msg);\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-ai-sdk",
-  "version": "1.3.31",
+  "version": "1.3.33",
   "description": "Vercel AI SDK adapter for assistant-ui",
   "keywords": [
     "ai-sdk",
@@ -15,13 +15,29 @@
   "author": "AgentbaseAI Inc.",
   "license": "MIT",
   "type": "module",
+  "imports": {
+    "#mcp-stdio": {
+      "types": "./src/mcp-stdio.node.ts",
+      "react-native": "./dist/mcp-stdio.unsupported.js",
+      "edge-light": "./dist/mcp-stdio.unsupported.js",
+      "workerd": "./dist/mcp-stdio.unsupported.js",
+      "browser": "./dist/mcp-stdio.unsupported.js",
+      "node": "./dist/mcp-stdio.node.js",
+      "default": "./dist/mcp-stdio.unsupported.js"
+    }
+  },
   "exports": {
     ".": {
+      "react-native": {
+        "types": "./dist/index.native.d.ts",
+        "default": "./dist/index.native.js"
+      },
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     }
   },
   "main": "./dist/index.js",
+  "react-native": "./dist/index.native.js",
   "types": "./dist/index.d.ts",
   "files": [
     "dist",
@@ -30,10 +46,11 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@ai-sdk/react": "^3.0.195",
-    "@assistant-ui/core": "^0.2.8",
-    "@assistant-ui/store": "^0.2.13",
-    "ai": "^6.0.193",
+    "@ai-sdk/mcp": "^1.0.46",
+    "@ai-sdk/react": "^3.0.199",
+    "@assistant-ui/core": "^0.2.11",
+    "@assistant-ui/store": "^0.2.14",
+    "ai": "^6.0.197",
     "assistant-cloud": "*"
   },
   "peerDependencies": {
@@ -48,13 +65,13 @@
   "devDependencies": {
     "@testing-library/react": "^16.3.2",
     "@types/json-schema": "^7.0.15",
-    "@types/react": "^19.2.15",
+    "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
     "jsdom": "^29.1.1",
-    "react": "^19.2.6",
-    "vitest": "^4.1.7",
-    "@assistant-ui/x-buildutils": "0.0.10",
-    "assistant-stream": "0.3.18"
+    "react": "^19.2.7",
+    "vitest": "^4.1.8",
+    "@assistant-ui/x-buildutils": "0.0.12",
+    "assistant-stream": "0.3.21"
   },
   "publishConfig": {
     "access": "public",

package/src/client.ts

@@ -0,0 +1,18 @@
+/// <reference types="@assistant-ui/core/react" />
+
+export { useAISDKRuntime } from "./ui/use-chat/useAISDKRuntime";
+export { useChatRuntime } from "./ui/use-chat/useChatRuntime";
+export type { UseChatRuntimeOptions } from "./ui/use-chat/useChatRuntime";
+export { AssistantChatTransport } from "./ui/use-chat/AssistantChatTransport";
+export {
+  RESUMABLE_STREAM_ID_HEADER,
+  createResumableSessionStorage,
+} from "./ui/resumable";
+export type {
+  AssistantChatResumableOptions,
+  ResumableClientStorage,
+} from "./ui/resumable";
+export { frontendTools } from "./frontendTools";
+export { injectQuoteContext } from "./injectQuoteContext";
+export type { ThreadTokenUsage, TokenUsageExtractableMessage } from "./usage";
+export { getThreadMessageTokenUsage, useThreadTokenUsage } from "./usage";

package/src/frontendTools.ts

@@ -1,37 +1,14 @@
 import { jsonSchema, type ToolSet } from "ai";
-import type { ToolJSONSchema, ToolModelContentPart } from "assistant-stream";
+import type { ToolJSONSchema } from "assistant-stream";
 import { unwrapModelContentEnvelope } from "./modelContentEnvelope";
-
-const toAISDKContent = (parts: readonly ToolModelContentPart[]) => ({
-  type: "content" as const,
-  value: parts.map((part) => {
-    if (part.type === "text") {
-      return { type: "text" as const, text: part.text };
-    }
-    const isImage = part.mediaType.startsWith("image/");
-    return isImage
-      ? {
-          type: "image-data" as const,
-          data: part.data,
-          mediaType: part.mediaType,
-        }
-      : {
-          type: "file-data" as const,
-          data: part.data,
-          mediaType: part.mediaType,
-          ...(part.filename !== undefined && { filename: part.filename }),
-        };
-  }),
-});
+import { toAISDKContent, toAISDKDefaultOutput } from "./toolOutputConversion";
 
 export const defaultToModelOutput = ({ output }: { output: unknown }) => {
-  const { modelContent } = unwrapModelContentEnvelope(output);
+  const { result, modelContent } = unwrapModelContentEnvelope(output);
   if (modelContent !== undefined) {
     return toAISDKContent(modelContent);
   }
-  return typeof output === "string"
-    ? { type: "text" as const, value: output }
-    : { type: "json" as const, value: (output ?? null) as any };
+  return toAISDKDefaultOutput(result);
 };
 
 export const frontendTools = (tools: Record<string, ToolJSONSchema>): ToolSet =>

package/src/generativeTools.test.ts

@@ -0,0 +1,389 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { AISDKToolkit } from "./generativeTools";
+import { wrapModelContentEnvelope } from "./modelContentEnvelope";
+
+const mocks = vi.hoisted(() => ({
+  close: vi.fn(),
+  tools: vi.fn(),
+  createMCPClient: vi.fn(),
+}));
+
+vi.mock("@ai-sdk/mcp", () => ({
+  createMCPClient: mocks.createMCPClient,
+}));
+
+vi.mock("@ai-sdk/mcp/mcp-stdio", () => ({
+  Experimental_StdioMCPTransport: vi.fn((config) => ({
+    type: "stdio",
+    config,
+  })),
+}));
+
+describe("AISDKToolkit.tools()", () => {
+  it("merges frontend tools with toolkit tools", async () => {
+    const toolSet = await new AISDKToolkit({
+      toolkit: {
+        serverTool: {
+          type: "backend",
+          description: "Server tool",
+          parameters: { type: "object", properties: {} },
+          execute: async () => "ok",
+        } as never,
+      },
+    }).tools({
+      frontend: {
+        clientTool: {
+          parameters: { type: "object", properties: {} },
+        },
+      },
+    });
+
+    expect(toolSet.clientTool).toBeDefined();
+    expect(toolSet.serverTool?.description).toBe("Server tool");
+    expect(toolSet.serverTool?.execute).toBeTypeOf("function");
+  });
+
+  it("keeps a flat toolkit tool named tools", async () => {
+    const toolSet = await new AISDKToolkit({
+      toolkit: {
+        tools: {
+          type: "backend",
+          description: "Actually a tool, not config",
+          parameters: { type: "object", properties: {} },
+          execute: async () => "ok",
+        } as never,
+      },
+    }).tools();
+
+    expect(toolSet.tools?.description).toBe("Actually a tool, not config");
+    expect(toolSet.tools?.execute).toBeTypeOf("function");
+  });
+
+  it("converts provider tools without an execute function", async () => {
+    const toolSet = await new AISDKToolkit({
+      toolkit: {
+        web_search: {
+          type: "provider",
+          providerId: "openai.web_search_preview",
+          args: { searchContextSize: "low" },
+        },
+      },
+    }).tools();
+
+    expect(toolSet.web_search).toMatchObject({
+      type: "provider",
+      id: "openai.web_search_preview",
+      args: { searchContextSize: "low" },
+    });
+    expect(toolSet.web_search).not.toHaveProperty("inputSchema");
+    expect(toolSet.web_search).not.toHaveProperty("execute");
+  });
+
+  it("forwards provider tool parameters and providerOptions when present", async () => {
+    const toolSet = await new AISDKToolkit({
+      toolkit: {
+        web_search: {
+          type: "provider",
+          providerId: "openai.web_search_preview",
+          args: { searchContextSize: "low" },
+          parameters: {
+            type: "object",
+            properties: {
+              query: { type: "string" },
+            },
+            required: ["query"],
+          },
+          providerOptions: {
+            openai: { rankingOptions: { scoreThreshold: 0.5 } },
+          },
+        },
+      },
+    }).tools();
+
+    expect(toolSet.web_search).toMatchObject({
+      type: "provider",
+      id: "openai.web_search_preview",
+      args: { searchContextSize: "low" },
+      providerOptions: {
+        openai: { rankingOptions: { scoreThreshold: 0.5 } },
+      },
+    });
+    expect(toolSet.web_search).toHaveProperty("inputSchema");
+  });
+
+  it("forwards explicit false supportsDeferredResults", async () => {
+    const toolSet = await new AISDKToolkit({
+      toolkit: {
+        web_search: {
+          type: "provider",
+          providerId: "openai.web_search_preview",
+          args: { searchContextSize: "low" },
+          supportsDeferredResults: false,
+        },
+      },
+    }).tools();
+
+    expect(toolSet.web_search).toMatchObject({
+      supportsDeferredResults: false,
+    });
+  });
+});
+
+describe("AISDKToolkit", () => {
+  beforeEach(() => {
+    mocks.close.mockReset();
+    mocks.tools.mockReset();
+    mocks.createMCPClient.mockReset();
+  });
+
+  it("loads MCP tools through pooled clients", async () => {
+    mocks.tools.mockResolvedValue({ echo: { inputSchema: {} } });
+    mocks.createMCPClient.mockResolvedValue({
+      tools: mocks.tools,
+      close: mocks.close,
+    });
+
+    const toolkit = new AISDKToolkit({
+      toolkit: {
+        local: {
+          type: "mcp",
+          server: { type: "http", url: "http://localhost:3001/mcp" },
+        },
+      },
+    });
+
+    await expect(toolkit.tools()).resolves.toHaveProperty("echo");
+    await toolkit.tools();
+
+    expect(mocks.createMCPClient).toHaveBeenCalledTimes(1);
+    expect(mocks.createMCPClient).toHaveBeenCalledWith({
+      transport: {
+        type: "http",
+        url: "http://localhost:3001/mcp",
+      },
+    });
+    expect(mocks.tools).toHaveBeenCalledTimes(2);
+  });
+
+  it("closes pooled MCP clients", async () => {
+    mocks.tools.mockResolvedValue({});
+    mocks.createMCPClient.mockResolvedValue({
+      tools: mocks.tools,
+      close: mocks.close,
+    });
+
+    const toolkit = new AISDKToolkit({
+      toolkit: {
+        local: {
+          type: "mcp",
+          server: { type: "sse", url: "http://localhost:3001/sse" },
+        },
+      },
+    });
+
+    await toolkit.tools();
+    await toolkit.close();
+
+    expect(mocks.close).toHaveBeenCalledTimes(1);
+  });
+
+  it("clears pooled MCP clients even when initialization fails", async () => {
+    const error = new Error("connect failed");
+    const closeError = new Error("close failed");
+    const close = vi.fn().mockRejectedValue(closeError);
+    mocks.tools.mockResolvedValue({});
+    mocks.createMCPClient
+      .mockResolvedValueOnce({
+        tools: mocks.tools,
+        close,
+      })
+      .mockRejectedValueOnce(error);
+
+    const toolkit = new AISDKToolkit({
+      toolkit: {
+        first: {
+          type: "mcp",
+          server: { type: "http", url: "http://localhost:3001/mcp" },
+        },
+        second: {
+          type: "mcp",
+          server: { type: "http", url: "http://localhost:3002/mcp" },
+        },
+      },
+    });
+
+    const toolsPromise = toolkit.tools();
+    await expect(toolkit.close()).rejects.toMatchObject({
+      errors: [error, closeError],
+    });
+    await expect(toolsPromise).rejects.toThrow(error);
+    expect(close).toHaveBeenCalledTimes(1);
+
+    await expect(toolkit.close()).resolves.toBeUndefined();
+  });
+
+  it("evicts failed MCP client initialization so later calls can retry", async () => {
+    const error = new Error("connect failed");
+    mocks.createMCPClient.mockRejectedValueOnce(error).mockResolvedValueOnce({
+      tools: vi.fn().mockResolvedValue({ echo: { inputSchema: {} } }),
+      close: mocks.close,
+    });
+
+    const toolkit = new AISDKToolkit({
+      toolkit: {
+        local: {
+          type: "mcp",
+          server: { type: "http", url: "http://localhost:3001/mcp" },
+        },
+      },
+    });
+
+    await expect(toolkit.tools()).rejects.toThrow(error);
+    await expect(toolkit.tools()).resolves.toHaveProperty("echo");
+    expect(mocks.createMCPClient).toHaveBeenCalledTimes(2);
+  });
+
+  it("rejects duplicate MCP tool names", async () => {
+    mocks.createMCPClient
+      .mockResolvedValueOnce({
+        tools: vi.fn().mockResolvedValue({ echo: { inputSchema: {} } }),
+        close: mocks.close,
+      })
+      .mockResolvedValueOnce({
+        tools: vi.fn().mockResolvedValue({ echo: { inputSchema: {} } }),
+        close: mocks.close,
+      });
+
+    const toolkit = new AISDKToolkit({
+      toolkit: {
+        first: {
+          type: "mcp",
+          server: { type: "http", url: "http://localhost:3001/mcp" },
+        },
+        second: {
+          type: "mcp",
+          server: { type: "http", url: "http://localhost:3002/mcp" },
+        },
+      },
+    });
+
+    await expect(toolkit.tools()).rejects.toThrow(
+      /MCP tool name collision: "echo"/,
+    );
+  });
+
+  it("includes provider tools alongside MCP tools", async () => {
+    mocks.tools.mockResolvedValue({ echo: { inputSchema: {} } });
+    mocks.createMCPClient.mockResolvedValue({
+      tools: mocks.tools,
+      close: mocks.close,
+    });
+
+    const toolkit = new AISDKToolkit({
+      toolkit: {
+        local: {
+          type: "mcp",
+          server: { type: "http", url: "http://localhost:3001/mcp" },
+        },
+        web_search: {
+          type: "provider",
+          providerId: "openai.web_search_preview",
+          args: { searchContextSize: "low" },
+          supportsDeferredResults: false,
+        },
+      },
+    });
+
+    await expect(toolkit.tools()).resolves.toMatchObject({
+      echo: { inputSchema: {} },
+      web_search: {
+        type: "provider",
+        id: "openai.web_search_preview",
+        args: { searchContextSize: "low" },
+        supportsDeferredResults: false,
+      },
+    });
+  });
+});
+
+describe("AISDKToolkit toModelOutput", () => {
+  const createWeatherTools = (toModelOutput?: any) =>
+    new AISDKToolkit({
+      toolkit: {
+        get_weather: {
+          ...(toModelOutput && { toModelOutput }),
+        },
+      } as any,
+    }).tools();
+
+  it("adapts assistant-ui model content parts to the AI SDK tool output shape", async () => {
+    const tools = await createWeatherTools(({ output }: any) => [
+      { type: "text", text: `Weather card displayed: ${output.location}` },
+    ]);
+
+    const output = await tools.get_weather!.toModelOutput!({
+      toolCallId: "tc-weather",
+      input: {},
+      output: { location: "San Francisco" },
+    });
+
+    expect(output).toEqual({
+      type: "content",
+      value: [{ type: "text", text: "Weather card displayed: San Francisco" }],
+    });
+  });
+
+  it("uses stored model content envelopes without re-running the custom projector", async () => {
+    let called = false;
+    const tools = await createWeatherTools(() => {
+      called = true;
+      return [{ type: "text", text: "recomputed" }];
+    });
+
+    const output = await tools.get_weather!.toModelOutput!({
+      toolCallId: "tc-weather",
+      input: {},
+      output: wrapModelContentEnvelope({ location: "San Francisco" }, [
+        { type: "text", text: "cached weather receipt" },
+      ]),
+    });
+
+    expect(called).toBe(false);
+    expect(output).toEqual({
+      type: "content",
+      value: [{ type: "text", text: "cached weather receipt" }],
+    });
+  });
+
+  it("falls back to default model output when no custom projector is defined", async () => {
+    const tools = await createWeatherTools();
+
+    const output = await tools.get_weather!.toModelOutput!({
+      toolCallId: "tc-weather",
+      input: {},
+      output: { location: "San Francisco" },
+    });
+
+    expect(output).toEqual({
+      type: "json",
+      value: { location: "San Francisco" },
+    });
+  });
+
+  it("uses stored model content envelopes when no custom projector is defined", async () => {
+    const tools = await createWeatherTools();
+
+    const output = await tools.get_weather!.toModelOutput!({
+      toolCallId: "tc-weather",
+      input: {},
+      output: wrapModelContentEnvelope({ location: "San Francisco" }, [
+        { type: "text", text: "cached weather receipt" },
+      ]),
+    });
+
+    expect(output).toEqual({
+      type: "content",
+      value: [{ type: "text", text: "cached weather receipt" }],
+    });
+  });
+});