ai 7.0.0-beta.6 → 7.0.0-beta.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ai
 
+## 7.0.0-beta.7
+
+### Patch Changes
+
+- 210ed3d: feat(ai): pass result provider metadata across the stream
+
 ## 7.0.0-beta.6
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1865,6 +1865,7 @@ type UIToolInvocation<TOOL extends UITool | Tool> = {
     output: asUITool<TOOL>['output'];
     errorText?: never;
     callProviderMetadata?: ProviderMetadata;
+    resultProviderMetadata?: ProviderMetadata;
     preliminary?: boolean;
     approval?: {
         id: string;
@@ -1878,6 +1879,7 @@ type UIToolInvocation<TOOL extends UITool | Tool> = {
     output?: never;
     errorText: string;
     callProviderMetadata?: ProviderMetadata;
+    resultProviderMetadata?: ProviderMetadata;
     approval?: {
         id: string;
         approved: true;
@@ -1957,6 +1959,7 @@ type DynamicToolUIPart = {
     output: unknown;
     errorText?: never;
     callProviderMetadata?: ProviderMetadata;
+    resultProviderMetadata?: ProviderMetadata;
     preliminary?: boolean;
     approval?: {
         id: string;
@@ -1969,6 +1972,7 @@ type DynamicToolUIPart = {
     output?: never;
     errorText: string;
     callProviderMetadata?: ProviderMetadata;
+    resultProviderMetadata?: ProviderMetadata;
     approval?: {
         id: string;
         approved: true;
@@ -2102,6 +2106,7 @@ declare const uiMessageChunkSchema: _ai_sdk_provider_utils.LazySchema<{
     toolCallId: string;
     output: unknown;
     providerExecuted?: boolean | undefined;
+    providerMetadata?: _ai_sdk_provider.SharedV4ProviderMetadata | undefined;
     dynamic?: boolean | undefined;
     preliminary?: boolean | undefined;
 } | {
@@ -2109,6 +2114,7 @@ declare const uiMessageChunkSchema: _ai_sdk_provider_utils.LazySchema<{
     toolCallId: string;
     errorText: string;
     providerExecuted?: boolean | undefined;
+    providerMetadata?: _ai_sdk_provider.SharedV4ProviderMetadata | undefined;
     dynamic?: boolean | undefined;
 } | {
     type: "tool-output-denied";
@@ -2233,6 +2239,7 @@ type UIMessageChunk<METADATA = unknown, DATA_TYPES extends UIDataTypes = UIDataT
     toolCallId: string;
     output: unknown;
     providerExecuted?: boolean;
+    providerMetadata?: ProviderMetadata;
     dynamic?: boolean;
     preliminary?: boolean;
 } | {
@@ -2240,6 +2247,7 @@ type UIMessageChunk<METADATA = unknown, DATA_TYPES extends UIDataTypes = UIDataT
     toolCallId: string;
     errorText: string;
     providerExecuted?: boolean;
+    providerMetadata?: ProviderMetadata;
     dynamic?: boolean;
 } | {
     type: 'tool-output-denied';

package/dist/index.d.ts

@@ -1865,6 +1865,7 @@ type UIToolInvocation<TOOL extends UITool | Tool> = {
     output: asUITool<TOOL>['output'];
     errorText?: never;
     callProviderMetadata?: ProviderMetadata;
+    resultProviderMetadata?: ProviderMetadata;
     preliminary?: boolean;
     approval?: {
         id: string;
@@ -1878,6 +1879,7 @@ type UIToolInvocation<TOOL extends UITool | Tool> = {
     output?: never;
     errorText: string;
     callProviderMetadata?: ProviderMetadata;
+    resultProviderMetadata?: ProviderMetadata;
     approval?: {
         id: string;
         approved: true;
@@ -1957,6 +1959,7 @@ type DynamicToolUIPart = {
     output: unknown;
     errorText?: never;
     callProviderMetadata?: ProviderMetadata;
+    resultProviderMetadata?: ProviderMetadata;
     preliminary?: boolean;
     approval?: {
         id: string;
@@ -1969,6 +1972,7 @@ type DynamicToolUIPart = {
     output?: never;
     errorText: string;
     callProviderMetadata?: ProviderMetadata;
+    resultProviderMetadata?: ProviderMetadata;
     approval?: {
         id: string;
         approved: true;
@@ -2102,6 +2106,7 @@ declare const uiMessageChunkSchema: _ai_sdk_provider_utils.LazySchema<{
     toolCallId: string;
     output: unknown;
     providerExecuted?: boolean | undefined;
+    providerMetadata?: _ai_sdk_provider.SharedV4ProviderMetadata | undefined;
     dynamic?: boolean | undefined;
     preliminary?: boolean | undefined;
 } | {
@@ -2109,6 +2114,7 @@ declare const uiMessageChunkSchema: _ai_sdk_provider_utils.LazySchema<{
     toolCallId: string;
     errorText: string;
     providerExecuted?: boolean | undefined;
+    providerMetadata?: _ai_sdk_provider.SharedV4ProviderMetadata | undefined;
     dynamic?: boolean | undefined;
 } | {
     type: "tool-output-denied";
@@ -2233,6 +2239,7 @@ type UIMessageChunk<METADATA = unknown, DATA_TYPES extends UIDataTypes = UIDataT
     toolCallId: string;
     output: unknown;
     providerExecuted?: boolean;
+    providerMetadata?: ProviderMetadata;
     dynamic?: boolean;
     preliminary?: boolean;
 } | {
@@ -2240,6 +2247,7 @@ type UIMessageChunk<METADATA = unknown, DATA_TYPES extends UIDataTypes = UIDataT
     toolCallId: string;
     errorText: string;
     providerExecuted?: boolean;
+    providerMetadata?: ProviderMetadata;
     dynamic?: boolean;
 } | {
     type: 'tool-output-denied';

package/dist/index.js

@@ -1370,7 +1370,7 @@ var import_provider_utils3 = require("@ai-sdk/provider-utils");
 var import_provider_utils4 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "7.0.0-beta.6" : "0.0.0-test";
+var VERSION = true ? "7.0.0-beta.7" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -5058,7 +5058,8 @@ function asContent({
               input: void 0,
               error: part.result,
               providerExecuted: true,
-              dynamic: part.dynamic
+              dynamic: part.dynamic,
+              ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
             });
           } else {
             contentParts.push({
@@ -5068,7 +5069,8 @@ function asContent({
               input: void 0,
               output: part.result,
               providerExecuted: true,
-              dynamic: part.dynamic
+              dynamic: part.dynamic,
+              ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
             });
           }
           break;
@@ -5081,7 +5083,8 @@ function asContent({
             input: toolCall.input,
             error: part.result,
             providerExecuted: true,
-            dynamic: toolCall.dynamic
+            dynamic: toolCall.dynamic,
+            ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
           });
         } else {
           contentParts.push({
@@ -5091,7 +5094,8 @@ function asContent({
             input: toolCall.input,
             output: part.result,
             providerExecuted: true,
-            dynamic: toolCall.dynamic
+            dynamic: toolCall.dynamic,
+            ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
           });
         }
         break;
@@ -5340,6 +5344,7 @@ var uiMessageChunkSchema = (0, import_provider_utils16.lazySchema)(
         toolCallId: import_v47.z.string(),
         output: import_v47.z.unknown(),
         providerExecuted: import_v47.z.boolean().optional(),
+        providerMetadata: providerMetadataSchema.optional(),
         dynamic: import_v47.z.boolean().optional(),
         preliminary: import_v47.z.boolean().optional()
       }),
@@ -5348,6 +5353,7 @@ var uiMessageChunkSchema = (0, import_provider_utils16.lazySchema)(
         toolCallId: import_v47.z.string(),
         errorText: import_v47.z.string(),
         providerExecuted: import_v47.z.boolean().optional(),
+        providerMetadata: providerMetadataSchema.optional(),
         dynamic: import_v47.z.boolean().optional()
       }),
       import_v47.z.strictObject({
@@ -5532,8 +5538,14 @@ function processUIMessageStream({
                 anyPart.title = options.title;
               }
               anyPart.providerExecuted = (_a22 = anyOptions.providerExecuted) != null ? _a22 : part.providerExecuted;
-              if (anyOptions.providerMetadata != null) {
-                part.callProviderMetadata = anyOptions.providerMetadata;
+              const providerMetadata = anyOptions.providerMetadata;
+              if (providerMetadata != null) {
+                if (options.state === "output-available" || options.state === "output-error") {
+                  const resultPart = part;
+                  resultPart.resultProviderMetadata = providerMetadata;
+                } else {
+                  part.callProviderMetadata = providerMetadata;
+                }
               }
             } else {
               state.message.parts.push({
@@ -5547,7 +5559,8 @@ function processUIMessageStream({
                 errorText: anyOptions.errorText,
                 providerExecuted: anyOptions.providerExecuted,
                 preliminary: anyOptions.preliminary,
-                ...anyOptions.providerMetadata != null ? { callProviderMetadata: anyOptions.providerMetadata } : {}
+                ...anyOptions.providerMetadata != null && (options.state === "output-available" || options.state === "output-error") ? { resultProviderMetadata: anyOptions.providerMetadata } : {},
+                ...anyOptions.providerMetadata != null && !(options.state === "output-available" || options.state === "output-error") ? { callProviderMetadata: anyOptions.providerMetadata } : {}
               });
             }
           }
@@ -5570,8 +5583,14 @@ function processUIMessageStream({
                 anyPart.title = options.title;
               }
               anyPart.providerExecuted = (_b2 = anyOptions.providerExecuted) != null ? _b2 : part.providerExecuted;
-              if (anyOptions.providerMetadata != null) {
-                part.callProviderMetadata = anyOptions.providerMetadata;
+              const providerMetadata = anyOptions.providerMetadata;
+              if (providerMetadata != null) {
+                if (options.state === "output-available" || options.state === "output-error") {
+                  const resultPart = part;
+                  resultPart.resultProviderMetadata = providerMetadata;
+                } else {
+                  part.callProviderMetadata = providerMetadata;
+                }
               }
             } else {
               state.message.parts.push({
@@ -5585,7 +5604,8 @@ function processUIMessageStream({
                 preliminary: anyOptions.preliminary,
                 providerExecuted: anyOptions.providerExecuted,
                 title: options.title,
-                ...anyOptions.providerMetadata != null ? { callProviderMetadata: anyOptions.providerMetadata } : {}
+                ...anyOptions.providerMetadata != null && (options.state === "output-available" || options.state === "output-error") ? { resultProviderMetadata: anyOptions.providerMetadata } : {},
+                ...anyOptions.providerMetadata != null && !(options.state === "output-available" || options.state === "output-error") ? { callProviderMetadata: anyOptions.providerMetadata } : {}
               });
             }
           }
@@ -5869,6 +5889,7 @@ function processUIMessageStream({
                   output: chunk.output,
                   preliminary: chunk.preliminary,
                   providerExecuted: chunk.providerExecuted,
+                  providerMetadata: chunk.providerMetadata,
                   title: toolInvocation.title
                 });
               } else {
@@ -5880,6 +5901,7 @@ function processUIMessageStream({
                   output: chunk.output,
                   providerExecuted: chunk.providerExecuted,
                   preliminary: chunk.preliminary,
+                  providerMetadata: chunk.providerMetadata,
                   title: toolInvocation.title
                 });
               }
@@ -5896,6 +5918,7 @@ function processUIMessageStream({
                   input: toolInvocation.input,
                   errorText: chunk.errorText,
                   providerExecuted: chunk.providerExecuted,
+                  providerMetadata: chunk.providerMetadata,
                   title: toolInvocation.title
                 });
               } else {
@@ -5907,6 +5930,7 @@ function processUIMessageStream({
                   rawInput: toolInvocation.rawInput,
                   errorText: chunk.errorText,
                   providerExecuted: chunk.providerExecuted,
+                  providerMetadata: chunk.providerMetadata,
                   title: toolInvocation.title
                 });
               }
@@ -6494,7 +6518,8 @@ function runToolsTransformation({
               input: toolInputs.get(chunk.toolCallId),
               providerExecuted: true,
               error: chunk.result,
-              dynamic: chunk.dynamic
+              dynamic: chunk.dynamic,
+              ...chunk.providerMetadata != null ? { providerMetadata: chunk.providerMetadata } : {}
             });
           } else {
             controller.enqueue({
@@ -6504,7 +6529,8 @@ function runToolsTransformation({
               input: toolInputs.get(chunk.toolCallId),
               output: chunk.result,
               providerExecuted: true,
-              dynamic: chunk.dynamic
+              dynamic: chunk.dynamic,
+              ...chunk.providerMetadata != null ? { providerMetadata: chunk.providerMetadata } : {}
             });
           }
           break;
@@ -8126,6 +8152,7 @@ var DefaultStreamTextResult = class {
                 toolCallId: part.toolCallId,
                 output: part.output,
                 ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
+                ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
                 ...part.preliminary != null ? { preliminary: part.preliminary } : {},
                 ...dynamic != null ? { dynamic } : {}
               });
@@ -8138,6 +8165,7 @@ var DefaultStreamTextResult = class {
                 toolCallId: part.toolCallId,
                 errorText: onError(part.error),
                 ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
+                ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
                 ...dynamic != null ? { dynamic } : {}
               });
               break;
@@ -8630,7 +8658,7 @@ async function convertToModelMessages(messages, options) {
         if (message.parts != null) {
           let block = [];
           async function processBlock() {
-            var _a21, _b, _c, _d, _e, _f;
+            var _a21, _b, _c, _d, _e, _f, _g;
             if (block.length === 0) {
               return;
             }
@@ -8675,6 +8703,7 @@ async function convertToModelMessages(messages, options) {
                     });
                   }
                   if (part.providerExecuted === true && part.state !== "approval-responded" && (part.state === "output-available" || part.state === "output-error")) {
+                    const resultProviderMetadata = (_b = part.resultProviderMetadata) != null ? _b : part.callProviderMetadata;
                     content.push({
                       type: "tool-result",
                       toolCallId: part.toolCallId,
@@ -8683,15 +8712,15 @@ async function convertToModelMessages(messages, options) {
                         toolCallId: part.toolCallId,
                         input: part.input,
                         output: part.state === "output-error" ? part.errorText : part.output,
-                        tool: (_b = options == null ? void 0 : options.tools) == null ? void 0 : _b[toolName],
+                        tool: (_c = options == null ? void 0 : options.tools) == null ? void 0 : _c[toolName],
                         errorMode: part.state === "output-error" ? "json" : "none"
                       }),
-                      ...part.callProviderMetadata != null ? { providerOptions: part.callProviderMetadata } : {}
+                      ...resultProviderMetadata != null ? { providerOptions: resultProviderMetadata } : {}
                     });
                   }
                 }
               } else if (isDataUIPart(part)) {
-                const dataPart = (_c = options == null ? void 0 : options.convertDataPart) == null ? void 0 : _c.call(
+                const dataPart = (_d = options == null ? void 0 : options.convertDataPart) == null ? void 0 : _d.call(
                   options,
                   part
                 );
@@ -8717,7 +8746,7 @@ async function convertToModelMessages(messages, options) {
               {
                 const content2 = [];
                 for (const toolPart of toolParts) {
-                  if (((_d = toolPart.approval) == null ? void 0 : _d.approved) != null) {
+                  if (((_e = toolPart.approval) == null ? void 0 : _e.approved) != null) {
                     content2.push({
                       type: "tool-approval-response",
                       approvalId: toolPart.approval.id,
@@ -8737,7 +8766,7 @@ async function convertToModelMessages(messages, options) {
                         toolName: getToolName(toolPart),
                         output: {
                           type: "error-text",
-                          value: (_e = toolPart.approval.reason) != null ? _e : "Tool execution denied."
+                          value: (_f = toolPart.approval.reason) != null ? _f : "Tool execution denied."
                         },
                         ...toolPart.callProviderMetadata != null ? { providerOptions: toolPart.callProviderMetadata } : {}
                       });
@@ -8754,7 +8783,7 @@ async function convertToModelMessages(messages, options) {
                           toolCallId: toolPart.toolCallId,
                           input: toolPart.input,
                           output: toolPart.state === "output-error" ? toolPart.errorText : toolPart.output,
-                          tool: (_f = options == null ? void 0 : options.tools) == null ? void 0 : _f[toolName],
+                          tool: (_g = options == null ? void 0 : options.tools) == null ? void 0 : _g[toolName],
                           errorMode: toolPart.state === "output-error" ? "text" : "none"
                         }),
                         ...toolPart.callProviderMetadata != null ? { providerOptions: toolPart.callProviderMetadata } : {}
@@ -8918,6 +8947,7 @@ var uiMessagesSchema = (0, import_provider_utils22.lazySchema)(
               output: import_v48.z.unknown(),
               errorText: import_v48.z.never().optional(),
               callProviderMetadata: providerMetadataSchema.optional(),
+              resultProviderMetadata: providerMetadataSchema.optional(),
               preliminary: import_v48.z.boolean().optional(),
               approval: import_v48.z.object({
                 id: import_v48.z.string(),
@@ -8936,6 +8966,7 @@ var uiMessagesSchema = (0, import_provider_utils22.lazySchema)(
               output: import_v48.z.never().optional(),
               errorText: import_v48.z.string(),
               callProviderMetadata: providerMetadataSchema.optional(),
+              resultProviderMetadata: providerMetadataSchema.optional(),
               approval: import_v48.z.object({
                 id: import_v48.z.string(),
                 approved: import_v48.z.literal(true),
@@ -9019,6 +9050,7 @@ var uiMessagesSchema = (0, import_provider_utils22.lazySchema)(
               output: import_v48.z.unknown(),
               errorText: import_v48.z.never().optional(),
               callProviderMetadata: providerMetadataSchema.optional(),
+              resultProviderMetadata: providerMetadataSchema.optional(),
               preliminary: import_v48.z.boolean().optional(),
               approval: import_v48.z.object({
                 id: import_v48.z.string(),
@@ -9036,6 +9068,7 @@ var uiMessagesSchema = (0, import_provider_utils22.lazySchema)(
               output: import_v48.z.never().optional(),
               errorText: import_v48.z.string(),
               callProviderMetadata: providerMetadataSchema.optional(),
+              resultProviderMetadata: providerMetadataSchema.optional(),
               approval: import_v48.z.object({
                 id: import_v48.z.string(),
                 approved: import_v48.z.literal(true),