ai 3.4.18 → 3.4.20

package/dist/index.js

@@ -96,7 +96,7 @@ __export(streams_exports, {
 });
 module.exports = __toCommonJS(streams_exports);
 var import_ui_utils10 = require("@ai-sdk/ui-utils");
-var import_provider_utils11 = require("@ai-sdk/provider-utils");
+var import_provider_utils10 = require("@ai-sdk/provider-utils");
 
 // core/index.ts
 var import_ui_utils6 = require("@ai-sdk/ui-utils");
@@ -676,10 +676,7 @@ var DefaultEmbedManyResult = class {
 };
 
 // core/generate-object/generate-object.ts
-var import_provider_utils6 = require("@ai-sdk/provider-utils");
-
-// core/prompt/convert-to-language-model-prompt.ts
-var import_provider_utils3 = require("@ai-sdk/provider-utils");
+var import_provider_utils5 = require("@ai-sdk/provider-utils");
 
 // util/download-error.ts
 var import_provider3 = require("@ai-sdk/provider");
@@ -923,19 +920,21 @@ function splitDataUrl(dataUrl) {
 async function convertToLanguageModelPrompt({
   prompt,
   modelSupportsImageUrls = true,
+  modelSupportsUrl = () => false,
   downloadImplementation = download
 }) {
-  const downloadedAssets = modelSupportsImageUrls || prompt.messages == null ? null : await downloadAssets(prompt.messages, downloadImplementation);
-  const languageModelMessages = [];
-  if (prompt.system != null) {
-    languageModelMessages.push({ role: "system", content: prompt.system });
-  }
-  languageModelMessages.push(
+  const downloadedAssets = await downloadAssets(
+    prompt.messages,
+    downloadImplementation,
+    modelSupportsImageUrls,
+    modelSupportsUrl
+  );
+  return [
+    ...prompt.system != null ? [{ role: "system", content: prompt.system }] : [],
     ...prompt.messages.map(
       (message) => convertToLanguageModelMessage(message, downloadedAssets)
     )
-  );
-  return languageModelMessages;
+  ];
 }
 function convertToLanguageModelMessage(message, downloadedAssets) {
   const role = message.role;
@@ -957,178 +956,7 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
       }
       return {
         role: "user",
-        content: message.content.map(
-          (part) => {
-            var _a11, _b, _c, _d, _e;
-            switch (part.type) {
-              case "text": {
-                return {
-                  type: "text",
-                  text: part.text,
-                  providerMetadata: part.experimental_providerMetadata
-                };
-              }
-              case "image": {
-                if (part.image instanceof URL) {
-                  if (downloadedAssets == null) {
-                    return {
-                      type: "image",
-                      image: part.image,
-                      mimeType: part.mimeType,
-                      providerMetadata: part.experimental_providerMetadata
-                    };
-                  } else {
-                    const downloadedImage = downloadedAssets[part.image.toString()];
-                    return {
-                      type: "image",
-                      image: downloadedImage.data,
-                      mimeType: (_a11 = part.mimeType) != null ? _a11 : downloadedImage.mimeType,
-                      providerMetadata: part.experimental_providerMetadata
-                    };
-                  }
-                }
-                if (typeof part.image === "string") {
-                  try {
-                    const url = new URL(part.image);
-                    switch (url.protocol) {
-                      case "http:":
-                      case "https:": {
-                        if (downloadedAssets == null) {
-                          return {
-                            type: "image",
-                            image: url,
-                            mimeType: part.mimeType,
-                            providerMetadata: part.experimental_providerMetadata
-                          };
-                        } else {
-                          const downloadedImage = downloadedAssets[url.toString()];
-                          return {
-                            type: "image",
-                            image: downloadedImage.data,
-                            mimeType: (_b = part.mimeType) != null ? _b : downloadedImage.mimeType,
-                            providerMetadata: part.experimental_providerMetadata
-                          };
-                        }
-                      }
-                      case "data:": {
-                        try {
-                          const { mimeType, base64Content } = splitDataUrl(
-                            part.image
-                          );
-                          if (mimeType == null || base64Content == null) {
-                            throw new Error("Invalid data URL format");
-                          }
-                          return {
-                            type: "image",
-                            image: convertDataContentToUint8Array(base64Content),
-                            mimeType,
-                            providerMetadata: part.experimental_providerMetadata
-                          };
-                        } catch (error) {
-                          throw new Error(
-                            `Error processing data URL: ${(0, import_provider_utils3.getErrorMessage)(
-                              message
-                            )}`
-                          );
-                        }
-                      }
-                    }
-                  } catch (_ignored) {
-                  }
-                }
-                const imageUint8 = convertDataContentToUint8Array(part.image);
-                return {
-                  type: "image",
-                  image: imageUint8,
-                  mimeType: (_c = part.mimeType) != null ? _c : detectImageMimeType(imageUint8),
-                  providerMetadata: part.experimental_providerMetadata
-                };
-              }
-              case "file": {
-                if (part.data instanceof URL) {
-                  if (downloadedAssets == null) {
-                    return {
-                      type: "file",
-                      data: part.data,
-                      mimeType: part.mimeType,
-                      providerMetadata: part.experimental_providerMetadata
-                    };
-                  } else {
-                    const downloadedImage = downloadedAssets[part.data.toString()];
-                    return {
-                      type: "file",
-                      data: (0, import_provider_utils3.convertUint8ArrayToBase64)(downloadedImage.data),
-                      mimeType: (_d = part.mimeType) != null ? _d : downloadedImage.mimeType,
-                      providerMetadata: part.experimental_providerMetadata
-                    };
-                  }
-                }
-                if (typeof part.data === "string") {
-                  try {
-                    const url = new URL(part.data);
-                    switch (url.protocol) {
-                      case "http:":
-                      case "https:": {
-                        if (downloadedAssets == null) {
-                          return {
-                            type: "file",
-                            data: url,
-                            mimeType: part.mimeType,
-                            providerMetadata: part.experimental_providerMetadata
-                          };
-                        } else {
-                          const downloadedImage = downloadedAssets[url.toString()];
-                          return {
-                            type: "file",
-                            data: (0, import_provider_utils3.convertUint8ArrayToBase64)(
-                              downloadedImage.data
-                            ),
-                            mimeType: (_e = part.mimeType) != null ? _e : downloadedImage.mimeType,
-                            providerMetadata: part.experimental_providerMetadata
-                          };
-                        }
-                      }
-                      case "data:": {
-                        try {
-                          const { mimeType, base64Content } = splitDataUrl(
-                            part.data
-                          );
-                          if (mimeType == null || base64Content == null) {
-                            throw new Error("Invalid data URL format");
-                          }
-                          return {
-                            type: "file",
-                            data: convertDataContentToBase64String(
-                              base64Content
-                            ),
-                            mimeType,
-                            providerMetadata: part.experimental_providerMetadata
-                          };
-                        } catch (error) {
-                          throw new Error(
-                            `Error processing data URL: ${(0, import_provider_utils3.getErrorMessage)(
-                              message
-                            )}`
-                          );
-                        }
-                      }
-                    }
-                  } catch (_ignored) {
-                  }
-                }
-                const imageBase64 = convertDataContentToBase64String(
-                  part.data
-                );
-                return {
-                  type: "file",
-                  data: imageBase64,
-                  mimeType: part.mimeType,
-                  providerMetadata: part.experimental_providerMetadata
-                };
-              }
-            }
-          }
-        ).filter((part) => part.type !== "text" || part.text !== ""),
+        content: message.content.map((part) => convertPartToLanguageModelPart(part, downloadedAssets)).filter((part) => part.type !== "text" || part.text !== ""),
         providerMetadata: message.experimental_providerMetadata
       };
     }
@@ -1163,6 +991,8 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
           toolCallId: part.toolCallId,
           toolName: part.toolName,
           result: part.result,
+          content: part.experimental_content,
+          isError: part.isError,
           providerMetadata: part.experimental_providerMetadata
         })),
         providerMetadata: message.experimental_providerMetadata
@@ -1174,17 +1004,19 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
     }
   }
 }
-async function downloadAssets(messages, downloadImplementation) {
+async function downloadAssets(messages, downloadImplementation, modelSupportsImageUrls, modelSupportsUrl) {
   const urls = messages.filter((message) => message.role === "user").map((message) => message.content).filter(
     (content) => Array.isArray(content)
   ).flat().filter(
     (part) => part.type === "image" || part.type === "file"
+  ).filter(
+    (part) => !(part.type === "image" && modelSupportsImageUrls === true)
   ).map((part) => part.type === "image" ? part.image : part.data).map(
     (part) => (
       // support string urls:
       typeof part === "string" && (part.startsWith("http:") || part.startsWith("https:")) ? new URL(part) : part
     )
-  ).filter((image) => image instanceof URL);
+  ).filter((image) => image instanceof URL).filter((url) => !modelSupportsUrl(url));
   const downloadedImages = await Promise.all(
     urls.map(async (url) => ({
       url,
@@ -1195,6 +1027,79 @@ async function downloadAssets(messages, downloadImplementation) {
     downloadedImages.map(({ url, data }) => [url.toString(), data])
   );
 }
+function convertPartToLanguageModelPart(part, downloadedAssets) {
+  if (part.type === "text") {
+    return {
+      type: "text",
+      text: part.text,
+      providerMetadata: part.experimental_providerMetadata
+    };
+  }
+  let mimeType = part.mimeType;
+  let data;
+  let content;
+  let normalizedData;
+  const type = part.type;
+  switch (type) {
+    case "image":
+      data = part.image;
+      break;
+    case "file":
+      data = part.data;
+      break;
+    default:
+      throw new Error(`Unsupported part type: ${type}`);
+  }
+  try {
+    content = typeof data === "string" ? new URL(data) : data;
+  } catch (error) {
+    content = data;
+  }
+  if (content instanceof URL) {
+    if (content.protocol === "data:") {
+      const { mimeType: dataUrlMimeType, base64Content } = splitDataUrl(
+        content.toString()
+      );
+      if (dataUrlMimeType == null || base64Content == null) {
+        throw new Error(`Invalid data URL format in part ${type}`);
+      }
+      mimeType = dataUrlMimeType;
+      normalizedData = convertDataContentToUint8Array(base64Content);
+    } else {
+      const downloadedFile = downloadedAssets[content.toString()];
+      if (downloadedFile) {
+        normalizedData = downloadedFile.data;
+        mimeType != null ? mimeType : mimeType = downloadedFile.mimeType;
+      } else {
+        normalizedData = content;
+      }
+    }
+  } else {
+    normalizedData = convertDataContentToUint8Array(content);
+  }
+  switch (type) {
+    case "image":
+      if (mimeType == null && normalizedData instanceof Uint8Array) {
+        mimeType = detectImageMimeType(normalizedData);
+      }
+      return {
+        type: "image",
+        image: normalizedData,
+        mimeType,
+        providerMetadata: part.experimental_providerMetadata
+      };
+    case "file":
+      if (mimeType == null) {
+        throw new Error(`Mime type is missing for file part`);
+      }
+      return {
+        type: "file",
+        data: normalizedData instanceof Uint8Array ? convertDataContentToBase64String(normalizedData) : normalizedData,
+        mimeType,
+        providerMetadata: part.experimental_providerMetadata
+      };
+  }
+}
 
 // errors/invalid-argument-error.ts
 var import_provider6 = require("@ai-sdk/provider");
@@ -1350,11 +1255,11 @@ function prepareCallSettings({
 
 // core/prompt/standardize-prompt.ts
 var import_provider7 = require("@ai-sdk/provider");
-var import_provider_utils4 = require("@ai-sdk/provider-utils");
-var import_zod6 = require("zod");
+var import_provider_utils3 = require("@ai-sdk/provider-utils");
+var import_zod7 = require("zod");
 
 // core/prompt/message.ts
-var import_zod5 = require("zod");
+var import_zod6 = require("zod");
 
 // core/types/provider-metadata.ts
 var import_zod3 = require("zod");
@@ -1379,67 +1284,83 @@ var providerMetadataSchema = import_zod3.z.record(
 );
 
 // core/prompt/content-part.ts
+var import_zod5 = require("zod");
+
+// core/prompt/tool-result-content.ts
 var import_zod4 = require("zod");
-var textPartSchema = import_zod4.z.object({
-  type: import_zod4.z.literal("text"),
-  text: import_zod4.z.string(),
+var toolResultContentSchema = import_zod4.z.array(
+  import_zod4.z.union([
+    import_zod4.z.object({ type: import_zod4.z.literal("text"), text: import_zod4.z.string() }),
+    import_zod4.z.object({
+      type: import_zod4.z.literal("image"),
+      data: import_zod4.z.string(),
+      mimeType: import_zod4.z.string().optional()
+    })
+  ])
+);
+
+// core/prompt/content-part.ts
+var textPartSchema = import_zod5.z.object({
+  type: import_zod5.z.literal("text"),
+  text: import_zod5.z.string(),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
-var imagePartSchema = import_zod4.z.object({
-  type: import_zod4.z.literal("image"),
-  image: import_zod4.z.union([dataContentSchema, import_zod4.z.instanceof(URL)]),
-  mimeType: import_zod4.z.string().optional(),
+var imagePartSchema = import_zod5.z.object({
+  type: import_zod5.z.literal("image"),
+  image: import_zod5.z.union([dataContentSchema, import_zod5.z.instanceof(URL)]),
+  mimeType: import_zod5.z.string().optional(),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
-var filePartSchema = import_zod4.z.object({
-  type: import_zod4.z.literal("file"),
-  data: import_zod4.z.union([dataContentSchema, import_zod4.z.instanceof(URL)]),
-  mimeType: import_zod4.z.string(),
+var filePartSchema = import_zod5.z.object({
+  type: import_zod5.z.literal("file"),
+  data: import_zod5.z.union([dataContentSchema, import_zod5.z.instanceof(URL)]),
+  mimeType: import_zod5.z.string(),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
-var toolCallPartSchema = import_zod4.z.object({
-  type: import_zod4.z.literal("tool-call"),
-  toolCallId: import_zod4.z.string(),
-  toolName: import_zod4.z.string(),
-  args: import_zod4.z.unknown()
+var toolCallPartSchema = import_zod5.z.object({
+  type: import_zod5.z.literal("tool-call"),
+  toolCallId: import_zod5.z.string(),
+  toolName: import_zod5.z.string(),
+  args: import_zod5.z.unknown()
 });
-var toolResultPartSchema = import_zod4.z.object({
-  type: import_zod4.z.literal("tool-result"),
-  toolCallId: import_zod4.z.string(),
-  toolName: import_zod4.z.string(),
-  result: import_zod4.z.unknown(),
-  isError: import_zod4.z.boolean().optional(),
+var toolResultPartSchema = import_zod5.z.object({
+  type: import_zod5.z.literal("tool-result"),
+  toolCallId: import_zod5.z.string(),
+  toolName: import_zod5.z.string(),
+  result: import_zod5.z.unknown(),
+  content: toolResultContentSchema.optional(),
+  isError: import_zod5.z.boolean().optional(),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
 
 // core/prompt/message.ts
-var coreSystemMessageSchema = import_zod5.z.object({
-  role: import_zod5.z.literal("system"),
-  content: import_zod5.z.string(),
+var coreSystemMessageSchema = import_zod6.z.object({
+  role: import_zod6.z.literal("system"),
+  content: import_zod6.z.string(),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
-var coreUserMessageSchema = import_zod5.z.object({
-  role: import_zod5.z.literal("user"),
-  content: import_zod5.z.union([
-    import_zod5.z.string(),
-    import_zod5.z.array(import_zod5.z.union([textPartSchema, imagePartSchema, filePartSchema]))
+var coreUserMessageSchema = import_zod6.z.object({
+  role: import_zod6.z.literal("user"),
+  content: import_zod6.z.union([
+    import_zod6.z.string(),
+    import_zod6.z.array(import_zod6.z.union([textPartSchema, imagePartSchema, filePartSchema]))
   ]),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
-var coreAssistantMessageSchema = import_zod5.z.object({
-  role: import_zod5.z.literal("assistant"),
-  content: import_zod5.z.union([
-    import_zod5.z.string(),
-    import_zod5.z.array(import_zod5.z.union([textPartSchema, toolCallPartSchema]))
+var coreAssistantMessageSchema = import_zod6.z.object({
+  role: import_zod6.z.literal("assistant"),
+  content: import_zod6.z.union([
+    import_zod6.z.string(),
+    import_zod6.z.array(import_zod6.z.union([textPartSchema, toolCallPartSchema]))
   ]),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
-var coreToolMessageSchema = import_zod5.z.object({
-  role: import_zod5.z.literal("tool"),
-  content: import_zod5.z.array(toolResultPartSchema),
+var coreToolMessageSchema = import_zod6.z.object({
+  role: import_zod6.z.literal("tool"),
+  content: import_zod6.z.array(toolResultPartSchema),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
-var coreMessageSchema = import_zod5.z.union([
+var coreMessageSchema = import_zod6.z.union([
   coreSystemMessageSchema,
   coreUserMessageSchema,
   coreAssistantMessageSchema,
@@ -1485,9 +1406,9 @@ function standardizePrompt(prompt) {
     };
   }
   if (prompt.messages != null) {
-    const validationResult = (0, import_provider_utils4.safeValidateTypes)({
+    const validationResult = (0, import_provider_utils3.safeValidateTypes)({
       value: prompt.messages,
-      schema: import_zod6.z.array(coreMessageSchema)
+      schema: import_zod7.z.array(coreMessageSchema)
     });
     if (!validationResult.success) {
       throw new import_provider7.InvalidPromptError({
@@ -1588,7 +1509,7 @@ _a6 = symbol6;
 
 // core/generate-object/output-strategy.ts
 var import_provider9 = require("@ai-sdk/provider");
-var import_provider_utils5 = require("@ai-sdk/provider-utils");
+var import_provider_utils4 = require("@ai-sdk/provider-utils");
 var import_ui_utils = require("@ai-sdk/ui-utils");
 
 // core/util/async-iterable-stream.ts
@@ -1638,7 +1559,7 @@ var objectOutputStrategy = (schema) => ({
     };
   },
   validateFinalResult(value) {
-    return (0, import_provider_utils5.safeValidateTypes)({ value, schema });
+    return (0, import_provider_utils4.safeValidateTypes)({ value, schema });
   },
   createElementStream() {
     throw new import_provider9.UnsupportedFunctionalityError({
@@ -1677,7 +1598,7 @@ var arrayOutputStrategy = (schema) => {
       const resultArray = [];
       for (let i = 0; i < inputArray.length; i++) {
         const element = inputArray[i];
-        const result = (0, import_provider_utils5.safeValidateTypes)({ value: element, schema });
+        const result = (0, import_provider_utils4.safeValidateTypes)({ value: element, schema });
         if (i === inputArray.length - 1 && !isFinalDelta) {
           continue;
         }
@@ -1718,7 +1639,7 @@ var arrayOutputStrategy = (schema) => {
       }
       const inputArray = value.elements;
       for (const element of inputArray) {
-        const result = (0, import_provider_utils5.safeValidateTypes)({ value: element, schema });
+        const result = (0, import_provider_utils4.safeValidateTypes)({ value: element, schema });
         if (!result.success) {
           return result;
         }
@@ -1947,7 +1868,7 @@ function validateObjectGenerationInput({
 }
 
 // core/generate-object/generate-object.ts
-var originalGenerateId = (0, import_provider_utils6.createIdGenerator)({ prefix: "aiobj-", size: 24 });
+var originalGenerateId = (0, import_provider_utils5.createIdGenerator)({ prefix: "aiobj", size: 24 });
 async function generateObject({
   model,
   enum: enumValues,
@@ -2017,6 +1938,7 @@ async function generateObject({
     }),
     tracer,
     fn: async (span) => {
+      var _a11, _b;
       const retry = retryWithExponentialBackoff({ maxRetries });
       if (mode === "auto" || mode == null) {
         mode = model.defaultObjectGenerationMode;
@@ -2027,6 +1949,7 @@ async function generateObject({
       let warnings;
       let rawResponse;
       let response;
+      let request;
       let logprobs;
       let resultProviderMetadata;
       switch (mode) {
@@ -2041,7 +1964,8 @@ async function generateObject({
           });
           const promptMessages = await convertToLanguageModelPrompt({
             prompt: standardPrompt,
-            modelSupportsImageUrls: model.supportsImageUrls
+            modelSupportsImageUrls: model.supportsImageUrls,
+            modelSupportsUrl: model.supportsUrl
           });
           const generateResult = await retry(
             () => recordSpan({
@@ -2074,7 +1998,7 @@ async function generateObject({
               }),
               tracer,
               fn: async (span2) => {
-                var _a11, _b, _c, _d, _e, _f;
+                var _a12, _b2, _c, _d, _e, _f;
                 const result2 = await model.doGenerate({
                   mode: {
                     type: "object-json",
@@ -2093,7 +2017,7 @@ async function generateObject({
                   throw new NoObjectGeneratedError();
                 }
                 const responseData = {
-                  id: (_b = (_a11 = result2.response) == null ? void 0 : _a11.id) != null ? _b : generateId3(),
+                  id: (_b2 = (_a12 = result2.response) == null ? void 0 : _a12.id) != null ? _b2 : generateId3(),
                   timestamp: (_d = (_c = result2.response) == null ? void 0 : _c.timestamp) != null ? _d : currentDate(),
                   modelId: (_f = (_e = result2.response) == null ? void 0 : _e.modelId) != null ? _f : model.modelId
                 };
@@ -2131,6 +2055,7 @@ async function generateObject({
           rawResponse = generateResult.rawResponse;
           logprobs = generateResult.logprobs;
           resultProviderMetadata = generateResult.providerMetadata;
+          request = (_a11 = generateResult.request) != null ? _a11 : {};
           response = generateResult.responseData;
           break;
         }
@@ -2142,7 +2067,8 @@ async function generateObject({
           });
           const promptMessages = await convertToLanguageModelPrompt({
             prompt: validatedPrompt,
-            modelSupportsImageUrls: model.supportsImageUrls
+            modelSupportsImageUrls: model.supportsImageUrls,
+            modelSupportsUrl: model.supportsUrl
           });
           const inputFormat = validatedPrompt.type;
           const generateResult = await retry(
@@ -2176,7 +2102,7 @@ async function generateObject({
               }),
               tracer,
               fn: async (span2) => {
-                var _a11, _b, _c, _d, _e, _f, _g, _h;
+                var _a12, _b2, _c, _d, _e, _f, _g, _h;
                 const result2 = await model.doGenerate({
                   mode: {
                     type: "object-tool",
@@ -2194,7 +2120,7 @@ async function generateObject({
                   abortSignal,
                   headers
                 });
-                const objectText = (_b = (_a11 = result2.toolCalls) == null ? void 0 : _a11[0]) == null ? void 0 : _b.args;
+                const objectText = (_b2 = (_a12 = result2.toolCalls) == null ? void 0 : _a12[0]) == null ? void 0 : _b2.args;
                 if (objectText === void 0) {
                   throw new NoObjectGeneratedError();
                 }
@@ -2237,6 +2163,7 @@ async function generateObject({
           rawResponse = generateResult.rawResponse;
           logprobs = generateResult.logprobs;
           resultProviderMetadata = generateResult.providerMetadata;
+          request = (_b = generateResult.request) != null ? _b : {};
           response = generateResult.responseData;
           break;
         }
@@ -2250,7 +2177,7 @@ async function generateObject({
           throw new Error(`Unsupported mode: ${_exhaustiveCheck}`);
         }
       }
-      const parseResult = (0, import_provider_utils6.safeParseJSON)({ text: result });
+      const parseResult = (0, import_provider_utils5.safeParseJSON)({ text: result });
       if (!parseResult.success) {
         throw parseResult.error;
       }
@@ -2283,6 +2210,7 @@ async function generateObject({
         finishReason,
         usage: calculateLanguageModelUsage(usage),
         warnings,
+        request,
         response: {
           ...response,
           headers: rawResponse == null ? void 0 : rawResponse.headers
@@ -2301,6 +2229,7 @@ var DefaultGenerateObjectResult = class {
     this.warnings = options.warnings;
     this.experimental_providerMetadata = options.providerMetadata;
     this.response = options.response;
+    this.request = options.request;
     this.rawResponse = {
       headers: options.response.headers
     };
@@ -2319,7 +2248,7 @@ var DefaultGenerateObjectResult = class {
 var experimental_generateObject = generateObject;
 
 // core/generate-object/stream-object.ts
-var import_provider_utils7 = require("@ai-sdk/provider-utils");
+var import_provider_utils6 = require("@ai-sdk/provider-utils");
 var import_ui_utils2 = require("@ai-sdk/ui-utils");
 
 // util/create-resolvable-promise.ts
@@ -2429,7 +2358,7 @@ function writeToServerResponse({
 }
 
 // core/generate-object/stream-object.ts
-var originalGenerateId2 = (0, import_provider_utils7.createIdGenerator)({ prefix: "aiobj-", size: 24 });
+var originalGenerateId2 = (0, import_provider_utils6.createIdGenerator)({ prefix: "aiobj", size: 24 });
 async function streamObject({
   model,
   schema: inputSchema,
@@ -2522,7 +2451,8 @@ async function streamObject({
             inputFormat: standardPrompt.type,
             prompt: await convertToLanguageModelPrompt({
               prompt: standardPrompt,
-              modelSupportsImageUrls: model.supportsImageUrls
+              modelSupportsImageUrls: model.supportsImageUrls,
+              modelSupportsUrl: model.supportsUrl
             }),
             providerMetadata,
             abortSignal,
@@ -2564,7 +2494,8 @@ async function streamObject({
             inputFormat: validatedPrompt.type,
             prompt: await convertToLanguageModelPrompt({
               prompt: validatedPrompt,
-              modelSupportsImageUrls: model.supportsImageUrls
+              modelSupportsImageUrls: model.supportsImageUrls,
+              modelSupportsUrl: model.supportsUrl
             }),
             providerMetadata,
             abortSignal,
@@ -2597,7 +2528,7 @@ async function streamObject({
         }
       }
       const {
-        result: { stream, warnings, rawResponse },
+        result: { stream, warnings, rawResponse, request },
         doStreamSpan,
         startTimestampMs
       } = await retry(
@@ -2643,6 +2574,7 @@ async function streamObject({
         stream: stream.pipeThrough(new TransformStream(transformer)),
         warnings,
         rawResponse,
+        request: request != null ? request : {},
         onFinish,
         rootSpan,
         doStreamSpan,
@@ -2661,6 +2593,7 @@ var DefaultStreamObjectResult = class {
     stream,
     warnings,
     rawResponse,
+    request,
     outputStrategy,
     onFinish,
     rootSpan,
@@ -2675,6 +2608,7 @@ var DefaultStreamObjectResult = class {
     this.warnings = warnings;
     this.rawResponse = rawResponse;
     this.outputStrategy = outputStrategy;
+    this.request = Promise.resolve(request);
     this.objectPromise = new DelayedPromise();
     const { resolve: resolveUsage, promise: usagePromise } = createResolvablePromise();
     this.usage = usagePromise;
@@ -2932,7 +2866,7 @@ var DefaultStreamObjectResult = class {
 var experimental_streamObject = streamObject;
 
 // core/generate-text/generate-text.ts
-var import_provider_utils9 = require("@ai-sdk/provider-utils");
+var import_provider_utils8 = require("@ai-sdk/provider-utils");
 
 // errors/index.ts
 var import_provider13 = require("@ai-sdk/provider");
@@ -3068,12 +3002,30 @@ function prepareToolsAndToolChoice({
     ([name11]) => activeTools.includes(name11)
   ) : Object.entries(tools);
   return {
-    tools: filteredTools.map(([name11, tool2]) => ({
-      type: "function",
-      name: name11,
-      description: tool2.description,
-      parameters: (0, import_ui_utils3.asSchema)(tool2.parameters).jsonSchema
-    })),
+    tools: filteredTools.map(([name11, tool2]) => {
+      const toolType = tool2.type;
+      switch (toolType) {
+        case void 0:
+        case "function":
+          return {
+            type: "function",
+            name: name11,
+            description: tool2.description,
+            parameters: (0, import_ui_utils3.asSchema)(tool2.parameters).jsonSchema
+          };
+        case "provider-defined":
+          return {
+            type: "provider-defined",
+            name: name11,
+            id: tool2.id,
+            args: tool2.args
+          };
+        default: {
+          const exhaustiveCheck = toolType;
+          throw new Error(`Unsupported tool type: ${exhaustiveCheck}`);
+        }
+      }
+    }),
     toolChoice: toolChoice == null ? { type: "auto" } : typeof toolChoice === "string" ? { type: toolChoice } : { type: "tool", toolName: toolChoice.toolName }
   };
 }
@@ -3092,7 +3044,7 @@ function removeTextAfterLastWhitespace(text) {
 }
 
 // core/generate-text/parse-tool-call.ts
-var import_provider_utils8 = require("@ai-sdk/provider-utils");
+var import_provider_utils7 = require("@ai-sdk/provider-utils");
 var import_ui_utils4 = require("@ai-sdk/ui-utils");
 function parseToolCall({
   toolCall,
@@ -3110,7 +3062,7 @@ function parseToolCall({
     });
   }
   const schema = (0, import_ui_utils4.asSchema)(tool2.parameters);
-  const parseResult = toolCall.args.trim() === "" ? (0, import_provider_utils8.safeValidateTypes)({ value: {}, schema }) : (0, import_provider_utils8.safeParseJSON)({ text: toolCall.args, schema });
+  const parseResult = toolCall.args.trim() === "" ? (0, import_provider_utils7.safeValidateTypes)({ value: {}, schema }) : (0, import_provider_utils7.safeParseJSON)({ text: toolCall.args, schema });
   if (parseResult.success === false) {
     throw new InvalidToolArgumentsError({
       toolName,
@@ -3129,6 +3081,7 @@ function parseToolCall({
 // core/generate-text/to-response-messages.ts
 function toResponseMessages({
   text = "",
+  tools,
   toolCalls,
   toolResults
 }) {
@@ -3140,19 +3093,28 @@ function toResponseMessages({
   if (toolResults.length > 0) {
     responseMessages.push({
       role: "tool",
-      content: toolResults.map((result) => ({
-        type: "tool-result",
-        toolCallId: result.toolCallId,
-        toolName: result.toolName,
-        result: result.result
-      }))
+      content: toolResults.map((toolResult) => {
+        const tool2 = tools[toolResult.toolName];
+        return (tool2 == null ? void 0 : tool2.experimental_toToolResultContent) != null ? {
+          type: "tool-result",
+          toolCallId: toolResult.toolCallId,
+          toolName: toolResult.toolName,
+          result: tool2.experimental_toToolResultContent(toolResult.result),
+          content: tool2.experimental_toToolResultContent(toolResult.result)
+        } : {
+          type: "tool-result",
+          toolCallId: toolResult.toolCallId,
+          toolName: toolResult.toolName,
+          result: toolResult.result
+        };
+      })
     });
   }
   return responseMessages;
 }
 
 // core/generate-text/generate-text.ts
-var originalGenerateId3 = (0, import_provider_utils9.createIdGenerator)({ prefix: "aitxt-", size: 24 });
+var originalGenerateId3 = (0, import_provider_utils8.createIdGenerator)({ prefix: "aitxt", size: 24 });
 async function generateText({
   model,
   tools,
@@ -3191,6 +3153,7 @@ async function generateText({
     headers,
     settings: { ...settings, maxRetries }
   });
+  const initialPrompt = standardizePrompt({ system, prompt, messages });
   const tracer = getTracer(telemetry);
   return recordSpan({
     name: "ai.generateText",
@@ -3211,9 +3174,8 @@ async function generateText({
     }),
     tracer,
     fn: async (span) => {
-      var _a11, _b, _c, _d, _e;
+      var _a11, _b, _c, _d, _e, _f, _g;
       const retry = retryWithExponentialBackoff({ maxRetries });
-      const currentPrompt = standardizePrompt({ system, prompt, messages });
       const mode = {
         type: "regular",
         ...prepareToolsAndToolChoice({ tools, toolChoice, activeTools })
@@ -3234,11 +3196,17 @@ async function generateText({
       let stepType = "initial";
       do {
         if (stepCount === 1) {
-          currentPrompt.type = "messages";
+          initialPrompt.type = "messages";
         }
+        const promptFormat = stepCount === 0 ? initialPrompt.type : "messages";
         const promptMessages = await convertToLanguageModelPrompt({
-          prompt: currentPrompt,
-          modelSupportsImageUrls: model.supportsImageUrls
+          prompt: {
+            type: promptFormat,
+            system: initialPrompt.system,
+            messages: [...initialPrompt.messages, ...responseMessages]
+          },
+          modelSupportsImageUrls: model.supportsImageUrls,
+          modelSupportsUrl: model.supportsUrl
         });
         currentModelResponse = await retry(
           () => recordSpan({
@@ -3251,7 +3219,7 @@ async function generateText({
                   telemetry
                 }),
                 ...baseTelemetryAttributes,
-                "ai.prompt.format": { input: () => currentPrompt.type },
+                "ai.prompt.format": { input: () => promptFormat },
                 "ai.prompt.messages": {
                   input: () => JSON.stringify(promptMessages)
                 },
@@ -3269,11 +3237,11 @@ async function generateText({
             }),
             tracer,
             fn: async (span2) => {
-              var _a12, _b2, _c2, _d2, _e2, _f;
+              var _a12, _b2, _c2, _d2, _e2, _f2;
               const result = await model.doGenerate({
                 mode,
                 ...callSettings,
-                inputFormat: currentPrompt.type,
+                inputFormat: promptFormat,
                 prompt: promptMessages,
                 providerMetadata,
                 abortSignal,
@@ -3282,7 +3250,7 @@ async function generateText({
               const responseData = {
                 id: (_b2 = (_a12 = result.response) == null ? void 0 : _a12.id) != null ? _b2 : generateId3(),
                 timestamp: (_d2 = (_c2 = result.response) == null ? void 0 : _c2.timestamp) != null ? _d2 : currentDate(),
-                modelId: (_f = (_e2 = result.response) == null ? void 0 : _e2.modelId) != null ? _f : model.modelId
+                modelId: (_f2 = (_e2 = result.response) == null ? void 0 : _e2.modelId) != null ? _f2 : model.modelId
               };
               span2.setAttributes(
                 selectTelemetryAttributes({
@@ -3352,7 +3320,27 @@ async function generateText({
         }
         const stepText = nextStepType === "continue" ? removeTextAfterLastWhitespace((_b = currentModelResponse.text) != null ? _b : "") : (_c = currentModelResponse.text) != null ? _c : "";
         text = nextStepType === "continue" || stepType === "continue" ? text + stepText : stepText;
-        const currentStep = {
+        if (stepType === "continue") {
+          const lastMessage = responseMessages[responseMessages.length - 1];
+          if (typeof lastMessage.content === "string") {
+            lastMessage.content = text;
+          } else {
+            lastMessage.content.push({
+              text: stepText,
+              type: "text"
+            });
+          }
+        } else {
+          responseMessages.push(
+            ...toResponseMessages({
+              text,
+              tools: tools != null ? tools : {},
+              toolCalls: currentToolCalls,
+              toolResults: currentToolResults
+            })
+          );
+        }
+        const currentStepResult = {
           stepType,
           text: stepText,
           toolCalls: currentToolCalls,
@@ -3361,36 +3349,18 @@ async function generateText({
           usage: currentUsage,
           warnings: currentModelResponse.warnings,
           logprobs: currentModelResponse.logprobs,
+          request: (_d = currentModelResponse.request) != null ? _d : {},
           response: {
             ...currentModelResponse.response,
-            headers: (_d = currentModelResponse.rawResponse) == null ? void 0 : _d.headers
+            headers: (_e = currentModelResponse.rawResponse) == null ? void 0 : _e.headers,
+            // deep clone msgs to avoid mutating past messages in multi-step:
+            messages: JSON.parse(JSON.stringify(responseMessages))
           },
           experimental_providerMetadata: currentModelResponse.providerMetadata,
           isContinued: nextStepType === "continue"
         };
-        steps.push(currentStep);
-        await (onStepFinish == null ? void 0 : onStepFinish(currentStep));
-        if (stepType === "continue") {
-          const lastMessage = currentPrompt.messages[currentPrompt.messages.length - 1];
-          if (typeof lastMessage.content === "string") {
-            lastMessage.content = text;
-          } else {
-            lastMessage.content.push({
-              text: stepText,
-              type: "text"
-            });
-          }
-          responseMessages[responseMessages.length - 1] = lastMessage;
-          currentPrompt.messages[currentPrompt.messages.length - 1] = lastMessage;
-        } else {
-          const newResponseMessages = toResponseMessages({
-            text,
-            toolCalls: currentToolCalls,
-            toolResults: currentToolResults
-          });
-          responseMessages.push(...newResponseMessages);
-          currentPrompt.messages.push(...newResponseMessages);
-        }
+        steps.push(currentStepResult);
+        await (onStepFinish == null ? void 0 : onStepFinish(currentStepResult));
         stepType = nextStepType;
       } while (stepType !== "done");
       span.setAttributes(
@@ -3424,9 +3394,11 @@ async function generateText({
         finishReason: currentModelResponse.finishReason,
         usage,
         warnings: currentModelResponse.warnings,
+        request: (_f = currentModelResponse.request) != null ? _f : {},
         response: {
           ...currentModelResponse.response,
-          headers: (_e = currentModelResponse.rawResponse) == null ? void 0 : _e.headers
+          headers: (_g = currentModelResponse.rawResponse) == null ? void 0 : _g.headers,
+          messages: responseMessages
         },
         logprobs: currentModelResponse.logprobs,
         responseMessages,
@@ -3504,6 +3476,7 @@ var DefaultGenerateTextResult = class {
     this.finishReason = options.finishReason;
     this.usage = options.usage;
     this.warnings = options.warnings;
+    this.request = options.request;
     this.response = options.response;
     this.responseMessages = options.responseMessages;
     this.roundtrips = options.steps;
@@ -3518,7 +3491,7 @@ var DefaultGenerateTextResult = class {
 var experimental_generateText = generateText;
 
 // core/generate-text/stream-text.ts
-var import_provider_utils10 = require("@ai-sdk/provider-utils");
+var import_provider_utils9 = require("@ai-sdk/provider-utils");
 
 // core/util/create-stitchable-stream.ts
 function createStitchableStream() {
@@ -3861,7 +3834,7 @@ function runToolsTransformation({
 }
 
 // core/generate-text/stream-text.ts
-var originalGenerateId4 = (0, import_provider_utils10.createIdGenerator)({ prefix: "aitxt-", size: 24 });
+var originalGenerateId4 = (0, import_provider_utils9.createIdGenerator)({ prefix: "aitxt", size: 24 });
 async function streamText({
   model,
   tools,
@@ -3903,6 +3876,7 @@ async function streamText({
     settings: { ...settings, maxRetries }
   });
   const tracer = getTracer(telemetry);
+  const initialPrompt = standardizePrompt({ system, prompt, messages });
   return recordSpan({
     name: "ai.streamText",
     attributes: selectTelemetryAttributes({
@@ -3922,14 +3896,20 @@ async function streamText({
     fn: async (rootSpan) => {
       const retry = retryWithExponentialBackoff({ maxRetries });
       const startStep = async ({
-        currentPrompt: currentPrompt2
+        responseMessages
       }) => {
+        const promptFormat = responseMessages.length === 0 ? initialPrompt.type : "messages";
         const promptMessages = await convertToLanguageModelPrompt({
-          prompt: currentPrompt2,
-          modelSupportsImageUrls: model.supportsImageUrls
+          prompt: {
+            type: promptFormat,
+            system: initialPrompt.system,
+            messages: [...initialPrompt.messages, ...responseMessages]
+          },
+          modelSupportsImageUrls: model.supportsImageUrls,
+          modelSupportsUrl: model.supportsUrl
         });
         const {
-          result: { stream: stream2, warnings: warnings2, rawResponse: rawResponse2 },
+          result: { stream: stream2, warnings: warnings2, rawResponse: rawResponse2, request: request2 },
           doStreamSpan: doStreamSpan2,
           startTimestampMs: startTimestampMs2
         } = await retry(
@@ -3944,7 +3924,7 @@ async function streamText({
                 }),
                 ...baseTelemetryAttributes,
                 "ai.prompt.format": {
-                  input: () => currentPrompt2.type
+                  input: () => promptFormat
                 },
                 "ai.prompt.messages": {
                   input: () => JSON.stringify(promptMessages)
@@ -3977,7 +3957,7 @@ async function streamText({
                   })
                 },
                 ...prepareCallSettings(settings),
-                inputFormat: currentPrompt2.type,
+                inputFormat: promptFormat,
                 prompt: promptMessages,
                 providerMetadata,
                 abortSignal,
@@ -3997,22 +3977,23 @@ async function streamText({
               abortSignal
             }),
             warnings: warnings2,
+            request: request2 != null ? request2 : {},
             rawResponse: rawResponse2
           },
           doStreamSpan: doStreamSpan2,
           startTimestampMs: startTimestampMs2
         };
       };
-      const currentPrompt = standardizePrompt({ system, prompt, messages });
       const {
-        result: { stream, warnings, rawResponse },
+        result: { stream, warnings, rawResponse, request },
         doStreamSpan,
         startTimestampMs
-      } = await startStep({ currentPrompt });
+      } = await startStep({ responseMessages: [] });
       return new DefaultStreamTextResult({
         stream,
         warnings,
         rawResponse,
+        request,
         onChunk,
         onFinish,
         onStepFinish,
@@ -4023,11 +4004,11 @@ async function streamText({
         maxSteps,
         continueSteps,
         startStep,
-        currentPrompt,
         modelId: model.modelId,
         now: now2,
         currentDate,
-        generateId: generateId3
+        generateId: generateId3,
+        tools
       });
     }
   });
@@ -4037,6 +4018,7 @@ var DefaultStreamTextResult = class {
     stream,
     warnings,
     rawResponse,
+    request,
     onChunk,
     onFinish,
     onStepFinish,
@@ -4047,11 +4029,11 @@ var DefaultStreamTextResult = class {
     maxSteps,
     continueSteps,
     startStep,
-    currentPrompt,
     modelId,
     now: now2,
     currentDate,
-    generateId: generateId3
+    generateId: generateId3,
+    tools
   }) {
     this.warnings = warnings;
     this.rawResponse = rawResponse;
@@ -4072,6 +4054,8 @@ var DefaultStreamTextResult = class {
       promise: providerMetadataPromise
     } = createResolvablePromise();
     this.experimental_providerMetadata = providerMetadataPromise;
+    const { resolve: resolveRequest, promise: requestPromise } = createResolvablePromise();
+    this.request = requestPromise;
     const { resolve: resolveResponse, promise: responsePromise } = createResolvablePromise();
     this.response = responsePromise;
     const {
@@ -4092,14 +4076,15 @@ var DefaultStreamTextResult = class {
       startTimestamp,
       doStreamSpan: doStreamSpan2,
       currentStep,
-      currentPrompt: currentPrompt2,
+      responseMessages,
       usage = {
         promptTokens: 0,
         completionTokens: 0,
         totalTokens: 0
       },
       stepType,
-      previousStepText = ""
+      previousStepText = "",
+      stepRequest
     }) {
       const stepToolCalls = [];
       const stepToolResults = [];
@@ -4226,6 +4211,7 @@ var DefaultStreamTextResult = class {
             },
             // invoke onFinish callback and resolve toolResults promise when the stream is about to close:
             async flush(controller) {
+              var _a11;
               const stepToolCallsJson = stepToolCalls.length > 0 ? JSON.stringify(stepToolCalls) : void 0;
               let nextStepType = "done";
               if (currentStep + 1 < maxSteps) {
@@ -4291,10 +4277,32 @@ var DefaultStreamTextResult = class {
                 usage: stepUsage,
                 experimental_providerMetadata: stepProviderMetadata,
                 logprobs: stepLogProbs,
-                response: stepResponse,
+                response: {
+                  ...stepResponse
+                },
                 isContinued: nextStepType === "continue"
               });
-              const stepResult = {
+              if (stepType === "continue") {
+                const lastMessage = responseMessages[responseMessages.length - 1];
+                if (typeof lastMessage.content === "string") {
+                  lastMessage.content = stepText;
+                } else {
+                  lastMessage.content.push({
+                    text: stepText,
+                    type: "text"
+                  });
+                }
+              } else {
+                responseMessages.push(
+                  ...toResponseMessages({
+                    text: stepText,
+                    tools: tools != null ? tools : {},
+                    toolCalls: stepToolCalls,
+                    toolResults: stepToolResults
+                  })
+                );
+              }
+              const currentStepResult = {
                 stepType,
                 text: stepText,
                 toolCalls: stepToolCalls,
@@ -4303,49 +4311,30 @@ var DefaultStreamTextResult = class {
                 usage: stepUsage,
                 warnings: self.warnings,
                 logprobs: stepLogProbs,
-                response: stepResponse,
+                request: stepRequest,
                 rawResponse: self.rawResponse,
+                response: {
+                  ...stepResponse,
+                  headers: (_a11 = self.rawResponse) == null ? void 0 : _a11.headers,
+                  // deep clone msgs to avoid mutating past messages in multi-step:
+                  messages: JSON.parse(JSON.stringify(responseMessages))
+                },
                 experimental_providerMetadata: stepProviderMetadata,
                 isContinued: nextStepType === "continue"
               };
-              stepResults.push(stepResult);
-              await (onStepFinish == null ? void 0 : onStepFinish(stepResult));
+              stepResults.push(currentStepResult);
+              await (onStepFinish == null ? void 0 : onStepFinish(currentStepResult));
               const combinedUsage = {
                 promptTokens: usage.promptTokens + stepUsage.promptTokens,
                 completionTokens: usage.completionTokens + stepUsage.completionTokens,
                 totalTokens: usage.totalTokens + stepUsage.totalTokens
               };
               if (nextStepType !== "done") {
-                if (stepType === "continue") {
-                  const lastMessage = currentPrompt2.messages[currentPrompt2.messages.length - 1];
-                  if (typeof lastMessage.content === "string") {
-                    lastMessage.content = stepText;
-                  } else {
-                    lastMessage.content.push({
-                      text: stepText,
-                      type: "text"
-                    });
-                  }
-                  currentPrompt2.messages[currentPrompt2.messages.length - 1] = lastMessage;
-                } else {
-                  const newResponseMessages = toResponseMessages({
-                    text: stepText,
-                    toolCalls: stepToolCalls,
-                    toolResults: stepToolResults
-                  });
-                  currentPrompt2.messages.push(...newResponseMessages);
-                }
                 const {
                   result,
                   doStreamSpan: doStreamSpan3,
                   startTimestampMs: startTimestamp2
-                } = await startStep({
-                  currentPrompt: {
-                    type: "messages",
-                    system: currentPrompt2.system,
-                    messages: currentPrompt2.messages
-                  }
-                });
+                } = await startStep({ responseMessages });
                 self.warnings = result.warnings;
                 self.rawResponse = result.rawResponse;
                 addStepStream({
@@ -4353,10 +4342,11 @@ var DefaultStreamTextResult = class {
                   startTimestamp: startTimestamp2,
                   doStreamSpan: doStreamSpan3,
                   currentStep: currentStep + 1,
-                  currentPrompt: currentPrompt2,
+                  responseMessages,
                   usage: combinedUsage,
                   stepType: nextStepType,
-                  previousStepText: fullStepText
+                  previousStepText: fullStepText,
+                  stepRequest: result.request
                 });
                 return;
               }
@@ -4367,7 +4357,9 @@ var DefaultStreamTextResult = class {
                   usage: combinedUsage,
                   experimental_providerMetadata: stepProviderMetadata,
                   logprobs: stepLogProbs,
-                  response: stepResponse
+                  response: {
+                    ...stepResponse
+                  }
                 });
                 closeStitchableStream();
                 rootSpan.setAttributes(
@@ -4390,34 +4382,13 @@ var DefaultStreamTextResult = class {
                     }
                   })
                 );
-                const responseMessages = stepResults.reduce((responseMessages2, step) => {
-                  if (step.stepType === "continue") {
-                    const lastResponseMessage = responseMessages2.pop();
-                    if (typeof lastResponseMessage.content === "string") {
-                      lastResponseMessage.content += step.text;
-                    } else {
-                      lastResponseMessage.content.push({
-                        text: step.text,
-                        type: "text"
-                      });
-                    }
-                    return [...responseMessages2, lastResponseMessage];
-                  }
-                  return [
-                    ...responseMessages2,
-                    ...toResponseMessages({
-                      text: step.text,
-                      toolCalls: step.toolCalls,
-                      toolResults: step.toolResults
-                    })
-                  ];
-                }, []);
                 resolveUsage(combinedUsage);
                 resolveFinishReason(stepFinishReason);
                 resolveText(fullStepText);
                 resolveToolCalls(stepToolCalls);
                 resolveProviderMetadata(stepProviderMetadata);
                 resolveToolResults(stepToolResults);
+                resolveRequest(stepRequest);
                 resolveResponse({
                   ...stepResponse,
                   headers: rawResponse == null ? void 0 : rawResponse.headers
@@ -4435,10 +4406,12 @@ var DefaultStreamTextResult = class {
                   // optional as well. Therefore we need to cast the toolResults to any.
                   // The type exposed to the users will be correctly inferred.
                   toolResults: stepToolResults,
+                  request: stepRequest,
                   rawResponse,
                   response: {
                     ...stepResponse,
-                    headers: rawResponse == null ? void 0 : rawResponse.headers
+                    headers: rawResponse == null ? void 0 : rawResponse.headers,
+                    messages: responseMessages
                   },
                   warnings,
                   experimental_providerMetadata: stepProviderMetadata,
@@ -4460,9 +4433,10 @@ var DefaultStreamTextResult = class {
       startTimestamp: startTimestampMs,
       doStreamSpan,
       currentStep: 0,
-      currentPrompt,
+      responseMessages: [],
       usage: void 0,
-      stepType: "initial"
+      stepType: "initial",
+      stepRequest: request
     });
   }
   /**
@@ -4501,7 +4475,7 @@ var DefaultStreamTextResult = class {
   }
   toDataStreamInternal({
     callbacks = {},
-    getErrorMessage: getErrorMessage4 = () => "",
+    getErrorMessage: getErrorMessage3 = () => "",
     // mask error messages for safety by default
     sendUsage = true
   } = {}) {
@@ -4576,7 +4550,7 @@ var DefaultStreamTextResult = class {
           }
           case "error": {
             controller.enqueue(
-              (0, import_ui_utils10.formatStreamPart)("error", getErrorMessage4(chunk.error))
+              (0, import_ui_utils10.formatStreamPart)("error", getErrorMessage3(chunk.error))
             );
             break;
           }
@@ -4624,7 +4598,7 @@ var DefaultStreamTextResult = class {
       statusText: "statusText" in options ? options.statusText : void 0
     };
     const data = options == null ? void 0 : "data" in options ? options.data : void 0;
-    const getErrorMessage4 = options == null ? void 0 : "getErrorMessage" in options ? options.getErrorMessage : void 0;
+    const getErrorMessage3 = options == null ? void 0 : "getErrorMessage" in options ? options.getErrorMessage : void 0;
     const sendUsage = options == null ? void 0 : "sendUsage" in options ? options.sendUsage : void 0;
     writeToServerResponse({
       response,
@@ -4634,7 +4608,7 @@ var DefaultStreamTextResult = class {
         contentType: "text/plain; charset=utf-8",
         dataStreamVersion: "v1"
       }),
-      stream: this.toDataStream({ data, getErrorMessage: getErrorMessage4, sendUsage })
+      stream: this.toDataStream({ data, getErrorMessage: getErrorMessage3, sendUsage })
     });
   }
   pipeTextStreamToResponse(response, init) {
@@ -4666,10 +4640,10 @@ var DefaultStreamTextResult = class {
       statusText: "statusText" in options ? options.statusText : void 0
     };
     const data = options == null ? void 0 : "data" in options ? options.data : void 0;
-    const getErrorMessage4 = options == null ? void 0 : "getErrorMessage" in options ? options.getErrorMessage : void 0;
+    const getErrorMessage3 = options == null ? void 0 : "getErrorMessage" in options ? options.getErrorMessage : void 0;
     const sendUsage = options == null ? void 0 : "sendUsage" in options ? options.sendUsage : void 0;
     return new Response(
-      this.toDataStream({ data, getErrorMessage: getErrorMessage4, sendUsage }),
+      this.toDataStream({ data, getErrorMessage: getErrorMessage3, sendUsage }),
       {
         status: (_a11 = init == null ? void 0 : init.status) != null ? _a11 : 200,
         statusText: init == null ? void 0 : init.statusText,
@@ -4711,6 +4685,7 @@ var experimental_wrapLanguageModel = ({
     modelId: modelId != null ? modelId : model.modelId,
     defaultObjectGenerationMode: model.defaultObjectGenerationMode,
     supportsImageUrls: model.supportsImageUrls,
+    supportsUrl: model.supportsUrl,
     supportsStructuredOutputs: model.supportsStructuredOutputs,
     async doGenerate(params) {
       const transformedParams = await doTransform({ params, type: "generate" });
@@ -4834,7 +4809,7 @@ function convertToCoreMessages(messages) {
           role: "assistant",
           content: [
             { type: "text", text: content },
-            ...toolInvocations.filter((invocation) => invocation.state !== "partial-call").map(({ toolCallId, toolName, args }) => ({
+            ...toolInvocations.map(({ toolCallId, toolName, args }) => ({
               type: "tool-call",
               toolCallId,
               toolName,
@@ -4842,19 +4817,25 @@ function convertToCoreMessages(messages) {
             }))
           ]
         });
-        const toolResults = toolInvocations.filter((invocation) => invocation.state === "result").map(({ toolCallId, toolName, args, result }) => ({
-          type: "tool-result",
-          toolCallId,
-          toolName,
-          args,
-          result
-        }));
-        if (toolResults.length > 0) {
-          coreMessages.push({
-            role: "tool",
-            content: toolResults
-          });
-        }
+        coreMessages.push({
+          role: "tool",
+          content: toolInvocations.map((ToolInvocation) => {
+            if (!("result" in ToolInvocation)) {
+              throw new MessageConversionError({
+                originalMessage: message,
+                message: "ToolInvocation must have a result: " + JSON.stringify(ToolInvocation)
+              });
+            }
+            const { toolCallId, toolName, args, result } = ToolInvocation;
+            return {
+              type: "tool-result",
+              toolCallId,
+              toolName,
+              args,
+              result
+            };
+          })
+        });
         break;
       }
       case "function":
@@ -6130,8 +6111,8 @@ var StreamingTextResponse = class extends Response {
 };
 
 // streams/index.ts
-var generateId2 = import_provider_utils11.generateId;
-var nanoid = import_provider_utils11.generateId;
+var generateId2 = import_provider_utils10.generateId;
+var nanoid = import_provider_utils10.generateId;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AISDKError,