@assistant-ui/react-data-stream 0.12.0 → 0.12.2

package/dist/converters/toLanguageModelMessages.d.ts

@@ -1,9 +1,10 @@
 import type { LanguageModelV2Message } from "@ai-sdk/provider";
-import { ThreadMessage } from "@assistant-ui/react";
+import type { ThreadMessage } from "@assistant-ui/react";
 /**
- * @deprecated This is an internal API and may change without notice.
+ * @deprecated Use `toGenericMessages` from `assistant-stream` for framework-agnostic conversion.
+ * This function is kept for AI SDK compatibility.
  */
-export declare function toLanguageModelMessages(message: readonly ThreadMessage[], options?: {
+export declare function toLanguageModelMessages(messages: readonly ThreadMessage[], options?: {
     unstable_includeId?: boolean | undefined;
 }): LanguageModelV2Message[];
 //# sourceMappingURL=toLanguageModelMessages.d.ts.map

package/dist/converters/toLanguageModelMessages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toLanguageModelMessages.d.ts","sourceRoot":"","sources":["../../src/converters/toLanguageModelMessages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,sBAAsB,EAIvB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAuF7B;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,SAAS,aAAa,EAAE,EACjC,OAAO,GAAE;IAAE,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAAO,GACzD,sBAAsB,EAAE,CAoG1B"}
+{"version":3,"file":"toLanguageModelMessages.d.ts","sourceRoot":"","sources":["../../src/converters/toLanguageModelMessages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,sBAAsB,EAIvB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAiFzD;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,SAAS,aAAa,EAAE,EAClC,OAAO,GAAE;IAAE,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAAO,GACzD,sBAAsB,EAAE,CAoC1B"}

package/dist/converters/toLanguageModelMessages.js

@@ -1,166 +1,95 @@
-const IMAGE_MEDIA_TYPES = {
-    jpg: "image/jpeg",
-    jpeg: "image/jpeg",
-    png: "image/png",
-    gif: "image/gif",
-    webp: "image/webp",
-    svg: "image/svg+xml",
-    avif: "image/avif",
-    bmp: "image/bmp",
-    ico: "image/x-icon",
-    tiff: "image/tiff",
-    tif: "image/tiff",
-};
-const inferImageMediaType = (url) => {
-    const ext = url.split(".").pop()?.toLowerCase().split("?")[0] ?? "";
-    return IMAGE_MEDIA_TYPES[ext] ?? "image/png";
-};
-const assistantMessageSplitter = () => {
-    const stash = [];
-    let assistantMessage = {
-        role: "assistant",
-        content: [],
-    };
-    let toolMessage = {
-        role: "tool",
-        content: [],
-    };
-    return {
-        addTextMessagePart: (part) => {
-            if (toolMessage.content.length > 0) {
-                stash.push(assistantMessage);
-                stash.push(toolMessage);
-                assistantMessage = {
-                    role: "assistant",
-                    content: [],
-                };
-                toolMessage = {
-                    role: "tool",
-                    content: [],
-                };
-            }
-            assistantMessage.content.push(part);
-        },
-        addToolCallPart: (part) => {
-            assistantMessage.content.push({
-                type: "tool-call",
-                toolCallId: part.toolCallId,
-                toolName: part.toolName,
-                input: part.args,
-            });
-            toolMessage.content.push({
-                type: "tool-result",
-                toolCallId: part.toolCallId,
-                toolName: part.toolName,
-                output: part.result === undefined
-                    ? {
-                        type: "error-text",
-                        value: "Error: tool has no configured code to run",
-                    }
-                    : part.isError
-                        ? { type: "error-json", value: part.result }
-                        : { type: "json", value: part.result },
-            });
-        },
-        getMessages: () => {
-            if (toolMessage.content.length > 0) {
-                return [...stash, assistantMessage, toolMessage];
-            }
-            return [...stash, assistantMessage];
-        },
-    };
-};
+import { toGenericMessages, } from "assistant-stream";
+function toUrl(value) {
+    if (value instanceof URL)
+        return value;
+    try {
+        return new URL(value);
+    }
+    catch {
+        // For relative URLs, create URL with a dummy base
+        return new URL(value, "file://");
+    }
+}
+function convertUserContent(content) {
+    return content.content.map((part) => {
+        if (part.type === "text") {
+            return part;
+        }
+        return {
+            type: "file",
+            data: toUrl(part.data),
+            mediaType: part.mediaType,
+        };
+    });
+}
+function convertAssistantContent(content) {
+    return content.map((part) => {
+        if (part.type === "text") {
+            return part;
+        }
+        return {
+            type: "tool-call",
+            toolCallId: part.toolCallId,
+            toolName: part.toolName,
+            input: part.args,
+        };
+    });
+}
+function convertToolContent(content) {
+    return content.map((part) => ({
+        type: "tool-result",
+        toolCallId: part.toolCallId,
+        toolName: part.toolName,
+        output: part.isError
+            ? { type: "error-json", value: part.result }
+            : { type: "json", value: part.result },
+    }));
+}
+function convertGenericToLanguageModel(generic) {
+    switch (generic.role) {
+        case "system":
+            return { role: "system", content: generic.content };
+        case "user":
+            return { role: "user", content: convertUserContent(generic) };
+        case "assistant":
+            return {
+                role: "assistant",
+                content: convertAssistantContent(generic.content),
+            };
+        case "tool":
+            return { role: "tool", content: convertToolContent(generic.content) };
+    }
+}
 /**
- * @deprecated This is an internal API and may change without notice.
+ * @deprecated Use `toGenericMessages` from `assistant-stream` for framework-agnostic conversion.
+ * This function is kept for AI SDK compatibility.
  */
-export function toLanguageModelMessages(message, options = {}) {
+export function toLanguageModelMessages(messages, options = {}) {
     const includeId = options.unstable_includeId ?? false;
-    return message.flatMap((message) => {
-        const role = message.role;
-        switch (role) {
-            case "system": {
-                return [
-                    {
-                        ...(includeId
-                            ? { unstable_id: message.id }
-                            : {}),
-                        role: "system",
-                        content: message.content[0].text,
-                    },
-                ];
+    const genericMessages = toGenericMessages(messages);
+    if (!includeId) {
+        return genericMessages.map(convertGenericToLanguageModel);
+    }
+    // When includeId is true, we need to map back to original message IDs
+    const result = [];
+    let messageIndex = 0;
+    for (const generic of genericMessages) {
+        const converted = convertGenericToLanguageModel(generic);
+        // Tool messages are synthesized from assistant message tool calls,
+        // they don't have a corresponding original message
+        if (generic.role !== "tool") {
+            // Find the corresponding original message for ID
+            while (messageIndex < messages.length &&
+                messages[messageIndex].role !== generic.role) {
+                messageIndex++;
             }
-            case "user": {
-                const attachments = "attachments" in message ? message.attachments : [];
-                const content = [
-                    ...message.content,
-                    ...attachments.map((a) => a.content).flat(),
-                ];
-                const msg = {
-                    ...(includeId ? { unstable_id: message.id } : {}),
-                    role: "user",
-                    content: content.map((part) => {
-                        const type = part.type;
-                        switch (type) {
-                            case "text": {
-                                return part;
-                            }
-                            case "image": {
-                                // ImageMessagePart doesn't include media type info, so we infer from URL
-                                return {
-                                    type: "file",
-                                    data: new URL(part.image),
-                                    mediaType: inferImageMediaType(part.image),
-                                };
-                            }
-                            case "file": {
-                                return {
-                                    type: "file",
-                                    data: new URL(part.data),
-                                    mediaType: part.mimeType,
-                                };
-                            }
-                            default: {
-                                const unhandledType = type;
-                                throw new Error(`Unsupported message part type: ${unhandledType}`);
-                            }
-                        }
-                    }),
-                };
-                return [msg];
-            }
-            case "assistant": {
-                const splitter = assistantMessageSplitter();
-                for (const part of message.content) {
-                    const type = part.type;
-                    switch (type) {
-                        case "reasoning":
-                        case "source":
-                        case "file":
-                        case "data":
-                        case "image": {
-                            break; // reasoning, source, file, and image parts are omitted
-                        }
-                        case "text": {
-                            splitter.addTextMessagePart(part);
-                            break;
-                        }
-                        case "tool-call": {
-                            splitter.addToolCallPart(part);
-                            break;
-                        }
-                        default: {
-                            const unhandledType = type;
-                            throw new Error(`Unhandled message part type: ${unhandledType}`);
-                        }
-                    }
-                }
-                return splitter.getMessages();
-            }
-            default: {
-                const unhandledRole = role;
-                throw new Error(`Unknown message role: ${unhandledRole}`);
+            if (messageIndex < messages.length) {
+                converted.unstable_id = messages[messageIndex].id;
+                messageIndex++;
             }
         }
-    });
+        result.push(converted);
+    }
+    return result;
 }
 //# sourceMappingURL=toLanguageModelMessages.js.map

package/dist/converters/toLanguageModelMessages.js.map

@@ -1 +1 @@
-{"version":3,"file":"toLanguageModelMessages.js","sourceRoot":"","sources":["../../src/converters/toLanguageModelMessages.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"toLanguageModelMessages.js","sourceRoot":"","sources":["../../src/converters/toLanguageModelMessages.ts"],"names":[],"mappings":"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"}

package/dist/useDataStreamRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDataStreamRuntime.d.ts","sourceRoot":"","sources":["../src/useDataStreamRuntime.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,gBAAgB,EAIrB,KAAK,mBAAmB,EACxB,KAAK,aAAa,EAGnB,MAAM,qBAAqB,CAAC;AAa7B,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC;AAErD,MAAM,MAAM,kBAAkB,GAAG,mBAAmB,GAAG,aAAa,CAAC;AAErE,MAAM,MAAM,2BAA2B,GAAG;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,4EAA4E;IAC5E,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,0DAA0D;IAC1D,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE;QACd,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,OAAO,CAAC;QACd,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB,KAAK,IAAI,CAAC;IACX,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;IAC5C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,OAAO,CAAC,EAAE,YAAY,GAAG,CAAC,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;IACvD,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IACpD,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,GAAG,mBAAmB,CAAC;AA2IxB,eAAO,MAAM,oBAAoB,GAC/B,SAAS,2BAA2B,KACnC,gBAQF,CAAC"}
+{"version":3,"file":"useDataStreamRuntime.d.ts","sourceRoot":"","sources":["../src/useDataStreamRuntime.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,gBAAgB,EAIrB,KAAK,mBAAmB,EACxB,KAAK,aAAa,EAEnB,MAAM,qBAAqB,CAAC;AAY7B,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC;AAErD,MAAM,MAAM,kBAAkB,GAAG,mBAAmB,GAAG,aAAa,CAAC;AAErE,MAAM,MAAM,2BAA2B,GAAG;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,4EAA4E;IAC5E,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,0DAA0D;IAC1D,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE;QACd,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,OAAO,CAAC;QACd,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB,KAAK,IAAI,CAAC;IACX,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;IAC5C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,OAAO,CAAC,EAAE,YAAY,GAAG,CAAC,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;IACvD,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IACpD,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,GAAG,mBAAmB,CAAC;AAqHxB,eAAO,MAAM,oBAAoB,GAC/B,SAAS,2BAA2B,KACnC,gBAQF,CAAC"}

package/dist/useDataStreamRuntime.js

@@ -1,24 +1,9 @@
 "use client";
 import { toLanguageModelMessages } from "./converters/index.js";
 import { INTERNAL, useLocalRuntime, } from "@assistant-ui/react";
-import { z } from "zod";
-import { AssistantMessageAccumulator, DataStreamDecoder, UIMessageStreamDecoder, unstable_toolResultStream, } from "assistant-stream";
+import { AssistantMessageAccumulator, DataStreamDecoder, toToolsJSONSchema, UIMessageStreamDecoder, unstable_toolResultStream, } from "assistant-stream";
 import { asAsyncIterableStream } from "assistant-stream/utils";
 const { splitLocalRuntimeOptions } = INTERNAL;
-const toAISDKTools = (tools) => {
-    return Object.fromEntries(Object.entries(tools).map(([name, tool]) => [
-        name,
-        {
-            ...(tool.description ? { description: tool.description } : undefined),
-            parameters: (tool.parameters instanceof z.ZodType
-                ? z.toJSONSchema(tool.parameters)
-                : tool.parameters),
-        },
-    ]));
-};
-const getEnabledTools = (tools) => {
-    return Object.fromEntries(Object.entries(tools).filter(([, tool]) => !tool.disabled && tool.type !== "backend"));
-};
 class DataStreamRuntimeAdapter {
     options;
     constructor(options) {
@@ -46,7 +31,7 @@ class DataStreamRuntimeAdapter {
                 messages: toLanguageModelMessages(messages, {
                     unstable_includeId: this.options.sendExtraMessageFields,
                 }),
-                tools: toAISDKTools(getEnabledTools(context.tools ?? {})),
+                tools: toToolsJSONSchema(context.tools ?? {}),
                 ...(unstable_assistantMessageId ? { unstable_assistantMessageId } : {}),
                 ...(unstable_threadId ? { threadId: unstable_threadId } : {}),
                 ...(unstable_parentId !== undefined

package/dist/useDataStreamRuntime.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDataStreamRuntime.js","sourceRoot":"","sources":["../src/useDataStreamRuntime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useDataStreamRuntime.js","sourceRoot":"","sources":["../src/useDataStreamRuntime.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-data-stream",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "Data stream adapter for assistant-ui",
   "keywords": [
     "data-stream",
@@ -29,12 +29,12 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@ai-sdk/provider": "^3.0.4",
-    "assistant-stream": "^0.2.47",
-    "zod": "^4.3.5"
+    "@ai-sdk/provider": "^3.0.5",
+    "assistant-stream": "^0.3.0",
+    "zod": "^4.3.6"
   },
   "peerDependencies": {
-    "@assistant-ui/react": "^0.11.58",
+    "@assistant-ui/react": "^0.12.3",
     "@types/react": "*",
     "react": "^18 || ^19"
   },
@@ -46,9 +46,9 @@
   "devDependencies": {
     "@types/json-schema": "^7.0.15",
     "@types/react": "^19.2.9",
-    "react": "^19.2.3",
-    "@assistant-ui/x-buildutils": "0.0.1",
-    "@assistant-ui/react": "0.11.58"
+    "react": "^19.2.4",
+    "@assistant-ui/react": "0.12.3",
+    "@assistant-ui/x-buildutils": "0.0.1"
   },
   "publishConfig": {
     "access": "public",

package/src/converters/toLanguageModelMessages.ts

@@ -6,201 +6,128 @@ import type {
   LanguageModelV2ToolCallPart,
   LanguageModelV2ToolResultPart,
 } from "@ai-sdk/provider";
+import type { ThreadMessage } from "@assistant-ui/react";
 import {
-  TextMessagePart,
-  ThreadMessage,
-  ToolCallMessagePart,
-} from "@assistant-ui/react";
-
-const IMAGE_MEDIA_TYPES: Record<string, string> = {
-  jpg: "image/jpeg",
-  jpeg: "image/jpeg",
-  png: "image/png",
-  gif: "image/gif",
-  webp: "image/webp",
-  svg: "image/svg+xml",
-  avif: "image/avif",
-  bmp: "image/bmp",
-  ico: "image/x-icon",
-  tiff: "image/tiff",
-  tif: "image/tiff",
-};
-
-const inferImageMediaType = (url: string): string => {
-  const ext = url.split(".").pop()?.toLowerCase().split("?")[0] ?? "";
-  return IMAGE_MEDIA_TYPES[ext] ?? "image/png";
-};
-
-const assistantMessageSplitter = () => {
-  const stash: LanguageModelV2Message[] = [];
-  let assistantMessage = {
-    role: "assistant" as const,
-    content: [] as (LanguageModelV2TextPart | LanguageModelV2ToolCallPart)[],
-  };
-  let toolMessage = {
-    role: "tool" as const,
-    content: [] as LanguageModelV2ToolResultPart[],
-  };
-
-  return {
-    addTextMessagePart: (part: TextMessagePart) => {
-      if (toolMessage.content.length > 0) {
-        stash.push(assistantMessage);
-        stash.push(toolMessage);
-
-        assistantMessage = {
-          role: "assistant" as const,
-          content: [] as (
-            | LanguageModelV2TextPart
-            | LanguageModelV2ToolCallPart
-          )[],
-        };
+  toGenericMessages,
+  type GenericMessage,
+  type GenericTextPart,
+  type GenericToolCallPart,
+  type GenericToolResultPart,
+} from "assistant-stream";
+
+function toUrl(value: string | URL): URL {
+  if (value instanceof URL) return value;
+  try {
+    return new URL(value);
+  } catch {
+    // For relative URLs, create URL with a dummy base
+    return new URL(value, "file://");
+  }
+}
 
-        toolMessage = {
-          role: "tool" as const,
-          content: [] as LanguageModelV2ToolResultPart[],
-        };
-      }
+function convertUserContent(
+  content: GenericMessage & { role: "user" },
+): (LanguageModelV2TextPart | LanguageModelV2FilePart)[] {
+  return content.content.map((part) => {
+    if (part.type === "text") {
+      return part;
+    }
+    return {
+      type: "file",
+      data: toUrl(part.data),
+      mediaType: part.mediaType,
+    };
+  });
+}
 
-      assistantMessage.content.push(part);
-    },
-    addToolCallPart: (part: ToolCallMessagePart) => {
-      assistantMessage.content.push({
-        type: "tool-call",
-        toolCallId: part.toolCallId,
-        toolName: part.toolName,
-        input: part.args,
-      });
+function convertAssistantContent(
+  content: (GenericTextPart | GenericToolCallPart)[],
+): (LanguageModelV2TextPart | LanguageModelV2ToolCallPart)[] {
+  return content.map((part) => {
+    if (part.type === "text") {
+      return part;
+    }
+    return {
+      type: "tool-call",
+      toolCallId: part.toolCallId,
+      toolName: part.toolName,
+      input: part.args,
+    };
+  });
+}
 
-      toolMessage.content.push({
-        type: "tool-result",
-        toolCallId: part.toolCallId,
-        toolName: part.toolName,
-        output:
-          part.result === undefined
-            ? {
-                type: "error-text",
-                value: "Error: tool has no configured code to run",
-              }
-            : part.isError
-              ? { type: "error-json", value: part.result as JSONValue }
-              : { type: "json", value: part.result as JSONValue },
-      });
-    },
-    getMessages: () => {
-      if (toolMessage.content.length > 0) {
-        return [...stash, assistantMessage, toolMessage];
-      }
+function convertToolContent(
+  content: GenericToolResultPart[],
+): LanguageModelV2ToolResultPart[] {
+  return content.map((part) => ({
+    type: "tool-result",
+    toolCallId: part.toolCallId,
+    toolName: part.toolName,
+    output: part.isError
+      ? { type: "error-json", value: part.result as JSONValue }
+      : { type: "json", value: part.result as JSONValue },
+  }));
+}
 
-      return [...stash, assistantMessage];
-    },
-  };
-};
+function convertGenericToLanguageModel(
+  generic: GenericMessage,
+): LanguageModelV2Message {
+  switch (generic.role) {
+    case "system":
+      return { role: "system", content: generic.content };
+    case "user":
+      return { role: "user", content: convertUserContent(generic) };
+    case "assistant":
+      return {
+        role: "assistant",
+        content: convertAssistantContent(generic.content),
+      };
+    case "tool":
+      return { role: "tool", content: convertToolContent(generic.content) };
+  }
+}
 
 /**
- * @deprecated This is an internal API and may change without notice.
+ * @deprecated Use `toGenericMessages` from `assistant-stream` for framework-agnostic conversion.
+ * This function is kept for AI SDK compatibility.
  */
 export function toLanguageModelMessages(
-  message: readonly ThreadMessage[],
+  messages: readonly ThreadMessage[],
   options: { unstable_includeId?: boolean | undefined } = {},
 ): LanguageModelV2Message[] {
   const includeId = options.unstable_includeId ?? false;
-  return message.flatMap((message) => {
-    const role = message.role;
-    switch (role) {
-      case "system": {
-        return [
-          {
-            ...(includeId
-              ? { unstable_id: (message as ThreadMessage).id }
-              : {}),
-            role: "system",
-            content: message.content[0].text,
-          },
-        ];
+  const genericMessages = toGenericMessages(messages as any);
+
+  if (!includeId) {
+    return genericMessages.map(convertGenericToLanguageModel);
+  }
+
+  // When includeId is true, we need to map back to original message IDs
+  const result: LanguageModelV2Message[] = [];
+  let messageIndex = 0;
+
+  for (const generic of genericMessages) {
+    const converted = convertGenericToLanguageModel(generic);
+
+    // Tool messages are synthesized from assistant message tool calls,
+    // they don't have a corresponding original message
+    if (generic.role !== "tool") {
+      // Find the corresponding original message for ID
+      while (
+        messageIndex < messages.length &&
+        messages[messageIndex]!.role !== generic.role
+      ) {
+        messageIndex++;
       }
 
-      case "user": {
-        const attachments = "attachments" in message ? message.attachments : [];
-        const content = [
-          ...message.content,
-          ...attachments.map((a) => a.content).flat(),
-        ];
-        const msg: LanguageModelV2Message = {
-          ...(includeId ? { unstable_id: (message as ThreadMessage).id } : {}),
-          role: "user",
-          content: content.map(
-            (part): LanguageModelV2TextPart | LanguageModelV2FilePart => {
-              const type = part.type;
-              switch (type) {
-                case "text": {
-                  return part;
-                }
-
-                case "image": {
-                  // ImageMessagePart doesn't include media type info, so we infer from URL
-                  return {
-                    type: "file",
-                    data: new URL(part.image),
-                    mediaType: inferImageMediaType(part.image),
-                  };
-                }
-
-                case "file": {
-                  return {
-                    type: "file",
-                    data: new URL(part.data),
-                    mediaType: part.mimeType,
-                  };
-                }
-
-                default: {
-                  const unhandledType: "audio" = type;
-                  throw new Error(
-                    `Unsupported message part type: ${unhandledType}`,
-                  );
-                }
-              }
-            },
-          ),
-        };
-        return [msg];
+      if (messageIndex < messages.length) {
+        (converted as any).unstable_id = messages[messageIndex]!.id;
+        messageIndex++;
       }
+    }
 
-      case "assistant": {
-        const splitter = assistantMessageSplitter();
-        for (const part of message.content) {
-          const type = part.type;
-          switch (type) {
-            case "reasoning":
-            case "source":
-            case "file":
-            case "data":
-            case "image": {
-              break; // reasoning, source, file, and image parts are omitted
-            }
-
-            case "text": {
-              splitter.addTextMessagePart(part);
-              break;
-            }
-            case "tool-call": {
-              splitter.addToolCallPart(part);
-              break;
-            }
-            default: {
-              const unhandledType: never = type;
-              throw new Error(`Unhandled message part type: ${unhandledType}`);
-            }
-          }
-        }
-        return splitter.getMessages();
-      }
+    result.push(converted);
+  }
 
-      default: {
-        const unhandledRole: never = role;
-        throw new Error(`Unknown message role: ${unhandledRole}`);
-      }
-    }
-  });
+  return result;
 }

package/src/useDataStreamRuntime.ts

@@ -8,14 +8,12 @@ import {
   INTERNAL,
   type LocalRuntimeOptions,
   type ThreadMessage,
-  type Tool,
   useLocalRuntime,
 } from "@assistant-ui/react";
-import { z } from "zod";
-import type { JSONSchema7 } from "json-schema";
 import {
   AssistantMessageAccumulator,
   DataStreamDecoder,
+  toToolsJSONSchema,
   UIMessageStreamDecoder,
   unstable_toolResultStream,
 } from "assistant-stream";
@@ -59,28 +57,6 @@ type DataStreamRuntimeRequestOptions = {
   state?: any;
 };
 
-const toAISDKTools = (tools: Record<string, Tool>) => {
-  return Object.fromEntries(
-    Object.entries(tools).map(([name, tool]) => [
-      name,
-      {
-        ...(tool.description ? { description: tool.description } : undefined),
-        parameters: (tool.parameters instanceof z.ZodType
-          ? z.toJSONSchema(tool.parameters)
-          : tool.parameters) as JSONSchema7,
-      },
-    ]),
-  );
-};
-
-const getEnabledTools = (tools: Record<string, Tool>) => {
-  return Object.fromEntries(
-    Object.entries(tools).filter(
-      ([, tool]) => !tool.disabled && tool.type !== "backend",
-    ),
-  );
-};
-
 class DataStreamRuntimeAdapter implements ChatModelAdapter {
   constructor(
     private options: Omit<
@@ -129,8 +105,8 @@ class DataStreamRuntimeAdapter implements ChatModelAdapter {
         messages: toLanguageModelMessages(messages, {
           unstable_includeId: this.options.sendExtraMessageFields,
         }) as DataStreamRuntimeRequestOptions["messages"],
-        tools: toAISDKTools(
-          getEnabledTools(context.tools ?? {}),
+        tools: toToolsJSONSchema(
+          context.tools ?? {},
         ) as unknown as DataStreamRuntimeRequestOptions["tools"],
         ...(unstable_assistantMessageId ? { unstable_assistantMessageId } : {}),
         ...(unstable_threadId ? { threadId: unstable_threadId } : {}),