ai 5.1.0-beta.8 → 6.0.0-beta.100

package/dist/internal/index.mjs

@@ -153,7 +153,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "5.1.0-beta.8" : "0.0.0-test";
+var VERSION = true ? "6.0.0-beta.100" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({ url }) => {
@@ -231,7 +231,7 @@ var dataContentSchema = z.union([
     { message: "Must be a Buffer" }
   )
 ]);
-function convertToLanguageModelV2DataContent(content) {
+function convertToLanguageModelV3DataContent(content) {
   if (content instanceof Uint8Array) {
     return { data: content, mediaType: void 0 };
   }
@@ -291,12 +291,26 @@ async function convertToLanguageModelPrompt({
     download2,
     supportedUrls
   );
-  return [
+  const messages = [
     ...prompt.system != null ? [{ role: "system", content: prompt.system }] : [],
     ...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,11 +352,13 @@ 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) {
             case "file": {
-              const { data, mediaType } = convertToLanguageModelV2DataContent(
+              const { data, mediaType } = convertToLanguageModelV3DataContent(
                 part.data
               );
               return {
@@ -382,7 +398,7 @@ function convertToLanguageModelMessage({
                 type: "tool-result",
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
-                output: part.output,
+                output: mapToolResultOutput(part.output),
                 providerOptions
               };
             }
@@ -394,11 +410,11 @@ function convertToLanguageModelMessage({
     case "tool": {
       return {
         role: "tool",
-        content: message.content.map((part) => ({
+        content: message.content.filter((part) => part.type !== "tool-approval-response").map((part) => ({
           type: "tool-result",
           toolCallId: part.toolCallId,
           toolName: part.toolName,
-          output: part.output,
+          output: mapToolResultOutput(part.output),
           providerOptions: part.providerOptions
         })),
         providerOptions: message.providerOptions
@@ -438,12 +454,12 @@ async function downloadAssets(messages, download2, supportedUrls) {
   }));
   const downloadedFiles = await download2(plannedDownloads);
   return Object.fromEntries(
-    downloadedFiles.filter(
-      (downloadedFile) => (downloadedFile == null ? void 0 : downloadedFile.data) != null
-    ).map(({ data, mediaType }, index) => [
-      plannedDownloads[index].url.toString(),
-      { data, mediaType }
-    ])
+    downloadedFiles.map(
+      (file, index) => file == null ? null : [
+        plannedDownloads[index].url.toString(),
+        { data: file.data, mediaType: file.mediaType }
+      ]
+    ).filter((file) => file != null)
   );
 }
 function convertPartToLanguageModelPart(part, downloadedAssets) {
@@ -467,7 +483,7 @@ function convertPartToLanguageModelPart(part, downloadedAssets) {
     default:
       throw new Error(`Unsupported part type: ${type}`);
   }
-  const { data: convertedData, mediaType: convertedMediaType } = convertToLanguageModelV2DataContent(originalData);
+  const { data: convertedData, mediaType: convertedMediaType } = convertToLanguageModelV3DataContent(originalData);
   let mediaType = convertedMediaType != null ? convertedMediaType : part.mediaType;
   let data = convertedData;
   if (data instanceof URL) {
@@ -505,6 +521,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 "@ai-sdk/provider-utils";
@@ -515,7 +556,7 @@ function isNonEmptyObject(object) {
 }
 
 // src/prompt/prepare-tools-and-tool-choice.ts
-function prepareToolsAndToolChoice({
+async function prepareToolsAndToolChoice({
   tools,
   toolChoice,
   activeTools
@@ -529,33 +570,37 @@ function prepareToolsAndToolChoice({
   const filteredTools = activeTools != null ? Object.entries(tools).filter(
     ([name5]) => activeTools.includes(name5)
   ) : 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 [name5, tool] of filteredTools) {
+    const toolType = tool.type;
+    switch (toolType) {
+      case void 0:
+      case "dynamic":
+      case "function":
+        languageModelTools.push({
+          type: "function",
+          name: name5,
+          description: tool.description,
+          inputSchema: await asSchema(tool.inputSchema).jsonSchema,
+          providerOptions: tool.providerOptions
+        });
+        break;
+      case "provider-defined":
+        languageModelTools.push({
+          type: "provider-defined",
+          name: name5,
+          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 }
   };
 }
@@ -579,7 +624,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 +632,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
@@ -623,40 +668,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 +759,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 +797,8 @@ var assistantModelMessageSchema = z5.object({
         filePartSchema,
         reasoningPartSchema,
         toolCallPartSchema,
-        toolResultPartSchema
+        toolResultPartSchema,
+        toolApprovalRequestSchema
       ])
     )
   ]),
@@ -699,7 +806,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([