ai 6.0.42 → 6.0.43

package/dist/internal/index.js

@@ -4,8 +4,8 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-  for (var name4 in all)
-    __defProp(target, name4, { get: all[name4], enumerable: true });
+  for (var name5 in all)
+    __defProp(target, name5, { get: all[name5], enumerable: true });
 };
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
@@ -153,11 +153,11 @@ var import_provider_utils2 = require("@ai-sdk/provider-utils");
 var import_provider_utils3 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.42" : "0.0.0-test";
+var VERSION = true ? "6.0.43" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({ url }) => {
-  var _a4;
+  var _a5;
   const urlText = url.toString();
   try {
     const response = await fetch(urlText, {
@@ -176,7 +176,7 @@ var download = async ({ url }) => {
     }
     return {
       data: new Uint8Array(await response.arrayBuffer()),
-      mediaType: (_a4 = response.headers.get("content-type")) != null ? _a4 : void 0
+      mediaType: (_a5 = response.headers.get("content-type")) != null ? _a5 : void 0
     };
   } catch (error) {
     if (import_provider_utils2.DownloadError.isInstance(error)) {
@@ -222,8 +222,8 @@ var dataContentSchema = import_v4.z.union([
   import_v4.z.custom(
     // Buffer might not be available in some environments such as CloudFlare:
     (value) => {
-      var _a4, _b;
-      return (_b = (_a4 = globalThis.Buffer) == null ? void 0 : _a4.isBuffer(value)) != null ? _b : false;
+      var _a5, _b;
+      return (_b = (_a5 = globalThis.Buffer) == null ? void 0 : _a5.isBuffer(value)) != null ? _b : false;
     },
     { message: "Must be a Buffer" }
   )
@@ -282,6 +282,29 @@ function asArray(value) {
   return value === void 0 ? [] : Array.isArray(value) ? value : [value];
 }
 
+// src/error/missing-tool-result-error.ts
+var import_provider3 = require("@ai-sdk/provider");
+var name2 = "AI_MissingToolResultsError";
+var marker2 = `vercel.ai.error.${name2}`;
+var symbol2 = Symbol.for(marker2);
+var _a2;
+var MissingToolResultsError = class extends import_provider3.AISDKError {
+  constructor({ toolCallIds }) {
+    super({
+      name: name2,
+      message: `Tool result${toolCallIds.length > 1 ? "s are" : " is"} missing for tool call${toolCallIds.length > 1 ? "s" : ""} ${toolCallIds.join(
+        ", "
+      )}.`
+    });
+    this[_a2] = true;
+    this.toolCallIds = toolCallIds;
+  }
+  static isInstance(error) {
+    return import_provider3.AISDKError.hasMarker(error, marker2);
+  }
+};
+_a2 = symbol2;
+
 // src/prompt/convert-to-language-model-prompt.ts
 async function convertToLanguageModelPrompt({
   prompt,
@@ -293,6 +316,32 @@ async function convertToLanguageModelPrompt({
     download2,
     supportedUrls
   );
+  const approvalIdToToolCallId = /* @__PURE__ */ new Map();
+  for (const message of prompt.messages) {
+    if (message.role === "assistant" && Array.isArray(message.content)) {
+      for (const part of message.content) {
+        if (part.type === "tool-approval-request" && "approvalId" in part && "toolCallId" in part) {
+          approvalIdToToolCallId.set(
+            part.approvalId,
+            part.toolCallId
+          );
+        }
+      }
+    }
+  }
+  const approvedToolCallIds = /* @__PURE__ */ new Set();
+  for (const message of prompt.messages) {
+    if (message.role === "tool") {
+      for (const part of message.content) {
+        if (part.type === "tool-approval-response") {
+          const toolCallId = approvalIdToToolCallId.get(part.approvalId);
+          if (toolCallId) {
+            approvedToolCallIds.add(toolCallId);
+          }
+        }
+      }
+    }
+  }
   const messages = [
     ...prompt.system != null ? typeof prompt.system === "string" ? [{ role: "system", content: prompt.system }] : asArray(prompt.system).map((message) => ({
       role: "system",
@@ -316,7 +365,51 @@ async function convertToLanguageModelPrompt({
       combinedMessages.push(message);
     }
   }
-  return combinedMessages;
+  const toolCallIds = /* @__PURE__ */ new Set();
+  for (const message of combinedMessages) {
+    switch (message.role) {
+      case "assistant": {
+        for (const content of message.content) {
+          if (content.type === "tool-call" && !content.providerExecuted) {
+            toolCallIds.add(content.toolCallId);
+          }
+        }
+        break;
+      }
+      case "tool": {
+        for (const content of message.content) {
+          if (content.type === "tool-result") {
+            toolCallIds.delete(content.toolCallId);
+          }
+        }
+        break;
+      }
+      case "user":
+      case "system":
+        for (const id of approvedToolCallIds) {
+          toolCallIds.delete(id);
+        }
+        if (toolCallIds.size > 0) {
+          throw new MissingToolResultsError({
+            toolCallIds: Array.from(toolCallIds)
+          });
+        }
+        break;
+    }
+  }
+  for (const id of approvedToolCallIds) {
+    toolCallIds.delete(id);
+  }
+  if (toolCallIds.size > 0) {
+    throw new MissingToolResultsError({ toolCallIds: Array.from(toolCallIds) });
+  }
+  return combinedMessages.filter(
+    // Filter out empty tool messages (e.g. if they only contained
+    // tool-approval-response parts that were removed).
+    // This prevents sending invalid empty messages to the provider.
+    // Note: provider-executed tool-approval-response parts are preserved.
+    (message) => message.role !== "tool" || message.content.length > 0
+  );
 }
 function convertToLanguageModelMessage({
   message,
@@ -455,8 +548,8 @@ async function downloadAssets(messages, download2, supportedUrls) {
   ).flat().filter(
     (part) => part.type === "image" || part.type === "file"
   ).map((part) => {
-    var _a4;
-    const mediaType = (_a4 = part.mediaType) != null ? _a4 : part.type === "image" ? "image/*" : void 0;
+    var _a5;
+    const mediaType = (_a5 = part.mediaType) != null ? _a5 : part.type === "image" ? "image/*" : void 0;
     let data = part.type === "image" ? part.image : part.data;
     if (typeof data === "string") {
       try {
@@ -486,7 +579,7 @@ async function downloadAssets(messages, download2, supportedUrls) {
   );
 }
 function convertPartToLanguageModelPart(part, downloadedAssets) {
-  var _a4;
+  var _a5;
   if (part.type === "text") {
     return {
       type: "text",
@@ -519,7 +612,7 @@ function convertPartToLanguageModelPart(part, downloadedAssets) {
   switch (type) {
     case "image": {
       if (data instanceof Uint8Array || typeof data === "string") {
-        mediaType = (_a4 = detectMediaType({ data, signatures: imageMediaTypeSignatures })) != null ? _a4 : mediaType;
+        mediaType = (_a5 = detectMediaType({ data, signatures: imageMediaTypeSignatures })) != null ? _a5 : mediaType;
       }
       return {
         type: "file",
@@ -591,10 +684,10 @@ async function prepareToolsAndToolChoice({
     };
   }
   const filteredTools = activeTools != null ? Object.entries(tools).filter(
-    ([name4]) => activeTools.includes(name4)
+    ([name5]) => activeTools.includes(name5)
   ) : Object.entries(tools);
   const languageModelTools = [];
-  for (const [name4, tool] of filteredTools) {
+  for (const [name5, tool] of filteredTools) {
     const toolType = tool.type;
     switch (toolType) {
       case void 0:
@@ -602,7 +695,7 @@ async function prepareToolsAndToolChoice({
       case "function":
         languageModelTools.push({
           type: "function",
-          name: name4,
+          name: name5,
           description: tool.description,
           inputSchema: await (0, import_provider_utils6.asSchema)(tool.inputSchema).jsonSchema,
           ...tool.inputExamples != null ? { inputExamples: tool.inputExamples } : {},
@@ -613,7 +706,7 @@ async function prepareToolsAndToolChoice({
       case "provider":
         languageModelTools.push({
           type: "provider",
-          name: name4,
+          name: name5,
           id: tool.id,
           args: tool.args
         });
@@ -631,7 +724,7 @@ async function prepareToolsAndToolChoice({
 }
 
 // src/prompt/standardize-prompt.ts
-var import_provider3 = require("@ai-sdk/provider");
+var import_provider4 = require("@ai-sdk/provider");
 var import_provider_utils7 = require("@ai-sdk/provider-utils");
 var import_v46 = require("zod/v4");
 
@@ -844,13 +937,13 @@ var modelMessageSchema = import_v45.z.union([
 // src/prompt/standardize-prompt.ts
 async function standardizePrompt(prompt) {
   if (prompt.prompt == null && prompt.messages == null) {
-    throw new import_provider3.InvalidPromptError({
+    throw new import_provider4.InvalidPromptError({
       prompt,
       message: "prompt or messages must be defined"
     });
   }
   if (prompt.prompt != null && prompt.messages != null) {
-    throw new import_provider3.InvalidPromptError({
+    throw new import_provider4.InvalidPromptError({
       prompt,
       message: "prompt and messages cannot be defined at the same time"
     });
@@ -858,7 +951,7 @@ async function standardizePrompt(prompt) {
   if (prompt.system != null && typeof prompt.system !== "string" && !asArray(prompt.system).every(
     (message) => typeof message === "object" && message !== null && "role" in message && message.role === "system"
   )) {
-    throw new import_provider3.InvalidPromptError({
+    throw new import_provider4.InvalidPromptError({
       prompt,
       message: "system must be a string, SystemModelMessage, or array of SystemModelMessage"
     });
@@ -871,13 +964,13 @@ async function standardizePrompt(prompt) {
   } else if (prompt.messages != null) {
     messages = prompt.messages;
   } else {
-    throw new import_provider3.InvalidPromptError({
+    throw new import_provider4.InvalidPromptError({
       prompt,
       message: "prompt or messages must be defined"
     });
   }
   if (messages.length === 0) {
-    throw new import_provider3.InvalidPromptError({
+    throw new import_provider4.InvalidPromptError({
       prompt,
       message: "messages must not be empty"
     });
@@ -887,7 +980,7 @@ async function standardizePrompt(prompt) {
     schema: import_v46.z.array(modelMessageSchema)
   });
   if (!validationResult.success) {
-    throw new import_provider3.InvalidPromptError({
+    throw new import_provider4.InvalidPromptError({
       prompt,
       message: "The messages do not match the ModelMessage[] schema.",
       cause: validationResult.error
@@ -900,30 +993,30 @@ async function standardizePrompt(prompt) {
 }
 
 // src/error/invalid-argument-error.ts
-var import_provider4 = require("@ai-sdk/provider");
-var name2 = "AI_InvalidArgumentError";
-var marker2 = `vercel.ai.error.${name2}`;
-var symbol2 = Symbol.for(marker2);
-var _a2;
-var InvalidArgumentError = class extends import_provider4.AISDKError {
+var import_provider5 = require("@ai-sdk/provider");
+var name3 = "AI_InvalidArgumentError";
+var marker3 = `vercel.ai.error.${name3}`;
+var symbol3 = Symbol.for(marker3);
+var _a3;
+var InvalidArgumentError = class extends import_provider5.AISDKError {
   constructor({
     parameter,
     value,
     message
   }) {
     super({
-      name: name2,
+      name: name3,
       message: `Invalid argument for parameter ${parameter}: ${message}`
     });
-    this[_a2] = true;
+    this[_a3] = true;
     this.parameter = parameter;
     this.value = value;
   }
   static isInstance(error) {
-    return import_provider4.AISDKError.hasMarker(error, marker2);
+    return import_provider5.AISDKError.hasMarker(error, marker3);
   }
 };
-_a2 = symbol2;
+_a3 = symbol3;
 
 // src/prompt/prepare-call-settings.ts
 function prepareCallSettings({
@@ -1019,32 +1112,32 @@ function prepareCallSettings({
 }
 
 // src/util/retry-with-exponential-backoff.ts
-var import_provider6 = require("@ai-sdk/provider");
+var import_provider7 = require("@ai-sdk/provider");
 var import_provider_utils8 = require("@ai-sdk/provider-utils");
 
 // src/util/retry-error.ts
-var import_provider5 = require("@ai-sdk/provider");
-var name3 = "AI_RetryError";
-var marker3 = `vercel.ai.error.${name3}`;
-var symbol3 = Symbol.for(marker3);
-var _a3;
-var RetryError = class extends import_provider5.AISDKError {
+var import_provider6 = require("@ai-sdk/provider");
+var name4 = "AI_RetryError";
+var marker4 = `vercel.ai.error.${name4}`;
+var symbol4 = Symbol.for(marker4);
+var _a4;
+var RetryError = class extends import_provider6.AISDKError {
   constructor({
     message,
     reason,
     errors
   }) {
-    super({ name: name3, message });
-    this[_a3] = true;
+    super({ name: name4, message });
+    this[_a4] = true;
     this.reason = reason;
     this.errors = errors;
     this.lastError = errors[errors.length - 1];
   }
   static isInstance(error) {
-    return import_provider5.AISDKError.hasMarker(error, marker3);
+    return import_provider6.AISDKError.hasMarker(error, marker4);
   }
 };
-_a3 = symbol3;
+_a4 = symbol4;
 
 // src/util/retry-with-exponential-backoff.ts
 function getRetryDelayInMs({
@@ -1112,7 +1205,7 @@ async function _retryWithExponentialBackoff(f, {
         errors: newErrors
       });
     }
-    if (error instanceof Error && import_provider6.APICallError.isInstance(error) && error.isRetryable === true && tryNumber <= maxRetries) {
+    if (error instanceof Error && import_provider7.APICallError.isInstance(error) && error.isRetryable === true && tryNumber <= maxRetries) {
       await (0, import_provider_utils8.delay)(
         getRetryDelayInMs({
           error,