ai 5.0.0-canary.6 → 5.0.0-canary.7

package/dist/index.mjs

@@ -1422,7 +1422,10 @@ function isSchema(value) {
   return typeof value === "object" && value !== null && schemaSymbol in value && value[schemaSymbol] === true && "jsonSchema" in value && "validate" in value;
 }
 function asSchema(schema) {
-  return isSchema(schema) ? schema : zodSchema(schema);
+  return schema == null ? jsonSchema({
+    properties: {},
+    additionalProperties: false
+  }) : isSchema(schema) ? schema : zodSchema(schema);
 }
 
 // core/util/should-resubmit-messages.ts
@@ -2552,9 +2555,6 @@ var NoObjectGeneratedError = class extends AISDKError4 {
 };
 _a4 = symbol4;
 
-// core/prompt/convert-to-language-model-prompt.ts
-import { convertUint8ArrayToBase64 as convertUint8ArrayToBase643 } from "@ai-sdk/provider-utils";
-
 // util/download-error.ts
 import { AISDKError as AISDKError5 } from "@ai-sdk/provider";
 var name5 = "AI_DownloadError";
@@ -2607,10 +2607,12 @@ async function download({ url }) {
 }
 
 // core/prompt/data-content.ts
+import { AISDKError as AISDKError7 } from "@ai-sdk/provider";
 import {
   convertBase64ToUint8Array as convertBase64ToUint8Array2,
   convertUint8ArrayToBase64 as convertUint8ArrayToBase642
 } from "@ai-sdk/provider-utils";
+import { z } from "zod";
 
 // core/prompt/invalid-data-content-error.ts
 import { AISDKError as AISDKError6 } from "@ai-sdk/provider";
@@ -2634,8 +2636,23 @@ var InvalidDataContentError = class extends AISDKError6 {
 };
 _a6 = symbol6;
 
+// core/prompt/split-data-url.ts
+function splitDataUrl(dataUrl) {
+  try {
+    const [header, base64Content] = dataUrl.split(",");
+    return {
+      mediaType: header.split(";")[0].split(":")[1],
+      base64Content
+    };
+  } catch (error) {
+    return {
+      mediaType: void 0,
+      base64Content: void 0
+    };
+  }
+}
+
 // core/prompt/data-content.ts
-import { z } from "zod";
 var dataContentSchema = z.union([
   z.string(),
   z.instanceof(Uint8Array),
@@ -2649,6 +2666,33 @@ var dataContentSchema = z.union([
     { message: "Must be a Buffer" }
   )
 ]);
+function convertToLanguageModelV2DataContent(content) {
+  if (content instanceof Uint8Array) {
+    return { data: content, mediaType: void 0 };
+  }
+  if (content instanceof ArrayBuffer) {
+    return { data: new Uint8Array(content), mediaType: void 0 };
+  }
+  if (typeof content === "string") {
+    try {
+      content = new URL(content);
+    } catch (error) {
+    }
+  }
+  if (content instanceof URL && content.protocol === "data:") {
+    const { mediaType: dataUrlMediaType, base64Content } = splitDataUrl(
+      content.toString()
+    );
+    if (dataUrlMediaType == null || base64Content == null) {
+      throw new AISDKError7({
+        name: "InvalidDataContentError",
+        message: `Invalid data URL format in content ${content.toString()}`
+      });
+    }
+    return { data: base64Content, mediaType: dataUrlMediaType };
+  }
+  return { data: content, mediaType: void 0 };
+}
 function convertDataContentToBase64String(content) {
   if (typeof content === "string") {
     return content;
@@ -2687,12 +2731,12 @@ function convertUint8ArrayToText(uint8Array) {
 }
 
 // core/prompt/invalid-message-role-error.ts
-import { AISDKError as AISDKError7 } from "@ai-sdk/provider";
+import { AISDKError as AISDKError8 } from "@ai-sdk/provider";
 var name7 = "AI_InvalidMessageRoleError";
 var marker7 = `vercel.ai.error.${name7}`;
 var symbol7 = Symbol.for(marker7);
 var _a7;
-var InvalidMessageRoleError = class extends AISDKError7 {
+var InvalidMessageRoleError = class extends AISDKError8 {
   constructor({
     role,
     message = `Invalid message role: '${role}'. Must be one of: "system", "user", "assistant", "tool".`
@@ -2702,27 +2746,11 @@ var InvalidMessageRoleError = class extends AISDKError7 {
     this.role = role;
   }
   static isInstance(error) {
-    return AISDKError7.hasMarker(error, marker7);
+    return AISDKError8.hasMarker(error, marker7);
   }
 };
 _a7 = symbol7;
 
-// core/prompt/split-data-url.ts
-function splitDataUrl(dataUrl) {
-  try {
-    const [header, base64Content] = dataUrl.split(",");
-    return {
-      mediaType: header.split(";")[0].split(":")[1],
-      base64Content
-    };
-  } catch (error) {
-    return {
-      mediaType: void 0,
-      base64Content: void 0
-    };
-  }
-}
-
 // core/prompt/convert-to-language-model-prompt.ts
 async function convertToLanguageModelPrompt({
   prompt,
@@ -2744,14 +2772,13 @@ async function convertToLanguageModelPrompt({
   ];
 }
 function convertToLanguageModelMessage(message, downloadedAssets) {
-  var _a17, _b, _c, _d, _e, _f;
   const role = message.role;
   switch (role) {
     case "system": {
       return {
         role: "system",
         content: message.content,
-        providerOptions: (_a17 = message.providerOptions) != null ? _a17 : message.experimental_providerMetadata
+        providerOptions: message.providerOptions
       };
     }
     case "user": {
@@ -2759,13 +2786,13 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
         return {
           role: "user",
           content: [{ type: "text", text: message.content }],
-          providerOptions: (_b = message.providerOptions) != null ? _b : message.experimental_providerMetadata
+          providerOptions: message.providerOptions
         };
       }
       return {
         role: "user",
         content: message.content.map((part) => convertPartToLanguageModelPart(part, downloadedAssets)).filter((part) => part.type !== "text" || part.text !== ""),
-        providerOptions: (_c = message.providerOptions) != null ? _c : message.experimental_providerMetadata
+        providerOptions: message.providerOptions
       };
     }
     case "assistant": {
@@ -2773,7 +2800,7 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
         return {
           role: "assistant",
           content: [{ type: "text", text: message.content }],
-          providerOptions: (_d = message.providerOptions) != null ? _d : message.experimental_providerMetadata
+          providerOptions: message.providerOptions
         };
       }
       return {
@@ -2782,15 +2809,18 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
           // remove empty text parts:
           (part) => part.type !== "text" || part.text !== ""
         ).map((part) => {
-          var _a18, _b2;
-          const providerOptions = (_a18 = part.providerOptions) != null ? _a18 : part.experimental_providerMetadata;
+          var _a17;
+          const providerOptions = part.providerOptions;
           switch (part.type) {
             case "file": {
+              const { data, mediaType } = convertToLanguageModelV2DataContent(
+                part.data
+              );
               return {
                 type: "file",
-                data: part.data instanceof URL ? part.data : convertDataContentToBase64String(part.data),
+                data,
                 filename: part.filename,
-                mediaType: (_b2 = part.mediaType) != null ? _b2 : part.mimeType,
+                mediaType: (_a17 = mediaType != null ? mediaType : part.mediaType) != null ? _a17 : part.mimeType,
                 providerOptions
               };
             }
@@ -2827,25 +2857,22 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
             }
           }
         }),
-        providerOptions: (_e = message.providerOptions) != null ? _e : message.experimental_providerMetadata
+        providerOptions: message.providerOptions
       };
     }
     case "tool": {
       return {
         role: "tool",
-        content: message.content.map((part) => {
-          var _a18;
-          return {
-            type: "tool-result",
-            toolCallId: part.toolCallId,
-            toolName: part.toolName,
-            result: part.result,
-            content: part.experimental_content,
-            isError: part.isError,
-            providerOptions: (_a18 = part.providerOptions) != null ? _a18 : part.experimental_providerMetadata
-          };
-        }),
-        providerOptions: (_f = message.providerOptions) != null ? _f : message.experimental_providerMetadata
+        content: message.content.map((part) => ({
+          type: "tool-result",
+          toolCallId: part.toolCallId,
+          toolName: part.toolName,
+          result: part.result,
+          content: part.experimental_content,
+          isError: part.isError,
+          providerOptions: part.providerOptions
+        })),
+        providerOptions: message.providerOptions
       };
     }
     default: {
@@ -2878,71 +2905,48 @@ async function downloadAssets(messages, downloadImplementation, modelSupportsIma
   );
 }
 function convertPartToLanguageModelPart(part, downloadedAssets) {
-  var _a17, _b, _c, _d, _e;
+  var _a17, _b, _c;
   if (part.type === "text") {
     return {
       type: "text",
       text: part.text,
-      providerOptions: (_a17 = part.providerOptions) != null ? _a17 : part.experimental_providerMetadata
+      providerOptions: part.providerOptions
     };
   }
-  let mediaType = (_b = part.mediaType) != null ? _b : part.mimeType;
-  let data;
-  let content;
-  let normalizedData;
+  let originalData;
   const type = part.type;
   switch (type) {
     case "image":
-      data = part.image;
+      originalData = part.image;
       break;
     case "file":
-      data = part.data;
+      originalData = 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 { mediaType: dataUrlMediaType, base64Content } = splitDataUrl(
-        content.toString()
-      );
-      if (dataUrlMediaType == null || base64Content == null) {
-        throw new Error(`Invalid data URL format in part ${type}`);
-      }
-      mediaType = dataUrlMediaType;
-      normalizedData = convertDataContentToUint8Array(base64Content);
-    } else {
-      const downloadedFile = downloadedAssets[content.toString()];
-      if (downloadedFile) {
-        normalizedData = downloadedFile.data;
-        mediaType != null ? mediaType : mediaType = downloadedFile.mediaType;
-      } else {
-        normalizedData = content;
-      }
+  const { data: convertedData, mediaType: convertedMediaType } = convertToLanguageModelV2DataContent(originalData);
+  let mediaType = (_a17 = convertedMediaType != null ? convertedMediaType : part.mediaType) != null ? _a17 : part.mimeType;
+  let data = convertedData;
+  if (data instanceof URL) {
+    const downloadedFile = downloadedAssets[data.toString()];
+    if (downloadedFile) {
+      data = downloadedFile.data;
+      mediaType = (_b = downloadedFile.mediaType) != null ? _b : mediaType;
     }
-  } else {
-    normalizedData = convertDataContentToUint8Array(content);
   }
   switch (type) {
     case "image": {
-      if (normalizedData instanceof Uint8Array) {
-        mediaType = (_c = detectMediaType({
-          data: normalizedData,
-          signatures: imageMediaTypeSignatures
-        })) != null ? _c : mediaType;
+      if (data instanceof Uint8Array || typeof data === "string") {
+        mediaType = (_c = detectMediaType({ data, signatures: imageMediaTypeSignatures })) != null ? _c : mediaType;
       }
       return {
         type: "file",
         mediaType: mediaType != null ? mediaType : "image/*",
         // any image
         filename: void 0,
-        data: normalizedData instanceof Uint8Array ? convertUint8ArrayToBase643(normalizedData) : normalizedData,
-        providerOptions: (_d = part.providerOptions) != null ? _d : part.experimental_providerMetadata
+        data,
+        providerOptions: part.providerOptions
       };
     }
     case "file": {
@@ -2953,8 +2957,8 @@ function convertPartToLanguageModelPart(part, downloadedAssets) {
         type: "file",
         mediaType,
         filename: part.filename,
-        data: normalizedData instanceof Uint8Array ? convertDataContentToBase64String(normalizedData) : normalizedData,
-        providerOptions: (_e = part.providerOptions) != null ? _e : part.experimental_providerMetadata
+        data,
+        providerOptions: part.providerOptions
       };
     }
   }
@@ -2962,7 +2966,7 @@ function convertPartToLanguageModelPart(part, downloadedAssets) {
 
 // core/prompt/prepare-call-settings.ts
 function prepareCallSettings({
-  maxTokens,
+  maxOutputTokens,
   temperature,
   topP,
   topK,
@@ -2971,19 +2975,19 @@ function prepareCallSettings({
   stopSequences,
   seed
 }) {
-  if (maxTokens != null) {
-    if (!Number.isInteger(maxTokens)) {
+  if (maxOutputTokens != null) {
+    if (!Number.isInteger(maxOutputTokens)) {
       throw new InvalidArgumentError({
-        parameter: "maxTokens",
-        value: maxTokens,
-        message: "maxTokens must be an integer"
+        parameter: "maxOutputTokens",
+        value: maxOutputTokens,
+        message: "maxOutputTokens must be an integer"
       });
     }
-    if (maxTokens < 1) {
+    if (maxOutputTokens < 1) {
       throw new InvalidArgumentError({
-        parameter: "maxTokens",
-        value: maxTokens,
-        message: "maxTokens must be >= 1"
+        parameter: "maxOutputTokens",
+        value: maxOutputTokens,
+        message: "maxOutputTokens must be >= 1"
       });
     }
   }
@@ -3042,7 +3046,7 @@ function prepareCallSettings({
     }
   }
   return {
-    maxTokens,
+    maxOutputTokens,
     // TODO v5 remove default 0 for temperature
     temperature: temperature != null ? temperature : 0,
     topP,
@@ -3137,12 +3141,12 @@ function attachmentsToParts(attachments) {
 }
 
 // core/prompt/message-conversion-error.ts
-import { AISDKError as AISDKError8 } from "@ai-sdk/provider";
+import { AISDKError as AISDKError9 } from "@ai-sdk/provider";
 var name8 = "AI_MessageConversionError";
 var marker8 = `vercel.ai.error.${name8}`;
 var symbol8 = Symbol.for(marker8);
 var _a8;
-var MessageConversionError = class extends AISDKError8 {
+var MessageConversionError = class extends AISDKError9 {
   constructor({
     originalMessage,
     message
@@ -3152,7 +3156,7 @@ var MessageConversionError = class extends AISDKError8 {
     this.originalMessage = originalMessage;
   }
   static isInstance(error) {
-    return AISDKError8.hasMarker(error, marker8);
+    return AISDKError9.hasMarker(error, marker8);
   }
 };
 _a8 = symbol8;
@@ -3426,7 +3430,7 @@ function detectSingleMessageCharacteristics(message) {
   "experimental_attachments" in message)) {
     return "has-ui-specific-parts";
   } else if (typeof message === "object" && message !== null && "content" in message && (Array.isArray(message.content) || // Core messages can have array content
-  "experimental_providerMetadata" in message || "providerOptions" in message)) {
+  "providerOptions" in message)) {
     return "has-core-specific-parts";
   } else if (typeof message === "object" && message !== null && "role" in message && "content" in message && typeof message.content === "string" && ["system", "user", "assistant", "tool"].includes(message.role)) {
     return "message";
@@ -3480,16 +3484,14 @@ var toolResultContentSchema = z4.array(
 var textPartSchema = z5.object({
   type: z5.literal("text"),
   text: z5.string(),
-  providerOptions: providerMetadataSchema.optional(),
-  experimental_providerMetadata: providerMetadataSchema.optional()
+  providerOptions: providerMetadataSchema.optional()
 });
 var imagePartSchema = z5.object({
   type: z5.literal("image"),
   image: z5.union([dataContentSchema, z5.instanceof(URL)]),
   mediaType: z5.string().optional(),
   mimeType: z5.string().optional(),
-  providerOptions: providerMetadataSchema.optional(),
-  experimental_providerMetadata: providerMetadataSchema.optional()
+  providerOptions: providerMetadataSchema.optional()
 });
 var filePartSchema = z5.object({
   type: z5.literal("file"),
@@ -3497,28 +3499,24 @@ var filePartSchema = z5.object({
   filename: z5.string().optional(),
   mediaType: z5.string(),
   mimeType: z5.string().optional(),
-  providerOptions: providerMetadataSchema.optional(),
-  experimental_providerMetadata: providerMetadataSchema.optional()
+  providerOptions: providerMetadataSchema.optional()
 });
 var reasoningPartSchema = z5.object({
   type: z5.literal("reasoning"),
   text: z5.string(),
-  providerOptions: providerMetadataSchema.optional(),
-  experimental_providerMetadata: providerMetadataSchema.optional()
+  providerOptions: providerMetadataSchema.optional()
 });
 var redactedReasoningPartSchema = z5.object({
   type: z5.literal("redacted-reasoning"),
   data: z5.string(),
-  providerOptions: providerMetadataSchema.optional(),
-  experimental_providerMetadata: providerMetadataSchema.optional()
+  providerOptions: providerMetadataSchema.optional()
 });
 var toolCallPartSchema = z5.object({
   type: z5.literal("tool-call"),
   toolCallId: z5.string(),
   toolName: z5.string(),
   args: z5.unknown(),
-  providerOptions: providerMetadataSchema.optional(),
-  experimental_providerMetadata: providerMetadataSchema.optional()
+  providerOptions: providerMetadataSchema.optional()
 });
 var toolResultPartSchema = z5.object({
   type: z5.literal("tool-result"),
@@ -3527,16 +3525,14 @@ var toolResultPartSchema = z5.object({
   result: z5.unknown(),
   content: toolResultContentSchema.optional(),
   isError: z5.boolean().optional(),
-  providerOptions: providerMetadataSchema.optional(),
-  experimental_providerMetadata: providerMetadataSchema.optional()
+  providerOptions: providerMetadataSchema.optional()
 });
 
 // core/prompt/message.ts
 var coreSystemMessageSchema = z6.object({
   role: z6.literal("system"),
   content: z6.string(),
-  providerOptions: providerMetadataSchema.optional(),
-  experimental_providerMetadata: providerMetadataSchema.optional()
+  providerOptions: providerMetadataSchema.optional()
 });
 var coreUserMessageSchema = z6.object({
   role: z6.literal("user"),
@@ -3544,8 +3540,7 @@ var coreUserMessageSchema = z6.object({
     z6.string(),
     z6.array(z6.union([textPartSchema, imagePartSchema, filePartSchema]))
   ]),
-  providerOptions: providerMetadataSchema.optional(),
-  experimental_providerMetadata: providerMetadataSchema.optional()
+  providerOptions: providerMetadataSchema.optional()
 });
 var coreAssistantMessageSchema = z6.object({
   role: z6.literal("assistant"),
@@ -3561,14 +3556,12 @@ var coreAssistantMessageSchema = z6.object({
       ])
     )
   ]),
-  providerOptions: providerMetadataSchema.optional(),
-  experimental_providerMetadata: providerMetadataSchema.optional()
+  providerOptions: providerMetadataSchema.optional()
 });
 var coreToolMessageSchema = z6.object({
   role: z6.literal("tool"),
   content: z6.array(toolResultPartSchema),
-  providerOptions: providerMetadataSchema.optional(),
-  experimental_providerMetadata: providerMetadataSchema.optional()
+  providerOptions: providerMetadataSchema.optional()
 });
 var coreMessageSchema = z6.union([
   coreSystemMessageSchema,
@@ -3657,13 +3650,13 @@ function standardizePrompt({
 
 // core/types/usage.ts
 function calculateLanguageModelUsage2({
-  promptTokens,
-  completionTokens
+  inputTokens,
+  outputTokens
 }) {
   return {
-    promptTokens,
-    completionTokens,
-    totalTokens: promptTokens + completionTokens
+    promptTokens: inputTokens != null ? inputTokens : NaN,
+    completionTokens: outputTokens != null ? outputTokens : NaN,
+    totalTokens: (inputTokens != null ? inputTokens : 0) + (outputTokens != null ? outputTokens : 0)
   };
 }
 function addLanguageModelUsage(usage1, usage2) {
@@ -4088,8 +4081,7 @@ async function generateObject({
   headers,
   experimental_repairText: repairText,
   experimental_telemetry: telemetry,
-  experimental_providerMetadata,
-  providerOptions = experimental_providerMetadata,
+  providerOptions,
   _internal: {
     generateId: generateId3 = originalGenerateId,
     currentDate = () => /* @__PURE__ */ new Date()
@@ -4196,7 +4188,7 @@ async function generateObject({
                   "gen_ai.system": model.provider,
                   "gen_ai.request.model": model.modelId,
                   "gen_ai.request.frequency_penalty": settings.frequencyPenalty,
-                  "gen_ai.request.max_tokens": settings.maxTokens,
+                  "gen_ai.request.max_tokens": settings.maxOutputTokens,
                   "gen_ai.request.presence_penalty": settings.presencePenalty,
                   "gen_ai.request.temperature": settings.temperature,
                   "gen_ai.request.top_k": settings.topK,
@@ -4244,14 +4236,15 @@ async function generateObject({
                       "ai.response.id": responseData.id,
                       "ai.response.model": responseData.modelId,
                       "ai.response.timestamp": responseData.timestamp.toISOString(),
-                      "ai.usage.promptTokens": result2.usage.promptTokens,
-                      "ai.usage.completionTokens": result2.usage.completionTokens,
+                      // TODO rename telemetry attributes to inputTokens and outputTokens
+                      "ai.usage.promptTokens": result2.usage.inputTokens,
+                      "ai.usage.completionTokens": result2.usage.outputTokens,
                       // standardized gen-ai llm span attributes:
                       "gen_ai.response.finish_reasons": [result2.finishReason],
                       "gen_ai.response.id": responseData.id,
                       "gen_ai.response.model": responseData.modelId,
-                      "gen_ai.usage.prompt_tokens": result2.usage.promptTokens,
-                      "gen_ai.usage.completion_tokens": result2.usage.completionTokens
+                      "gen_ai.usage.input_tokens": result2.usage.inputTokens,
+                      "gen_ai.usage.output_tokens": result2.usage.outputTokens
                     }
                   })
                 );
@@ -4303,7 +4296,7 @@ async function generateObject({
                   "gen_ai.system": model.provider,
                   "gen_ai.request.model": model.modelId,
                   "gen_ai.request.frequency_penalty": settings.frequencyPenalty,
-                  "gen_ai.request.max_tokens": settings.maxTokens,
+                  "gen_ai.request.max_tokens": settings.maxOutputTokens,
                   "gen_ai.request.presence_penalty": settings.presencePenalty,
                   "gen_ai.request.temperature": settings.temperature,
                   "gen_ai.request.top_k": settings.topK,
@@ -4355,14 +4348,15 @@ async function generateObject({
                       "ai.response.id": responseData.id,
                       "ai.response.model": responseData.modelId,
                       "ai.response.timestamp": responseData.timestamp.toISOString(),
-                      "ai.usage.promptTokens": result2.usage.promptTokens,
-                      "ai.usage.completionTokens": result2.usage.completionTokens,
+                      // TODO rename telemetry attributes to inputTokens and outputTokens
+                      "ai.usage.promptTokens": result2.usage.inputTokens,
+                      "ai.usage.completionTokens": result2.usage.outputTokens,
                       // standardized gen-ai llm span attributes:
                       "gen_ai.response.finish_reasons": [result2.finishReason],
                       "gen_ai.response.id": responseData.id,
                       "gen_ai.response.model": responseData.modelId,
-                      "gen_ai.usage.input_tokens": result2.usage.promptTokens,
-                      "gen_ai.usage.output_tokens": result2.usage.completionTokens
+                      "gen_ai.usage.input_tokens": result2.usage.inputTokens,
+                      "gen_ai.usage.output_tokens": result2.usage.outputTokens
                     }
                   })
                 );
@@ -4447,8 +4441,9 @@ async function generateObject({
             "ai.response.object": {
               output: () => JSON.stringify(object2)
             },
-            "ai.usage.promptTokens": usage.promptTokens,
-            "ai.usage.completionTokens": usage.completionTokens
+            // TODO rename telemetry attributes to inputTokens and outputTokens
+            "ai.usage.promptTokens": usage.inputTokens,
+            "ai.usage.completionTokens": usage.outputTokens
           }
         })
       );
@@ -4472,7 +4467,6 @@ var DefaultGenerateObjectResult = class {
     this.usage = options.usage;
     this.warnings = options.warnings;
     this.providerMetadata = options.providerMetadata;
-    this.experimental_providerMetadata = options.providerMetadata;
     this.response = options.response;
     this.request = options.request;
     this.logprobs = options.logprobs;
@@ -4648,8 +4642,7 @@ function streamObject({
   abortSignal,
   headers,
   experimental_telemetry: telemetry,
-  experimental_providerMetadata,
-  providerOptions = experimental_providerMetadata,
+  providerOptions,
   onError,
   onFinish,
   _internal: {
@@ -4898,7 +4891,7 @@ var DefaultStreamObjectResult = class {
                 "gen_ai.system": model.provider,
                 "gen_ai.request.model": model.modelId,
                 "gen_ai.request.frequency_penalty": settings.frequencyPenalty,
-                "gen_ai.request.max_tokens": settings.maxTokens,
+                "gen_ai.request.max_tokens": settings.maxOutputTokens,
                 "gen_ai.request.presence_penalty": settings.presencePenalty,
                 "gen_ai.request.temperature": settings.temperature,
                 "gen_ai.request.top_k": settings.topK,
@@ -5086,8 +5079,7 @@ var DefaultStreamObjectResult = class {
                     headers: response == null ? void 0 : response.headers
                   },
                   warnings,
-                  providerMetadata,
-                  experimental_providerMetadata: providerMetadata
+                  providerMetadata
                 }));
               } catch (error2) {
                 controller.enqueue({ type: "error", error: error2 });
@@ -5119,9 +5111,6 @@ var DefaultStreamObjectResult = class {
   get usage() {
     return this.usagePromise.value;
   }
-  get experimental_providerMetadata() {
-    return this.providerMetadataPromise.value;
-  }
   get providerMetadata() {
     return this.providerMetadataPromise.value;
   }
@@ -5212,30 +5201,30 @@ var DefaultStreamObjectResult = class {
 import { createIdGenerator as createIdGenerator3 } from "@ai-sdk/provider-utils";
 
 // errors/no-output-specified-error.ts
-import { AISDKError as AISDKError9 } from "@ai-sdk/provider";
+import { AISDKError as AISDKError10 } from "@ai-sdk/provider";
 var name9 = "AI_NoOutputSpecifiedError";
 var marker9 = `vercel.ai.error.${name9}`;
 var symbol9 = Symbol.for(marker9);
 var _a9;
-var NoOutputSpecifiedError = class extends AISDKError9 {
+var NoOutputSpecifiedError = class extends AISDKError10 {
   // used in isInstance
   constructor({ message = "No output specified." } = {}) {
     super({ name: name9, message });
     this[_a9] = true;
   }
   static isInstance(error) {
-    return AISDKError9.hasMarker(error, marker9);
+    return AISDKError10.hasMarker(error, marker9);
   }
 };
 _a9 = symbol9;
 
 // errors/tool-execution-error.ts
-import { AISDKError as AISDKError10, getErrorMessage as getErrorMessage2 } from "@ai-sdk/provider";
+import { AISDKError as AISDKError11, getErrorMessage as getErrorMessage2 } from "@ai-sdk/provider";
 var name10 = "AI_ToolExecutionError";
 var marker10 = `vercel.ai.error.${name10}`;
 var symbol10 = Symbol.for(marker10);
 var _a10;
-var ToolExecutionError = class extends AISDKError10 {
+var ToolExecutionError = class extends AISDKError11 {
   constructor({
     toolArgs,
     toolName,
@@ -5250,7 +5239,7 @@ var ToolExecutionError = class extends AISDKError10 {
     this.toolCallId = toolCallId;
   }
   static isInstance(error) {
-    return AISDKError10.hasMarker(error, marker10);
+    return AISDKError11.hasMarker(error, marker10);
   }
 };
 _a10 = symbol10;
@@ -5321,12 +5310,12 @@ function removeTextAfterLastWhitespace(text2) {
 import { safeParseJSON as safeParseJSON3, safeValidateTypes as safeValidateTypes3 } from "@ai-sdk/provider-utils";
 
 // errors/invalid-tool-arguments-error.ts
-import { AISDKError as AISDKError11, getErrorMessage as getErrorMessage3 } from "@ai-sdk/provider";
+import { AISDKError as AISDKError12, getErrorMessage as getErrorMessage3 } from "@ai-sdk/provider";
 var name11 = "AI_InvalidToolArgumentsError";
 var marker11 = `vercel.ai.error.${name11}`;
 var symbol11 = Symbol.for(marker11);
 var _a11;
-var InvalidToolArgumentsError = class extends AISDKError11 {
+var InvalidToolArgumentsError = class extends AISDKError12 {
   constructor({
     toolArgs,
     toolName,
@@ -5341,18 +5330,18 @@ var InvalidToolArgumentsError = class extends AISDKError11 {
     this.toolName = toolName;
   }
   static isInstance(error) {
-    return AISDKError11.hasMarker(error, marker11);
+    return AISDKError12.hasMarker(error, marker11);
   }
 };
 _a11 = symbol11;
 
 // errors/no-such-tool-error.ts
-import { AISDKError as AISDKError12 } from "@ai-sdk/provider";
+import { AISDKError as AISDKError13 } from "@ai-sdk/provider";
 var name12 = "AI_NoSuchToolError";
 var marker12 = `vercel.ai.error.${name12}`;
 var symbol12 = Symbol.for(marker12);
 var _a12;
-var NoSuchToolError = class extends AISDKError12 {
+var NoSuchToolError = class extends AISDKError13 {
   constructor({
     toolName,
     availableTools = void 0,
@@ -5364,18 +5353,18 @@ var NoSuchToolError = class extends AISDKError12 {
     this.availableTools = availableTools;
   }
   static isInstance(error) {
-    return AISDKError12.hasMarker(error, marker12);
+    return AISDKError13.hasMarker(error, marker12);
   }
 };
 _a12 = symbol12;
 
 // errors/tool-call-repair-error.ts
-import { AISDKError as AISDKError13, getErrorMessage as getErrorMessage4 } from "@ai-sdk/provider";
+import { AISDKError as AISDKError14, getErrorMessage as getErrorMessage4 } from "@ai-sdk/provider";
 var name13 = "AI_ToolCallRepairError";
 var marker13 = `vercel.ai.error.${name13}`;
 var symbol13 = Symbol.for(marker13);
 var _a13;
-var ToolCallRepairError = class extends AISDKError13 {
+var ToolCallRepairError = class extends AISDKError14 {
   constructor({
     cause,
     originalError,
@@ -5386,7 +5375,7 @@ var ToolCallRepairError = class extends AISDKError13 {
     this.originalError = originalError;
   }
   static isInstance(error) {
-    return AISDKError13.hasMarker(error, marker13);
+    return AISDKError14.hasMarker(error, marker13);
   }
 };
 _a13 = symbol13;
@@ -5413,7 +5402,10 @@ async function parseToolCall({
       repairedToolCall = await repairToolCall({
         toolCall,
         tools,
-        parameterSchema: ({ toolName }) => asSchema(tools[toolName].parameters).jsonSchema,
+        parameterSchema: ({ toolName }) => {
+          const { parameters } = tools[toolName];
+          return asSchema(parameters).jsonSchema;
+        },
         system,
         messages,
         error
@@ -5455,7 +5447,7 @@ async function doParseToolCall({
     type: "tool-call",
     toolCallId: toolCall.toolCallId,
     toolName,
-    args: parseResult.value
+    args: parseResult == null ? void 0 : parseResult.value
   };
 }
 
@@ -5544,8 +5536,7 @@ async function generateText({
   experimental_output: output,
   experimental_continueSteps: continueSteps = false,
   experimental_telemetry: telemetry,
-  experimental_providerMetadata,
-  providerOptions = experimental_providerMetadata,
+  providerOptions,
   experimental_activeTools: activeTools,
   experimental_repairToolCall: repairToolCall,
   _internal: {
@@ -5663,7 +5654,7 @@ async function generateText({
                 "gen_ai.system": model.provider,
                 "gen_ai.request.model": model.modelId,
                 "gen_ai.request.frequency_penalty": settings.frequencyPenalty,
-                "gen_ai.request.max_tokens": settings.maxTokens,
+                "gen_ai.request.max_tokens": settings.maxOutputTokens,
                 "gen_ai.request.presence_penalty": settings.presencePenalty,
                 "gen_ai.request.stop_sequences": settings.stopSequences,
                 "gen_ai.request.temperature": settings.temperature,
@@ -5705,14 +5696,15 @@ async function generateText({
                     "ai.response.id": responseData.id,
                     "ai.response.model": responseData.modelId,
                     "ai.response.timestamp": responseData.timestamp.toISOString(),
-                    "ai.usage.promptTokens": result.usage.promptTokens,
-                    "ai.usage.completionTokens": result.usage.completionTokens,
+                    // TODO rename telemetry attributes to inputTokens and outputTokens
+                    "ai.usage.promptTokens": result.usage.inputTokens,
+                    "ai.usage.completionTokens": result.usage.outputTokens,
                     // standardized gen-ai llm span attributes:
                     "gen_ai.response.finish_reasons": [result.finishReason],
                     "gen_ai.response.id": responseData.id,
                     "gen_ai.response.model": responseData.modelId,
-                    "gen_ai.usage.input_tokens": result.usage.promptTokens,
-                    "gen_ai.usage.output_tokens": result.usage.completionTokens
+                    "gen_ai.usage.input_tokens": result.usage.inputTokens,
+                    "gen_ai.usage.output_tokens": result.usage.outputTokens
                   }
                 })
               );
@@ -5810,7 +5802,6 @@ async function generateText({
             messages: structuredClone(responseMessages)
           },
           providerMetadata: currentModelResponse.providerMetadata,
-          experimental_providerMetadata: currentModelResponse.providerMetadata,
           isContinued: nextStepType === "continue"
         };
         steps.push(currentStepResult);
@@ -5828,8 +5819,9 @@ async function generateText({
             "ai.response.toolCalls": {
               output: () => JSON.stringify(currentModelResponse.toolCalls)
             },
-            "ai.usage.promptTokens": currentModelResponse.usage.promptTokens,
-            "ai.usage.completionTokens": currentModelResponse.usage.completionTokens
+            // TODO rename telemetry attributes to inputTokens and outputTokens
+            "ai.usage.promptTokens": currentModelResponse.usage.inputTokens,
+            "ai.usage.completionTokens": currentModelResponse.usage.outputTokens
           }
         })
       );
@@ -5958,7 +5950,6 @@ var DefaultGenerateTextResult = class {
     this.request = options.request;
     this.response = options.response;
     this.steps = options.steps;
-    this.experimental_providerMetadata = options.providerMetadata;
     this.providerMetadata = options.providerMetadata;
     this.logprobs = options.logprobs;
     this.outputResolver = options.outputResolver;
@@ -5992,7 +5983,7 @@ import { safeParseJSON as safeParseJSON4, safeValidateTypes as safeValidateTypes
 
 // errors/index.ts
 import {
-  AISDKError as AISDKError16,
+  AISDKError as AISDKError17,
   APICallError as APICallError2,
   EmptyResponseBodyError,
   InvalidPromptError as InvalidPromptError2,
@@ -6006,12 +5997,12 @@ import {
 } from "@ai-sdk/provider";
 
 // errors/invalid-stream-part-error.ts
-import { AISDKError as AISDKError14 } from "@ai-sdk/provider";
+import { AISDKError as AISDKError15 } from "@ai-sdk/provider";
 var name14 = "AI_InvalidStreamPartError";
 var marker14 = `vercel.ai.error.${name14}`;
 var symbol14 = Symbol.for(marker14);
 var _a14;
-var InvalidStreamPartError = class extends AISDKError14 {
+var InvalidStreamPartError = class extends AISDKError15 {
   constructor({
     chunk,
     message
@@ -6021,18 +6012,18 @@ var InvalidStreamPartError = class extends AISDKError14 {
     this.chunk = chunk;
   }
   static isInstance(error) {
-    return AISDKError14.hasMarker(error, marker14);
+    return AISDKError15.hasMarker(error, marker14);
   }
 };
 _a14 = symbol14;
 
 // errors/mcp-client-error.ts
-import { AISDKError as AISDKError15 } from "@ai-sdk/provider";
+import { AISDKError as AISDKError16 } from "@ai-sdk/provider";
 var name15 = "AI_MCPClientError";
 var marker15 = `vercel.ai.error.${name15}`;
 var symbol15 = Symbol.for(marker15);
 var _a15;
-var MCPClientError = class extends AISDKError15 {
+var MCPClientError = class extends AISDKError16 {
   constructor({
     name: name17 = "MCPClientError",
     message,
@@ -6042,7 +6033,7 @@ var MCPClientError = class extends AISDKError15 {
     this[_a15] = true;
   }
   static isInstance(error) {
-    return AISDKError15.hasMarker(error, marker15);
+    return AISDKError16.hasMarker(error, marker15);
   }
 };
 _a15 = symbol15;
@@ -6196,7 +6187,7 @@ function smoothStream({
 }
 
 // core/generate-text/stream-text.ts
-import { AISDKError as AISDKError17 } from "@ai-sdk/provider";
+import { AISDKError as AISDKError18 } from "@ai-sdk/provider";
 import { createIdGenerator as createIdGenerator4 } from "@ai-sdk/provider-utils";
 
 // util/as-array.ts
@@ -6471,7 +6462,7 @@ function runToolsTransformation({
             finishReason: chunk.finishReason,
             logprobs: chunk.logprobs,
             usage: calculateLanguageModelUsage2(chunk.usage),
-            experimental_providerMetadata: chunk.providerMetadata
+            providerMetadata: chunk.providerMetadata
           };
           break;
         }
@@ -6537,8 +6528,7 @@ function streamText({
   experimental_output: output,
   experimental_continueSteps: continueSteps = false,
   experimental_telemetry: telemetry,
-  experimental_providerMetadata,
-  providerOptions = experimental_providerMetadata,
+  providerOptions,
   experimental_toolCallStreaming = false,
   toolCallStreaming = experimental_toolCallStreaming,
   experimental_activeTools: activeTools,
@@ -6732,7 +6722,7 @@ var DefaultStreamTextResult = class {
         }
         if (part.type === "reasoning-signature") {
           if (activeReasoningText == null) {
-            throw new AISDKError17({
+            throw new AISDKError18({
               name: "InvalidStreamPart",
               message: "reasoning-signature without reasoning"
             });
@@ -6799,8 +6789,7 @@ var DefaultStreamTextResult = class {
               ...part.response,
               messages: [...recordedResponse.messages, ...stepMessages]
             },
-            providerMetadata: part.experimental_providerMetadata,
-            experimental_providerMetadata: part.experimental_providerMetadata,
+            providerMetadata: part.providerMetadata,
             isContinued: part.isContinued
           };
           await (onStepFinish == null ? void 0 : onStepFinish(currentStepResult));
@@ -6841,9 +6830,7 @@ var DefaultStreamTextResult = class {
           self.responsePromise.resolve(lastStep.response);
           self.toolCallsPromise.resolve(lastStep.toolCalls);
           self.toolResultsPromise.resolve(lastStep.toolResults);
-          self.providerMetadataPromise.resolve(
-            lastStep.experimental_providerMetadata
-          );
+          self.providerMetadataPromise.resolve(lastStep.providerMetadata);
           self.reasoningPromise.resolve(lastStep.reasoning);
           self.reasoningDetailsPromise.resolve(lastStep.reasoningDetails);
           const finishReason = recordedFinishReason != null ? recordedFinishReason : "unknown";
@@ -6873,7 +6860,6 @@ var DefaultStreamTextResult = class {
             response: lastStep.response,
             warnings: lastStep.warnings,
             providerMetadata: lastStep.providerMetadata,
-            experimental_providerMetadata: lastStep.experimental_providerMetadata,
             steps: recordedSteps
           }));
           rootSpan.setAttributes(
@@ -7017,7 +7003,7 @@ var DefaultStreamTextResult = class {
                   "gen_ai.system": model.provider,
                   "gen_ai.request.model": model.modelId,
                   "gen_ai.request.frequency_penalty": settings.frequencyPenalty,
-                  "gen_ai.request.max_tokens": settings.maxTokens,
+                  "gen_ai.request.max_tokens": settings.maxOutputTokens,
                   "gen_ai.request.presence_penalty": settings.presencePenalty,
                   "gen_ai.request.stop_sequences": settings.stopSequences,
                   "gen_ai.request.temperature": settings.temperature,
@@ -7195,7 +7181,7 @@ var DefaultStreamTextResult = class {
                     case "finish": {
                       stepUsage = chunk.usage;
                       stepFinishReason = chunk.finishReason;
-                      stepProviderMetadata = chunk.experimental_providerMetadata;
+                      stepProviderMetadata = chunk.providerMetadata;
                       stepLogProbs = chunk.logprobs;
                       const msToFinish = now2() - startTimestampMs;
                       doStreamSpan.addEvent("ai.stream.finish");
@@ -7287,7 +7273,6 @@ var DefaultStreamTextResult = class {
                     finishReason: stepFinishReason,
                     usage: stepUsage,
                     providerMetadata: stepProviderMetadata,
-                    experimental_providerMetadata: stepProviderMetadata,
                     logprobs: stepLogProbs,
                     request: stepRequest,
                     response: {
@@ -7305,7 +7290,6 @@ var DefaultStreamTextResult = class {
                       finishReason: stepFinishReason,
                       usage: combinedUsage,
                       providerMetadata: stepProviderMetadata,
-                      experimental_providerMetadata: stepProviderMetadata,
                       logprobs: stepLogProbs,
                       response: {
                         ...stepResponse,
@@ -7391,9 +7375,6 @@ var DefaultStreamTextResult = class {
   get finishReason() {
     return this.finishReasonPromise.value;
   }
-  get experimental_providerMetadata() {
-    return this.providerMetadataPromise.value;
-  }
   get providerMetadata() {
     return this.providerMetadataPromise.value;
   }
@@ -7744,8 +7725,8 @@ var DefaultStreamTextResult = class {
 };
 
 // errors/no-transcript-generated-error.ts
-import { AISDKError as AISDKError18 } from "@ai-sdk/provider";
-var NoTranscriptGeneratedError = class extends AISDKError18 {
+import { AISDKError as AISDKError19 } from "@ai-sdk/provider";
+var NoTranscriptGeneratedError = class extends AISDKError19 {
   constructor(options) {
     super({
       name: "AI_NoTranscriptGeneratedError",
@@ -8121,7 +8102,7 @@ function appendClientMessage({
 }
 
 // core/prompt/append-response-messages.ts
-import { AISDKError as AISDKError19 } from "@ai-sdk/provider";
+import { AISDKError as AISDKError20 } from "@ai-sdk/provider";
 function appendResponseMessages({
   messages,
   responseMessages,
@@ -8204,7 +8185,7 @@ function appendResponseMessages({
                 break;
               case "file":
                 if (part.data instanceof URL) {
-                  throw new AISDKError19({
+                  throw new AISDKError20({
                     name: "InvalidAssistantFileData",
                     message: "File data cannot be a URL"
                   });
@@ -8338,7 +8319,7 @@ function customProvider({
 var experimental_customProvider = customProvider;
 
 // core/registry/no-such-provider-error.ts
-import { AISDKError as AISDKError20, NoSuchModelError as NoSuchModelError3 } from "@ai-sdk/provider";
+import { AISDKError as AISDKError21, NoSuchModelError as NoSuchModelError3 } from "@ai-sdk/provider";
 var name16 = "AI_NoSuchProviderError";
 var marker16 = `vercel.ai.error.${name16}`;
 var symbol16 = Symbol.for(marker16);
@@ -8357,7 +8338,7 @@ var NoSuchProviderError = class extends NoSuchModelError3 {
     this.availableProviders = availableProviders;
   }
   static isInstance(error) {
-    return AISDKError20.hasMarker(error, marker16);
+    return AISDKError21.hasMarker(error, marker16);
   }
 };
 _a16 = symbol16;
@@ -8928,6 +8909,7 @@ var MCPClient = class {
   async tools({
     schemas = "automatic"
   } = {}) {
+    var _a17;
     const tools = {};
     try {
       const listToolsResult = await this.listTools();
@@ -8935,14 +8917,18 @@ var MCPClient = class {
         if (schemas !== "automatic" && !(name17 in schemas)) {
           continue;
         }
-        const parameters = schemas === "automatic" ? jsonSchema(inputSchema) : schemas[name17].parameters;
+        const parameters = schemas === "automatic" ? jsonSchema({
+          ...inputSchema,
+          properties: (_a17 = inputSchema.properties) != null ? _a17 : {},
+          additionalProperties: false
+        }) : schemas[name17].parameters;
         const self = this;
         const toolWithExecute = tool({
           description,
           parameters,
           execute: async (args, options) => {
-            var _a17;
-            (_a17 = options == null ? void 0 : options.abortSignal) == null ? void 0 : _a17.throwIfAborted();
+            var _a18;
+            (_a18 = options == null ? void 0 : options.abortSignal) == null ? void 0 : _a18.throwIfAborted();
             return self.callTool({
               name: name17,
               args,
@@ -9282,7 +9268,7 @@ var StreamData = class {
   }
 };
 export {
-  AISDKError16 as AISDKError,
+  AISDKError17 as AISDKError,
   APICallError2 as APICallError,
   DownloadError,
   EmptyResponseBodyError,