ai 3.3.34 → 3.3.36

package/dist/index.mjs

@@ -1067,6 +1067,7 @@ function prepareCallSettings({
   maxTokens,
   temperature,
   topP,
+  topK,
   presencePenalty,
   frequencyPenalty,
   stopSequences,
@@ -1107,6 +1108,15 @@ function prepareCallSettings({
       });
     }
   }
+  if (topK != null) {
+    if (typeof topK !== "number") {
+      throw new InvalidArgumentError({
+        parameter: "topK",
+        value: topP,
+        message: "topP must be a number"
+      });
+    }
+  }
   if (presencePenalty != null) {
     if (typeof presencePenalty !== "number") {
       throw new InvalidArgumentError({
@@ -1154,6 +1164,7 @@ function prepareCallSettings({
     maxTokens,
     temperature: temperature != null ? temperature : 0,
     topP,
+    topK,
     presencePenalty,
     frequencyPenalty,
     stopSequences: stopSequences != null && stopSequences.length > 0 ? stopSequences : void 0,
@@ -2752,64 +2763,20 @@ var experimental_streamObject = streamObject;
 // core/generate-text/generate-text.ts
 import { createIdGenerator as createIdGenerator3 } from "@ai-sdk/provider-utils";
 
-// core/prompt/prepare-tools-and-tool-choice.ts
-import { asSchema as asSchema2 } from "@ai-sdk/ui-utils";
-
-// core/util/is-non-empty-object.ts
-function isNonEmptyObject(object) {
-  return object != null && Object.keys(object).length > 0;
-}
-
-// core/prompt/prepare-tools-and-tool-choice.ts
-function prepareToolsAndToolChoice({
-  tools,
-  toolChoice
-}) {
-  if (!isNonEmptyObject(tools)) {
-    return {
-      tools: void 0,
-      toolChoice: void 0
-    };
-  }
-  return {
-    tools: Object.entries(tools).map(([name11, tool2]) => ({
-      type: "function",
-      name: name11,
-      description: tool2.description,
-      parameters: asSchema2(tool2.parameters).jsonSchema
-    })),
-    toolChoice: toolChoice == null ? { type: "auto" } : typeof toolChoice === "string" ? { type: toolChoice } : { type: "tool", toolName: toolChoice.toolName }
-  };
-}
-
-// core/generate-text/to-response-messages.ts
-function toResponseMessages({
-  text = "",
-  toolCalls,
-  toolResults
-}) {
-  const responseMessages = [];
-  responseMessages.push({
-    role: "assistant",
-    content: [{ type: "text", text }, ...toolCalls]
-  });
-  if (toolResults.length > 0) {
-    responseMessages.push({
-      role: "tool",
-      content: toolResults.map((result) => ({
-        type: "tool-result",
-        toolCallId: result.toolCallId,
-        toolName: result.toolName,
-        result: result.result
-      }))
-    });
-  }
-  return responseMessages;
-}
-
-// core/generate-text/tool-call.ts
-import { safeParseJSON as safeParseJSON2 } from "@ai-sdk/provider-utils";
-import { asSchema as asSchema3 } from "@ai-sdk/ui-utils";
+// errors/index.ts
+import {
+  AISDKError as AISDKError10,
+  APICallError as APICallError2,
+  EmptyResponseBodyError,
+  InvalidPromptError as InvalidPromptError2,
+  InvalidResponseDataError,
+  JSONParseError,
+  LoadAPIKeyError,
+  NoContentGeneratedError,
+  NoSuchModelError,
+  TypeValidationError as TypeValidationError2,
+  UnsupportedFunctionalityError as UnsupportedFunctionalityError2
+} from "@ai-sdk/provider";
 
 // errors/invalid-tool-arguments-error.ts
 import { AISDKError as AISDKError7, getErrorMessage as getErrorMessage3 } from "@ai-sdk/provider";
@@ -2897,7 +2864,85 @@ var NoSuchToolError = class extends AISDKError8 {
 };
 _a8 = symbol8;
 
+// core/prompt/message-conversion-error.ts
+import { AISDKError as AISDKError9 } from "@ai-sdk/provider";
+var name9 = "AI_MessageConversionError";
+var marker9 = `vercel.ai.error.${name9}`;
+var symbol9 = Symbol.for(marker9);
+var _a9;
+var MessageConversionError = class extends AISDKError9 {
+  constructor({
+    originalMessage,
+    message
+  }) {
+    super({ name: name9, message });
+    this[_a9] = true;
+    this.originalMessage = originalMessage;
+  }
+  static isInstance(error) {
+    return AISDKError9.hasMarker(error, marker9);
+  }
+};
+_a9 = symbol9;
+
+// core/prompt/prepare-tools-and-tool-choice.ts
+import { asSchema as asSchema2 } from "@ai-sdk/ui-utils";
+
+// core/util/is-non-empty-object.ts
+function isNonEmptyObject(object) {
+  return object != null && Object.keys(object).length > 0;
+}
+
+// core/prompt/prepare-tools-and-tool-choice.ts
+function prepareToolsAndToolChoice({
+  tools,
+  toolChoice
+}) {
+  if (!isNonEmptyObject(tools)) {
+    return {
+      tools: void 0,
+      toolChoice: void 0
+    };
+  }
+  return {
+    tools: Object.entries(tools).map(([name11, tool2]) => ({
+      type: "function",
+      name: name11,
+      description: tool2.description,
+      parameters: asSchema2(tool2.parameters).jsonSchema
+    })),
+    toolChoice: toolChoice == null ? { type: "auto" } : typeof toolChoice === "string" ? { type: toolChoice } : { type: "tool", toolName: toolChoice.toolName }
+  };
+}
+
+// core/generate-text/to-response-messages.ts
+function toResponseMessages({
+  text = "",
+  toolCalls,
+  toolResults
+}) {
+  const responseMessages = [];
+  responseMessages.push({
+    role: "assistant",
+    content: [{ type: "text", text }, ...toolCalls]
+  });
+  if (toolResults.length > 0) {
+    responseMessages.push({
+      role: "tool",
+      content: toolResults.map((result) => ({
+        type: "tool-result",
+        toolCallId: result.toolCallId,
+        toolName: result.toolName,
+        result: result.result
+      }))
+    });
+  }
+  return responseMessages;
+}
+
 // core/generate-text/tool-call.ts
+import { safeParseJSON as safeParseJSON2 } from "@ai-sdk/provider-utils";
+import { asSchema as asSchema3 } from "@ai-sdk/ui-utils";
 function parseToolCall({
   toolCall,
   tools
@@ -2946,6 +2991,7 @@ async function generateText({
   headers,
   maxAutomaticRoundtrips = 0,
   maxToolRoundtrips = maxAutomaticRoundtrips,
+  maxSteps = maxToolRoundtrips != null ? maxToolRoundtrips + 1 : 1,
   experimental_telemetry: telemetry,
   experimental_providerMetadata: providerMetadata,
   _internal: {
@@ -2955,6 +3001,13 @@ async function generateText({
   ...settings
 }) {
   var _a11;
+  if (maxSteps < 1) {
+    throw new InvalidArgumentError({
+      parameter: "maxSteps",
+      value: maxSteps,
+      message: "maxSteps must be at least 1"
+    });
+  }
   const baseTelemetryAttributes = getBaseTelemetryAttributes({
     model,
     telemetry,
@@ -2976,7 +3029,7 @@ async function generateText({
         "ai.prompt": {
           input: () => JSON.stringify({ system, prompt, messages })
         },
-        "ai.settings.maxToolRoundtrips": maxToolRoundtrips
+        "ai.settings.maxSteps": maxSteps
       }
     }),
     tracer,
@@ -3000,16 +3053,16 @@ async function generateText({
       let currentModelResponse;
       let currentToolCalls = [];
       let currentToolResults = [];
-      let roundtripCount = 0;
+      let stepCount = 0;
       const responseMessages = [];
-      const roundtrips = [];
+      const steps = [];
       const usage = {
         completionTokens: 0,
         promptTokens: 0,
         totalTokens: 0
       };
       do {
-        const currentInputFormat = roundtripCount === 0 ? validatedPrompt.type : "messages";
+        const currentInputFormat = stepCount === 0 ? validatedPrompt.type : "messages";
         currentModelResponse = await retry(
           () => recordSpan({
             name: "ai.generateText.doGenerate",
@@ -3106,7 +3159,7 @@ async function generateText({
         usage.completionTokens += currentUsage.completionTokens;
         usage.promptTokens += currentUsage.promptTokens;
         usage.totalTokens += currentUsage.totalTokens;
-        roundtrips.push({
+        steps.push({
           text: (_b = currentModelResponse.text) != null ? _b : "",
           toolCalls: currentToolCalls,
           toolResults: currentToolResults,
@@ -3133,8 +3186,8 @@ async function generateText({
       } while (
         // there are tool calls:
         currentToolCalls.length > 0 && // all current tool calls have results:
-        currentToolResults.length === currentToolCalls.length && // the number of roundtrips is less than the maximum:
-        roundtripCount++ < maxToolRoundtrips
+        currentToolResults.length === currentToolCalls.length && // the number of steps is less than the maximum:
+        ++stepCount < maxSteps
       );
       span.setAttributes(
         selectTelemetryAttributes({
@@ -3176,7 +3229,7 @@ async function generateText({
         },
         logprobs: currentModelResponse.logprobs,
         responseMessages,
-        roundtrips,
+        steps,
         providerMetadata: currentModelResponse.providerMetadata
       });
     }
@@ -3251,7 +3304,8 @@ var DefaultGenerateTextResult = class {
     this.warnings = options.warnings;
     this.response = options.response;
     this.responseMessages = options.responseMessages;
-    this.roundtrips = options.roundtrips;
+    this.roundtrips = options.steps;
+    this.steps = options.steps;
     this.experimental_providerMetadata = options.providerMetadata;
     this.rawResponse = {
       headers: options.response.headers
@@ -3616,6 +3670,7 @@ async function streamText({
   abortSignal,
   headers,
   maxToolRoundtrips = 0,
+  maxSteps = maxToolRoundtrips != null ? maxToolRoundtrips + 1 : 1,
   experimental_telemetry: telemetry,
   experimental_providerMetadata: providerMetadata,
   experimental_toolCallStreaming: toolCallStreaming = false,
@@ -3629,6 +3684,13 @@ async function streamText({
   ...settings
 }) {
   var _a11;
+  if (maxSteps < 1) {
+    throw new InvalidArgumentError({
+      parameter: "maxSteps",
+      value: maxSteps,
+      message: "maxSteps must be at least 1"
+    });
+  }
   const baseTelemetryAttributes = getBaseTelemetryAttributes({
     model,
     telemetry,
@@ -3646,14 +3708,15 @@ async function streamText({
         // specific settings that only make sense on the outer level:
         "ai.prompt": {
           input: () => JSON.stringify({ system, prompt, messages })
-        }
+        },
+        "ai.settings.maxSteps": maxSteps
       }
     }),
     tracer,
     endWhenDone: false,
     fn: async (rootSpan) => {
       const retry = retryWithExponentialBackoff({ maxRetries });
-      const startRoundtrip = async ({
+      const startStep = async ({
         promptMessages: promptMessages2,
         promptType
       }) => {
@@ -3735,7 +3798,7 @@ async function streamText({
         result: { stream, warnings, rawResponse },
         doStreamSpan,
         startTimestampMs
-      } = await startRoundtrip({
+      } = await startStep({
         promptType: validatePrompt({ system, prompt, messages }).type,
         promptMessages
       });
@@ -3749,8 +3812,8 @@ async function streamText({
         doStreamSpan,
         telemetry,
         startTimestampMs,
-        maxToolRoundtrips,
-        startRoundtrip,
+        maxSteps,
+        startStep,
         promptMessages,
         modelId: model.modelId,
         now: now2,
@@ -3771,8 +3834,8 @@ var DefaultStreamTextResult = class {
     doStreamSpan,
     telemetry,
     startTimestampMs,
-    maxToolRoundtrips,
-    startRoundtrip,
+    maxSteps,
+    startStep,
     promptMessages,
     modelId,
     now: now2,
@@ -3791,6 +3854,8 @@ var DefaultStreamTextResult = class {
     this.toolCalls = toolCallsPromise;
     const { resolve: resolveToolResults, promise: toolResultsPromise } = createResolvablePromise();
     this.toolResults = toolResultsPromise;
+    const { resolve: resolveSteps, promise: stepsPromise } = createResolvablePromise();
+    this.steps = stepsPromise;
     const {
       resolve: resolveProviderMetadata,
       promise: providerMetadataPromise
@@ -3804,12 +3869,13 @@ var DefaultStreamTextResult = class {
       close: closeStitchableStream
     } = createStitchableStream();
     this.originalStream = stitchableStream;
+    const stepResults = [];
     const self = this;
-    function addRoundtripStream({
+    function addStepStream({
       stream: stream2,
       startTimestamp,
       doStreamSpan: doStreamSpan2,
-      currentToolRoundtrip,
+      currentStep,
       promptMessages: promptMessages2,
       usage = {
         promptTokens: 0,
@@ -3817,19 +3883,19 @@ var DefaultStreamTextResult = class {
         totalTokens: 0
       }
     }) {
-      const roundtripToolCalls = [];
-      const roundtripToolResults = [];
-      let roundtripFinishReason = "unknown";
-      let roundtripUsage = {
+      const stepToolCalls = [];
+      const stepToolResults = [];
+      let stepFinishReason = "unknown";
+      let stepUsage = {
         promptTokens: 0,
         completionTokens: 0,
         totalTokens: 0
       };
-      let roundtripProviderMetadata;
-      let roundtripFirstChunk = true;
-      let roundtripText = "";
-      let roundtripLogProbs;
-      let roundtripResponse = {
+      let stepProviderMetadata;
+      let stepFirstChunk = true;
+      let stepText = "";
+      let stepLogProbs;
+      let stepResponse = {
         id: generateId3(),
         timestamp: currentDate(),
         modelId
@@ -3839,9 +3905,9 @@ var DefaultStreamTextResult = class {
           new TransformStream({
             async transform(chunk, controller) {
               var _a11, _b, _c;
-              if (roundtripFirstChunk) {
+              if (stepFirstChunk) {
                 const msToFirstChunk = now2() - startTimestamp;
-                roundtripFirstChunk = false;
+                stepFirstChunk = false;
                 doStreamSpan2.addEvent("ai.stream.firstChunk", {
                   "ai.response.msToFirstChunk": msToFirstChunk,
                   // deprecated:
@@ -3860,40 +3926,40 @@ var DefaultStreamTextResult = class {
               switch (chunkType) {
                 case "text-delta": {
                   controller.enqueue(chunk);
-                  roundtripText += chunk.textDelta;
+                  stepText += chunk.textDelta;
                   await (onChunk == null ? void 0 : onChunk({ chunk }));
                   break;
                 }
                 case "tool-call": {
                   controller.enqueue(chunk);
-                  roundtripToolCalls.push(chunk);
+                  stepToolCalls.push(chunk);
                   await (onChunk == null ? void 0 : onChunk({ chunk }));
                   break;
                 }
                 case "tool-result": {
                   controller.enqueue(chunk);
-                  roundtripToolResults.push(chunk);
+                  stepToolResults.push(chunk);
                   await (onChunk == null ? void 0 : onChunk({ chunk }));
                   break;
                 }
                 case "response-metadata": {
-                  roundtripResponse = {
-                    id: (_a11 = chunk.id) != null ? _a11 : roundtripResponse.id,
-                    timestamp: (_b = chunk.timestamp) != null ? _b : roundtripResponse.timestamp,
-                    modelId: (_c = chunk.modelId) != null ? _c : roundtripResponse.modelId
+                  stepResponse = {
+                    id: (_a11 = chunk.id) != null ? _a11 : stepResponse.id,
+                    timestamp: (_b = chunk.timestamp) != null ? _b : stepResponse.timestamp,
+                    modelId: (_c = chunk.modelId) != null ? _c : stepResponse.modelId
                   };
                   break;
                 }
                 case "finish": {
-                  roundtripUsage = chunk.usage;
-                  roundtripFinishReason = chunk.finishReason;
-                  roundtripProviderMetadata = chunk.experimental_providerMetadata;
-                  roundtripLogProbs = chunk.logprobs;
+                  stepUsage = chunk.usage;
+                  stepFinishReason = chunk.finishReason;
+                  stepProviderMetadata = chunk.experimental_providerMetadata;
+                  stepLogProbs = chunk.logprobs;
                   const msToFinish = now2() - startTimestamp;
                   doStreamSpan2.addEvent("ai.stream.finish");
                   doStreamSpan2.setAttributes({
                     "ai.response.msToFinish": msToFinish,
-                    "ai.response.avgCompletionTokensPerSecond": 1e3 * roundtripUsage.completionTokens / msToFinish
+                    "ai.response.avgCompletionTokensPerSecond": 1e3 * stepUsage.completionTokens / msToFinish
                   });
                   break;
                 }
@@ -3905,7 +3971,7 @@ var DefaultStreamTextResult = class {
                 }
                 case "error": {
                   controller.enqueue(chunk);
-                  roundtripFinishReason = "error";
+                  stepFinishReason = "error";
                   break;
                 }
                 default: {
@@ -3917,41 +3983,52 @@ var DefaultStreamTextResult = class {
             // invoke onFinish callback and resolve toolResults promise when the stream is about to close:
             async flush(controller) {
               controller.enqueue({
-                type: "roundtrip-finish",
-                finishReason: roundtripFinishReason,
-                usage: roundtripUsage,
-                experimental_providerMetadata: roundtripProviderMetadata,
-                logprobs: roundtripLogProbs,
-                response: roundtripResponse
+                type: "step-finish",
+                finishReason: stepFinishReason,
+                usage: stepUsage,
+                experimental_providerMetadata: stepProviderMetadata,
+                logprobs: stepLogProbs,
+                response: stepResponse
               });
-              const telemetryToolCalls = roundtripToolCalls.length > 0 ? JSON.stringify(roundtripToolCalls) : void 0;
+              stepResults.push({
+                text: stepText,
+                toolCalls: stepToolCalls,
+                toolResults: stepToolResults,
+                finishReason: stepFinishReason,
+                usage: stepUsage,
+                warnings: self.warnings,
+                logprobs: stepLogProbs,
+                response: stepResponse,
+                rawResponse: self.rawResponse
+              });
+              const telemetryToolCalls = stepToolCalls.length > 0 ? JSON.stringify(stepToolCalls) : void 0;
               try {
                 doStreamSpan2.setAttributes(
                   selectTelemetryAttributes({
                     telemetry,
                     attributes: {
-                      "ai.response.finishReason": roundtripFinishReason,
-                      "ai.response.text": { output: () => roundtripText },
+                      "ai.response.finishReason": stepFinishReason,
+                      "ai.response.text": { output: () => stepText },
                       "ai.response.toolCalls": {
                         output: () => telemetryToolCalls
                       },
-                      "ai.response.id": roundtripResponse.id,
-                      "ai.response.model": roundtripResponse.modelId,
-                      "ai.response.timestamp": roundtripResponse.timestamp.toISOString(),
-                      "ai.usage.promptTokens": roundtripUsage.promptTokens,
-                      "ai.usage.completionTokens": roundtripUsage.completionTokens,
+                      "ai.response.id": stepResponse.id,
+                      "ai.response.model": stepResponse.modelId,
+                      "ai.response.timestamp": stepResponse.timestamp.toISOString(),
+                      "ai.usage.promptTokens": stepUsage.promptTokens,
+                      "ai.usage.completionTokens": stepUsage.completionTokens,
                       // deprecated
-                      "ai.finishReason": roundtripFinishReason,
-                      "ai.result.text": { output: () => roundtripText },
+                      "ai.finishReason": stepFinishReason,
+                      "ai.result.text": { output: () => stepText },
                       "ai.result.toolCalls": {
                         output: () => telemetryToolCalls
                       },
                       // standardized gen-ai llm span attributes:
-                      "gen_ai.response.finish_reasons": [roundtripFinishReason],
-                      "gen_ai.response.id": roundtripResponse.id,
-                      "gen_ai.response.model": roundtripResponse.modelId,
-                      "gen_ai.usage.input_tokens": roundtripUsage.promptTokens,
-                      "gen_ai.usage.output_tokens": roundtripUsage.completionTokens
+                      "gen_ai.response.finish_reasons": [stepFinishReason],
+                      "gen_ai.response.id": stepResponse.id,
+                      "gen_ai.response.model": stepResponse.modelId,
+                      "gen_ai.usage.input_tokens": stepUsage.promptTokens,
+                      "gen_ai.usage.output_tokens": stepUsage.completionTokens
                     }
                   })
                 );
@@ -3960,21 +4037,21 @@ var DefaultStreamTextResult = class {
                 doStreamSpan2.end();
               }
               const combinedUsage = {
-                promptTokens: usage.promptTokens + roundtripUsage.promptTokens,
-                completionTokens: usage.completionTokens + roundtripUsage.completionTokens,
-                totalTokens: usage.totalTokens + roundtripUsage.totalTokens
+                promptTokens: usage.promptTokens + stepUsage.promptTokens,
+                completionTokens: usage.completionTokens + stepUsage.completionTokens,
+                totalTokens: usage.totalTokens + stepUsage.totalTokens
               };
               if (
                 // there are tool calls:
-                roundtripToolCalls.length > 0 && // all current tool calls have results:
-                roundtripToolResults.length === roundtripToolCalls.length && // the number of roundtrips is less than the maximum:
-                currentToolRoundtrip < maxToolRoundtrips
+                stepToolCalls.length > 0 && // all current tool calls have results:
+                stepToolResults.length === stepToolCalls.length && // the number of steps is less than the maximum:
+                currentStep + 1 < maxSteps
               ) {
                 promptMessages2.push(
                   ...toResponseMessages({
-                    text: roundtripText,
-                    toolCalls: roundtripToolCalls,
-                    toolResults: roundtripToolResults
+                    text: stepText,
+                    toolCalls: stepToolCalls,
+                    toolResults: stepToolResults
                   }).map(
                     (message) => convertToLanguageModelMessage(message, null)
                   )
@@ -3983,17 +4060,17 @@ var DefaultStreamTextResult = class {
                   result,
                   doStreamSpan: doStreamSpan3,
                   startTimestampMs: startTimestamp2
-                } = await startRoundtrip({
+                } = await startStep({
                   promptType: "messages",
                   promptMessages: promptMessages2
                 });
                 self.warnings = result.warnings;
                 self.rawResponse = result.rawResponse;
-                addRoundtripStream({
+                addStepStream({
                   stream: result.stream,
                   startTimestamp: startTimestamp2,
                   doStreamSpan: doStreamSpan3,
-                  currentToolRoundtrip: currentToolRoundtrip + 1,
+                  currentStep: currentStep + 1,
                   promptMessages: promptMessages2,
                   usage: combinedUsage
                 });
@@ -4002,27 +4079,27 @@ var DefaultStreamTextResult = class {
               try {
                 controller.enqueue({
                   type: "finish",
-                  finishReason: roundtripFinishReason,
+                  finishReason: stepFinishReason,
                   usage: combinedUsage,
-                  experimental_providerMetadata: roundtripProviderMetadata,
-                  logprobs: roundtripLogProbs,
-                  response: roundtripResponse
+                  experimental_providerMetadata: stepProviderMetadata,
+                  logprobs: stepLogProbs,
+                  response: stepResponse
                 });
                 closeStitchableStream();
                 rootSpan.setAttributes(
                   selectTelemetryAttributes({
                     telemetry,
                     attributes: {
-                      "ai.response.finishReason": roundtripFinishReason,
-                      "ai.response.text": { output: () => roundtripText },
+                      "ai.response.finishReason": stepFinishReason,
+                      "ai.response.text": { output: () => stepText },
                       "ai.response.toolCalls": {
                         output: () => telemetryToolCalls
                       },
                       "ai.usage.promptTokens": combinedUsage.promptTokens,
                       "ai.usage.completionTokens": combinedUsage.completionTokens,
                       // deprecated
-                      "ai.finishReason": roundtripFinishReason,
-                      "ai.result.text": { output: () => roundtripText },
+                      "ai.finishReason": stepFinishReason,
+                      "ai.result.text": { output: () => stepText },
                       "ai.result.toolCalls": {
                         output: () => telemetryToolCalls
                       }
@@ -4030,32 +4107,35 @@ var DefaultStreamTextResult = class {
                   })
                 );
                 resolveUsage(combinedUsage);
-                resolveFinishReason(roundtripFinishReason);
-                resolveText(roundtripText);
-                resolveToolCalls(roundtripToolCalls);
-                resolveProviderMetadata(roundtripProviderMetadata);
-                resolveToolResults(roundtripToolResults);
+                resolveFinishReason(stepFinishReason);
+                resolveText(stepText);
+                resolveToolCalls(stepToolCalls);
+                resolveProviderMetadata(stepProviderMetadata);
+                resolveToolResults(stepToolResults);
                 resolveResponse({
-                  ...roundtripResponse,
+                  ...stepResponse,
                   headers: rawResponse == null ? void 0 : rawResponse.headers
                 });
+                resolveSteps(stepResults);
                 await (onFinish == null ? void 0 : onFinish({
-                  finishReason: roundtripFinishReason,
+                  finishReason: stepFinishReason,
                   usage: combinedUsage,
-                  text: roundtripText,
-                  toolCalls: roundtripToolCalls,
+                  text: stepText,
+                  toolCalls: stepToolCalls,
                   // The tool results are inferred as a never[] type, because they are
                   // optional and the execute method with an inferred result type is
                   // optional as well. Therefore we need to cast the toolResults to any.
                   // The type exposed to the users will be correctly inferred.
-                  toolResults: roundtripToolResults,
+                  toolResults: stepToolResults,
                   rawResponse,
                   response: {
-                    ...roundtripResponse,
+                    ...stepResponse,
                     headers: rawResponse == null ? void 0 : rawResponse.headers
                   },
                   warnings,
-                  experimental_providerMetadata: roundtripProviderMetadata
+                  experimental_providerMetadata: stepProviderMetadata,
+                  steps: stepResults
+                  // see tool results comment above
                 }));
               } catch (error) {
                 controller.error(error);
@@ -4067,11 +4147,11 @@ var DefaultStreamTextResult = class {
         )
       );
     }
-    addRoundtripStream({
+    addStepStream({
       stream,
       startTimestamp: startTimestampMs,
       doStreamSpan,
-      currentToolRoundtrip: 0,
+      currentStep: 0,
       promptMessages,
       usage: void 0
     });
@@ -4112,8 +4192,9 @@ var DefaultStreamTextResult = class {
   }
   toDataStreamInternal({
     callbacks = {},
-    getErrorMessage: getErrorMessage4 = () => ""
+    getErrorMessage: getErrorMessage4 = () => "",
     // mask error messages for safety by default
+    sendUsage = true
   } = {}) {
     let aggregatedResponse = "";
     const callbackTransformer = new TransformStream({
@@ -4143,10 +4224,11 @@ var DefaultStreamTextResult = class {
       transform: async (chunk, controller) => {
         const chunkType = chunk.type;
         switch (chunkType) {
-          case "text-delta":
+          case "text-delta": {
             controller.enqueue(formatStreamPart("text", chunk.textDelta));
             break;
-          case "tool-call-streaming-start":
+          }
+          case "tool-call-streaming-start": {
             controller.enqueue(
               formatStreamPart("tool_call_streaming_start", {
                 toolCallId: chunk.toolCallId,
@@ -4154,7 +4236,8 @@ var DefaultStreamTextResult = class {
               })
             );
             break;
-          case "tool-call-delta":
+          }
+          case "tool-call-delta": {
             controller.enqueue(
               formatStreamPart("tool_call_delta", {
                 toolCallId: chunk.toolCallId,
@@ -4162,7 +4245,8 @@ var DefaultStreamTextResult = class {
               })
             );
             break;
-          case "tool-call":
+          }
+          case "tool-call": {
             controller.enqueue(
               formatStreamPart("tool_call", {
                 toolCallId: chunk.toolCallId,
@@ -4171,7 +4255,8 @@ var DefaultStreamTextResult = class {
               })
             );
             break;
-          case "tool-result":
+          }
+          case "tool-result": {
             controller.enqueue(
               formatStreamPart("tool_result", {
                 toolCallId: chunk.toolCallId,
@@ -4179,33 +4264,37 @@ var DefaultStreamTextResult = class {
               })
             );
             break;
-          case "error":
+          }
+          case "error": {
             controller.enqueue(
               formatStreamPart("error", getErrorMessage4(chunk.error))
             );
             break;
-          case "roundtrip-finish":
+          }
+          case "step-finish": {
             controller.enqueue(
-              formatStreamPart("finish_roundtrip", {
+              formatStreamPart("finish_step", {
                 finishReason: chunk.finishReason,
-                usage: {
+                usage: sendUsage ? {
                   promptTokens: chunk.usage.promptTokens,
                   completionTokens: chunk.usage.completionTokens
-                }
+                } : void 0
               })
             );
             break;
-          case "finish":
+          }
+          case "finish": {
             controller.enqueue(
               formatStreamPart("finish_message", {
                 finishReason: chunk.finishReason,
-                usage: {
+                usage: sendUsage ? {
                   promptTokens: chunk.usage.promptTokens,
                   completionTokens: chunk.usage.completionTokens
-                }
+                } : void 0
               })
             );
             break;
+          }
           default: {
             const exhaustiveCheck = chunkType;
             throw new Error(`Unknown chunk type: ${exhaustiveCheck}`);
@@ -4226,6 +4315,7 @@ var DefaultStreamTextResult = class {
     };
     const data = options == null ? void 0 : "data" in options ? options.data : void 0;
     const getErrorMessage4 = options == null ? void 0 : "getErrorMessage" in options ? options.getErrorMessage : void 0;
+    const sendUsage = options == null ? void 0 : "sendUsage" in options ? options.sendUsage : void 0;
     writeToServerResponse({
       response,
       status: init == null ? void 0 : init.status,
@@ -4234,7 +4324,7 @@ var DefaultStreamTextResult = class {
         contentType: "text/plain; charset=utf-8",
         dataStreamVersion: "v1"
       }),
-      stream: this.toDataStream({ data, getErrorMessage: getErrorMessage4 })
+      stream: this.toDataStream({ data, getErrorMessage: getErrorMessage4, sendUsage })
     });
   }
   pipeTextStreamToResponse(response, init) {
@@ -4253,7 +4343,8 @@ var DefaultStreamTextResult = class {
   }
   toDataStream(options) {
     const stream = this.toDataStreamInternal({
-      getErrorMessage: options == null ? void 0 : options.getErrorMessage
+      getErrorMessage: options == null ? void 0 : options.getErrorMessage,
+      sendUsage: options == null ? void 0 : options.sendUsage
     });
     return (options == null ? void 0 : options.data) ? mergeStreams(options == null ? void 0 : options.data.stream, stream) : stream;
   }
@@ -4266,14 +4357,18 @@ var DefaultStreamTextResult = class {
     };
     const data = options == null ? void 0 : "data" in options ? options.data : void 0;
     const getErrorMessage4 = options == null ? void 0 : "getErrorMessage" in options ? options.getErrorMessage : void 0;
-    return new Response(this.toDataStream({ data, getErrorMessage: getErrorMessage4 }), {
-      status: (_a11 = init == null ? void 0 : init.status) != null ? _a11 : 200,
-      statusText: init == null ? void 0 : init.statusText,
-      headers: prepareResponseHeaders(init, {
-        contentType: "text/plain; charset=utf-8",
-        dataStreamVersion: "v1"
-      })
-    });
+    const sendUsage = options == null ? void 0 : "sendUsage" in options ? options.sendUsage : void 0;
+    return new Response(
+      this.toDataStream({ data, getErrorMessage: getErrorMessage4, sendUsage }),
+      {
+        status: (_a11 = init == null ? void 0 : init.status) != null ? _a11 : 200,
+        statusText: init == null ? void 0 : init.statusText,
+        headers: prepareResponseHeaders(init, {
+          contentType: "text/plain; charset=utf-8",
+          dataStreamVersion: "v1"
+        })
+      }
+    );
   }
   toTextStreamResponse(init) {
     var _a11;
@@ -4375,27 +4470,6 @@ function attachmentsToParts(attachments) {
   return parts;
 }
 
-// core/prompt/message-conversion-error.ts
-import { AISDKError as AISDKError9 } from "@ai-sdk/provider";
-var name9 = "AI_MessageConversionError";
-var marker9 = `vercel.ai.error.${name9}`;
-var symbol9 = Symbol.for(marker9);
-var _a9;
-var MessageConversionError = class extends AISDKError9 {
-  constructor({
-    originalMessage,
-    message
-  }) {
-    super({ name: name9, message });
-    this[_a9] = true;
-    this.originalMessage = originalMessage;
-  }
-  static isInstance(error) {
-    return AISDKError9.hasMarker(error, marker9);
-  }
-};
-_a9 = symbol9;
-
 // core/prompt/convert-to-core-messages.ts
 function convertToCoreMessages(messages) {
   const coreMessages = [];
@@ -4475,7 +4549,7 @@ function convertToCoreMessages(messages) {
 }
 
 // core/registry/custom-provider.ts
-import { NoSuchModelError } from "@ai-sdk/provider";
+import { NoSuchModelError as NoSuchModelError2 } from "@ai-sdk/provider";
 function experimental_customProvider({
   languageModels,
   textEmbeddingModels,
@@ -4489,7 +4563,7 @@ function experimental_customProvider({
       if (fallbackProvider) {
         return fallbackProvider.languageModel(modelId);
       }
-      throw new NoSuchModelError({ modelId, modelType: "languageModel" });
+      throw new NoSuchModelError2({ modelId, modelType: "languageModel" });
     },
     textEmbeddingModel(modelId) {
       if (textEmbeddingModels != null && modelId in textEmbeddingModels) {
@@ -4498,18 +4572,18 @@ function experimental_customProvider({
       if (fallbackProvider) {
         return fallbackProvider.textEmbeddingModel(modelId);
       }
-      throw new NoSuchModelError({ modelId, modelType: "textEmbeddingModel" });
+      throw new NoSuchModelError2({ modelId, modelType: "textEmbeddingModel" });
     }
   };
 }
 
 // core/registry/no-such-provider-error.ts
-import { AISDKError as AISDKError10, NoSuchModelError as NoSuchModelError2 } from "@ai-sdk/provider";
+import { AISDKError as AISDKError11, NoSuchModelError as NoSuchModelError3 } from "@ai-sdk/provider";
 var name10 = "AI_NoSuchProviderError";
 var marker10 = `vercel.ai.error.${name10}`;
 var symbol10 = Symbol.for(marker10);
 var _a10;
-var NoSuchProviderError = class extends NoSuchModelError2 {
+var NoSuchProviderError = class extends NoSuchModelError3 {
   constructor({
     modelId,
     modelType,
@@ -4523,7 +4597,7 @@ var NoSuchProviderError = class extends NoSuchModelError2 {
     this.availableProviders = availableProviders;
   }
   static isInstance(error) {
-    return AISDKError10.hasMarker(error, marker10);
+    return AISDKError11.hasMarker(error, marker10);
   }
   /**
    * @deprecated use `isInstance` instead
@@ -4549,7 +4623,7 @@ var NoSuchProviderError = class extends NoSuchModelError2 {
 _a10 = symbol10;
 
 // core/registry/provider-registry.ts
-import { NoSuchModelError as NoSuchModelError3 } from "@ai-sdk/provider";
+import { NoSuchModelError as NoSuchModelError4 } from "@ai-sdk/provider";
 function experimental_createProviderRegistry(providers) {
   const registry = new DefaultProviderRegistry();
   for (const [id, provider] of Object.entries(providers)) {
@@ -4583,7 +4657,7 @@ var DefaultProviderRegistry = class {
   splitId(id, modelType) {
     const index = id.indexOf(":");
     if (index === -1) {
-      throw new NoSuchModelError3({
+      throw new NoSuchModelError4({
         modelId: id,
         modelType,
         message: `Invalid ${modelType} id for registry: ${id} (must be in the format "providerId:modelId")`
@@ -4596,7 +4670,7 @@ var DefaultProviderRegistry = class {
     const [providerId, modelId] = this.splitId(id, "languageModel");
     const model = (_b = (_a11 = this.getProvider(providerId)).languageModel) == null ? void 0 : _b.call(_a11, modelId);
     if (model == null) {
-      throw new NoSuchModelError3({ modelId: id, modelType: "languageModel" });
+      throw new NoSuchModelError4({ modelId: id, modelType: "languageModel" });
     }
     return model;
   }
@@ -4606,7 +4680,7 @@ var DefaultProviderRegistry = class {
     const provider = this.getProvider(providerId);
     const model = (_c = (_a11 = provider.textEmbeddingModel) == null ? void 0 : _a11.call(provider, modelId)) != null ? _c : "textEmbedding" in provider ? (_b = provider.textEmbedding) == null ? void 0 : _b.call(provider, modelId) : void 0;
     if (model == null) {
-      throw new NoSuchModelError3({
+      throw new NoSuchModelError4({
         modelId: id,
         modelType: "textEmbeddingModel"
       });
@@ -4645,21 +4719,6 @@ function magnitude(vector) {
   return Math.sqrt(dotProduct(vector, vector));
 }
 
-// errors/index.ts
-import {
-  AISDKError as AISDKError11,
-  APICallError as APICallError2,
-  EmptyResponseBodyError,
-  InvalidPromptError as InvalidPromptError2,
-  InvalidResponseDataError,
-  JSONParseError,
-  LoadAPIKeyError,
-  NoContentGeneratedError,
-  NoSuchModelError as NoSuchModelError4,
-  TypeValidationError as TypeValidationError2,
-  UnsupportedFunctionalityError as UnsupportedFunctionalityError2
-} from "@ai-sdk/provider";
-
 // streams/ai-stream.ts
 import {
   createParser
@@ -5713,7 +5772,7 @@ var StreamingTextResponse = class extends Response {
 var generateId2 = generateIdImpl;
 var nanoid = generateIdImpl;
 export {
-  AISDKError11 as AISDKError,
+  AISDKError10 as AISDKError,
   AIStream,
   APICallError2 as APICallError,
   AWSBedrockAnthropicMessagesStream,
@@ -5743,7 +5802,7 @@ export {
   MistralStream,
   NoContentGeneratedError,
   NoObjectGeneratedError,
-  NoSuchModelError4 as NoSuchModelError,
+  NoSuchModelError,
   NoSuchProviderError,
   NoSuchToolError,
   OpenAIStream,