ai 6.0.0-beta.54 → 6.0.0-beta.56

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # ai
 
+## 6.0.0-beta.56
+
+### Patch Changes
+
+- 3794514: feat: flexible tool output content support
+- Updated dependencies [3794514]
+  - @ai-sdk/provider-utils@4.0.0-beta.19
+  - @ai-sdk/provider@3.0.0-beta.8
+  - @ai-sdk/gateway@2.0.0-beta.35
+
+## 6.0.0-beta.55
+
+### Patch Changes
+
+- 42cf7ed: fix(agent): use tool.toModelOutput when available
+
 ## 6.0.0-beta.54
 
 ### Patch Changes

package/dist/index.js

@@ -870,7 +870,7 @@ function detectMediaType({
 var import_provider_utils2 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.0-beta.54" : "0.0.0-test";
+var VERSION = true ? "6.0.0-beta.56" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({ url }) => {
@@ -1120,7 +1120,7 @@ function convertToLanguageModelMessage({
                 type: "tool-result",
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
-                output: part.output,
+                output: mapToolResultOutput(part.output),
                 providerOptions
               };
             }
@@ -1136,7 +1136,7 @@ function convertToLanguageModelMessage({
           type: "tool-result",
           toolCallId: part.toolCallId,
           toolName: part.toolName,
-          output: part.output,
+          output: mapToolResultOutput(part.output),
           providerOptions: part.providerOptions
         })),
         providerOptions: message.providerOptions
@@ -1243,6 +1243,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/create-tool-model-output.ts
 var import_provider20 = require("@ai-sdk/provider");
@@ -1479,44 +1504,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("execution-denied"),
-    reason: import_v44.z.string().optional()
-  }),
-  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(),
@@ -6498,7 +6569,7 @@ var BasicAgent = class {
    */
   respond(options) {
     return this.stream({
-      prompt: convertToModelMessages(options.messages)
+      prompt: convertToModelMessages(options.messages, { tools: this.tools })
     }).toUIMessageStreamResponse();
   }
 };