ai 5.0.0-alpha.11 → 5.0.0-alpha.13

package/dist/index.mjs

@@ -455,42 +455,45 @@ import { parseJsonEventStream } from "@ai-sdk/provider-utils";
 // src/ui-message-stream/ui-message-stream-parts.ts
 import { z } from "zod";
 var uiMessageStreamPartSchema = z.union([
-  z.object({
+  z.strictObject({
     type: z.literal("text"),
     text: z.string()
   }),
-  z.object({
+  z.strictObject({
     type: z.literal("error"),
     errorText: z.string()
   }),
-  z.object({
+  z.strictObject({
     type: z.literal("tool-call-streaming-start"),
     toolCallId: z.string(),
     toolName: z.string()
   }),
-  z.object({
+  z.strictObject({
     type: z.literal("tool-call-delta"),
     toolCallId: z.string(),
     argsTextDelta: z.string()
   }),
-  z.object({
+  z.strictObject({
     type: z.literal("tool-call"),
     toolCallId: z.string(),
     toolName: z.string(),
     args: z.unknown()
   }),
-  z.object({
+  z.strictObject({
     type: z.literal("tool-result"),
     toolCallId: z.string(),
     result: z.unknown(),
     providerMetadata: z.any().optional()
   }),
-  z.object({
+  z.strictObject({
     type: z.literal("reasoning"),
     text: z.string(),
     providerMetadata: z.record(z.any()).optional()
   }),
-  z.object({
+  z.strictObject({
+    type: z.literal("reasoning-part-finish")
+  }),
+  z.strictObject({
     type: z.literal("source-url"),
     sourceId: z.string(),
     url: z.string(),
@@ -498,7 +501,7 @@ var uiMessageStreamPartSchema = z.union([
     providerMetadata: z.any().optional()
     // Use z.any() for generic metadata
   }),
-  z.object({
+  z.strictObject({
     type: z.literal("source-document"),
     sourceId: z.string(),
     mediaType: z.string(),
@@ -507,39 +510,34 @@ var uiMessageStreamPartSchema = z.union([
     providerMetadata: z.any().optional()
     // Use z.any() for generic metadata
   }),
-  z.object({
+  z.strictObject({
     type: z.literal("file"),
     url: z.string(),
     mediaType: z.string()
   }),
-  z.object({
+  z.strictObject({
     type: z.string().startsWith("data-"),
     id: z.string().optional(),
     data: z.unknown()
   }),
-  z.object({
-    type: z.literal("metadata"),
-    value: z.object({ metadata: z.unknown() })
+  z.strictObject({
+    type: z.literal("start-step")
   }),
-  z.object({
-    type: z.literal("start-step"),
-    metadata: z.unknown().optional()
+  z.strictObject({
+    type: z.literal("finish-step")
   }),
-  z.object({
-    type: z.literal("finish-step"),
-    metadata: z.unknown().optional()
-  }),
-  z.object({
+  z.strictObject({
     type: z.literal("start"),
     messageId: z.string().optional(),
-    metadata: z.unknown().optional()
+    messageMetadata: z.unknown().optional()
   }),
-  z.object({
+  z.strictObject({
     type: z.literal("finish"),
-    metadata: z.unknown().optional()
+    messageMetadata: z.unknown().optional()
   }),
-  z.object({
-    type: z.literal("reasoning-part-finish")
+  z.strictObject({
+    type: z.literal("message-metadata"),
+    messageMetadata: z.unknown()
   })
 ]);
 function isDataUIMessageStreamPart(part) {
@@ -729,6 +727,137 @@ var SerialJobExecutor = class {
   }
 };
 
+// src/ui/convert-file-list-to-file-ui-parts.ts
+async function convertFileListToFileUIParts(files) {
+  if (files == null) {
+    return [];
+  }
+  if (!globalThis.FileList || !(files instanceof globalThis.FileList)) {
+    throw new Error("FileList is not supported in the current environment");
+  }
+  return Promise.all(
+    Array.from(files).map(async (file) => {
+      const { name: name17, type } = file;
+      const dataUrl = await new Promise((resolve, reject) => {
+        const reader = new FileReader();
+        reader.onload = (readerEvent) => {
+          var _a17;
+          resolve((_a17 = readerEvent.target) == null ? void 0 : _a17.result);
+        };
+        reader.onerror = (error) => reject(error);
+        reader.readAsDataURL(file);
+      });
+      return {
+        type: "file",
+        mediaType: type,
+        filename: name17,
+        url: dataUrl
+      };
+    })
+  );
+}
+
+// src/ui/default-chat-transport.ts
+import {
+  parseJsonEventStream as parseJsonEventStream2
+} from "@ai-sdk/provider-utils";
+var getOriginalFetch2 = () => fetch;
+async function fetchUIMessageStream({
+  api,
+  body,
+  credentials,
+  headers,
+  abortSignal,
+  fetch: fetch2 = getOriginalFetch2(),
+  requestType = "generate"
+}) {
+  var _a17;
+  const response = requestType === "resume" ? await fetch2(`${api}?id=${body.id}`, {
+    method: "GET",
+    headers: {
+      "Content-Type": "application/json",
+      ...headers
+    },
+    signal: abortSignal,
+    credentials
+  }) : await fetch2(api, {
+    method: "POST",
+    body: JSON.stringify(body),
+    headers: {
+      "Content-Type": "application/json",
+      ...headers
+    },
+    signal: abortSignal,
+    credentials
+  });
+  if (!response.ok) {
+    throw new Error(
+      (_a17 = await response.text()) != null ? _a17 : "Failed to fetch the chat response."
+    );
+  }
+  if (!response.body) {
+    throw new Error("The response body is empty.");
+  }
+  return parseJsonEventStream2({
+    stream: response.body,
+    schema: uiMessageStreamPartSchema
+  }).pipeThrough(
+    new TransformStream({
+      async transform(part, controller) {
+        if (!part.success) {
+          throw part.error;
+        }
+        controller.enqueue(part.value);
+      }
+    })
+  );
+}
+var DefaultChatTransport = class {
+  constructor({
+    api = "/api/chat",
+    credentials,
+    headers,
+    body,
+    fetch: fetch2,
+    prepareRequest
+  } = {}) {
+    this.api = api;
+    this.credentials = credentials;
+    this.headers = headers;
+    this.body = body;
+    this.fetch = fetch2;
+    this.prepareRequest = prepareRequest;
+  }
+  submitMessages({
+    chatId,
+    messages,
+    abortSignal,
+    metadata,
+    headers,
+    body,
+    requestType
+  }) {
+    var _a17, _b;
+    const preparedRequest = (_a17 = this.prepareRequest) == null ? void 0 : _a17.call(this, {
+      id: chatId,
+      messages,
+      body: { ...this.body, ...body },
+      headers: { ...this.headers, ...headers },
+      credentials: this.credentials,
+      requestMetadata: metadata
+    });
+    return fetchUIMessageStream({
+      api: this.api,
+      body: (preparedRequest == null ? void 0 : preparedRequest.body) !== void 0 ? preparedRequest.body : { ...this.body, ...body, id: chatId, messages },
+      headers: (preparedRequest == null ? void 0 : preparedRequest.headers) !== void 0 ? preparedRequest.headers : { ...this.headers, ...headers },
+      credentials: (_b = preparedRequest == null ? void 0 : preparedRequest.credentials) != null ? _b : this.credentials,
+      abortSignal,
+      fetch: this.fetch,
+      requestType
+    });
+  }
+};
+
 // src/ui/process-ui-message-stream.ts
 import {
   validateTypes
@@ -1104,27 +1233,26 @@ async function parsePartialJson(jsonText) {
   return { value: void 0, state: "failed-parse" };
 }
 
-// src/ui/get-tool-invocations.ts
-function getToolInvocations(message) {
-  return message.parts.filter(
-    (part) => part.type === "tool-invocation"
-  ).map((part) => part.toolInvocation);
+// src/ui/ui-messages.ts
+function isToolUIPart(part) {
+  return part.type.startsWith("tool-");
+}
+function getToolName(part) {
+  return part.type.split("-")[1];
 }
 
 // src/ui/process-ui-message-stream.ts
 function createStreamingUIMessageState({
   lastMessage,
-  newMessageId = ""
-} = {}) {
-  const isContinuation = (lastMessage == null ? void 0 : lastMessage.role) === "assistant";
-  const message = isContinuation ? lastMessage : {
-    id: newMessageId,
-    metadata: {},
-    role: "assistant",
-    parts: []
-  };
+  messageId
+}) {
   return {
-    message,
+    message: (lastMessage == null ? void 0 : lastMessage.role) === "assistant" ? lastMessage : {
+      id: messageId,
+      metadata: void 0,
+      role: "assistant",
+      parts: []
+    },
     activeTextPart: void 0,
     activeReasoningPart: void 0,
     partialToolCalls: {}
@@ -1141,16 +1269,21 @@ function processUIMessageStream({
     new TransformStream({
       async transform(part, controller) {
         await runUpdateMessageJob(async ({ state, write }) => {
-          function updateToolInvocationPart(toolCallId, invocation) {
+          function updateToolInvocationPart(options) {
             const part2 = state.message.parts.find(
-              (part3) => isToolInvocationUIPart(part3) && part3.toolInvocation.toolCallId === toolCallId
+              (part3) => isToolUIPart(part3) && part3.toolCallId === options.toolCallId
             );
             if (part2 != null) {
-              part2.toolInvocation = invocation;
+              part2.state = options.state;
+              part2.args = options.args;
+              part2.result = options.result;
             } else {
               state.message.parts.push({
-                type: "tool-invocation",
-                toolInvocation: invocation
+                type: `tool-${options.toolName}`,
+                toolCallId: options.toolCallId,
+                state: options.state,
+                args: options.args,
+                result: options.result
               });
             }
           }
@@ -1234,16 +1367,16 @@ function processUIMessageStream({
               break;
             }
             case "tool-call-streaming-start": {
-              const toolInvocations = getToolInvocations(state.message);
+              const toolInvocations = state.message.parts.filter(isToolUIPart);
               state.partialToolCalls[part.toolCallId] = {
                 text: "",
                 toolName: part.toolName,
                 index: toolInvocations.length
               };
-              updateToolInvocationPart(part.toolCallId, {
-                state: "partial-call",
+              updateToolInvocationPart({
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
+                state: "partial-call",
                 args: void 0
               });
               write();
@@ -1255,20 +1388,20 @@ function processUIMessageStream({
               const { value: partialArgs } = await parsePartialJson(
                 partialToolCall.text
               );
-              updateToolInvocationPart(part.toolCallId, {
-                state: "partial-call",
+              updateToolInvocationPart({
                 toolCallId: part.toolCallId,
                 toolName: partialToolCall.toolName,
+                state: "partial-call",
                 args: partialArgs
               });
               write();
               break;
             }
             case "tool-call": {
-              updateToolInvocationPart(part.toolCallId, {
-                state: "call",
+              updateToolInvocationPart({
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
+                state: "call",
                 args: part.args
               });
               write();
@@ -1277,10 +1410,10 @@ function processUIMessageStream({
                   toolCall: part
                 });
                 if (result != null) {
-                  updateToolInvocationPart(part.toolCallId, {
-                    state: "result",
+                  updateToolInvocationPart({
                     toolCallId: part.toolCallId,
                     toolName: part.toolName,
+                    state: "result",
                     args: part.args,
                     result
                   });
@@ -1290,7 +1423,7 @@ function processUIMessageStream({
               break;
             }
             case "tool-result": {
-              const toolInvocations = getToolInvocations(state.message);
+              const toolInvocations = state.message.parts.filter(isToolUIPart);
               if (toolInvocations == null) {
                 throw new Error("tool_result must be preceded by a tool_call");
               }
@@ -1302,9 +1435,14 @@ function processUIMessageStream({
                   "tool_result must be preceded by a tool_call with the same toolCallId"
                 );
               }
-              updateToolInvocationPart(part.toolCallId, {
-                ...toolInvocations[toolInvocationIndex],
+              const toolName = getToolName(
+                toolInvocations[toolInvocationIndex]
+              );
+              updateToolInvocationPart({
+                toolCallId: part.toolCallId,
+                toolName,
                 state: "result",
+                args: toolInvocations[toolInvocationIndex].args,
                 result: part.result
               });
               write();
@@ -1312,39 +1450,33 @@ function processUIMessageStream({
             }
             case "start-step": {
               state.message.parts.push({ type: "step-start" });
-              await updateMessageMetadata(part.metadata);
-              write();
               break;
             }
             case "finish-step": {
               state.activeTextPart = void 0;
               state.activeReasoningPart = void 0;
-              await updateMessageMetadata(part.metadata);
-              if (part.metadata != null) {
-                write();
-              }
               break;
             }
             case "start": {
               if (part.messageId != null) {
                 state.message.id = part.messageId;
               }
-              await updateMessageMetadata(part.metadata);
-              if (part.messageId != null || part.metadata != null) {
+              await updateMessageMetadata(part.messageMetadata);
+              if (part.messageId != null || part.messageMetadata != null) {
                 write();
               }
               break;
             }
             case "finish": {
-              await updateMessageMetadata(part.metadata);
-              if (part.metadata != null) {
+              await updateMessageMetadata(part.messageMetadata);
+              if (part.messageMetadata != null) {
                 write();
               }
               break;
             }
-            case "metadata": {
-              await updateMessageMetadata(part.metadata);
-              if (part.metadata != null) {
+            case "message-metadata": {
+              await updateMessageMetadata(part.messageMetadata);
+              if (part.messageMetadata != null) {
                 write();
               }
               break;
@@ -1372,9 +1504,6 @@ function processUIMessageStream({
     })
   );
 }
-function isToolInvocationUIPart(part) {
-  return part.type === "tool-invocation";
-}
 function isObject(value) {
   return typeof value === "object" && value !== null;
 }
@@ -1409,139 +1538,8 @@ function isAssistantMessageWithCompletedToolCalls(message) {
   const lastStepStartIndex = message.parts.reduce((lastIndex, part, index) => {
     return part.type === "step-start" ? index : lastIndex;
   }, -1);
-  const lastStepToolInvocations = message.parts.slice(lastStepStartIndex + 1).filter((part) => part.type === "tool-invocation");
-  return lastStepToolInvocations.length > 0 && lastStepToolInvocations.every((part) => "result" in part.toolInvocation);
-}
-
-// src/ui/default-chat-transport.ts
-import {
-  parseJsonEventStream as parseJsonEventStream2
-} from "@ai-sdk/provider-utils";
-var getOriginalFetch2 = () => fetch;
-async function fetchUIMessageStream({
-  api,
-  body,
-  credentials,
-  headers,
-  abortSignal,
-  fetch: fetch2 = getOriginalFetch2(),
-  requestType = "generate"
-}) {
-  var _a17;
-  const response = requestType === "resume" ? await fetch2(`${api}?id=${body.id}`, {
-    method: "GET",
-    headers: {
-      "Content-Type": "application/json",
-      ...headers
-    },
-    signal: abortSignal,
-    credentials
-  }) : await fetch2(api, {
-    method: "POST",
-    body: JSON.stringify(body),
-    headers: {
-      "Content-Type": "application/json",
-      ...headers
-    },
-    signal: abortSignal,
-    credentials
-  });
-  if (!response.ok) {
-    throw new Error(
-      (_a17 = await response.text()) != null ? _a17 : "Failed to fetch the chat response."
-    );
-  }
-  if (!response.body) {
-    throw new Error("The response body is empty.");
-  }
-  return parseJsonEventStream2({
-    stream: response.body,
-    schema: uiMessageStreamPartSchema
-  }).pipeThrough(
-    new TransformStream({
-      async transform(part, controller) {
-        if (!part.success) {
-          throw part.error;
-        }
-        controller.enqueue(part.value);
-      }
-    })
-  );
-}
-var DefaultChatTransport = class {
-  constructor({
-    api = "/api/chat",
-    credentials,
-    headers,
-    body,
-    fetch: fetch2,
-    prepareRequest
-  } = {}) {
-    this.api = api;
-    this.credentials = credentials;
-    this.headers = headers;
-    this.body = body;
-    this.fetch = fetch2;
-    this.prepareRequest = prepareRequest;
-  }
-  submitMessages({
-    chatId,
-    messages,
-    abortSignal,
-    metadata,
-    headers,
-    body,
-    requestType
-  }) {
-    var _a17, _b;
-    const preparedRequest = (_a17 = this.prepareRequest) == null ? void 0 : _a17.call(this, {
-      id: chatId,
-      messages,
-      body: { ...this.body, ...body },
-      headers: { ...this.headers, ...headers },
-      credentials: this.credentials,
-      requestMetadata: metadata
-    });
-    return fetchUIMessageStream({
-      api: this.api,
-      body: (preparedRequest == null ? void 0 : preparedRequest.body) !== void 0 ? preparedRequest.body : { ...this.body, ...body, id: chatId, messages },
-      headers: (preparedRequest == null ? void 0 : preparedRequest.headers) !== void 0 ? preparedRequest.headers : { ...this.headers, ...headers },
-      credentials: (_b = preparedRequest == null ? void 0 : preparedRequest.credentials) != null ? _b : this.credentials,
-      abortSignal,
-      fetch: this.fetch,
-      requestType
-    });
-  }
-};
-
-// src/ui/convert-file-list-to-file-ui-parts.ts
-async function convertFileListToFileUIParts(files) {
-  if (files == null) {
-    return [];
-  }
-  if (!globalThis.FileList || !(files instanceof globalThis.FileList)) {
-    throw new Error("FileList is not supported in the current environment");
-  }
-  return Promise.all(
-    Array.from(files).map(async (file) => {
-      const { name: name17, type } = file;
-      const dataUrl = await new Promise((resolve, reject) => {
-        const reader = new FileReader();
-        reader.onload = (readerEvent) => {
-          var _a17;
-          resolve((_a17 = readerEvent.target) == null ? void 0 : _a17.result);
-        };
-        reader.onerror = (error) => reject(error);
-        reader.readAsDataURL(file);
-      });
-      return {
-        type: "file",
-        mediaType: type,
-        filename: name17,
-        url: dataUrl
-      };
-    })
-  );
+  const lastStepToolInvocations = message.parts.slice(lastStepStartIndex + 1).filter(isToolUIPart);
+  return lastStepToolInvocations.length > 0 && lastStepToolInvocations.every((part) => part.state === "result");
 }
 
 // src/ui/chat.ts
@@ -1558,7 +1556,6 @@ var AbstractChat = class {
     onToolCall,
     onFinish
   }) {
-    this.subscribers = /* @__PURE__ */ new Set();
     this.activeResponse = void 0;
     this.jobExecutor = new SerialJobExecutor();
     this.removeAssistantResponse = () => {
@@ -1570,7 +1567,6 @@ var AbstractChat = class {
         throw new Error("Last message is not an assistant message");
       }
       this.state.popMessage();
-      this.emit({ type: "messages-changed" });
     };
     /**
      * Append a user message to the chat list. This triggers the API call to fetch
@@ -1595,7 +1591,6 @@ var AbstractChat = class {
         id: (_a17 = uiMessage.id) != null ? _a17 : this.generateId(),
         role: (_b = uiMessage.role) != null ? _b : "user"
       });
-      this.emit({ type: "messages-changed" });
       await this.triggerRequest({ requestType: "generate", ...options });
     };
     /**
@@ -1607,7 +1602,6 @@ var AbstractChat = class {
       }
       if (this.lastMessage.role === "assistant") {
         this.state.popMessage();
-        this.emit({ type: "messages-changed" });
       }
       await this.triggerRequest({ requestType: "generate", ...options });
     };
@@ -1622,7 +1616,7 @@ var AbstractChat = class {
       result
     }) => {
       this.jobExecutor.run(async () => {
-        updateToolCallResult({
+        updateToolResult({
           messages: this.state.messages,
           toolCallId,
           toolResult: result
@@ -1648,7 +1642,6 @@ var AbstractChat = class {
         return;
       if ((_a17 = this.activeResponse) == null ? void 0 : _a17.abortController) {
         this.activeResponse.abortController.abort();
-        this.activeResponse.abortController = void 0;
       }
     };
     this.id = id;
@@ -1681,7 +1674,6 @@ var AbstractChat = class {
       return;
     this.state.status = status;
     this.state.error = error;
-    this.emit({ type: "status-changed" });
   }
   get error() {
     return this.state.error;
@@ -1692,18 +1684,8 @@ var AbstractChat = class {
   get lastMessage() {
     return this.state.messages[this.state.messages.length - 1];
   }
-  subscribe(subscriber) {
-    this.subscribers.add(subscriber);
-    return () => this.subscribers.delete(subscriber);
-  }
   set messages(messages) {
     this.state.messages = messages;
-    this.emit({ type: "messages-changed" });
-  }
-  emit(event) {
-    for (const subscriber of this.subscribers) {
-      subscriber.onChange(event);
-    }
   }
   async triggerRequest({
     requestType,
@@ -1720,7 +1702,7 @@ var AbstractChat = class {
       const activeResponse = {
         state: createStreamingUIMessageState({
           lastMessage: this.state.snapshot(lastMessage),
-          newMessageId: this.generateId()
+          messageId: this.generateId()
         }),
         abortController: new AbortController()
       };
@@ -1751,9 +1733,6 @@ var AbstractChat = class {
               } else {
                 this.state.pushMessage(activeResponse.state.message);
               }
-              this.emit({
-                type: "messages-changed"
-              });
             }
           })
         )
@@ -1800,23 +1779,20 @@ var AbstractChat = class {
     }
   }
 };
-function updateToolCallResult({
+function updateToolResult({
   messages,
   toolCallId,
   toolResult: result
 }) {
   const lastMessage = messages[messages.length - 1];
-  const invocationPart = lastMessage.parts.find(
-    (part) => part.type === "tool-invocation" && part.toolInvocation.toolCallId === toolCallId
+  const toolPart = lastMessage.parts.find(
+    (part) => isToolUIPart(part) && part.toolCallId === toolCallId
   );
-  if (invocationPart == null) {
+  if (toolPart == null) {
     return;
   }
-  invocationPart.toolInvocation = {
-    ...invocationPart.toolInvocation,
-    state: "result",
-    result
-  };
+  toolPart.state = "result";
+  toolPart.result = result;
 }
 
 // src/ui/convert-to-model-messages.ts
@@ -1857,75 +1833,71 @@ function convertToModelMessages(messages, options) {
             }
             const content = [];
             for (const part of block) {
-              switch (part.type) {
-                case "text": {
-                  content.push(part);
-                  break;
-                }
-                case "file": {
-                  content.push({
-                    type: "file",
-                    mediaType: part.mediaType,
-                    data: part.url
-                  });
-                  break;
-                }
-                case "reasoning": {
-                  content.push({
-                    type: "reasoning",
-                    text: part.text,
-                    providerOptions: part.providerMetadata
+              if (part.type === "text") {
+                content.push(part);
+              } else if (part.type === "file") {
+                content.push({
+                  type: "file",
+                  mediaType: part.mediaType,
+                  data: part.url
+                });
+              } else if (part.type === "reasoning") {
+                content.push({
+                  type: "reasoning",
+                  text: part.text,
+                  providerOptions: part.providerMetadata
+                });
+              } else if (isToolUIPart(part)) {
+                const toolName = getToolName(part);
+                if (part.state === "partial-call") {
+                  throw new MessageConversionError({
+                    originalMessage: message,
+                    message: `Partial tool call is not supported: ${part.toolCallId}`
                   });
-                  break;
-                }
-                case "tool-invocation":
+                } else {
                   content.push({
                     type: "tool-call",
-                    toolCallId: part.toolInvocation.toolCallId,
-                    toolName: part.toolInvocation.toolName,
-                    args: part.toolInvocation.args
+                    toolCallId: part.toolCallId,
+                    toolName,
+                    args: part.args
                   });
-                  break;
-                default: {
-                  const _exhaustiveCheck = part;
-                  throw new Error(`Unsupported part: ${_exhaustiveCheck}`);
                 }
+              } else {
+                const _exhaustiveCheck = part;
+                throw new Error(`Unsupported part: ${_exhaustiveCheck}`);
               }
             }
             modelMessages.push({
               role: "assistant",
               content
             });
-            const stepInvocations = block.filter(
-              (part) => part.type === "tool-invocation"
-            ).map((part) => part.toolInvocation);
-            if (stepInvocations.length > 0) {
+            const toolParts = block.filter(isToolUIPart);
+            if (toolParts.length > 0) {
               modelMessages.push({
                 role: "tool",
-                content: stepInvocations.map(
-                  (toolInvocation) => {
-                    if (!("result" in toolInvocation)) {
-                      throw new MessageConversionError({
-                        originalMessage: message,
-                        message: "ToolInvocation must have a result: " + JSON.stringify(toolInvocation)
-                      });
-                    }
-                    const { toolCallId, toolName, result } = toolInvocation;
-                    const tool2 = tools[toolName];
-                    return (tool2 == null ? void 0 : tool2.experimental_toToolResultContent) != null ? {
-                      type: "tool-result",
-                      toolCallId,
-                      toolName,
-                      result: tool2.experimental_toToolResultContent(result),
-                      experimental_content: tool2.experimental_toToolResultContent(result)
-                    } : {
-                      type: "tool-result",
-                      toolCallId,
-                      toolName,
-                      result
-                    };
+                content: toolParts.map((toolPart) => {
+                  if (toolPart.state !== "result") {
+                    throw new MessageConversionError({
+                      originalMessage: message,
+                      message: "ToolInvocation must have a result: " + JSON.stringify(toolPart)
+                    });
                   }
-                )
+                  const toolName = getToolName(toolPart);
+                  const { toolCallId, result } = toolPart;
+                  const tool2 = tools[toolName];
+                  return (tool2 == null ? void 0 : tool2.experimental_toToolResultContent) != null ? {
+                    type: "tool-result",
+                    toolCallId,
+                    toolName,
+                    result: tool2.experimental_toToolResultContent(result),
+                    experimental_content: tool2.experimental_toToolResultContent(result)
+                  } : {
+                    type: "tool-result",
+                    toolCallId,
+                    toolName,
+                    result
+                  };
+                })
               });
             }
             block = [];
@@ -1933,18 +1905,10 @@ function convertToModelMessages(messages, options) {
           var processBlock = processBlock2;
           let block = [];
           for (const part of message.parts) {
-            switch (part.type) {
-              case "text":
-              case "reasoning":
-              case "file":
-              case "tool-invocation": {
-                block.push(part);
-                break;
-              }
-              case "step-start": {
-                processBlock2();
-                break;
-              }
+            if (part.type === "text" || part.type === "reasoning" || part.type === "file" || isToolUIPart(part)) {
+              block.push(part);
+            } else if (part.type === "step-start") {
+              processBlock2();
             }
           }
           processBlock2();
@@ -2074,9 +2038,14 @@ var TextStreamChatTransport = class {
   }
 };
 
+// src/ui-message-stream/create-ui-message-stream.ts
+import {
+  generateId as generateIdFunc2
+} from "@ai-sdk/provider-utils";
+
 // src/ui-message-stream/handle-ui-message-stream-finish.ts
 function handleUIMessageStreamFinish({
-  newMessageId,
+  messageId,
   originalMessages = [],
   onFinish,
   stream
@@ -2084,19 +2053,30 @@ function handleUIMessageStreamFinish({
   if (onFinish == null) {
     return stream;
   }
-  const lastMessage = originalMessages[originalMessages.length - 1];
-  const isContinuation = (lastMessage == null ? void 0 : lastMessage.role) === "assistant";
-  const messageId = isContinuation ? lastMessage.id : newMessageId;
+  const lastMessage = originalMessages == null ? void 0 : originalMessages[originalMessages.length - 1];
   const state = createStreamingUIMessageState({
-    lastMessage: structuredClone(lastMessage),
-    newMessageId: messageId
+    lastMessage: lastMessage ? structuredClone(lastMessage) : void 0,
+    messageId
+    // will be overridden by the stream
   });
   const runUpdateMessageJob = async (job) => {
     await job({ state, write: () => {
     } });
   };
   return processUIMessageStream({
-    stream,
+    stream: stream.pipeThrough(
+      new TransformStream({
+        transform(chunk, controller) {
+          if (chunk.type === "start") {
+            const startChunk = chunk;
+            if (startChunk.messageId == null) {
+              startChunk.messageId = messageId;
+            }
+          }
+          controller.enqueue(chunk);
+        }
+      })
+    ),
     runUpdateMessageJob
   }).pipeThrough(
     new TransformStream({
@@ -2104,12 +2084,12 @@ function handleUIMessageStreamFinish({
         controller.enqueue(chunk);
       },
       flush() {
-        const isContinuation2 = state.message.id === (lastMessage == null ? void 0 : lastMessage.id);
+        const isContinuation = state.message.id === (lastMessage == null ? void 0 : lastMessage.id);
         onFinish({
-          isContinuation: isContinuation2,
+          isContinuation,
           responseMessage: state.message,
           messages: [
-            ...isContinuation2 ? originalMessages.slice(0, -1) : originalMessages,
+            ...isContinuation ? originalMessages.slice(0, -1) : originalMessages,
             state.message
           ]
         });
@@ -2124,7 +2104,8 @@ function createUIMessageStream({
   onError = () => "An error occurred.",
   // mask error messages for safety by default
   originalMessages,
-  onFinish
+  onFinish,
+  generateId: generateId3 = generateIdFunc2
 }) {
   let controller;
   const ongoingStreamPromises = [];
@@ -2156,7 +2137,10 @@ function createUIMessageStream({
                 safeEnqueue(value);
               }
             })().catch((error) => {
-              safeEnqueue({ type: "error", errorText: onError(error) });
+              safeEnqueue({
+                type: "error",
+                errorText: onError(error)
+              });
             })
           );
         },
@@ -2166,12 +2150,18 @@ function createUIMessageStream({
     if (result) {
       ongoingStreamPromises.push(
         result.catch((error) => {
-          safeEnqueue({ type: "error", errorText: onError(error) });
+          safeEnqueue({
+            type: "error",
+            errorText: onError(error)
+          });
         })
       );
     }
   } catch (error) {
-    safeEnqueue({ type: "error", errorText: onError(error) });
+    safeEnqueue({
+      type: "error",
+      errorText: onError(error)
+    });
   }
   const waitForStreams = new Promise(async (resolve) => {
     while (ongoingStreamPromises.length > 0) {
@@ -2187,22 +2177,12 @@ function createUIMessageStream({
   });
   return handleUIMessageStreamFinish({
     stream,
-    newMessageId: "",
+    messageId: generateId3(),
     originalMessages,
     onFinish
   });
 }
 
-// src/ui-message-stream/ui-message-stream-headers.ts
-var uiMessageStreamHeaders = {
-  "content-type": "text/event-stream",
-  "cache-control": "no-cache",
-  connection: "keep-alive",
-  "x-vercel-ai-ui-message-stream": "v1",
-  "x-accel-buffering": "no"
-  // disable nginx buffering
-};
-
 // src/ui-message-stream/json-to-sse-transform-stream.ts
 var JsonToSseTransformStream = class extends TransformStream {
   constructor() {
@@ -2219,6 +2199,16 @@ var JsonToSseTransformStream = class extends TransformStream {
   }
 };
 
+// src/ui-message-stream/ui-message-stream-headers.ts
+var uiMessageStreamHeaders = {
+  "content-type": "text/event-stream",
+  "cache-control": "no-cache",
+  connection: "keep-alive",
+  "x-vercel-ai-ui-message-stream": "v1",
+  "x-accel-buffering": "no"
+  // disable nginx buffering
+};
+
 // src/ui-message-stream/create-ui-message-stream-response.ts
 function createUIMessageStreamResponse({
   status,
@@ -4885,7 +4875,8 @@ var DefaultStreamObjectResult = class {
           }),
           providerOptions,
           abortSignal,
-          headers
+          headers,
+          includeRawChunks: false
         };
         const transformer = {
           transform: (chunk, controller) => {
@@ -6243,7 +6234,6 @@ import { generateId } from "@ai-sdk/provider-utils";
 function runToolsTransformation({
   tools,
   generatorStream,
-  toolCallStreaming,
   tracer,
   telemetry,
   system,
@@ -6284,6 +6274,10 @@ function runToolsTransformation({
           controller.enqueue(chunk);
           break;
         }
+        case "raw": {
+          controller.enqueue(chunk);
+          break;
+        }
         case "file": {
           controller.enqueue({
             type: "file",
@@ -6295,22 +6289,20 @@ function runToolsTransformation({
           break;
         }
         case "tool-call-delta": {
-          if (toolCallStreaming) {
-            if (!activeToolCalls[chunk.toolCallId]) {
-              controller.enqueue({
-                type: "tool-call-streaming-start",
-                toolCallId: chunk.toolCallId,
-                toolName: chunk.toolName
-              });
-              activeToolCalls[chunk.toolCallId] = true;
-            }
+          if (!activeToolCalls[chunk.toolCallId]) {
             controller.enqueue({
-              type: "tool-call-delta",
+              type: "tool-call-streaming-start",
               toolCallId: chunk.toolCallId,
-              toolName: chunk.toolName,
-              argsTextDelta: chunk.argsTextDelta
+              toolName: chunk.toolName
             });
+            activeToolCalls[chunk.toolCallId] = true;
           }
+          controller.enqueue({
+            type: "tool-call-delta",
+            toolCallId: chunk.toolCallId,
+            toolName: chunk.toolName,
+            argsTextDelta: chunk.argsTextDelta
+          });
           break;
         }
         case "tool-call": {
@@ -6441,6 +6433,18 @@ function runToolsTransformation({
   });
 }
 
+// src/ui-message-stream/get-response-ui-message-id.ts
+function getResponseUIMessageId({
+  originalMessages,
+  responseMessageId
+}) {
+  if (originalMessages == null) {
+    return void 0;
+  }
+  const lastMessage = originalMessages[originalMessages.length - 1];
+  return (lastMessage == null ? void 0 : lastMessage.role) === "assistant" ? lastMessage.id : typeof responseMessageId === "function" ? responseMessageId() : responseMessageId;
+}
+
 // core/generate-text/stream-text.ts
 var originalGenerateId4 = createIdGenerator4({
   prefix: "aitxt",
@@ -6461,12 +6465,11 @@ function streamText({
   experimental_telemetry: telemetry,
   prepareStep,
   providerOptions,
-  experimental_toolCallStreaming = false,
-  toolCallStreaming = experimental_toolCallStreaming,
   experimental_activeTools,
   activeTools = experimental_activeTools,
   experimental_repairToolCall: repairToolCall,
   experimental_transform: transform,
+  includeRawChunks = false,
   onChunk,
   onError = ({ error }) => {
     console.error(error);
@@ -6492,7 +6495,6 @@ function streamText({
     messages,
     tools,
     toolChoice,
-    toolCallStreaming,
     transforms: asArray(transform),
     activeTools,
     repairToolCall,
@@ -6500,6 +6502,7 @@ function streamText({
     output,
     providerOptions,
     prepareStep,
+    includeRawChunks,
     onChunk,
     onError,
     onFinish,
@@ -6570,7 +6573,6 @@ var DefaultStreamTextResult = class {
     messages,
     tools,
     toolChoice,
-    toolCallStreaming,
     transforms,
     activeTools,
     repairToolCall,
@@ -6578,6 +6580,7 @@ var DefaultStreamTextResult = class {
     output,
     providerOptions,
     prepareStep,
+    includeRawChunks,
     now: now2,
     currentDate,
     generateId: generateId3,
@@ -6590,6 +6593,7 @@ var DefaultStreamTextResult = class {
     this._finishReason = new DelayedPromise();
     this._steps = new DelayedPromise();
     this.output = output;
+    this.includeRawChunks = includeRawChunks;
     this.generateId = generateId3;
     let stepFinish;
     let activeReasoningPart = void 0;
@@ -6605,7 +6609,7 @@ var DefaultStreamTextResult = class {
       async transform(chunk, controller) {
         controller.enqueue(chunk);
         const { part } = chunk;
-        if (part.type === "text" || part.type === "reasoning" || part.type === "source" || part.type === "tool-call" || part.type === "tool-result" || part.type === "tool-call-streaming-start" || part.type === "tool-call-delta") {
+        if (part.type === "text" || part.type === "reasoning" || part.type === "source" || part.type === "tool-call" || part.type === "tool-result" || part.type === "tool-call-streaming-start" || part.type === "tool-call-delta" || part.type === "raw") {
           await (onChunk == null ? void 0 : onChunk({ chunk: part }));
         }
         if (part.type === "error") {
@@ -6797,6 +6801,7 @@ var DefaultStreamTextResult = class {
           usage
         }) {
           var _a17, _b, _c, _d;
+          const includeRawChunks2 = self.includeRawChunks;
           stepFinish = new DelayedPromise();
           const initialPrompt = await standardizePrompt({
             system,
@@ -6883,7 +6888,8 @@ var DefaultStreamTextResult = class {
                     prompt: promptMessages,
                     providerOptions,
                     abortSignal,
-                    headers
+                    headers,
+                    includeRawChunks: includeRawChunks2
                   })
                 };
               }
@@ -6892,7 +6898,6 @@ var DefaultStreamTextResult = class {
           const streamWithToolResults = runToolsTransformation({
             tools,
             generatorStream: stream2,
-            toolCallStreaming,
             tracer,
             telemetry,
             system,
@@ -7052,6 +7057,12 @@ var DefaultStreamTextResult = class {
                       stepFinishReason = "error";
                       break;
                     }
+                    case "raw": {
+                      if (includeRawChunks2) {
+                        controller.enqueue(chunk);
+                      }
+                      break;
+                    }
                     default: {
                       const exhaustiveCheck = chunkType;
                       throw new Error(`Unknown chunk type: ${exhaustiveCheck}`);
@@ -7272,23 +7283,24 @@ var DefaultStreamTextResult = class {
     );
   }
   toUIMessageStream({
-    newMessageId,
-    originalMessages = [],
+    originalMessages,
     onFinish,
     messageMetadata,
-    sendReasoning = false,
+    sendReasoning = true,
     sendSources = false,
     sendStart = true,
     sendFinish = true,
     onError = () => "An error occurred."
     // mask error messages for safety by default
   } = {}) {
-    const lastMessage = originalMessages[originalMessages.length - 1];
-    const isContinuation = (lastMessage == null ? void 0 : lastMessage.role) === "assistant";
-    const messageId = isContinuation ? lastMessage.id : newMessageId;
+    const responseMessageId = getResponseUIMessageId({
+      originalMessages,
+      responseMessageId: this.generateId
+    });
     const baseStream = this.fullStream.pipeThrough(
       new TransformStream({
         transform: async (part, controller) => {
+          const messageMetadataValue = messageMetadata == null ? void 0 : messageMetadata({ part });
           const partType = part.type;
           switch (partType) {
             case "text": {
@@ -7385,59 +7397,57 @@ var DefaultStreamTextResult = class {
               break;
             }
             case "start-step": {
-              const metadata = messageMetadata == null ? void 0 : messageMetadata({ part });
-              controller.enqueue({
-                type: "start-step",
-                metadata
-              });
+              controller.enqueue({ type: "start-step" });
               break;
             }
             case "finish-step": {
-              const metadata = messageMetadata == null ? void 0 : messageMetadata({ part });
-              controller.enqueue({
-                type: "finish-step",
-                metadata
-              });
+              controller.enqueue({ type: "finish-step" });
               break;
             }
             case "start": {
               if (sendStart) {
-                const metadata = messageMetadata == null ? void 0 : messageMetadata({ part });
                 controller.enqueue({
                   type: "start",
-                  messageId,
-                  metadata
+                  messageId: responseMessageId,
+                  messageMetadata: messageMetadataValue
                 });
               }
               break;
             }
             case "finish": {
               if (sendFinish) {
-                const metadata = messageMetadata == null ? void 0 : messageMetadata({ part });
                 controller.enqueue({
                   type: "finish",
-                  metadata
+                  messageMetadata: messageMetadataValue
                 });
               }
               break;
             }
+            case "raw": {
+              break;
+            }
             default: {
               const exhaustiveCheck = partType;
               throw new Error(`Unknown chunk type: ${exhaustiveCheck}`);
             }
           }
+          if (messageMetadataValue != null && partType !== "start" && partType !== "finish") {
+            controller.enqueue({
+              type: "message-metadata",
+              messageMetadata: messageMetadataValue
+            });
+          }
         }
       })
     );
     return handleUIMessageStreamFinish({
       stream: baseStream,
-      newMessageId: messageId != null ? messageId : this.generateId(),
+      messageId: responseMessageId != null ? responseMessageId : this.generateId(),
       originalMessages,
       onFinish
     });
   }
   pipeUIMessageStreamToResponse(response, {
-    newMessageId,
     originalMessages,
     onFinish,
     messageMetadata,
@@ -7451,7 +7461,6 @@ var DefaultStreamTextResult = class {
     pipeUIMessageStreamToResponse({
       response,
       stream: this.toUIMessageStream({
-        newMessageId,
         originalMessages,
         onFinish,
         messageMetadata,
@@ -7472,7 +7481,6 @@ var DefaultStreamTextResult = class {
     });
   }
   toUIMessageStreamResponse({
-    newMessageId,
     originalMessages,
     onFinish,
     messageMetadata,
@@ -7485,7 +7493,6 @@ var DefaultStreamTextResult = class {
   } = {}) {
     return createUIMessageStreamResponse({
       stream: this.toUIMessageStream({
-        newMessageId,
         originalMessages,
         onFinish,
         messageMetadata,
@@ -8582,9 +8589,10 @@ export {
   generateObject,
   generateText,
   getTextFromDataUrl,
-  getToolInvocations,
+  getToolName,
   hasToolCall,
   isDeepEqualData,
+  isToolUIPart,
   jsonSchema2 as jsonSchema,
   modelMessageSchema,
   parsePartialJson,