ai 5.0.0-alpha.5 → 5.0.0-alpha.7

package/dist/index.mjs

@@ -449,21 +449,8 @@ function pipeTextStreamToResponse({
   });
 }
 
-// src/ui/append-client-message.ts
-function appendClientMessage({
-  messages,
-  message
-}) {
-  return [
-    ...messages.length > 0 && messages[messages.length - 1].id === message.id ? messages.slice(0, -1) : messages,
-    message
-  ];
-}
-
-// src/ui/call-chat-api.ts
-import {
-  parseJsonEventStream
-} from "@ai-sdk/provider-utils";
+// src/ui/call-completion-api.ts
+import { parseJsonEventStream } from "@ai-sdk/provider-utils";
 
 // src/ui-message-stream/ui-message-stream-parts.ts
 import { z } from "zod";
@@ -569,6 +556,138 @@ async function consumeStream({
   }
 }
 
+// src/ui/process-text-stream.ts
+async function processTextStream({
+  stream,
+  onTextPart
+}) {
+  const reader = stream.pipeThrough(new TextDecoderStream()).getReader();
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) {
+      break;
+    }
+    await onTextPart(value);
+  }
+}
+
+// src/ui/call-completion-api.ts
+var getOriginalFetch = () => fetch;
+async function callCompletionApi({
+  api,
+  prompt,
+  credentials,
+  headers,
+  body,
+  streamProtocol = "data",
+  setCompletion,
+  setLoading,
+  setError,
+  setAbortController,
+  onFinish,
+  onError,
+  fetch: fetch2 = getOriginalFetch()
+}) {
+  var _a17;
+  try {
+    setLoading(true);
+    setError(void 0);
+    const abortController = new AbortController();
+    setAbortController(abortController);
+    setCompletion("");
+    const response = await fetch2(api, {
+      method: "POST",
+      body: JSON.stringify({
+        prompt,
+        ...body
+      }),
+      credentials,
+      headers: {
+        "Content-Type": "application/json",
+        ...headers
+      },
+      signal: abortController.signal
+    }).catch((err) => {
+      throw err;
+    });
+    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.");
+    }
+    let result = "";
+    switch (streamProtocol) {
+      case "text": {
+        await processTextStream({
+          stream: response.body,
+          onTextPart: (chunk) => {
+            result += chunk;
+            setCompletion(result);
+          }
+        });
+        break;
+      }
+      case "data": {
+        await consumeStream({
+          stream: parseJsonEventStream({
+            stream: response.body,
+            schema: uiMessageStreamPartSchema
+          }).pipeThrough(
+            new TransformStream({
+              async transform(part) {
+                if (!part.success) {
+                  throw part.error;
+                }
+                const streamPart = part.value;
+                if (streamPart.type === "text") {
+                  result += streamPart.text;
+                  setCompletion(result);
+                } else if (streamPart.type === "error") {
+                  throw new Error(streamPart.errorText);
+                }
+              }
+            })
+          ),
+          onError: (error) => {
+            throw error;
+          }
+        });
+        break;
+      }
+      default: {
+        const exhaustiveCheck = streamProtocol;
+        throw new Error(`Unknown stream protocol: ${exhaustiveCheck}`);
+      }
+    }
+    if (onFinish) {
+      onFinish(prompt, result);
+    }
+    setAbortController(null);
+    return result;
+  } catch (err) {
+    if (err.name === "AbortError") {
+      setAbortController(null);
+      return null;
+    }
+    if (err instanceof Error) {
+      if (onError) {
+        onError(err);
+      }
+    }
+    setError(err);
+  } finally {
+    setLoading(false);
+  }
+}
+
+// src/ui/chat-store.ts
+import {
+  generateId as generateIdFunc
+} from "@ai-sdk/provider-utils";
+
 // src/ui/process-ui-message-stream.ts
 import {
   validateTypes
@@ -944,14 +1063,6 @@ async function parsePartialJson(jsonText) {
   return { value: void 0, state: "failed-parse" };
 }
 
-// src/ui/extract-max-tool-invocation-step.ts
-function extractMaxToolInvocationStep(toolInvocations) {
-  return toolInvocations == null ? void 0 : toolInvocations.reduce((max, toolInvocation) => {
-    var _a17;
-    return Math.max(max, (_a17 = toolInvocation.step) != null ? _a17 : 0);
-  }, 0);
-}
-
 // src/ui/get-tool-invocations.ts
 function getToolInvocations(message) {
   return message.parts.filter(
@@ -964,9 +1075,7 @@ function createStreamingUIMessageState({
   lastMessage,
   newMessageId = ""
 } = {}) {
-  var _a17;
   const isContinuation = (lastMessage == null ? void 0 : lastMessage.role) === "assistant";
-  const step = isContinuation ? 1 + ((_a17 = extractMaxToolInvocationStep(getToolInvocations(lastMessage))) != null ? _a17 : 0) : 0;
   const message = isContinuation ? lastMessage : {
     id: newMessageId,
     metadata: {},
@@ -977,8 +1086,7 @@ function createStreamingUIMessageState({
     message,
     activeTextPart: void 0,
     activeReasoningPart: void 0,
-    partialToolCalls: {},
-    step
+    partialToolCalls: {}
   };
 }
 function processUIMessageStream({
@@ -1076,13 +1184,11 @@ function processUIMessageStream({
               const toolInvocations = getToolInvocations(state.message);
               state.partialToolCalls[part.toolCallId] = {
                 text: "",
-                step: state.step,
                 toolName: part.toolName,
                 index: toolInvocations.length
               };
               updateToolInvocationPart(part.toolCallId, {
                 state: "partial-call",
-                step: state.step,
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
                 args: void 0
@@ -1098,7 +1204,6 @@ function processUIMessageStream({
               );
               updateToolInvocationPart(part.toolCallId, {
                 state: "partial-call",
-                step: partialToolCall.step,
                 toolCallId: part.toolCallId,
                 toolName: partialToolCall.toolName,
                 args: partialArgs
@@ -1109,7 +1214,6 @@ function processUIMessageStream({
             case "tool-call": {
               updateToolInvocationPart(part.toolCallId, {
                 state: "call",
-                step: state.step,
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
                 args: part.args
@@ -1122,7 +1226,6 @@ function processUIMessageStream({
                 if (result != null) {
                   updateToolInvocationPart(part.toolCallId, {
                     state: "result",
-                    step: state.step,
                     toolCallId: part.toolCallId,
                     toolName: part.toolName,
                     args: part.args,
@@ -1161,7 +1264,6 @@ function processUIMessageStream({
               break;
             }
             case "finish-step": {
-              state.step += 1;
               state.activeTextPart = void 0;
               state.activeReasoningPart = void 0;
               await updateMessageMetadata(part.metadata);
@@ -1224,408 +1326,64 @@ function isObject(value) {
   return typeof value === "object" && value !== null;
 }
 
-// src/ui/transform-text-to-ui-message-stream.ts
-function transformTextToUiMessageStream({
-  stream
+// src/ui/should-resubmit-messages.ts
+function shouldResubmitMessages({
+  originalMaxToolInvocationStep,
+  originalMessageCount,
+  maxSteps,
+  messages
 }) {
-  return stream.pipeThrough(
-    new TransformStream({
-      start(controller) {
-        controller.enqueue({ type: "start" });
-        controller.enqueue({ type: "start-step" });
-      },
-      async transform(part, controller) {
-        controller.enqueue({ type: "text", text: part });
-      },
-      async flush(controller) {
-        controller.enqueue({ type: "finish-step" });
-        controller.enqueue({ type: "finish" });
-      }
-    })
+  const lastMessage = messages[messages.length - 1];
+  const lastMessageStepStartCount = lastMessage.parts.filter(
+    (part) => part.type === "step-start"
+  ).length;
+  return (
+    // check if the feature is enabled:
+    maxSteps > 1 && // ensure there is a last message:
+    lastMessage != null && // ensure we actually have new steps (to prevent infinite loops in case of errors):
+    (messages.length > originalMessageCount || lastMessageStepStartCount !== originalMaxToolInvocationStep) && // check that next step is possible:
+    isAssistantMessageWithCompletedToolCalls(lastMessage) && // limit the number of automatic steps:
+    lastMessageStepStartCount < maxSteps
   );
 }
+function isAssistantMessageWithCompletedToolCalls(message) {
+  if (message.role !== "assistant") {
+    return false;
+  }
+  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/call-chat-api.ts
-var getOriginalFetch = () => fetch;
-async function fetchUIMessageStream({
-  api,
-  body,
-  credentials,
-  headers,
-  abortController,
-  fetch: fetch2 = getOriginalFetch(),
-  requestType = "generate"
-}) {
-  var _a17, _b, _c;
-  const response = requestType === "resume" ? await fetch2(`${api}?chatId=${body.chatId}`, {
-    method: "GET",
-    headers: {
-      "Content-Type": "application/json",
-      ...headers
-    },
-    signal: (_a17 = abortController == null ? void 0 : abortController()) == null ? void 0 : _a17.signal,
-    credentials
-  }) : await fetch2(api, {
-    method: "POST",
-    body: JSON.stringify(body),
-    headers: {
-      "Content-Type": "application/json",
-      ...headers
-    },
-    signal: (_b = abortController == null ? void 0 : abortController()) == null ? void 0 : _b.signal,
-    credentials
-  });
-  if (!response.ok) {
-    throw new Error(
-      (_c = await response.text()) != null ? _c : "Failed to fetch the chat response."
+// src/ui/chat-store.ts
+var ChatStore = class {
+  constructor({
+    chats = {},
+    generateId: generateId3,
+    transport,
+    maxSteps = 1,
+    messageMetadataSchema,
+    dataPartSchemas,
+    createChat
+  }) {
+    this.createChat = createChat;
+    this.chats = new Map(
+      Object.entries(chats).map(([id, chat]) => [
+        id,
+        this.createChat({ messages: chat.messages })
+      ])
     );
+    this.maxSteps = maxSteps;
+    this.transport = transport;
+    this.subscribers = /* @__PURE__ */ new Set();
+    this.generateId = generateId3 != null ? generateId3 : generateIdFunc;
+    this.messageMetadataSchema = messageMetadataSchema;
+    this.dataPartSchemas = dataPartSchemas;
   }
-  if (!response.body) {
-    throw new Error("The response body is empty.");
-  }
-  return parseJsonEventStream({
-    stream: response.body,
-    schema: uiMessageStreamPartSchema
-  }).pipeThrough(
-    new TransformStream({
-      async transform(part, controller) {
-        if (!part.success) {
-          throw part.error;
-        }
-        controller.enqueue(part.value);
-      }
-    })
-  );
-}
-async function fetchTextStream({
-  api,
-  body,
-  credentials,
-  headers,
-  abortController,
-  fetch: fetch2 = getOriginalFetch(),
-  requestType = "generate"
-}) {
-  var _a17, _b, _c;
-  const response = requestType === "resume" ? await fetch2(`${api}?chatId=${body.chatId}`, {
-    method: "GET",
-    headers: {
-      "Content-Type": "application/json",
-      ...headers
-    },
-    signal: (_a17 = abortController == null ? void 0 : abortController()) == null ? void 0 : _a17.signal,
-    credentials
-  }) : await fetch2(api, {
-    method: "POST",
-    body: JSON.stringify(body),
-    headers: {
-      "Content-Type": "application/json",
-      ...headers
-    },
-    signal: (_b = abortController == null ? void 0 : abortController()) == null ? void 0 : _b.signal,
-    credentials
-  });
-  if (!response.ok) {
-    throw new Error(
-      (_c = await response.text()) != null ? _c : "Failed to fetch the chat response."
-    );
-  }
-  if (!response.body) {
-    throw new Error("The response body is empty.");
-  }
-  return transformTextToUiMessageStream({
-    stream: response.body.pipeThrough(new TextDecoderStream())
-  });
-}
-async function consumeUIMessageStream({
-  stream,
-  onUpdate,
-  onFinish,
-  onToolCall,
-  generateId: generateId3,
-  lastMessage,
-  messageMetadataSchema
-}) {
-  const state = createStreamingUIMessageState({
-    lastMessage: lastMessage ? structuredClone(lastMessage) : void 0,
-    newMessageId: generateId3()
-  });
-  const runUpdateMessageJob = async (job) => {
-    await job({
-      state,
-      write: () => {
-        onUpdate({ message: state.message });
-      }
-    });
-  };
-  await consumeStream({
-    stream: processUIMessageStream({
-      stream,
-      onToolCall,
-      messageMetadataSchema,
-      runUpdateMessageJob
-    }),
-    onError: (error) => {
-      throw error;
-    }
-  });
-  onFinish == null ? void 0 : onFinish({ message: state.message });
-}
-async function callChatApi({
-  api,
-  body,
-  streamProtocol = "ui-message",
-  credentials,
-  headers,
-  abortController,
-  onUpdate,
-  onFinish,
-  onToolCall,
-  generateId: generateId3,
-  fetch: fetch2 = getOriginalFetch(),
-  lastMessage,
-  requestType = "generate",
-  messageMetadataSchema
-}) {
-  const stream = streamProtocol === "text" ? await fetchTextStream({
-    api,
-    body,
-    credentials,
-    headers,
-    abortController,
-    fetch: fetch2,
-    requestType
-  }) : await fetchUIMessageStream({
-    api,
-    body,
-    credentials,
-    headers,
-    abortController,
-    fetch: fetch2,
-    requestType
-  });
-  await consumeUIMessageStream({
-    stream,
-    onUpdate,
-    onFinish,
-    onToolCall,
-    generateId: generateId3,
-    lastMessage,
-    messageMetadataSchema
-  });
-}
-
-// src/ui/call-completion-api.ts
-import { parseJsonEventStream as parseJsonEventStream2 } from "@ai-sdk/provider-utils";
-
-// src/ui/process-text-stream.ts
-async function processTextStream({
-  stream,
-  onTextPart
-}) {
-  const reader = stream.pipeThrough(new TextDecoderStream()).getReader();
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) {
-      break;
-    }
-    await onTextPart(value);
-  }
-}
-
-// src/ui/call-completion-api.ts
-var getOriginalFetch2 = () => fetch;
-async function callCompletionApi({
-  api,
-  prompt,
-  credentials,
-  headers,
-  body,
-  streamProtocol = "data",
-  setCompletion,
-  setLoading,
-  setError,
-  setAbortController,
-  onFinish,
-  onError,
-  fetch: fetch2 = getOriginalFetch2()
-}) {
-  var _a17;
-  try {
-    setLoading(true);
-    setError(void 0);
-    const abortController = new AbortController();
-    setAbortController(abortController);
-    setCompletion("");
-    const response = await fetch2(api, {
-      method: "POST",
-      body: JSON.stringify({
-        prompt,
-        ...body
-      }),
-      credentials,
-      headers: {
-        "Content-Type": "application/json",
-        ...headers
-      },
-      signal: abortController.signal
-    }).catch((err) => {
-      throw err;
-    });
-    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.");
-    }
-    let result = "";
-    switch (streamProtocol) {
-      case "text": {
-        await processTextStream({
-          stream: response.body,
-          onTextPart: (chunk) => {
-            result += chunk;
-            setCompletion(result);
-          }
-        });
-        break;
-      }
-      case "data": {
-        await consumeStream({
-          stream: parseJsonEventStream2({
-            stream: response.body,
-            schema: uiMessageStreamPartSchema
-          }).pipeThrough(
-            new TransformStream({
-              async transform(part) {
-                if (!part.success) {
-                  throw part.error;
-                }
-                const streamPart = part.value;
-                if (streamPart.type === "text") {
-                  result += streamPart.text;
-                  setCompletion(result);
-                } else if (streamPart.type === "error") {
-                  throw new Error(streamPart.errorText);
-                }
-              }
-            })
-          ),
-          onError: (error) => {
-            throw error;
-          }
-        });
-        break;
-      }
-      default: {
-        const exhaustiveCheck = streamProtocol;
-        throw new Error(`Unknown stream protocol: ${exhaustiveCheck}`);
-      }
-    }
-    if (onFinish) {
-      onFinish(prompt, result);
-    }
-    setAbortController(null);
-    return result;
-  } catch (err) {
-    if (err.name === "AbortError") {
-      setAbortController(null);
-      return null;
-    }
-    if (err instanceof Error) {
-      if (onError) {
-        onError(err);
-      }
-    }
-    setError(err);
-  } finally {
-    setLoading(false);
-  }
-}
-
-// src/ui/chat-store.ts
-import {
-  generateId as generateIdFunc
-} from "@ai-sdk/provider-utils";
-
-// src/ui/should-resubmit-messages.ts
-function shouldResubmitMessages({
-  originalMaxToolInvocationStep,
-  originalMessageCount,
-  maxSteps,
-  messages
-}) {
-  var _a17;
-  const lastMessage = messages[messages.length - 1];
-  return (
-    // check if the feature is enabled:
-    maxSteps > 1 && // ensure there is a last message:
-    lastMessage != null && // ensure we actually have new steps (to prevent infinite loops in case of errors):
-    (messages.length > originalMessageCount || extractMaxToolInvocationStep(getToolInvocations(lastMessage)) !== originalMaxToolInvocationStep) && // check that next step is possible:
-    isAssistantMessageWithCompletedToolCalls(lastMessage) && // limit the number of automatic steps:
-    ((_a17 = extractMaxToolInvocationStep(getToolInvocations(lastMessage))) != null ? _a17 : 0) < maxSteps
-  );
-}
-function isAssistantMessageWithCompletedToolCalls(message) {
-  if (message.role !== "assistant") {
-    return false;
-  }
-  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/update-tool-call-result.ts
-function updateToolCallResult({
-  messages,
-  toolCallId,
-  toolResult: result
-}) {
-  const lastMessage = messages[messages.length - 1];
-  const invocationPart = lastMessage.parts.find(
-    (part) => part.type === "tool-invocation" && part.toolInvocation.toolCallId === toolCallId
-  );
-  if (invocationPart == null) {
-    return;
-  }
-  invocationPart.toolInvocation = {
-    ...invocationPart.toolInvocation,
-    state: "result",
-    result
-  };
-}
-
-// src/ui/chat-store.ts
-var ChatStore = class {
-  constructor({
-    chats = {},
-    generateId: generateId3,
-    transport,
-    maxSteps = 1,
-    messageMetadataSchema,
-    dataPartSchemas,
-    createChat
-  }) {
-    this.createChat = createChat;
-    this.chats = new Map(
-      Object.entries(chats).map(([id, chat]) => [
-        id,
-        this.createChat({ messages: chat.messages })
-      ])
-    );
-    this.maxSteps = maxSteps;
-    this.transport = transport;
-    this.subscribers = /* @__PURE__ */ new Set();
-    this.generateId = generateId3 != null ? generateId3 : generateIdFunc;
-    this.messageMetadataSchema = messageMetadataSchema;
-    this.dataPartSchemas = dataPartSchemas;
-  }
-  hasChat(id) {
-    return this.chats.has(id);
+  hasChat(id) {
+    return this.chats.has(id);
   }
   addChat(id, messages) {
     this.chats.set(id, this.createChat({ messages }));
@@ -1818,14 +1576,15 @@ var ChatStore = class {
     const chat = this.getChatState(chatId);
     this.setStatus({ id: chatId, status: "submitted", error: void 0 });
     const messageCount = chat.messages.length;
-    const maxStep = extractMaxToolInvocationStep(
-      getToolInvocations(chat.messages[chat.messages.length - 1])
-    );
+    const lastMessage = chat.messages[chat.messages.length - 1];
+    const maxStep = lastMessage.parts.filter(
+      (part) => part.type === "step-start"
+    ).length;
     try {
-      const lastMessage = chat.messages[chat.messages.length - 1];
+      const lastMessage2 = chat.messages[chat.messages.length - 1];
       const activeResponse = {
         state: createStreamingUIMessageState({
-          lastMessage: chat.snapshot ? chat.snapshot(lastMessage) : lastMessage,
+          lastMessage: chat.snapshot ? chat.snapshot(lastMessage2) : lastMessage2,
           newMessageId: this.generateId()
         }),
         abortController: new AbortController()
@@ -1904,109 +1663,27 @@ var ChatStore = class {
         headers,
         body
       });
-    }
-  }
-};
-
-// src/ui/chat-transport.ts
-var DefaultChatTransport = class {
-  constructor({
-    api,
-    credentials,
-    headers,
-    body,
-    fetch: fetch2,
-    prepareRequestBody
-  }) {
-    this.api = api;
-    this.credentials = credentials;
-    this.headers = headers;
-    this.body = body;
-    this.fetch = fetch2;
-    this.prepareRequestBody = prepareRequestBody;
-  }
-  submitMessages({
-    chatId,
-    messages,
-    abortController,
-    body,
-    headers,
-    requestType
-  }) {
-    var _a17, _b;
-    return fetchUIMessageStream({
-      api: this.api,
-      headers: {
-        ...this.headers,
-        ...headers
-      },
-      body: (_b = (_a17 = this.prepareRequestBody) == null ? void 0 : _a17.call(this, {
-        chatId,
-        messages,
-        ...this.body,
-        ...body
-      })) != null ? _b : {
-        chatId,
-        messages,
-        ...this.body,
-        ...body
-      },
-      credentials: this.credentials,
-      abortController: () => abortController,
-      fetch: this.fetch,
-      requestType
-    });
-  }
-};
-var TextStreamChatTransport = class {
-  constructor({
-    api,
-    credentials,
-    headers,
-    body,
-    fetch: fetch2,
-    prepareRequestBody
-  }) {
-    this.api = api;
-    this.credentials = credentials;
-    this.headers = headers;
-    this.body = body;
-    this.fetch = fetch2;
-    this.prepareRequestBody = prepareRequestBody;
-  }
-  submitMessages({
-    chatId,
-    messages,
-    abortController,
-    body,
-    headers,
-    requestType
-  }) {
-    var _a17, _b;
-    return fetchTextStream({
-      api: this.api,
-      headers: {
-        ...this.headers,
-        ...headers
-      },
-      body: (_b = (_a17 = this.prepareRequestBody) == null ? void 0 : _a17.call(this, {
-        chatId,
-        messages,
-        ...this.body,
-        ...body
-      })) != null ? _b : {
-        chatId,
-        messages,
-        ...this.body,
-        ...body
-      },
-      credentials: this.credentials,
-      abortController: () => abortController,
-      fetch: this.fetch,
-      requestType
-    });
+    }
   }
 };
+function updateToolCallResult({
+  messages,
+  toolCallId,
+  toolResult: result
+}) {
+  const lastMessage = messages[messages.length - 1];
+  const invocationPart = lastMessage.parts.find(
+    (part) => part.type === "tool-invocation" && part.toolInvocation.toolCallId === toolCallId
+  );
+  if (invocationPart == null) {
+    return;
+  }
+  invocationPart.toolInvocation = {
+    ...invocationPart.toolInvocation,
+    state: "result",
+    result
+  };
+}
 
 // src/ui/convert-file-list-to-file-ui-parts.ts
 async function convertFileListToFileUIParts(files) {
@@ -2040,7 +1717,7 @@ async function convertFileListToFileUIParts(files) {
 
 // src/ui/convert-to-model-messages.ts
 function convertToModelMessages(messages, options) {
-  var _a17, _b;
+  var _a17;
   const tools = (_a17 = options == null ? void 0 : options.tools) != null ? _a17 : {};
   const modelMessages = [];
   for (const message of messages) {
@@ -2071,6 +1748,9 @@ function convertToModelMessages(messages, options) {
       case "assistant": {
         if (message.parts != null) {
           let processBlock2 = function() {
+            if (block.length === 0) {
+              return;
+            }
             const content = [];
             for (const part of block) {
               switch (part.type) {
@@ -2145,33 +1825,20 @@ function convertToModelMessages(messages, options) {
               });
             }
             block = [];
-            blockHasToolInvocations = false;
-            currentStep++;
           };
           var processBlock = processBlock2;
-          let currentStep = 0;
-          let blockHasToolInvocations = false;
           let block = [];
           for (const part of message.parts) {
             switch (part.type) {
-              case "text": {
-                if (blockHasToolInvocations) {
-                  processBlock2();
-                }
-                block.push(part);
-                break;
-              }
+              case "text":
+              case "reasoning":
               case "file":
-              case "reasoning": {
+              case "tool-invocation": {
                 block.push(part);
                 break;
               }
-              case "tool-invocation": {
-                if (((_b = part.toolInvocation.step) != null ? _b : 0) !== currentStep) {
-                  processBlock2();
-                }
-                block.push(part);
-                blockHasToolInvocations = true;
+              case "step-start": {
+                processBlock2();
                 break;
               }
             }
@@ -2198,6 +1865,113 @@ var convertToCoreMessages = convertToModelMessages;
 import {
   generateId as generateIdFunc2
 } from "@ai-sdk/provider-utils";
+
+// 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,
+  abortController,
+  fetch: fetch2 = getOriginalFetch2(),
+  requestType = "generate"
+}) {
+  var _a17, _b, _c;
+  const response = requestType === "resume" ? await fetch2(`${api}?chatId=${body.chatId}`, {
+    method: "GET",
+    headers: {
+      "Content-Type": "application/json",
+      ...headers
+    },
+    signal: (_a17 = abortController == null ? void 0 : abortController()) == null ? void 0 : _a17.signal,
+    credentials
+  }) : await fetch2(api, {
+    method: "POST",
+    body: JSON.stringify(body),
+    headers: {
+      "Content-Type": "application/json",
+      ...headers
+    },
+    signal: (_b = abortController == null ? void 0 : abortController()) == null ? void 0 : _b.signal,
+    credentials
+  });
+  if (!response.ok) {
+    throw new Error(
+      (_c = await response.text()) != null ? _c : "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,
+    credentials,
+    headers,
+    body,
+    fetch: fetch2,
+    prepareRequestBody
+  }) {
+    this.api = api;
+    this.credentials = credentials;
+    this.headers = headers;
+    this.body = body;
+    this.fetch = fetch2;
+    this.prepareRequestBody = prepareRequestBody;
+  }
+  submitMessages({
+    chatId,
+    messages,
+    abortController,
+    body,
+    headers,
+    requestType
+  }) {
+    var _a17, _b;
+    return fetchUIMessageStream({
+      api: this.api,
+      headers: {
+        ...this.headers,
+        ...headers
+      },
+      body: (_b = (_a17 = this.prepareRequestBody) == null ? void 0 : _a17.call(this, {
+        chatId,
+        messages,
+        ...this.body,
+        ...body
+      })) != null ? _b : {
+        chatId,
+        messages,
+        ...this.body,
+        ...body
+      },
+      credentials: this.credentials,
+      abortController: () => abortController,
+      fetch: this.fetch,
+      requestType
+    });
+  }
+};
+
+// src/ui/default-chat-store-options.ts
 function defaultChatStoreOptions({
   api = "/api/chat",
   fetch: fetch2,
@@ -2228,6 +2002,119 @@ function defaultChatStoreOptions({
   });
 }
 
+// src/ui/transform-text-to-ui-message-stream.ts
+function transformTextToUiMessageStream({
+  stream
+}) {
+  return stream.pipeThrough(
+    new TransformStream({
+      start(controller) {
+        controller.enqueue({ type: "start" });
+        controller.enqueue({ type: "start-step" });
+      },
+      async transform(part, controller) {
+        controller.enqueue({ type: "text", text: part });
+      },
+      async flush(controller) {
+        controller.enqueue({ type: "finish-step" });
+        controller.enqueue({ type: "finish" });
+      }
+    })
+  );
+}
+
+// src/ui/text-stream-chat-transport.ts
+var getOriginalFetch3 = () => fetch;
+async function fetchTextStream({
+  api,
+  body,
+  credentials,
+  headers,
+  abortController,
+  fetch: fetch2 = getOriginalFetch3(),
+  requestType = "generate"
+}) {
+  var _a17, _b, _c;
+  const response = requestType === "resume" ? await fetch2(`${api}?chatId=${body.chatId}`, {
+    method: "GET",
+    headers: {
+      "Content-Type": "application/json",
+      ...headers
+    },
+    signal: (_a17 = abortController == null ? void 0 : abortController()) == null ? void 0 : _a17.signal,
+    credentials
+  }) : await fetch2(api, {
+    method: "POST",
+    body: JSON.stringify(body),
+    headers: {
+      "Content-Type": "application/json",
+      ...headers
+    },
+    signal: (_b = abortController == null ? void 0 : abortController()) == null ? void 0 : _b.signal,
+    credentials
+  });
+  if (!response.ok) {
+    throw new Error(
+      (_c = await response.text()) != null ? _c : "Failed to fetch the chat response."
+    );
+  }
+  if (!response.body) {
+    throw new Error("The response body is empty.");
+  }
+  return transformTextToUiMessageStream({
+    stream: response.body.pipeThrough(new TextDecoderStream())
+  });
+}
+var TextStreamChatTransport = class {
+  constructor({
+    api,
+    credentials,
+    headers,
+    body,
+    fetch: fetch2,
+    prepareRequestBody
+  }) {
+    this.api = api;
+    this.credentials = credentials;
+    this.headers = headers;
+    this.body = body;
+    this.fetch = fetch2;
+    this.prepareRequestBody = prepareRequestBody;
+  }
+  submitMessages({
+    chatId,
+    messages,
+    abortController,
+    body,
+    headers,
+    requestType
+  }) {
+    var _a17, _b;
+    return fetchTextStream({
+      api: this.api,
+      headers: {
+        ...this.headers,
+        ...headers
+      },
+      body: (_b = (_a17 = this.prepareRequestBody) == null ? void 0 : _a17.call(this, {
+        chatId,
+        messages,
+        ...this.body,
+        ...body
+      })) != null ? _b : {
+        chatId,
+        messages,
+        ...this.body,
+        ...body
+      },
+      credentials: this.credentials,
+      abortController: () => abortController,
+      fetch: this.fetch,
+      requestType
+    });
+  }
+};
+
 // src/ui-message-stream/handle-ui-message-stream-finish.ts
 function handleUIMessageStreamFinish({
   newMessageId,
@@ -4462,11 +4349,17 @@ function validateObjectGenerationInput({
   }
 }
 
+// core/prompt/resolve-language-model.ts
+import { gateway } from "@ai-sdk/gateway";
+function resolveLanguageModel(model) {
+  return typeof model === "string" ? gateway.languageModel(model) : model;
+}
+
 // core/generate-object/generate-object.ts
 var originalGenerateId = createIdGenerator({ prefix: "aiobj", size: 24 });
 async function generateObject(options) {
   const {
-    model,
+    model: modelArg,
     output = "object",
     system,
     prompt,
@@ -4483,6 +4376,7 @@ async function generateObject(options) {
     } = {},
     ...settings
   } = options;
+  const model = resolveLanguageModel(modelArg);
   const enumValues = "enum" in options ? options.enum : void 0;
   const {
     schema: inputSchema,
@@ -4942,7 +4836,7 @@ function streamObject(options) {
 }
 var DefaultStreamObjectResult = class {
   constructor({
-    model,
+    model: modelArg,
     headers,
     telemetry,
     settings,
@@ -4967,6 +4861,7 @@ var DefaultStreamObjectResult = class {
     this._warnings = new DelayedPromise();
     this._request = new DelayedPromise();
     this._response = new DelayedPromise();
+    const model = resolveLanguageModel(modelArg);
     const { maxRetries, retry } = prepareRetries({
       maxRetries: maxRetriesArg
     });
@@ -5784,7 +5679,7 @@ var originalGenerateId3 = createIdGenerator3({
   size: 24
 });
 async function generateText({
-  model,
+  model: modelArg,
   tools,
   toolChoice,
   system,
@@ -5809,6 +5704,7 @@ async function generateText({
   onStepFinish,
   ...settings
 }) {
+  const model = resolveLanguageModel(modelArg);
   const stopConditions = asArray(stopWhen);
   const { maxRetries, retry } = prepareRetries({ maxRetries: maxRetriesArg });
   const callSettings = prepareCallSettings(settings);
@@ -5845,7 +5741,7 @@ async function generateText({
     }),
     tracer,
     fn: async (span) => {
-      var _a17, _b, _c, _d;
+      var _a17, _b, _c, _d, _e;
       const callSettings2 = prepareCallSettings(settings);
       let currentModelResponse;
       let currentToolCalls = [];
@@ -5864,16 +5760,18 @@ async function generateText({
         }));
         const promptMessages = await convertToLanguageModelPrompt({
           prompt: {
-            system: initialPrompt.system,
+            system: (_a17 = prepareStepResult == null ? void 0 : prepareStepResult.system) != null ? _a17 : initialPrompt.system,
             messages: stepInputMessages
           },
           supportedUrls: await model.supportedUrls
         });
-        const stepModel = (_a17 = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _a17 : model;
+        const stepModel = resolveLanguageModel(
+          (_b = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _b : model
+        );
         const { toolChoice: stepToolChoice, tools: stepTools } = prepareToolsAndToolChoice({
           tools,
-          toolChoice: (_b = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _b : toolChoice,
-          activeTools: (_c = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _c : activeTools
+          toolChoice: (_c = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _c : toolChoice,
+          activeTools: (_d = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _d : activeTools
         });
         currentModelResponse = await retry(
           () => {
@@ -5916,7 +5814,7 @@ async function generateText({
               }),
               tracer,
               fn: async (span2) => {
-                var _a19, _b2, _c2, _d2, _e, _f, _g, _h;
+                var _a19, _b2, _c2, _d2, _e2, _f, _g, _h;
                 const result = await stepModel.doGenerate({
                   ...callSettings2,
                   tools: stepTools,
@@ -5930,7 +5828,7 @@ async function generateText({
                 const responseData = {
                   id: (_b2 = (_a19 = result.response) == null ? void 0 : _a19.id) != null ? _b2 : generateId3(),
                   timestamp: (_d2 = (_c2 = result.response) == null ? void 0 : _c2.timestamp) != null ? _d2 : currentDate(),
-                  modelId: (_f = (_e = result.response) == null ? void 0 : _e.modelId) != null ? _f : stepModel.modelId,
+                  modelId: (_f = (_e2 = result.response) == null ? void 0 : _e2.modelId) != null ? _f : stepModel.modelId,
                   headers: (_g = result.response) == null ? void 0 : _g.headers,
                   body: (_h = result.response) == null ? void 0 : _h.body
                 };
@@ -6006,7 +5904,7 @@ async function generateText({
           usage: currentModelResponse.usage,
           warnings: currentModelResponse.warnings,
           providerMetadata: currentModelResponse.providerMetadata,
-          request: (_d = currentModelResponse.request) != null ? _d : {},
+          request: (_e = currentModelResponse.request) != null ? _e : {},
           response: {
             ...currentModelResponse.response,
             // deep clone msgs to avoid mutating past messages in multi-step:
@@ -6602,7 +6500,7 @@ function streamText({
   ...settings
 }) {
   return new DefaultStreamTextResult({
-    model,
+    model: resolveLanguageModel(model),
     telemetry,
     headers,
     settings,
@@ -6917,7 +6815,7 @@ var DefaultStreamTextResult = class {
           responseMessages,
           usage
         }) {
-          var _a17, _b, _c;
+          var _a17, _b, _c, _d;
           stepFinish = new DelayedPromise();
           const initialPrompt = await standardizePrompt({
             system,
@@ -6935,16 +6833,18 @@ var DefaultStreamTextResult = class {
           }));
           const promptMessages = await convertToLanguageModelPrompt({
             prompt: {
-              system: initialPrompt.system,
+              system: (_a17 = prepareStepResult == null ? void 0 : prepareStepResult.system) != null ? _a17 : initialPrompt.system,
               messages: stepInputMessages
             },
             supportedUrls: await model.supportedUrls
           });
-          const stepModel = (_a17 = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _a17 : model;
+          const stepModel = resolveLanguageModel(
+            (_b = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _b : model
+          );
           const { toolChoice: stepToolChoice, tools: stepTools } = prepareToolsAndToolChoice({
             tools,
-            toolChoice: (_b = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _b : toolChoice,
-            activeTools: (_c = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _c : activeTools
+            toolChoice: (_c = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _c : toolChoice,
+            activeTools: (_d = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _d : activeTools
           });
           const {
             result: { stream: stream2, response, request },
@@ -7050,7 +6950,7 @@ var DefaultStreamTextResult = class {
             streamWithToolResults.pipeThrough(
               new TransformStream({
                 async transform(chunk, controller) {
-                  var _a18, _b2, _c2, _d;
+                  var _a18, _b2, _c2, _d2;
                   if (chunk.type === "stream-start") {
                     warnings = chunk.warnings;
                     return;
@@ -7127,7 +7027,7 @@ var DefaultStreamTextResult = class {
                       doStreamSpan.addEvent("ai.stream.finish");
                       doStreamSpan.setAttributes({
                         "ai.response.msToFinish": msToFinish,
-                        "ai.response.avgOutputTokensPerSecond": 1e3 * ((_d = stepUsage.outputTokens) != null ? _d : 0) / msToFinish
+                        "ai.response.avgOutputTokensPerSecond": 1e3 * ((_d2 = stepUsage.outputTokens) != null ? _d2 : 0) / msToFinish
                       });
                       break;
                     }
@@ -7384,7 +7284,7 @@ var DefaultStreamTextResult = class {
   } = {}) {
     const lastMessage = originalMessages[originalMessages.length - 1];
     const isContinuation = (lastMessage == null ? void 0 : lastMessage.role) === "assistant";
-    const messageId = isContinuation ? lastMessage.id : newMessageId != null ? newMessageId : this.generateId();
+    const messageId = isContinuation ? lastMessage.id : newMessageId;
     const baseStream = this.fullStream.pipeThrough(
       new TransformStream({
         transform: async (part, controller) => {
@@ -7520,7 +7420,7 @@ var DefaultStreamTextResult = class {
     );
     return handleUIMessageStreamFinish({
       stream: baseStream,
-      newMessageId: messageId,
+      newMessageId: messageId != null ? messageId : this.generateId(),
       originalMessages,
       onFinish
     });
@@ -7824,7 +7724,9 @@ var doWrap = ({
 };
 
 // core/registry/custom-provider.ts
-import { NoSuchModelError as NoSuchModelError2 } from "@ai-sdk/provider";
+import {
+  NoSuchModelError as NoSuchModelError2
+} from "@ai-sdk/provider";
 function customProvider({
   languageModels,
   textEmbeddingModels,
@@ -7889,7 +7791,9 @@ var NoSuchProviderError = class extends NoSuchModelError3 {
 _a16 = symbol16;
 
 // core/registry/provider-registry.ts
-import { NoSuchModelError as NoSuchModelError4 } from "@ai-sdk/provider";
+import {
+  NoSuchModelError as NoSuchModelError4
+} from "@ai-sdk/provider";
 function createProviderRegistry(providers, {
   separator = ":"
 } = {}) {
@@ -8634,10 +8538,8 @@ export {
   ToolExecutionError,
   TypeValidationError,
   UnsupportedFunctionalityError,
-  appendClientMessage,
   asSchema5 as asSchema,
   assistantModelMessageSchema,
-  callChatApi,
   callCompletionApi,
   convertFileListToFileUIParts,
   convertToCoreMessages,
@@ -8664,7 +8566,6 @@ export {
   generateImage as experimental_generateImage,
   generateSpeech as experimental_generateSpeech,
   transcribe as experimental_transcribe,
-  extractMaxToolInvocationStep,
   extractReasoningMiddleware,
   generateId2 as generateId,
   generateObject,
@@ -8672,14 +8573,12 @@ export {
   getTextFromDataUrl,
   getToolInvocations,
   hasToolCall,
-  isAssistantMessageWithCompletedToolCalls,
   isDeepEqualData,
   jsonSchema2 as jsonSchema,
   modelMessageSchema,
   parsePartialJson,
   pipeTextStreamToResponse,
   pipeUIMessageStreamToResponse,
-  shouldResubmitMessages,
   simulateReadableStream,
   simulateStreamingMiddleware,
   smoothStream,
@@ -8689,7 +8588,6 @@ export {
   systemModelMessageSchema,
   tool,
   toolModelMessageSchema,
-  updateToolCallResult,
   userModelMessageSchema,
   wrapLanguageModel
 };