ai 5.0.0-beta.31 → 5.0.0-beta.33

package/dist/index.js

@@ -1895,12 +1895,15 @@ function createToolModelOutput({
   if (errorMode === "text") {
     return { type: "error-text", value: (0, import_provider21.getErrorMessage)(output) };
   } else if (errorMode === "json") {
-    return { type: "error-json", value: output };
+    return { type: "error-json", value: toJSONValue(output) };
   }
   if (tool3 == null ? void 0 : tool3.toModelOutput) {
     return tool3.toModelOutput(output);
   }
-  return typeof output === "string" ? { type: "text", value: output } : { type: "json", value: output };
+  return typeof output === "string" ? { type: "text", value: output } : { type: "json", value: toJSONValue(output) };
+}
+function toJSONValue(value) {
+  return value === void 0 ? null : value;
 }
 
 // src/generate-text/to-response-messages.ts
@@ -5406,7 +5409,7 @@ async function embed({
     }),
     tracer,
     fn: async (span) => {
-      const { embedding, usage, response } = await retry(
+      const { embedding, usage, response, providerMetadata } = await retry(
         () => (
           // nested spans to align with the embedMany telemetry data:
           recordSpan({
@@ -5450,6 +5453,7 @@ async function embed({
               return {
                 embedding: embedding2,
                 usage: usage2,
+                providerMetadata: modelResponse.providerMetadata,
                 response: modelResponse.response
               };
             }
@@ -5469,6 +5473,7 @@ async function embed({
         value,
         embedding,
         usage,
+        providerMetadata,
         response
       });
     }
@@ -5479,6 +5484,7 @@ var DefaultEmbedResult = class {
     this.value = options.value;
     this.embedding = options.embedding;
     this.usage = options.usage;
+    this.providerMetadata = options.providerMetadata;
     this.response = options.response;
   }
 };
@@ -5536,58 +5542,64 @@ async function embedMany({
     }),
     tracer,
     fn: async (span) => {
+      var _a16;
       const [maxEmbeddingsPerCall, supportsParallelCalls] = await Promise.all([
         model.maxEmbeddingsPerCall,
         model.supportsParallelCalls
       ]);
       if (maxEmbeddingsPerCall == null || maxEmbeddingsPerCall === Infinity) {
-        const { embeddings: embeddings2, usage, response } = await retry(() => {
-          return recordSpan({
-            name: "ai.embedMany.doEmbed",
-            attributes: selectTelemetryAttributes({
-              telemetry,
-              attributes: {
-                ...assembleOperationName({
-                  operationId: "ai.embedMany.doEmbed",
-                  telemetry
-                }),
-                ...baseTelemetryAttributes,
-                // specific settings that only make sense on the outer level:
-                "ai.values": {
-                  input: () => values.map((value) => JSON.stringify(value))
+        const { embeddings: embeddings2, usage, response, providerMetadata: providerMetadata2 } = await retry(
+          () => {
+            return recordSpan({
+              name: "ai.embedMany.doEmbed",
+              attributes: selectTelemetryAttributes({
+                telemetry,
+                attributes: {
+                  ...assembleOperationName({
+                    operationId: "ai.embedMany.doEmbed",
+                    telemetry
+                  }),
+                  ...baseTelemetryAttributes,
+                  // specific settings that only make sense on the outer level:
+                  "ai.values": {
+                    input: () => values.map((value) => JSON.stringify(value))
+                  }
                 }
+              }),
+              tracer,
+              fn: async (doEmbedSpan) => {
+                var _a17;
+                const modelResponse = await model.doEmbed({
+                  values,
+                  abortSignal,
+                  headers,
+                  providerOptions
+                });
+                const embeddings3 = modelResponse.embeddings;
+                const usage2 = (_a17 = modelResponse.usage) != null ? _a17 : { tokens: NaN };
+                doEmbedSpan.setAttributes(
+                  selectTelemetryAttributes({
+                    telemetry,
+                    attributes: {
+                      "ai.embeddings": {
+                        output: () => embeddings3.map(
+                          (embedding) => JSON.stringify(embedding)
+                        )
+                      },
+                      "ai.usage.tokens": usage2.tokens
+                    }
+                  })
+                );
+                return {
+                  embeddings: embeddings3,
+                  usage: usage2,
+                  providerMetadata: modelResponse.providerMetadata,
+                  response: modelResponse.response
+                };
               }
-            }),
-            tracer,
-            fn: async (doEmbedSpan) => {
-              var _a16;
-              const modelResponse = await model.doEmbed({
-                values,
-                abortSignal,
-                headers,
-                providerOptions
-              });
-              const embeddings3 = modelResponse.embeddings;
-              const usage2 = (_a16 = modelResponse.usage) != null ? _a16 : { tokens: NaN };
-              doEmbedSpan.setAttributes(
-                selectTelemetryAttributes({
-                  telemetry,
-                  attributes: {
-                    "ai.embeddings": {
-                      output: () => embeddings3.map((embedding) => JSON.stringify(embedding))
-                    },
-                    "ai.usage.tokens": usage2.tokens
-                  }
-                })
-              );
-              return {
-                embeddings: embeddings3,
-                usage: usage2,
-                response: modelResponse.response
-              };
-            }
-          });
-        });
+            });
+          }
+        );
         span.setAttributes(
           selectTelemetryAttributes({
             telemetry,
@@ -5603,6 +5615,7 @@ async function embedMany({
           values,
           embeddings: embeddings2,
           usage,
+          providerMetadata: providerMetadata2,
           responses: [response]
         });
       }
@@ -5610,6 +5623,7 @@ async function embedMany({
       const embeddings = [];
       const responses = [];
       let tokens = 0;
+      let providerMetadata;
       const parallelChunks = splitArray(
         valueChunks,
         supportsParallelCalls ? maxParallelCalls : 1
@@ -5636,7 +5650,7 @@ async function embedMany({
                 }),
                 tracer,
                 fn: async (doEmbedSpan) => {
-                  var _a16;
+                  var _a17;
                   const modelResponse = await model.doEmbed({
                     values: chunk,
                     abortSignal,
@@ -5644,7 +5658,7 @@ async function embedMany({
                     providerOptions
                   });
                   const embeddings2 = modelResponse.embeddings;
-                  const usage = (_a16 = modelResponse.usage) != null ? _a16 : { tokens: NaN };
+                  const usage = (_a17 = modelResponse.usage) != null ? _a17 : { tokens: NaN };
                   doEmbedSpan.setAttributes(
                     selectTelemetryAttributes({
                       telemetry,
@@ -5661,6 +5675,7 @@ async function embedMany({
                   return {
                     embeddings: embeddings2,
                     usage,
+                    providerMetadata: modelResponse.providerMetadata,
                     response: modelResponse.response
                   };
                 }
@@ -5672,6 +5687,20 @@ async function embedMany({
           embeddings.push(...result.embeddings);
           responses.push(result.response);
           tokens += result.usage.tokens;
+          if (result.providerMetadata) {
+            if (!providerMetadata) {
+              providerMetadata = { ...result.providerMetadata };
+            } else {
+              for (const [providerName, metadata] of Object.entries(
+                result.providerMetadata
+              )) {
+                providerMetadata[providerName] = {
+                  ...(_a16 = providerMetadata[providerName]) != null ? _a16 : {},
+                  ...metadata
+                };
+              }
+            }
+          }
         }
       }
       span.setAttributes(
@@ -5689,6 +5718,7 @@ async function embedMany({
         values,
         embeddings,
         usage: { tokens },
+        providerMetadata,
         responses
       });
     }
@@ -5699,6 +5729,7 @@ var DefaultEmbedManyResult = class {
     this.values = options.values;
     this.embeddings = options.embeddings;
     this.usage = options.usage;
+    this.providerMetadata = options.providerMetadata;
     this.responses = options.responses;
   }
 };
@@ -6699,6 +6730,7 @@ var DefaultStreamObjectResult = class {
     this._warnings = new DelayedPromise();
     this._request = new DelayedPromise();
     this._response = new DelayedPromise();
+    this._finishReason = new DelayedPromise();
     const model = resolveLanguageModel(modelArg);
     const { maxRetries, retry } = prepareRetries({
       maxRetries: maxRetriesArg
@@ -6918,6 +6950,7 @@ var DefaultStreamObjectResult = class {
                     ...fullResponse,
                     headers: response == null ? void 0 : response.headers
                   });
+                  self._finishReason.resolve(finishReason != null ? finishReason : "unknown");
                   const validationResult = await outputStrategy.validateFinalResult(
                     latestObjectJson,
                     {
@@ -7052,6 +7085,9 @@ var DefaultStreamObjectResult = class {
   get response() {
     return this._response.promise;
   }
+  get finishReason() {
+    return this._finishReason.promise;
+  }
   get partialObjectStream() {
     return createAsyncIterableStream(
       this.baseStream.pipeThrough(
@@ -7904,38 +7940,38 @@ var SUPPORTED_PROTOCOL_VERSIONS = [
   "2025-03-26",
   "2024-11-05"
 ];
-var ClientOrServerImplementationSchema = import_v48.z.object({
+var ClientOrServerImplementationSchema = import_v48.z.looseObject({
   name: import_v48.z.string(),
   version: import_v48.z.string()
-}).passthrough();
-var BaseParamsSchema = import_v48.z.object({
-  _meta: import_v48.z.optional(import_v48.z.object({}).passthrough())
-}).passthrough();
+});
+var BaseParamsSchema = import_v48.z.looseObject({
+  _meta: import_v48.z.optional(import_v48.z.object({}).loose())
+});
 var ResultSchema = BaseParamsSchema;
 var RequestSchema = import_v48.z.object({
   method: import_v48.z.string(),
   params: import_v48.z.optional(BaseParamsSchema)
 });
-var ServerCapabilitiesSchema = import_v48.z.object({
-  experimental: import_v48.z.optional(import_v48.z.object({}).passthrough()),
-  logging: import_v48.z.optional(import_v48.z.object({}).passthrough()),
+var ServerCapabilitiesSchema = import_v48.z.looseObject({
+  experimental: import_v48.z.optional(import_v48.z.object({}).loose()),
+  logging: import_v48.z.optional(import_v48.z.object({}).loose()),
   prompts: import_v48.z.optional(
-    import_v48.z.object({
+    import_v48.z.looseObject({
       listChanged: import_v48.z.optional(import_v48.z.boolean())
-    }).passthrough()
+    })
   ),
   resources: import_v48.z.optional(
-    import_v48.z.object({
+    import_v48.z.looseObject({
       subscribe: import_v48.z.optional(import_v48.z.boolean()),
       listChanged: import_v48.z.optional(import_v48.z.boolean())
-    }).passthrough()
+    })
   ),
   tools: import_v48.z.optional(
-    import_v48.z.object({
+    import_v48.z.looseObject({
       listChanged: import_v48.z.optional(import_v48.z.boolean())
-    }).passthrough()
+    })
   )
-}).passthrough();
+});
 var InitializeResultSchema = ResultSchema.extend({
   protocolVersion: import_v48.z.string(),
   capabilities: ServerCapabilitiesSchema,
@@ -7950,21 +7986,21 @@ var ToolSchema = import_v48.z.object({
   description: import_v48.z.optional(import_v48.z.string()),
   inputSchema: import_v48.z.object({
     type: import_v48.z.literal("object"),
-    properties: import_v48.z.optional(import_v48.z.object({}).passthrough())
-  }).passthrough()
-}).passthrough();
+    properties: import_v48.z.optional(import_v48.z.object({}).loose())
+  }).loose()
+}).loose();
 var ListToolsResultSchema = PaginatedResultSchema.extend({
   tools: import_v48.z.array(ToolSchema)
 });
 var TextContentSchema = import_v48.z.object({
   type: import_v48.z.literal("text"),
   text: import_v48.z.string()
-}).passthrough();
+}).loose();
 var ImageContentSchema = import_v48.z.object({
   type: import_v48.z.literal("image"),
-  data: import_v48.z.string().base64(),
+  data: import_v48.z.base64(),
   mimeType: import_v48.z.string()
-}).passthrough();
+}).loose();
 var ResourceContentsSchema = import_v48.z.object({
   /**
    * The URI of this resource.
@@ -7974,17 +8010,17 @@ var ResourceContentsSchema = import_v48.z.object({
    * The MIME type of this resource, if known.
    */
   mimeType: import_v48.z.optional(import_v48.z.string())
-}).passthrough();
+}).loose();
 var TextResourceContentsSchema = ResourceContentsSchema.extend({
   text: import_v48.z.string()
 });
 var BlobResourceContentsSchema = ResourceContentsSchema.extend({
-  blob: import_v48.z.string().base64()
+  blob: import_v48.z.base64()
 });
 var EmbeddedResourceSchema = import_v48.z.object({
   type: import_v48.z.literal("resource"),
   resource: import_v48.z.union([TextResourceContentsSchema, BlobResourceContentsSchema])
-}).passthrough();
+}).loose();
 var CallToolResultSchema = ResultSchema.extend({
   content: import_v48.z.array(
     import_v48.z.union([TextContentSchema, ImageContentSchema, EmbeddedResourceSchema])
@@ -8182,11 +8218,11 @@ function isCustomMcpTransport(transport) {
 // src/tool/mcp/mcp-client.ts
 var CLIENT_VERSION = "1.0.0";
 async function createMCPClient(config) {
-  const client = new MCPClient(config);
+  const client = new DefaultMCPClient(config);
   await client.init();
   return client;
 }
-var MCPClient = class {
+var DefaultMCPClient = class {
   constructor({
     transport: transportConfig,
     name: name16 = "ai-sdk-mcp-client",