ai 5.1.0-beta.9 → 6.0.0-beta.101

package/dist/internal/index.d.mts

@@ -1,6 +1,6 @@
 import { ModelMessage, Tool } from '@ai-sdk/provider-utils';
 export { convertAsyncIteratorToReadableStream } from '@ai-sdk/provider-utils';
-import { LanguageModelV2Prompt, LanguageModelV2FunctionTool, LanguageModelV2ProviderDefinedTool, LanguageModelV2ToolChoice } from '@ai-sdk/provider';
+import { LanguageModelV3Prompt, LanguageModelV3FunctionTool, LanguageModelV3ProviderDefinedTool, LanguageModelV3ToolChoice } from '@ai-sdk/provider';
 
 /**
  * Experimental. Can change in patch versions without warning.
@@ -80,7 +80,7 @@ declare function convertToLanguageModelPrompt({ prompt, supportedUrls, download,
     prompt: StandardizedPrompt;
     supportedUrls: Record<string, RegExp[]>;
     download: DownloadFunction | undefined;
-}): Promise<LanguageModelV2Prompt>;
+}): Promise<LanguageModelV3Prompt>;
 
 type CallSettings = {
     /**
@@ -166,16 +166,16 @@ type ToolChoice<TOOLS extends Record<string, unknown>> = 'auto' | 'none' | 'requ
     toolName: Extract<keyof TOOLS, string>;
 };
 
-type ToolSet = Record<string, (Tool<never, never> | Tool<any, any> | Tool<any, never> | Tool<never, any>) & Pick<Tool<any, any>, 'execute' | 'onInputAvailable' | 'onInputStart' | 'onInputDelta'>>;
+type ToolSet = Record<string, (Tool<never, never> | Tool<any, any> | Tool<any, never> | Tool<never, any>) & Pick<Tool<any, any>, 'execute' | 'onInputAvailable' | 'onInputStart' | 'onInputDelta' | 'needsApproval'>>;
 
 declare function prepareToolsAndToolChoice<TOOLS extends ToolSet>({ tools, toolChoice, activeTools, }: {
     tools: TOOLS | undefined;
     toolChoice: ToolChoice<TOOLS> | undefined;
     activeTools: Array<keyof TOOLS> | undefined;
-}): {
-    tools: Array<LanguageModelV2FunctionTool | LanguageModelV2ProviderDefinedTool> | undefined;
-    toolChoice: LanguageModelV2ToolChoice | undefined;
-};
+}): Promise<{
+    tools: Array<LanguageModelV3FunctionTool | LanguageModelV3ProviderDefinedTool> | undefined;
+    toolChoice: LanguageModelV3ToolChoice | undefined;
+}>;
 
 /**
  * Validates call settings and returns a new object with limited values.

package/dist/internal/index.d.ts

@@ -1,6 +1,6 @@
 import { ModelMessage, Tool } from '@ai-sdk/provider-utils';
 export { convertAsyncIteratorToReadableStream } from '@ai-sdk/provider-utils';
-import { LanguageModelV2Prompt, LanguageModelV2FunctionTool, LanguageModelV2ProviderDefinedTool, LanguageModelV2ToolChoice } from '@ai-sdk/provider';
+import { LanguageModelV3Prompt, LanguageModelV3FunctionTool, LanguageModelV3ProviderDefinedTool, LanguageModelV3ToolChoice } from '@ai-sdk/provider';
 
 /**
  * Experimental. Can change in patch versions without warning.
@@ -80,7 +80,7 @@ declare function convertToLanguageModelPrompt({ prompt, supportedUrls, download,
     prompt: StandardizedPrompt;
     supportedUrls: Record<string, RegExp[]>;
     download: DownloadFunction | undefined;
-}): Promise<LanguageModelV2Prompt>;
+}): Promise<LanguageModelV3Prompt>;
 
 type CallSettings = {
     /**
@@ -166,16 +166,16 @@ type ToolChoice<TOOLS extends Record<string, unknown>> = 'auto' | 'none' | 'requ
     toolName: Extract<keyof TOOLS, string>;
 };
 
-type ToolSet = Record<string, (Tool<never, never> | Tool<any, any> | Tool<any, never> | Tool<never, any>) & Pick<Tool<any, any>, 'execute' | 'onInputAvailable' | 'onInputStart' | 'onInputDelta'>>;
+type ToolSet = Record<string, (Tool<never, never> | Tool<any, any> | Tool<any, never> | Tool<never, any>) & Pick<Tool<any, any>, 'execute' | 'onInputAvailable' | 'onInputStart' | 'onInputDelta' | 'needsApproval'>>;
 
 declare function prepareToolsAndToolChoice<TOOLS extends ToolSet>({ tools, toolChoice, activeTools, }: {
     tools: TOOLS | undefined;
     toolChoice: ToolChoice<TOOLS> | undefined;
     activeTools: Array<keyof TOOLS> | undefined;
-}): {
-    tools: Array<LanguageModelV2FunctionTool | LanguageModelV2ProviderDefinedTool> | undefined;
-    toolChoice: LanguageModelV2ToolChoice | undefined;
-};
+}): Promise<{
+    tools: Array<LanguageModelV3FunctionTool | LanguageModelV3ProviderDefinedTool> | undefined;
+    toolChoice: LanguageModelV3ToolChoice | undefined;
+}>;
 
 /**
  * Validates call settings and returns a new object with limited values.

package/dist/internal/index.js

@@ -177,7 +177,7 @@ _a = symbol;
 var import_provider_utils2 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "5.1.0-beta.9" : "0.0.0-test";
+var VERSION = true ? "6.0.0-beta.101" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({ url }) => {
@@ -252,7 +252,7 @@ var dataContentSchema = import_v4.z.union([
     { message: "Must be a Buffer" }
   )
 ]);
-function convertToLanguageModelV2DataContent(content) {
+function convertToLanguageModelV3DataContent(content) {
   if (content instanceof Uint8Array) {
     return { data: content, mediaType: void 0 };
   }
@@ -312,12 +312,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,
@@ -359,11 +373,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 {
@@ -403,7 +419,7 @@ function convertToLanguageModelMessage({
                 type: "tool-result",
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
-                output: part.output,
+                output: mapToolResultOutput(part.output),
                 providerOptions
               };
             }
@@ -415,11 +431,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
@@ -488,7 +504,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) {
@@ -526,6 +542,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
 var import_provider_utils5 = require("@ai-sdk/provider-utils");
@@ -536,7 +577,7 @@ function isNonEmptyObject(object) {
 }
 
 // src/prompt/prepare-tools-and-tool-choice.ts
-function prepareToolsAndToolChoice({
+async function prepareToolsAndToolChoice({
   tools,
   toolChoice,
   activeTools
@@ -550,33 +591,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: (0, import_provider_utils5.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 (0, import_provider_utils5.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 }
   };
 }
@@ -600,7 +645,7 @@ var jsonValueSchema = import_v42.z.lazy(
     import_v42.z.string(),
     import_v42.z.number(),
     import_v42.z.boolean(),
-    import_v42.z.record(import_v42.z.string(), jsonValueSchema),
+    import_v42.z.record(import_v42.z.string(), jsonValueSchema.optional()),
     import_v42.z.array(jsonValueSchema)
   ])
 );
@@ -608,7 +653,7 @@ var jsonValueSchema = import_v42.z.lazy(
 // src/types/provider-metadata.ts
 var providerMetadataSchema = import_v43.z.record(
   import_v43.z.string(),
-  import_v43.z.record(import_v43.z.string(), jsonValueSchema)
+  import_v43.z.record(import_v43.z.string(), jsonValueSchema.optional())
 );
 
 // src/prompt/content-part.ts
@@ -644,40 +689,90 @@ var toolCallPartSchema = import_v44.z.object({
   providerOptions: providerMetadataSchema.optional(),
   providerExecuted: import_v44.z.boolean().optional()
 });
-var outputSchema = import_v44.z.discriminatedUnion("type", [
-  import_v44.z.object({
-    type: import_v44.z.literal("text"),
-    value: import_v44.z.string()
-  }),
-  import_v44.z.object({
-    type: import_v44.z.literal("json"),
-    value: jsonValueSchema
-  }),
-  import_v44.z.object({
-    type: import_v44.z.literal("error-text"),
-    value: import_v44.z.string()
-  }),
-  import_v44.z.object({
-    type: import_v44.z.literal("error-json"),
-    value: jsonValueSchema
-  }),
-  import_v44.z.object({
-    type: import_v44.z.literal("content"),
-    value: import_v44.z.array(
-      import_v44.z.union([
-        import_v44.z.object({
-          type: import_v44.z.literal("text"),
-          text: import_v44.z.string()
-        }),
-        import_v44.z.object({
-          type: import_v44.z.literal("media"),
-          data: import_v44.z.string(),
-          mediaType: import_v44.z.string()
-        })
-      ])
-    )
-  })
-]);
+var outputSchema = import_v44.z.discriminatedUnion(
+  "type",
+  [
+    import_v44.z.object({
+      type: import_v44.z.literal("text"),
+      value: import_v44.z.string(),
+      providerOptions: providerMetadataSchema.optional()
+    }),
+    import_v44.z.object({
+      type: import_v44.z.literal("json"),
+      value: jsonValueSchema,
+      providerOptions: providerMetadataSchema.optional()
+    }),
+    import_v44.z.object({
+      type: import_v44.z.literal("execution-denied"),
+      reason: import_v44.z.string().optional(),
+      providerOptions: providerMetadataSchema.optional()
+    }),
+    import_v44.z.object({
+      type: import_v44.z.literal("error-text"),
+      value: import_v44.z.string(),
+      providerOptions: providerMetadataSchema.optional()
+    }),
+    import_v44.z.object({
+      type: import_v44.z.literal("error-json"),
+      value: jsonValueSchema,
+      providerOptions: providerMetadataSchema.optional()
+    }),
+    import_v44.z.object({
+      type: import_v44.z.literal("content"),
+      value: import_v44.z.array(
+        import_v44.z.union([
+          import_v44.z.object({
+            type: import_v44.z.literal("text"),
+            text: import_v44.z.string(),
+            providerOptions: providerMetadataSchema.optional()
+          }),
+          import_v44.z.object({
+            type: import_v44.z.literal("media"),
+            data: import_v44.z.string(),
+            mediaType: import_v44.z.string()
+          }),
+          import_v44.z.object({
+            type: import_v44.z.literal("file-data"),
+            data: import_v44.z.string(),
+            mediaType: import_v44.z.string(),
+            filename: import_v44.z.string().optional(),
+            providerOptions: providerMetadataSchema.optional()
+          }),
+          import_v44.z.object({
+            type: import_v44.z.literal("file-url"),
+            url: import_v44.z.string(),
+            providerOptions: providerMetadataSchema.optional()
+          }),
+          import_v44.z.object({
+            type: import_v44.z.literal("file-id"),
+            fileId: import_v44.z.union([import_v44.z.string(), import_v44.z.record(import_v44.z.string(), import_v44.z.string())]),
+            providerOptions: providerMetadataSchema.optional()
+          }),
+          import_v44.z.object({
+            type: import_v44.z.literal("image-data"),
+            data: import_v44.z.string(),
+            mediaType: import_v44.z.string(),
+            providerOptions: providerMetadataSchema.optional()
+          }),
+          import_v44.z.object({
+            type: import_v44.z.literal("image-url"),
+            url: import_v44.z.string(),
+            providerOptions: providerMetadataSchema.optional()
+          }),
+          import_v44.z.object({
+            type: import_v44.z.literal("image-file-id"),
+            fileId: import_v44.z.union([import_v44.z.string(), import_v44.z.record(import_v44.z.string(), import_v44.z.string())]),
+            providerOptions: providerMetadataSchema.optional()
+          }),
+          import_v44.z.object({
+            type: import_v44.z.literal("custom"),
+            providerOptions: providerMetadataSchema.optional()
+          })
+        ])
+      )
+    })
+  ]
+);
 var toolResultPartSchema = import_v44.z.object({
   type: import_v44.z.literal("tool-result"),
   toolCallId: import_v44.z.string(),
@@ -685,6 +780,17 @@ var toolResultPartSchema = import_v44.z.object({
   output: outputSchema,
   providerOptions: providerMetadataSchema.optional()
 });
+var toolApprovalRequestSchema = import_v44.z.object({
+  type: import_v44.z.literal("tool-approval-request"),
+  approvalId: import_v44.z.string(),
+  toolCallId: import_v44.z.string()
+});
+var toolApprovalResponseSchema = import_v44.z.object({
+  type: import_v44.z.literal("tool-approval-response"),
+  approvalId: import_v44.z.string(),
+  approved: import_v44.z.boolean(),
+  reason: import_v44.z.string().optional()
+});
 
 // src/prompt/message.ts
 var systemModelMessageSchema = import_v45.z.object(
@@ -712,7 +818,8 @@ var assistantModelMessageSchema = import_v45.z.object({
         filePartSchema,
         reasoningPartSchema,
         toolCallPartSchema,
-        toolResultPartSchema
+        toolResultPartSchema,
+        toolApprovalRequestSchema
       ])
     )
   ]),
@@ -720,7 +827,7 @@ var assistantModelMessageSchema = import_v45.z.object({
 });
 var toolModelMessageSchema = import_v45.z.object({
   role: import_v45.z.literal("tool"),
-  content: import_v45.z.array(toolResultPartSchema),
+  content: import_v45.z.array(import_v45.z.union([toolResultPartSchema, toolApprovalResponseSchema])),
   providerOptions: providerMetadataSchema.optional()
 });
 var modelMessageSchema = import_v45.z.union([