@zenning/ai 5.3.2 → 6.0.13

package/dist/internal/index.mjs

@@ -120,44 +120,19 @@ function detectMediaType({
   return void 0;
 }
 
-// src/util/download/download-error.ts
-import { AISDKError } from "@zenning/provider";
-var name = "AI_DownloadError";
-var marker = `vercel.ai.error.${name}`;
-var symbol = Symbol.for(marker);
-var _a;
-var DownloadError = class extends AISDKError {
-  constructor({
-    url,
-    statusCode,
-    statusText,
-    cause,
-    message = cause == null ? `Failed to download ${url}: ${statusCode} ${statusText}` : `Failed to download ${url}: ${cause}`
-  }) {
-    super({ name, message, cause });
-    this[_a] = true;
-    this.url = url;
-    this.statusCode = statusCode;
-    this.statusText = statusText;
-  }
-  static isInstance(error) {
-    return AISDKError.hasMarker(error, marker);
-  }
-};
-_a = symbol;
-
 // src/util/download/download.ts
+import { DownloadError } from "@zenning/provider-utils";
 import {
   withUserAgentSuffix,
   getRuntimeEnvironmentUserAgent
 } from "@zenning/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "5.3.2" : "0.0.0-test";
+var VERSION = true ? "6.0.13" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({ url }) => {
-  var _a5;
+  var _a4;
   const urlText = url.toString();
   try {
     const response = await fetch(urlText, {
@@ -176,7 +151,7 @@ var download = async ({ url }) => {
     }
     return {
       data: new Uint8Array(await response.arrayBuffer()),
-      mediaType: (_a5 = response.headers.get("content-type")) != null ? _a5 : void 0
+      mediaType: (_a4 = response.headers.get("content-type")) != null ? _a4 : void 0
     };
   } catch (error) {
     if (DownloadError.isInstance(error)) {
@@ -194,7 +169,7 @@ var createDefaultDownloadFunction = (download2 = download) => (requestedDownload
 );
 
 // src/prompt/data-content.ts
-import { AISDKError as AISDKError2 } from "@zenning/provider";
+import { AISDKError } from "@zenning/provider";
 import {
   convertBase64ToUint8Array as convertBase64ToUint8Array2,
   convertUint8ArrayToBase64
@@ -225,8 +200,8 @@ var dataContentSchema = z.union([
   z.custom(
     // Buffer might not be available in some environments such as CloudFlare:
     (value) => {
-      var _a5, _b;
-      return (_b = (_a5 = globalThis.Buffer) == null ? void 0 : _a5.isBuffer(value)) != null ? _b : false;
+      var _a4, _b;
+      return (_b = (_a4 = globalThis.Buffer) == null ? void 0 : _a4.isBuffer(value)) != null ? _b : false;
     },
     { message: "Must be a Buffer" }
   )
@@ -249,7 +224,7 @@ function convertToLanguageModelV3DataContent(content) {
       content.toString()
     );
     if (dataUrlMediaType == null || base64Content == null) {
-      throw new AISDKError2({
+      throw new AISDKError({
         name: "InvalidDataContentError",
         message: `Invalid data URL format in content ${content.toString()}`
       });
@@ -260,25 +235,30 @@ function convertToLanguageModelV3DataContent(content) {
 }
 
 // src/prompt/invalid-message-role-error.ts
-import { AISDKError as AISDKError3 } from "@zenning/provider";
-var name2 = "AI_InvalidMessageRoleError";
-var marker2 = `vercel.ai.error.${name2}`;
-var symbol2 = Symbol.for(marker2);
-var _a2;
-var InvalidMessageRoleError = class extends AISDKError3 {
+import { AISDKError as AISDKError2 } from "@zenning/provider";
+var name = "AI_InvalidMessageRoleError";
+var marker = `vercel.ai.error.${name}`;
+var symbol = Symbol.for(marker);
+var _a;
+var InvalidMessageRoleError = class extends AISDKError2 {
   constructor({
     role,
     message = `Invalid message role: '${role}'. Must be one of: "system", "user", "assistant", "tool".`
   }) {
-    super({ name: name2, message });
-    this[_a2] = true;
+    super({ name, message });
+    this[_a] = true;
     this.role = role;
   }
   static isInstance(error) {
-    return AISDKError3.hasMarker(error, marker2);
+    return AISDKError2.hasMarker(error, marker);
   }
 };
-_a2 = symbol2;
+_a = symbol;
+
+// src/util/as-array.ts
+function asArray(value) {
+  return value === void 0 ? [] : Array.isArray(value) ? value : [value];
+}
 
 // src/prompt/convert-to-language-model-prompt.ts
 async function convertToLanguageModelPrompt({
@@ -291,12 +271,30 @@ async function convertToLanguageModelPrompt({
     download2,
     supportedUrls
   );
-  return [
-    ...prompt.system != null ? [{ role: "system", content: prompt.system }] : [],
+  const messages = [
+    ...prompt.system != null ? typeof prompt.system === "string" ? [{ role: "system", content: prompt.system }] : asArray(prompt.system).map((message) => ({
+      role: "system",
+      content: message.content,
+      providerOptions: message.providerOptions
+    })) : [],
     ...prompt.messages.map(
       (message) => convertToLanguageModelMessage({ message, downloadedAssets })
     )
   ];
+  const combinedMessages = [];
+  for (const message of messages) {
+    if (message.role !== "tool") {
+      combinedMessages.push(message);
+      continue;
+    }
+    const lastCombinedMessage = combinedMessages.at(-1);
+    if ((lastCombinedMessage == null ? void 0 : lastCombinedMessage.role) === "tool") {
+      lastCombinedMessage.content.push(...message.content);
+    } else {
+      combinedMessages.push(message);
+    }
+  }
+  return combinedMessages;
 }
 function convertToLanguageModelMessage({
   message,
@@ -338,6 +336,8 @@ function convertToLanguageModelMessage({
         content: message.content.filter(
           // remove empty text parts (no text, and no provider options):
           (part) => part.type !== "text" || part.text !== "" || part.providerOptions != null
+        ).filter(
+          (part) => part.type !== "tool-approval-request"
         ).map((part) => {
           const providerOptions = part.providerOptions;
           switch (part.type) {
@@ -382,7 +382,7 @@ function convertToLanguageModelMessage({
                 type: "tool-result",
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
-                output: part.output,
+                output: mapToolResultOutput(part.output),
                 providerOptions
               };
             }
@@ -394,13 +394,30 @@ function convertToLanguageModelMessage({
     case "tool": {
       return {
         role: "tool",
-        content: message.content.map((part) => ({
-          type: "tool-result",
-          toolCallId: part.toolCallId,
-          toolName: part.toolName,
-          output: part.output,
-          providerOptions: part.providerOptions
-        })),
+        content: message.content.filter(
+          // Only include tool-approval-response for provider-executed tools
+          (part) => part.type !== "tool-approval-response" || part.providerExecuted
+        ).map((part) => {
+          switch (part.type) {
+            case "tool-result": {
+              return {
+                type: "tool-result",
+                toolCallId: part.toolCallId,
+                toolName: part.toolName,
+                output: mapToolResultOutput(part.output),
+                providerOptions: part.providerOptions
+              };
+            }
+            case "tool-approval-response": {
+              return {
+                type: "tool-approval-response",
+                approvalId: part.approvalId,
+                approved: part.approved,
+                reason: part.reason
+              };
+            }
+          }
+        }),
         providerOptions: message.providerOptions
       };
     }
@@ -416,8 +433,8 @@ async function downloadAssets(messages, download2, supportedUrls) {
   ).flat().filter(
     (part) => part.type === "image" || part.type === "file"
   ).map((part) => {
-    var _a5;
-    const mediaType = (_a5 = part.mediaType) != null ? _a5 : part.type === "image" ? "image/*" : void 0;
+    var _a4;
+    const mediaType = (_a4 = part.mediaType) != null ? _a4 : part.type === "image" ? "image/*" : void 0;
     let data = part.type === "image" ? part.image : part.data;
     if (typeof data === "string") {
       try {
@@ -447,7 +464,7 @@ async function downloadAssets(messages, download2, supportedUrls) {
   );
 }
 function convertPartToLanguageModelPart(part, downloadedAssets) {
-  var _a5;
+  var _a4;
   if (part.type === "text") {
     return {
       type: "text",
@@ -480,7 +497,7 @@ function convertPartToLanguageModelPart(part, downloadedAssets) {
   switch (type) {
     case "image": {
       if (data instanceof Uint8Array || typeof data === "string") {
-        mediaType = (_a5 = detectMediaType({ data, signatures: imageMediaTypeSignatures })) != null ? _a5 : mediaType;
+        mediaType = (_a4 = detectMediaType({ data, signatures: imageMediaTypeSignatures })) != null ? _a4 : mediaType;
       }
       return {
         type: "file",
@@ -505,6 +522,31 @@ function convertPartToLanguageModelPart(part, downloadedAssets) {
     }
   }
 }
+function mapToolResultOutput(output) {
+  if (output.type !== "content") {
+    return output;
+  }
+  return {
+    type: "content",
+    value: output.value.map((item) => {
+      if (item.type !== "media") {
+        return item;
+      }
+      if (item.mediaType.startsWith("image/")) {
+        return {
+          type: "image-data",
+          data: item.data,
+          mediaType: item.mediaType
+        };
+      }
+      return {
+        type: "file-data",
+        data: item.data,
+        mediaType: item.mediaType
+      };
+    })
+  };
+}
 
 // src/prompt/prepare-tools-and-tool-choice.ts
 import { asSchema } from "@zenning/provider-utils";
@@ -515,7 +557,7 @@ function isNonEmptyObject(object) {
 }
 
 // src/prompt/prepare-tools-and-tool-choice.ts
-function prepareToolsAndToolChoice({
+async function prepareToolsAndToolChoice({
   tools,
   toolChoice,
   activeTools
@@ -527,42 +569,50 @@ function prepareToolsAndToolChoice({
     };
   }
   const filteredTools = activeTools != null ? Object.entries(tools).filter(
-    ([name5]) => activeTools.includes(name5)
+    ([name4]) => activeTools.includes(name4)
   ) : Object.entries(tools);
-  return {
-    tools: filteredTools.map(([name5, tool]) => {
-      const toolType = tool.type;
-      switch (toolType) {
-        case void 0:
-        case "dynamic":
-        case "function":
-          return {
-            type: "function",
-            name: name5,
-            description: tool.description,
-            inputSchema: asSchema(tool.inputSchema).jsonSchema,
-            providerOptions: tool.providerOptions
-          };
-        case "provider-defined":
-          return {
-            type: "provider-defined",
-            name: name5,
-            id: tool.id,
-            args: tool.args
-          };
-        default: {
-          const exhaustiveCheck = toolType;
-          throw new Error(`Unsupported tool type: ${exhaustiveCheck}`);
-        }
+  const languageModelTools = [];
+  for (const [name4, tool] of filteredTools) {
+    const toolType = tool.type;
+    switch (toolType) {
+      case void 0:
+      case "dynamic":
+      case "function":
+        languageModelTools.push({
+          type: "function",
+          name: name4,
+          description: tool.description,
+          inputSchema: await asSchema(tool.inputSchema).jsonSchema,
+          ...tool.inputExamples != null ? { inputExamples: tool.inputExamples } : {},
+          providerOptions: tool.providerOptions,
+          ...tool.strict != null ? { strict: tool.strict } : {}
+        });
+        break;
+      case "provider":
+        languageModelTools.push({
+          type: "provider",
+          name: name4,
+          id: tool.id,
+          args: tool.args
+        });
+        break;
+      default: {
+        const exhaustiveCheck = toolType;
+        throw new Error(`Unsupported tool type: ${exhaustiveCheck}`);
       }
-    }),
+    }
+  }
+  return {
+    tools: languageModelTools,
     toolChoice: toolChoice == null ? { type: "auto" } : typeof toolChoice === "string" ? { type: toolChoice } : { type: "tool", toolName: toolChoice.toolName }
   };
 }
 
 // src/prompt/standardize-prompt.ts
 import { InvalidPromptError } from "@zenning/provider";
-import { safeValidateTypes } from "@zenning/provider-utils";
+import {
+  safeValidateTypes
+} from "@zenning/provider-utils";
 import { z as z6 } from "zod/v4";
 
 // src/prompt/message.ts
@@ -579,7 +629,7 @@ var jsonValueSchema = z2.lazy(
     z2.string(),
     z2.number(),
     z2.boolean(),
-    z2.record(z2.string(), jsonValueSchema),
+    z2.record(z2.string(), jsonValueSchema.optional()),
     z2.array(jsonValueSchema)
   ])
 );
@@ -587,7 +637,7 @@ var jsonValueSchema = z2.lazy(
 // src/types/provider-metadata.ts
 var providerMetadataSchema = z3.record(
   z3.string(),
-  z3.record(z3.string(), jsonValueSchema)
+  z3.record(z3.string(), jsonValueSchema.optional())
 );
 
 // src/prompt/content-part.ts
@@ -615,6 +665,11 @@ var reasoningPartSchema = z4.object({
   text: z4.string(),
   providerOptions: providerMetadataSchema.optional()
 });
+var compactionPartSchema = z4.object({
+  type: z4.literal("compaction"),
+  encrypted_content: z4.string(),
+  providerOptions: providerMetadataSchema.optional()
+});
 var toolCallPartSchema = z4.object({
   type: z4.literal("tool-call"),
   toolCallId: z4.string(),
@@ -623,40 +678,90 @@ var toolCallPartSchema = z4.object({
   providerOptions: providerMetadataSchema.optional(),
   providerExecuted: z4.boolean().optional()
 });
-var outputSchema = z4.discriminatedUnion("type", [
-  z4.object({
-    type: z4.literal("text"),
-    value: z4.string()
-  }),
-  z4.object({
-    type: z4.literal("json"),
-    value: jsonValueSchema
-  }),
-  z4.object({
-    type: z4.literal("error-text"),
-    value: z4.string()
-  }),
-  z4.object({
-    type: z4.literal("error-json"),
-    value: jsonValueSchema
-  }),
-  z4.object({
-    type: z4.literal("content"),
-    value: z4.array(
-      z4.union([
-        z4.object({
-          type: z4.literal("text"),
-          text: z4.string()
-        }),
-        z4.object({
-          type: z4.literal("media"),
-          data: z4.string(),
-          mediaType: z4.string()
-        })
-      ])
-    )
-  })
-]);
+var outputSchema = z4.discriminatedUnion(
+  "type",
+  [
+    z4.object({
+      type: z4.literal("text"),
+      value: z4.string(),
+      providerOptions: providerMetadataSchema.optional()
+    }),
+    z4.object({
+      type: z4.literal("json"),
+      value: jsonValueSchema,
+      providerOptions: providerMetadataSchema.optional()
+    }),
+    z4.object({
+      type: z4.literal("execution-denied"),
+      reason: z4.string().optional(),
+      providerOptions: providerMetadataSchema.optional()
+    }),
+    z4.object({
+      type: z4.literal("error-text"),
+      value: z4.string(),
+      providerOptions: providerMetadataSchema.optional()
+    }),
+    z4.object({
+      type: z4.literal("error-json"),
+      value: jsonValueSchema,
+      providerOptions: providerMetadataSchema.optional()
+    }),
+    z4.object({
+      type: z4.literal("content"),
+      value: z4.array(
+        z4.union([
+          z4.object({
+            type: z4.literal("text"),
+            text: z4.string(),
+            providerOptions: providerMetadataSchema.optional()
+          }),
+          z4.object({
+            type: z4.literal("media"),
+            data: z4.string(),
+            mediaType: z4.string()
+          }),
+          z4.object({
+            type: z4.literal("file-data"),
+            data: z4.string(),
+            mediaType: z4.string(),
+            filename: z4.string().optional(),
+            providerOptions: providerMetadataSchema.optional()
+          }),
+          z4.object({
+            type: z4.literal("file-url"),
+            url: z4.string(),
+            providerOptions: providerMetadataSchema.optional()
+          }),
+          z4.object({
+            type: z4.literal("file-id"),
+            fileId: z4.union([z4.string(), z4.record(z4.string(), z4.string())]),
+            providerOptions: providerMetadataSchema.optional()
+          }),
+          z4.object({
+            type: z4.literal("image-data"),
+            data: z4.string(),
+            mediaType: z4.string(),
+            providerOptions: providerMetadataSchema.optional()
+          }),
+          z4.object({
+            type: z4.literal("image-url"),
+            url: z4.string(),
+            providerOptions: providerMetadataSchema.optional()
+          }),
+          z4.object({
+            type: z4.literal("image-file-id"),
+            fileId: z4.union([z4.string(), z4.record(z4.string(), z4.string())]),
+            providerOptions: providerMetadataSchema.optional()
+          }),
+          z4.object({
+            type: z4.literal("custom"),
+            providerOptions: providerMetadataSchema.optional()
+          })
+        ])
+      )
+    })
+  ]
+);
 var toolResultPartSchema = z4.object({
   type: z4.literal("tool-result"),
   toolCallId: z4.string(),
@@ -664,6 +769,17 @@ var toolResultPartSchema = z4.object({
   output: outputSchema,
   providerOptions: providerMetadataSchema.optional()
 });
+var toolApprovalRequestSchema = z4.object({
+  type: z4.literal("tool-approval-request"),
+  approvalId: z4.string(),
+  toolCallId: z4.string()
+});
+var toolApprovalResponseSchema = z4.object({
+  type: z4.literal("tool-approval-response"),
+  approvalId: z4.string(),
+  approved: z4.boolean(),
+  reason: z4.string().optional()
+});
 
 // src/prompt/message.ts
 var systemModelMessageSchema = z5.object(
@@ -691,7 +807,9 @@ var assistantModelMessageSchema = z5.object({
         filePartSchema,
         reasoningPartSchema,
         toolCallPartSchema,
-        toolResultPartSchema
+        toolResultPartSchema,
+        toolApprovalRequestSchema,
+        compactionPartSchema
       ])
     )
   ]),
@@ -699,7 +817,7 @@ var assistantModelMessageSchema = z5.object({
 });
 var toolModelMessageSchema = z5.object({
   role: z5.literal("tool"),
-  content: z5.array(toolResultPartSchema),
+  content: z5.array(z5.union([toolResultPartSchema, toolApprovalResponseSchema])),
   providerOptions: providerMetadataSchema.optional()
 });
 var modelMessageSchema = z5.union([
@@ -723,10 +841,12 @@ async function standardizePrompt(prompt) {
       message: "prompt and messages cannot be defined at the same time"
     });
   }
-  if (prompt.system != null && typeof prompt.system !== "string") {
+  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 InvalidPromptError({
       prompt,
-      message: "system must be a string"
+      message: "system must be a string, SystemModelMessage, or array of SystemModelMessage"
     });
   }
   let messages;
@@ -755,7 +875,7 @@ async function standardizePrompt(prompt) {
   if (!validationResult.success) {
     throw new InvalidPromptError({
       prompt,
-      message: "The messages must be a ModelMessage[]. If you have passed a UIMessage[], you can use convertToModelMessages to convert them.",
+      message: "The messages do not match the ModelMessage[] schema.",
       cause: validationResult.error
     });
   }
@@ -766,30 +886,30 @@ async function standardizePrompt(prompt) {
 }
 
 // src/error/invalid-argument-error.ts
-import { AISDKError as AISDKError4 } from "@zenning/provider";
-var name3 = "AI_InvalidArgumentError";
-var marker3 = `vercel.ai.error.${name3}`;
-var symbol3 = Symbol.for(marker3);
-var _a3;
-var InvalidArgumentError = class extends AISDKError4 {
+import { AISDKError as AISDKError3 } from "@zenning/provider";
+var name2 = "AI_InvalidArgumentError";
+var marker2 = `vercel.ai.error.${name2}`;
+var symbol2 = Symbol.for(marker2);
+var _a2;
+var InvalidArgumentError = class extends AISDKError3 {
   constructor({
     parameter,
     value,
     message
   }) {
     super({
-      name: name3,
+      name: name2,
       message: `Invalid argument for parameter ${parameter}: ${message}`
     });
-    this[_a3] = true;
+    this[_a2] = true;
     this.parameter = parameter;
     this.value = value;
   }
   static isInstance(error) {
-    return AISDKError4.hasMarker(error, marker3);
+    return AISDKError3.hasMarker(error, marker2);
   }
 };
-_a3 = symbol3;
+_a2 = symbol2;
 
 // src/prompt/prepare-call-settings.ts
 function prepareCallSettings({
@@ -889,28 +1009,28 @@ import { APICallError } from "@zenning/provider";
 import { delay, getErrorMessage, isAbortError } from "@zenning/provider-utils";
 
 // src/util/retry-error.ts
-import { AISDKError as AISDKError5 } from "@zenning/provider";
-var name4 = "AI_RetryError";
-var marker4 = `vercel.ai.error.${name4}`;
-var symbol4 = Symbol.for(marker4);
-var _a4;
-var RetryError = class extends AISDKError5 {
+import { AISDKError as AISDKError4 } from "@zenning/provider";
+var name3 = "AI_RetryError";
+var marker3 = `vercel.ai.error.${name3}`;
+var symbol3 = Symbol.for(marker3);
+var _a3;
+var RetryError = class extends AISDKError4 {
   constructor({
     message,
     reason,
     errors
   }) {
-    super({ name: name4, message });
-    this[_a4] = true;
+    super({ name: name3, message });
+    this[_a3] = true;
     this.reason = reason;
     this.errors = errors;
     this.lastError = errors[errors.length - 1];
   }
   static isInstance(error) {
-    return AISDKError5.hasMarker(error, marker4);
+    return AISDKError4.hasMarker(error, marker3);
   }
 };
-_a4 = symbol4;
+_a3 = symbol3;
 
 // src/util/retry-with-exponential-backoff.ts
 function getRetryDelayInMs({
@@ -1038,7 +1158,35 @@ function prepareRetries({
     })
   };
 }
+
+// src/types/usage.ts
+function asLanguageModelUsage(usage) {
+  return {
+    inputTokens: usage.inputTokens.total,
+    inputTokenDetails: {
+      noCacheTokens: usage.inputTokens.noCache,
+      cacheReadTokens: usage.inputTokens.cacheRead,
+      cacheWriteTokens: usage.inputTokens.cacheWrite
+    },
+    outputTokens: usage.outputTokens.total,
+    outputTokenDetails: {
+      textTokens: usage.outputTokens.text,
+      reasoningTokens: usage.outputTokens.reasoning
+    },
+    totalTokens: addTokenCounts(
+      usage.inputTokens.total,
+      usage.outputTokens.total
+    ),
+    raw: usage.raw,
+    reasoningTokens: usage.outputTokens.reasoning,
+    cachedInputTokens: usage.inputTokens.cacheRead
+  };
+}
+function addTokenCounts(tokenCount1, tokenCount2) {
+  return tokenCount1 == null && tokenCount2 == null ? void 0 : (tokenCount1 != null ? tokenCount1 : 0) + (tokenCount2 != null ? tokenCount2 : 0);
+}
 export {
+  asLanguageModelUsage,
   convertAsyncIteratorToReadableStream,
   convertToLanguageModelPrompt,
   prepareCallSettings,