ai 7.0.131 → 7.0.133

package/docs/07-reference/01-ai-sdk-core/index.mdx

@@ -147,6 +147,12 @@ It also contains the following helper functions:
       description: 'Creates a client for connecting to MCP servers.',
       href: '/docs/reference/ai-sdk-core/create-mcp-client',
     },
+    {
+      title: 'MCP Events',
+      description:
+        'Experimental event methods, webhook delivery, and subscription types.',
+      href: '/docs/reference/ai-sdk-core/mcp-events',
+    },
     {
       title: 'MCP Apps',
       description:

package/docs/07-reference/02-ai-sdk-ui/50-direct-chat-transport.mdx

@@ -77,6 +77,19 @@ export default function Chat() {
       description:
         'Extracts message metadata that will be sent to the client. Called on `start` and `finish` events.',
     },
+    {
+      name: 'onStepEnd',
+      type: 'UIMessageStreamOnStepEndCallback',
+      isOptional: true,
+      description:
+        'Called after each step is converted to UI message parts. Receives messages, isContinuation, and the accumulated responseMessage, including step metadata, for inspection or persistence.',
+    },
+    {
+      name: 'onStepFinish',
+      type: 'UIMessageStreamOnStepFinishCallback',
+      isOptional: true,
+      description: 'Deprecated alias for onStepEnd.',
+    },
     {
       name: 'sendReasoning',
       type: 'boolean',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai",
-  "version": "7.0.131",
+  "version": "7.0.133",
   "type": "module",
   "description": "AI SDK by Vercel - build apps like ChatGPT, Claude, Gemini, and more with a single interface for any model using the Vercel AI Gateway or go direct to OpenAI, Anthropic, Google, or any other model provider.",
   "license": "Apache-2.0",
@@ -42,20 +42,20 @@
     }
   },
   "dependencies": {
-    "@ai-sdk/gateway": "4.0.107",
-    "@ai-sdk/provider": "4.0.24",
-    "@ai-sdk/provider-utils": "5.0.56"
+    "@ai-sdk/gateway": "4.0.108",
+    "@ai-sdk/provider": "4.0.25",
+    "@ai-sdk/provider-utils": "5.0.57"
   },
   "devDependencies": {
-    "@ai-sdk/amazon-bedrock": "5.0.109",
-    "@ai-sdk/deepseek": "3.0.61",
-    "@ai-sdk/google": "4.0.90",
-    "@ai-sdk/groq": "4.0.57",
-    "@ai-sdk/huggingface": "2.0.65",
-    "@ai-sdk/moonshotai": "3.0.65",
-    "@ai-sdk/openai": "4.0.87",
+    "@ai-sdk/amazon-bedrock": "5.0.111",
+    "@ai-sdk/deepseek": "3.0.62",
+    "@ai-sdk/google": "4.0.92",
+    "@ai-sdk/groq": "4.0.58",
+    "@ai-sdk/huggingface": "2.0.66",
+    "@ai-sdk/moonshotai": "3.0.66",
+    "@ai-sdk/openai": "4.0.89",
     "@ai-sdk/test-server": "2.0.4",
-    "@ai-sdk/xai": "5.0.18",
+    "@ai-sdk/xai": "5.0.19",
     "@edge-runtime/vm": "^5.0.0",
     "@smithy/eventstream-codec": "^4.3.3",
     "@smithy/util-utf8": "^4.3.3",

package/src/agent/create-agent-ui-stream-response.ts

@@ -4,20 +4,18 @@ import type {
   Experimental_SandboxSession as SandboxSession,
   ToolSet,
 } from '@ai-sdk/provider-utils';
-import type {
-  GenerateTextOnStepEndCallback,
-  GenerateTextOnStepFinishCallback,
-} from '../generate-text/generate-text-events';
 import type { Output } from '../generate-text/output';
 import type { StreamTextTransform } from '../generate-text/stream-text';
-import type { UIMessageStreamOptions } from '../generate-text/stream-text-result';
 import type { TimeoutConfiguration } from '../prompt/request-options';
 import { createUIMessageStreamResponse } from '../ui-message-stream';
 import type { UIMessageStreamResponseInit } from '../ui-message-stream/ui-message-stream-response-init';
 import type { InferUITools, UIMessage, UIDataTypes } from '../ui/ui-messages';
 import type { Agent } from './agent';
 import type { convertToModelMessages } from '../ui/convert-to-model-messages';
-import { createAgentUIStream } from './create-agent-ui-stream';
+import {
+  createAgentUIStream,
+  type AgentUIMessageStreamOptions,
+} from './create-agent-ui-stream';
 
 /**
  * Runs the agent and returns a response object with a UI message stream.
@@ -32,6 +30,7 @@ import { createAgentUIStream } from './create-agent-ui-stream';
  * @param experimental_transform - Stream transformations. Optional.
  * @param onStepEnd - Callback that is called when each step ends. Optional.
  * @param onStepFinish - Deprecated alias for `onStepEnd`. Optional.
+ * @param onUIMessageStepEnd - Callback with the accumulated UI message after each step. Optional.
  * @param headers - Additional headers for the response. Optional.
  * @param status - The status code for the response. Optional.
  * @param statusText - The status text for the response. Optional.
@@ -73,11 +72,8 @@ export async function createAgentUIStreamResponse<
   experimental_sandbox?: SandboxSession;
   options?: CALL_OPTIONS;
   experimental_transform?: Arrayable<StreamTextTransform<TOOLS>>;
-  onStepEnd?: GenerateTextOnStepEndCallback<TOOLS>;
-  /** @deprecated Use `onStepEnd` instead. */
-  onStepFinish?: GenerateTextOnStepFinishCallback<TOOLS>;
 } & UIMessageStreamResponseInit &
-  UIMessageStreamOptions<UI_MESSAGE>): Promise<Response> {
+  AgentUIMessageStreamOptions<TOOLS, UI_MESSAGE>): Promise<Response> {
   return createUIMessageStreamResponse({
     headers,
     status,

package/src/agent/create-agent-ui-stream.ts

@@ -14,6 +14,7 @@ import type { StreamTextTransform } from '../generate-text/stream-text';
 import type { UIMessageStreamOptions } from '../generate-text/stream-text-result';
 import type { TimeoutConfiguration } from '../prompt/request-options';
 import type { InferUIMessageChunk } from '../ui-message-stream';
+import type { UIMessageStreamOnStepEndCallback } from '../ui-message-stream/ui-message-stream-on-step-end-callback';
 import { toUIMessageStream } from '../ui-message-stream/to-ui-message-stream';
 import { convertToModelMessages } from '../ui/convert-to-model-messages';
 import type {
@@ -29,6 +30,23 @@ import {
 } from '../util/async-iterable-stream';
 import type { Agent } from './agent';
 
+/**
+ * UI stream options with separate generation and UI message step callbacks.
+ */
+export type AgentUIMessageStreamOptions<
+  TOOLS extends ToolSet,
+  UI_MESSAGE extends UIMessage,
+> = Omit<UIMessageStreamOptions<UI_MESSAGE>, 'onStepEnd' | 'onStepFinish'> & {
+  onStepEnd?: GenerateTextOnStepEndCallback<TOOLS>;
+  /** @deprecated Use `onStepEnd` instead. */
+  onStepFinish?: GenerateTextOnStepFinishCallback<TOOLS>;
+  /**
+   * Called after each step is converted to UI message parts.
+   * Receives the accumulated UI message for inspection or persistence.
+   */
+  onUIMessageStepEnd?: UIMessageStreamOnStepEndCallback<UI_MESSAGE>;
+};
+
 /**
  * Runs the agent and stream the output as a UI message stream.
  *
@@ -42,6 +60,7 @@ import type { Agent } from './agent';
  * @param experimental_transform - The stream transformations. Optional.
  * @param onStepEnd - Callback that is called when each step ends. Optional.
  * @param onStepFinish - Deprecated alias for `onStepEnd`. Optional.
+ * @param onUIMessageStepEnd - Callback with the accumulated UI message after each step. Optional.
  *
  * @returns The UI message stream.
  */
@@ -67,6 +86,7 @@ export async function createAgentUIStream<
   experimental_transform,
   onStepEnd,
   onStepFinish,
+  onUIMessageStepEnd,
   ...uiMessageStreamOptions
 }: {
   agent: Agent<CALL_OPTIONS, TOOLS, RUNTIME_CONTEXT, OUTPUT>;
@@ -83,11 +103,8 @@ export async function createAgentUIStream<
   experimental_sandbox?: SandboxSession;
   options?: CALL_OPTIONS;
   experimental_transform?: Arrayable<StreamTextTransform<TOOLS>>;
-  onStepEnd?: GenerateTextOnStepEndCallback<TOOLS>;
-  /** @deprecated Use `onStepEnd` instead. */
-  onStepFinish?: GenerateTextOnStepFinishCallback<TOOLS>;
   // TODO `originalMessages` is part of this for bc, omit in v7
-} & UIMessageStreamOptions<UI_MESSAGE>): Promise<
+} & AgentUIMessageStreamOptions<TOOLS, UI_MESSAGE>): Promise<
   AsyncIterableStream<InferUIMessageChunk<UI_MESSAGE>>
 > {
   const validatedMessages = await validateUIMessagesForAgent<UI_MESSAGE>({
@@ -125,6 +142,7 @@ export async function createAgentUIStream<
     toUIMessageStream({
       ...uiMessageStreamOptions,
       originalMessages,
+      onStepEnd: onUIMessageStepEnd,
       stream: result.stream,
       tools: agent.tools,
     }),

package/src/agent/pipe-agent-ui-stream-to-response.ts

@@ -5,20 +5,18 @@ import type {
   ToolSet,
 } from '@ai-sdk/provider-utils';
 import type { ServerResponse } from 'node:http';
-import type {
-  GenerateTextOnStepEndCallback,
-  GenerateTextOnStepFinishCallback,
-} from '../generate-text/generate-text-events';
 import type { Output } from '../generate-text/output';
 import type { StreamTextTransform } from '../generate-text/stream-text';
-import type { UIMessageStreamOptions } from '../generate-text/stream-text-result';
 import type { TimeoutConfiguration } from '../prompt/request-options';
 import { pipeUIMessageStreamToResponse } from '../ui-message-stream';
 import type { UIMessageStreamResponseInit } from '../ui-message-stream/ui-message-stream-response-init';
 import type { InferUITools, UIMessage, UIDataTypes } from '../ui/ui-messages';
 import type { Agent } from './agent';
 import type { convertToModelMessages } from '../ui/convert-to-model-messages';
-import { createAgentUIStream } from './create-agent-ui-stream';
+import {
+  createAgentUIStream,
+  type AgentUIMessageStreamOptions,
+} from './create-agent-ui-stream';
 
 /**
  * Pipes the agent UI message stream to a Node.js ServerResponse object.
@@ -34,6 +32,7 @@ import { createAgentUIStream } from './create-agent-ui-stream';
  * @param experimental_transform - Stream transformations. Optional.
  * @param onStepEnd - Callback that is called when each step ends. Optional.
  * @param onStepFinish - Deprecated alias for `onStepEnd`. Optional.
+ * @param onUIMessageStepEnd - Callback with the accumulated UI message after each step. Optional.
  * @param headers - Additional headers for the response. Optional.
  * @param status - The status code for the response. Optional.
  * @param statusText - The status text for the response. Optional.
@@ -75,11 +74,8 @@ export async function pipeAgentUIStreamToResponse<
   experimental_sandbox?: SandboxSession;
   options?: CALL_OPTIONS;
   experimental_transform?: Arrayable<StreamTextTransform<TOOLS>>;
-  onStepEnd?: GenerateTextOnStepEndCallback<TOOLS>;
-  /** @deprecated Use `onStepEnd` instead. */
-  onStepFinish?: GenerateTextOnStepFinishCallback<TOOLS>;
 } & UIMessageStreamResponseInit &
-  UIMessageStreamOptions<UI_MESSAGE>): Promise<void> {
+  AgentUIMessageStreamOptions<TOOLS, UI_MESSAGE>): Promise<void> {
   return pipeUIMessageStreamToResponse({
     response,
     headers,

package/src/decide/decide-events.ts

@@ -1,9 +1,11 @@
 import type {
   Experimental_DecisionModelV4CallOptions as DecisionModelV4CallOptions,
   Experimental_DecisionModelV4Result as DecisionModelV4Result,
+  Experimental_DecisionModelV4Question as DecisionQuestion,
 } from '@ai-sdk/provider';
 import type { Context, ProviderOptions } from '@ai-sdk/provider-utils';
-import type { DecisionQuestion, DecisionResult } from './decision-result';
+import type { DecisionState } from './decision-state';
+import type { DecisionResult } from './decision-result';
 
 /**
  * Event passed to the `onStart` callback for decision operations.
@@ -27,7 +29,7 @@ export type DecideStartEvent<RUNTIME_CONTEXT extends Context = Context> = {
   readonly modelId: string;
 
   /** The shared state used to make decisions. */
-  readonly state: DecisionModelV4CallOptions['state'];
+  readonly state: DecisionState;
 
   /** The questions to decide against the shared state. */
   readonly questions: Readonly<Record<string, DecisionQuestion>>;
@@ -100,7 +102,7 @@ export type DecisionModelCallStartEvent = {
   readonly state: DecisionModelV4CallOptions['state'];
 
   /** The questions to decide against the shared state. */
-  readonly questions: Readonly<Record<string, DecisionQuestion>>;
+  readonly questions: DecisionModelV4CallOptions['questions'];
 };
 
 /**

package/src/decide/decide.ts

@@ -1,7 +1,7 @@
 import {
   Experimental_DecisionRefusalError as DecisionRefusalError,
   Experimental_DecisionUnsupportedQuestionTypeError as DecisionUnsupportedQuestionTypeError,
-  type Experimental_DecisionModelV4CallOptions as DecisionModelV4CallOptions,
+  type Experimental_DecisionModelV4Question as DecisionQuestion,
 } from '@ai-sdk/provider';
 import {
   createIdGenerator,
@@ -9,6 +9,7 @@ import {
   type Context,
   type ProviderOptions,
 } from '@ai-sdk/provider-utils';
+import { prepareDecisionState, type DecisionState } from './decision-state';
 import { resolveDecisionModel } from '../model/resolve-model';
 import { logWarnings } from '../logger/log-warnings';
 import type { TelemetryOptions } from '../telemetry/telemetry-options';
@@ -17,11 +18,7 @@ import { notify } from '../util/notify';
 import { prepareRetries } from '../util/prepare-retries';
 import { VERSION } from '../version';
 import type { DecideEndEvent, DecideStartEvent } from './decide-events';
-import type {
-  DecisionModel,
-  DecisionQuestion,
-  DecisionResult,
-} from './decision-result';
+import type { DecisionModel, DecisionResult } from './decision-result';
 import { createRestrictedTelemetryDispatcher } from './restricted-telemetry-dispatcher';
 import {
   validateDecisionInput,
@@ -53,7 +50,7 @@ export async function decide<
 }: {
   /** A decision model instance or an ID resolved by the configured default provider. */
   model: DecisionModel;
-  state: DecisionModelV4CallOptions['state'];
+  state: DecisionState;
   questions: QUESTIONS;
   /** Maximum retries for transient provider failures. Defaults to 2. */
   maxRetries?: number;
@@ -122,12 +119,13 @@ export async function decide<
       });
 
       try {
+        const preparedState = await prepareDecisionState(state, abortSignal);
         const modelCallEvent = {
           callId,
           operationId: 'ai.decide.doDecide' as const,
           provider: model.provider,
           modelId: model.modelId,
-          state,
+          state: preparedState,
           questions,
         };
         await notify({
@@ -139,7 +137,7 @@ export async function decide<
         const result = await retry(async () => {
           abortSignal?.throwIfAborted();
           return await model.doDecide({
-            state,
+            state: preparedState,
             questions,
             abortSignal,
             headers: withUserAgentSuffix(headers ?? {}, `ai/${VERSION}`),

package/src/decide/decision-result.ts

@@ -1,12 +1,11 @@
 import type {
   Experimental_DecisionModelV4 as DecisionModelV4,
   Experimental_EvaluationModelV4 as EvaluationModelV4,
-  Experimental_DecisionModelV4Question as DecisionModelV4Question,
   Experimental_DecisionModelV4Result as DecisionModelV4Result,
+  Experimental_DecisionModelV4Question as DecisionQuestion,
 } from '@ai-sdk/provider';
 
 export type DecisionModel = string | DecisionModelV4 | EvaluationModelV4;
-export type DecisionQuestion = DecisionModelV4Question;
 
 export type DecisionAnswer<QUESTION extends DecisionQuestion> =
   QUESTION extends { type: 'choice'; criteria: infer CRITERIA }

package/src/decide/decision-state.ts

@@ -0,0 +1,61 @@
+import type {
+  Experimental_DecisionModelV4State as DecisionModelV4State,
+  JSONObject,
+  JSONValue,
+} from '@ai-sdk/provider';
+import type { FilePart, TextPart } from '@ai-sdk/provider-utils';
+import { convertToLanguageModelPrompt } from '../prompt/convert-to-language-model-prompt';
+
+/** Shared text, JSON data, or ordered multimodal parts for a decision. */
+export type DecisionState =
+  | string
+  | Readonly<JSONObject>
+  | readonly DecisionStatePart[];
+
+export type DecisionStatePart =
+  | TextPart
+  | FilePart
+  | { type: 'json'; value: JSONValue };
+
+function isDecisionStateParts(
+  state: DecisionState,
+): state is readonly DecisionStatePart[] {
+  return Array.isArray(state);
+}
+
+export async function prepareDecisionState(
+  state: DecisionState,
+  abortSignal?: AbortSignal,
+): Promise<DecisionModelV4State> {
+  if (typeof state === 'string') {
+    return [{ type: 'text', text: state }];
+  }
+  if (!isDecisionStateParts(state)) {
+    return [{ type: 'json', value: state }];
+  }
+  if (
+    state.every(
+      (part): part is Exclude<DecisionStatePart, FilePart> =>
+        part.type !== 'file',
+    )
+  ) {
+    return state;
+  }
+  const files = state.filter((part): part is FilePart => part.type === 'file');
+
+  const prompt = await convertToLanguageModelPrompt({
+    prompt: {
+      instructions: undefined,
+      messages: [{ role: 'user', content: files }],
+    },
+    supportedUrls: {},
+    download: undefined,
+    abortSignal,
+  });
+  const message = prompt[0];
+  if (message.role !== 'user') throw new Error('Expected user message.');
+  let fileIndex = 0;
+  return state.map(part =>
+    part.type === 'file' ? message.content[fileIndex++] : part,
+  );
+}

package/src/decide/index.ts

@@ -1,5 +1,6 @@
 import type { Context } from '@ai-sdk/provider-utils';
 import { decide } from './decide';
+import type { Experimental_DecisionModelV4Question as DecisionQuestion } from '@ai-sdk/provider';
 import type {
   DecideStartEvent,
   DecideEndEvent,
@@ -8,7 +9,6 @@ import type {
 } from './decide-events';
 import type {
   DecisionModel,
-  DecisionQuestion,
   DecisionAnswer,
   DecisionResult,
 } from './decision-result';
@@ -22,7 +22,6 @@ export type {
 } from './decide-events';
 export type {
   DecisionModel as Experimental_DecisionModel,
-  DecisionQuestion as Experimental_DecisionQuestion,
   DecisionAnswer as Experimental_DecisionAnswer,
   DecisionResult as Experimental_DecisionResult,
 } from './decision-result';
@@ -62,3 +61,10 @@ export type Experimental_EvaluationAnswer<QUESTION extends DecisionQuestion> =
 export type Experimental_EvaluationResult<
   QUESTIONS extends Record<string, DecisionQuestion>,
 > = DecisionResult<QUESTIONS>;
+
+export type {
+  DecisionState as Experimental_DecisionState,
+  DecisionStatePart as Experimental_DecisionStatePart,
+} from './decision-state';
+
+export type { Experimental_DecisionModelV4Question as Experimental_DecisionQuestion } from '@ai-sdk/provider';

package/src/decide/validate-decision.ts

@@ -1,8 +1,10 @@
 import {
   InvalidResponseDataError,
-  type Experimental_DecisionModelV4CallOptions as DecisionModelV4CallOptions,
   type Experimental_DecisionModelV4Result as DecisionModelV4Result,
+  type Experimental_DecisionModelV4Question as DecisionQuestion,
 } from '@ai-sdk/provider';
+import { filePartSchema, textPartSchema } from '../prompt/content-part';
+import type { DecisionState } from './decision-state';
 import { InvalidArgumentError } from '../error/invalid-argument-error';
 
 // Absolute tolerance for sums and means. Never renormalize provider output.
@@ -50,12 +52,30 @@ function invalidInput(
 export function validateDecisionInput({
   state,
   questions,
-}: DecisionModelV4CallOptions) {
-  if (!isInput(state)) {
+}: {
+  state: DecisionState;
+  questions: Readonly<Record<string, DecisionQuestion>>;
+}) {
+  const validState = Array.isArray(state)
+    ? Array.from(state).every(part => {
+        if (!isRecord(part)) return false;
+        switch (part.type) {
+          case 'text':
+            return textPartSchema.safeParse(part).success;
+          case 'file':
+            return filePartSchema.safeParse(part).success;
+          case 'json':
+            return isJSON(part.value);
+          default:
+            return false;
+        }
+      })
+    : (typeof state === 'string' || isRecord(state)) && isJSON(state);
+  if (!validState) {
     invalidInput(
       'state',
       state,
-      'must be a JSON-compatible string, object, or array',
+      'must be a string, JSON object, or array of text, file, or json parts',
     );
   }
   if (!isRecord(questions) || Object.keys(questions).length === 0) {
@@ -178,7 +198,7 @@ export function validateDecisionAnswers({
   answers,
   rounding,
 }: {
-  questions: DecisionModelV4CallOptions['questions'];
+  questions: Readonly<Record<string, DecisionQuestion>>;
   answers: unknown;
   rounding?: DecisionModelV4Result['rounding'];
 }) {

package/src/generate-text/stream-text-result.ts

@@ -12,6 +12,8 @@ import type { LanguageModelResponseMetadata } from '../types/language-model-resp
 import type { LanguageModelUsage } from '../types/usage';
 import type { InferUIMessageChunk } from '../ui-message-stream/ui-message-chunks';
 import type { UIMessageStreamOnEndCallback } from '../ui-message-stream/ui-message-stream-on-end-callback';
+import type { UIMessageStreamOnStepEndCallback } from '../ui-message-stream/ui-message-stream-on-step-end-callback';
+import type { UIMessageStreamOnStepFinishCallback } from '../ui-message-stream/ui-message-stream-on-step-finish-callback';
 import type { UIMessageStreamResponseInit } from '../ui-message-stream/ui-message-stream-response-init';
 import type { InferUIMessageMetadata, UIMessage } from '../ui/ui-messages';
 import type { AsyncIterableStream } from '../util/async-iterable-stream';
@@ -57,6 +59,15 @@ export type UIMessageStreamOptions<UI_MESSAGE extends UIMessage> = {
    */
   generateMessageId?: IdGenerator;
 
+  /**
+   * Called after each step is converted to UI message parts.
+   * Receives the accumulated UI message for inspection or persistence.
+   */
+  onStepEnd?: UIMessageStreamOnStepEndCallback<UI_MESSAGE>;
+
+  /** @deprecated Use `onStepEnd` instead. */
+  onStepFinish?: UIMessageStreamOnStepFinishCallback<UI_MESSAGE>;
+
   onEnd?: UIMessageStreamOnEndCallback<UI_MESSAGE>;
 
   /**

package/src/generate-text/stream-text.ts

@@ -3458,6 +3458,8 @@ class DefaultStreamTextResult<
   toUIMessageStream<UI_MESSAGE extends UIMessage>({
     originalMessages,
     generateMessageId,
+    onStepEnd,
+    onStepFinish,
     onEnd,
     onFinish,
     messageMetadata,
@@ -3475,6 +3477,7 @@ class DefaultStreamTextResult<
         tools: this.tools,
         originalMessages,
         generateMessageId,
+        onStepEnd: onStepEnd ?? onStepFinish,
         onEnd: onEnd ?? onFinish,
         messageMetadata,
         sendReasoning,
@@ -3491,6 +3494,8 @@ class DefaultStreamTextResult<
     {
       originalMessages,
       generateMessageId,
+      onStepEnd,
+      onStepFinish,
       onEnd,
       onFinish,
       messageMetadata,
@@ -3507,6 +3512,7 @@ class DefaultStreamTextResult<
       stream: this.toUIMessageStream({
         originalMessages,
         generateMessageId,
+        onStepEnd: onStepEnd ?? onStepFinish,
         onEnd: onEnd ?? onFinish,
         messageMetadata,
         sendReasoning,
@@ -3530,6 +3536,8 @@ class DefaultStreamTextResult<
   toUIMessageStreamResponse<UI_MESSAGE extends UIMessage>({
     originalMessages,
     generateMessageId,
+    onStepEnd,
+    onStepFinish,
     onEnd,
     onFinish,
     messageMetadata,
@@ -3545,6 +3553,7 @@ class DefaultStreamTextResult<
       stream: this.toUIMessageStream({
         originalMessages,
         generateMessageId,
+        onStepEnd: onStepEnd ?? onStepFinish,
         onEnd: onEnd ?? onFinish,
         messageMetadata,
         sendReasoning,

package/src/ui-message-stream/to-ui-message-stream.ts

@@ -14,7 +14,7 @@ import { toUIMessageChunk } from './to-ui-message-chunk';
  * Converts a stream of `TextStreamPart<TOOLS>` chunks (as emitted by
  * `streamText`'s `stream`) into a stream of `UIMessageChunk`s suitable for
  * UI message streaming, including response message ID injection and
- * `onEnd` handling.
+ * step and stream end callbacks.
  */
 export function toUIMessageStream<
   TOOLS extends ToolSet = ToolSet,
@@ -30,6 +30,8 @@ export function toUIMessageStream<
   messageMetadata,
   originalMessages,
   generateMessageId,
+  onStepEnd,
+  onStepFinish,
   onEnd,
   onFinish,
 }: {
@@ -130,7 +132,7 @@ export function toUIMessageStream<
             responseMessageId,
           });
 
-          if (uiMessageChunk != null) {
+          if (uiMessageChunk != null && part.type !== 'finish-step') {
             controller.enqueue(uiMessageChunk);
           }
 
@@ -147,6 +149,11 @@ export function toUIMessageStream<
             });
           }
 
+          // Apply step metadata before the boundary triggers a UI snapshot.
+          if (uiMessageChunk != null && part.type === 'finish-step') {
+            controller.enqueue(uiMessageChunk);
+          }
+
           if (part.type === 'finish') {
             setSourceOutcome({ status: 'completed' });
           } else if (part.type === 'abort') {
@@ -166,6 +173,7 @@ export function toUIMessageStream<
     stream: uiMessageChunkStream,
     messageId: responseMessageId ?? generateMessageId?.(),
     originalMessages,
+    onStepEnd: onStepEnd ?? onStepFinish,
     onEnd: onEnd ?? onFinish,
     onError,
     getOutcome: () => outcome,