ai 7.0.120 → 7.0.123

package/docs/07-reference/03-ai-sdk-rsc/01-stream-ui.mdx

@@ -208,7 +208,7 @@ To see `streamUI` in action, check out [these examples](#examples).
             {
               name: 'role',
               type: "'tool'",
-              description: 'The role for the assistant message.',
+              description: 'The role for the tool message.',
             },
             {
               name: 'content',
@@ -364,7 +364,7 @@ To see `streamUI` in action, check out [these examples](#examples).
             {
               name: 'generate',
               isOptional: true,
-              type: '(async (parameters) => ReactNode) | AsyncGenerator<ReactNode, ReactNode, void>',
+              type: '(parameters) => ReactNode | Promise<ReactNode> | Generator<ReactNode, ReactNode, void> | AsyncGenerator<ReactNode, ReactNode, void>',
               description:
                 'A function or a generator function that is called with the arguments from the tool call and yields React nodes as the UI.',
             },

package/docs/07-reference/04-ai-sdk-workflow/01-workflow-agent.mdx

@@ -1022,7 +1022,7 @@ const result = await agent.stream({
   messages,
 
   // Per-call callbacks (both fire)
-  onStepEnd({ usage }) {
+  async onStepEnd({ usage }) {
     await trackUsage(usage);
   },
 

package/docs/08-migration-guides/25-migration-guide-5-0-data.mdx

@@ -127,6 +127,7 @@ type V4FilePart = Extract<V4Part, { type: 'file' }>;
 // Type guards
 function isV4Message(msg: V4Message | MyUIMessage): msg is V4Message {
   return (
+    msg?.parts == null ||
     'toolInvocations' in msg ||
     (msg?.parts?.some(p => p.type === 'tool-invocation') ?? false) ||
     msg?.role === 'data' ||
@@ -465,9 +466,8 @@ export async function POST(req: Request) {
     message: convertV5MessageToV4(message), // convert to v4
   });
 
-  // Load previous messages (already in v5 format)
-  const previousMessages = await loadChat(chatId);
-  const messages = [...previousMessages, message];
+  // Load all messages, including the one just saved (already in v5 format)
+  const messages = await loadChat(chatId);
 
   const result = streamText({
     model: __MODEL__,
@@ -827,8 +827,7 @@ export async function POST(req: Request) {
     message,
   });
 
-  const previousMessages = await loadChat(chatId);
-  const messages = [...previousMessages, message];
+  const messages = await loadChat(chatId);
 
   const result = streamText({
     model: __MODEL__,

package/docs/08-migration-guides/26-migration-guide-5-0.mdx

@@ -723,7 +723,8 @@ const runtimeTool = dynamicTool({
   inputSchema: z.object({}),
   execute: async input => {
     // Input and output are typed as 'unknown'
-    return { result: `Processed: ${input.query}` };
+    const { query } = input as { query: string };
+    return { result: `Processed: ${query}` };
   },
 });
 ```

package/docs/08-migration-guides/29-migration-guide-4-0.mdx

@@ -27,8 +27,8 @@ description: Learn how to upgrade AI SDK 3.4 to 4.0.
 You need to update the following packages to the following versions in your `package.json` file(s):
 
 - `ai` package: `4.0.*`
-- `ai-sdk@provider-utils` package: `2.0.*`
-- `ai-sdk/*` packages: `1.0.*` (other `@ai-sdk` packages)
+- `@ai-sdk/provider-utils` package: `2.0.*`
+- `@ai-sdk/*` packages: `1.0.*` (other `@ai-sdk/*` packages)
 
 ## Codemods
 
@@ -440,7 +440,7 @@ const result = streamText({
 
 result.toDataStream();
 result.pipeDataStreamToResponse(response);
-result.toUIMessageStreamResponse();
+result.toDataStreamResponse();
 ```
 
 ### Renamed "formatStreamPart" to "formatDataStreamPart"
@@ -518,7 +518,7 @@ import { Provider } from 'ai';
   providers](/docs/reference/ai-sdk-core/provider-registry#setup) instead.
 </Note>
 
-#### Removed `experimental_​createModelRegistry` function
+#### Removed `experimental_createModelRegistry` function
 
 The `experimental_createModelRegistry` function has been removed.
 Please use the `experimental_createProviderRegistry` function instead.
@@ -573,7 +573,7 @@ const result = await streamText({
   // ...
 });
 
-result.toUIMessageStreamResponse(response, {
+result.pipeDataStreamToResponse(response, {
   init: {
     headers: {
       'X-Custom-Header': 'value',
@@ -588,7 +588,7 @@ const result = streamText({
   // ...
 });
 
-result.toUIMessageStreamResponse(response, {
+result.pipeDataStreamToResponse(response, {
   headers: {
     'X-Custom-Header': 'value',
   },
@@ -621,7 +621,7 @@ const { text, response } = await generateText({
 const responseMessages = response.messages;
 ```
 
-### Removed `experimental_​continuationSteps` option
+### Removed `experimental_continuationSteps` option
 
 The `experimental_continuationSteps` option has been removed from the `generateText` function.
 Please use the `experimental_continueSteps` option instead.
@@ -710,7 +710,7 @@ const warnings = await result.warnings;
   code manually.
 </Note>
 
-The `simulateReadableStream` function from `ai/test` has been renamed to `chunks`.
+The `values` option of the `simulateReadableStream` function from `ai/test` has been renamed to `chunks`.
 
 ```ts filename="AI SDK 3.4"
 import { simulateReadableStream } from 'ai/test';
@@ -965,7 +965,7 @@ return AssistantResponse(
 );
 ```
 
-#### Removed `experimental_​AssistantResponse` export
+#### Removed `experimental_AssistantResponse` export
 
 <Note type="warning">
   There is no codemod available for this change. Please review and update your

package/docs/08-migration-guides/37-migration-guide-3-3.mdx

@@ -18,7 +18,7 @@ introducing significant improvements and new features across the AI SDK and its
 
 ## New Features
 
-### Open Telemetry Support
+### OpenTelemetry Support
 
 - Added experimental [OpenTelemetry support](/docs/ai-sdk-core/telemetry) for all [AI SDK Core functions](/docs/ai-sdk-core/overview#ai-sdk-core-functions), enabling better observability and tracing capabilities.
 

package/docs/08-migration-guides/38-migration-guide-3-2.mdx

@@ -23,7 +23,7 @@ This guide will help you upgrade to AI SDK 3.2:
 
 To update to AI SDK version 3.2, run the following command using your preferred package manager:
 
-<Snippet text="pnpm add ai@latest" />
+<Snippet text="pnpm add ai@3.2" />
 
 ## Removed Functionality
 

package/docs/08-migration-guides/39-migration-guide-3-1.mdx

@@ -80,7 +80,7 @@ export async function POST(req: Request) {
     messages,
   });
 
-  return result.toUIMessageStreamResponse();
+  return result.toDataStreamResponse();
 }
 ```
 

package/docs/09-troubleshooting/12-use-chat-an-error-occurred.mdx

@@ -49,14 +49,16 @@ return createUIMessageStreamResponse({
 });
 ```
 
-In case you are using `createDataStreamResponse`, you can use the `onError` function when calling `toDataStreamResponse`:
+In case you are using `createUIMessageStream`, you can pass the `onError` function to it:
 
 ```tsx
-const response = createDataStreamResponse({
-  // ...
-  async execute(dataStream) {
+const response = createUIMessageStreamResponse({
+  stream: createUIMessageStream({
     // ...
-  },
-  onError: errorHandler,
+    async execute({ writer }) {
+      // ...
+    },
+    onError: errorHandler,
+  }),
 });
 ```

package/docs/09-troubleshooting/50-react-maximum-update-depth-exceeded.mdx

@@ -23,17 +23,17 @@ Use the `throttle` option to throttle the UI updates:
 ### `useChat`
 
 ```tsx filename="page.tsx" highlight="2-3"
-const { messages, ... } = useChat({
+const { messages } = useChat({
   // Throttle the messages and data updates to 50ms:
-  throttle: 50
-})
+  throttle: 50,
+});
 ```
 
 ### `useCompletion`
 
 ```tsx filename="page.tsx" highlight="2-3"
-const { completion, ... } = useCompletion({
+const { completion } = useCompletion({
   // Throttle the completion and data updates to 50ms:
-  throttle: 50
-})
+  throttle: 50,
+});
 ```

package/docs/09-troubleshooting/70-high-memory-usage-with-images.mdx

@@ -17,7 +17,7 @@ This is especially noticeable when using `experimental_download` to process imag
 
 ## Background
 
-By default, the AI SDK includes the full request messages plus request and response bodies in the step results. When processing images, the request messages and request body can contain base64-encoded image data, which can be very large (a single image can be 1MB+ when base64 encoded). If you process many images and keep references to the results, this data accumulates in memory.
+When enabled with the `include` option, the AI SDK includes the full request messages plus request and response bodies in the step results. When processing images, the request messages and request body can contain base64-encoded image data, which can be very large (a single image can be 1MB+ when base64 encoded). If you process many images and keep references to the results, this data accumulates in memory.
 
 For example, processing 100 images of 500KB each would include ~50MB+ of request body data in memory.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai",
-  "version": "7.0.120",
+  "version": "7.0.123",
   "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.98",
-    "@ai-sdk/provider": "4.0.19",
-    "@ai-sdk/provider-utils": "5.0.50"
+    "@ai-sdk/gateway": "4.0.101",
+    "@ai-sdk/provider": "4.0.20",
+    "@ai-sdk/provider-utils": "5.0.52"
   },
   "devDependencies": {
-    "@ai-sdk/amazon-bedrock": "5.0.99",
-    "@ai-sdk/deepseek": "3.0.55",
-    "@ai-sdk/google": "4.0.84",
-    "@ai-sdk/groq": "4.0.51",
-    "@ai-sdk/huggingface": "2.0.58",
-    "@ai-sdk/moonshotai": "3.0.59",
-    "@ai-sdk/openai": "4.0.79",
-    "@ai-sdk/test-server": "2.0.2",
-    "@ai-sdk/xai": "5.0.11",
+    "@ai-sdk/amazon-bedrock": "5.0.102",
+    "@ai-sdk/deepseek": "3.0.57",
+    "@ai-sdk/google": "4.0.86",
+    "@ai-sdk/groq": "4.0.53",
+    "@ai-sdk/huggingface": "2.0.60",
+    "@ai-sdk/moonshotai": "3.0.61",
+    "@ai-sdk/openai": "4.0.82",
+    "@ai-sdk/test-server": "2.0.3",
+    "@ai-sdk/xai": "5.0.13",
     "@edge-runtime/vm": "^5.0.0",
     "@smithy/eventstream-codec": "^4.3.3",
     "@smithy/util-utf8": "^4.3.3",
@@ -63,7 +63,7 @@
     "@types/node": "22.19.19",
     "@vercel/ai-tsconfig": "0.0.0",
     "esbuild": "^0.28.1",
-    "tsup": "^8.5.1",
+    "tsdown": "^0.23.0",
     "tsx": "4.23.12",
     "typescript": "5.8.3",
     "zod": "3.25.76"
@@ -113,9 +113,9 @@
     "grok"
   ],
   "scripts": {
-    "build": "pnpm clean && tsup --tsconfig tsconfig.build.json",
-    "build:watch": "pnpm clean && tsup --watch --tsconfig tsconfig.build.json",
-    "clean": "del-cli dist docs *.tsbuildinfo",
+    "build": "pnpm clean && tsdown",
+    "build:watch": "pnpm clean && tsdown --watch",
+    "clean": "del-cli docs *.tsbuildinfo",
     "type-check": "tsc --build",
     "test": "pnpm test:node && pnpm test:edge",
     "test:update": "pnpm test:node -u",

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

@@ -33,6 +33,7 @@ import { createAgentUIStream } from './create-agent-ui-stream';
  * @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.
+ * @param keepAliveMs - Optional interval for sending SSE keep-alive comments.
  * @param consumeSseStream - Whether to consume the SSE stream. Optional.
  *
  * @returns The response object.
@@ -47,6 +48,7 @@ export async function createAgentUIStreamResponse<
   headers,
   status,
   statusText,
+  keepAliveMs,
   consumeSseStream,
   ...options
 }: {
@@ -68,6 +70,7 @@ export async function createAgentUIStreamResponse<
     headers,
     status,
     statusText,
+    keepAliveMs,
     consumeSseStream,
     stream: await createAgentUIStream(options),
   });

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

@@ -35,6 +35,7 @@ import { createAgentUIStream } from './create-agent-ui-stream';
  * @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.
+ * @param keepAliveMs - Optional interval for sending SSE keep-alive comments.
  * @param consumeSseStream - Whether to consume the SSE stream. Optional.
  */
 export async function pipeAgentUIStreamToResponse<
@@ -48,6 +49,7 @@ export async function pipeAgentUIStreamToResponse<
   headers,
   status,
   statusText,
+  keepAliveMs,
   consumeSseStream,
   ...options
 }: {
@@ -71,6 +73,7 @@ export async function pipeAgentUIStreamToResponse<
     headers,
     status,
     statusText,
+    keepAliveMs,
     consumeSseStream,
     stream: await createAgentUIStream(options),
   });

package/src/embed/embed-many.ts

@@ -14,6 +14,8 @@ import type { TelemetryOptions } from '../telemetry/telemetry-options';
 import type { Embedding, EmbeddingModel, ProviderMetadata } from '../types';
 import type { Warning } from '../types/warning';
 import type { Callback } from '../util/callback';
+import { getOwn } from '../util/get-own';
+import { setOwn } from '../util/set-own';
 import { notify } from '../util/notify';
 import { prepareRetries } from '../util/prepare-retries';
 import { splitArray } from '../util/split-array';
@@ -427,10 +429,10 @@ export async function embedMany<RUNTIME_CONTEXT extends Context = Context>({
                 for (const [providerName, metadata] of Object.entries(
                   result.providerMetadata,
                 )) {
-                  providerMetadata[providerName] = {
-                    ...providerMetadata[providerName],
+                  setOwn(providerMetadata, providerName, {
+                    ...getOwn(providerMetadata, providerName),
                     ...metadata,
-                  };
+                  });
                 }
               }
             }

package/src/generate-image/generate-image.ts

@@ -25,6 +25,8 @@ import type { ImageModel } from '../types/image-model';
 import type { ImageModelResponseMetadata } from '../types/image-model-response-metadata';
 import { addImageModelUsage, type ImageModelUsage } from '../types/usage';
 import type { Warning } from '../types/warning';
+import { getOwn } from '../util/get-own';
+import { setOwn } from '../util/set-own';
 import { prepareRetries } from '../util/prepare-retries';
 import { RetryError } from '../util/retry-error';
 import { VERSION } from '../version';
@@ -324,8 +326,11 @@ export async function generateImage({
               .images;
           }
         } else {
-          providerMetadata[providerName] ??= { images: [] };
-          providerMetadata[providerName].images.push(...metadata.images);
+          const currentEntry = getOwn(providerMetadata, providerName) ?? {
+            images: [],
+          };
+          currentEntry.images.push(...metadata.images);
+          setOwn(providerMetadata, providerName, currentEntry);
         }
       }
     }
@@ -395,7 +400,7 @@ export function getImageProviderMetadata(
     const value = metadata.images?.[imageIndex];
 
     if (isJSONObject(value) && !Array.isArray(value)) {
-      (imageMetadata ??= {})[providerName] = value;
+      setOwn((imageMetadata ??= {}), providerName, value);
     }
   }
 

package/src/generate-text/prune-messages.ts

@@ -82,7 +82,7 @@ export function pruneMessages({
     const keptToolCallIds: Set<string> = new Set();
     const keptApprovalIds: Set<string> = new Set();
 
-    if (keepLastMessagesCount != null) {
+    if (keepLastMessagesCount != null && keepLastMessagesCount !== 0) {
       for (const message of messages.slice(-keepLastMessagesCount)) {
         if (
           (message.role === 'assistant' || message.role === 'tool') &&

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

@@ -159,10 +159,20 @@ export function smoothStream<TOOLS extends ToolSet>({
           return;
         }
 
-        // Flush buffer when type or id changes
+        if (chunk.text.length === 0 && chunk.providerMetadata != null) {
+          flushBuffer(controller);
+          controller.enqueue(chunk);
+          return;
+        }
+
+        // Flush at metadata boundaries because one output part cannot preserve
+        // metadata from multiple input deltas.
         if (
-          (chunk.type !== type || chunk.id !== id) &&
-          (buffer.length > 0 || providerMetadata != null)
+          buffer.length > 0 &&
+          (chunk.type !== type ||
+            chunk.id !== id ||
+            providerMetadata != null ||
+            chunk.providerMetadata != null)
         ) {
           flushBuffer(controller);
         }
@@ -170,20 +180,25 @@ export function smoothStream<TOOLS extends ToolSet>({
         buffer += chunk.text;
         id = chunk.id;
         type = chunk.type;
-
-        // Preserve providerMetadata (e.g., Anthropic thinking signatures)
-        if (chunk.providerMetadata != null) {
-          providerMetadata = chunk.providerMetadata;
-        }
+        providerMetadata = chunk.providerMetadata;
 
         let match;
 
         while ((match = detectChunk(buffer)) != null) {
-          controller.enqueue({ type, text: match, id });
+          controller.enqueue({
+            type,
+            text: match,
+            id,
+            ...(providerMetadata != null ? { providerMetadata } : {}),
+          });
           buffer = buffer.slice(match.length);
 
           await delay(isDocumentHidden() ? null : delayInMs);
         }
+
+        if (buffer.length === 0) {
+          providerMetadata = undefined;
+        }
       },
     });
   };

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

@@ -104,6 +104,11 @@ export type UIMessageStreamOptions<UI_MESSAGE extends UIMessage> = {
   /**
    * Process an error, e.g. to log it. Default to `() => 'An error occurred.'`.
    *
+   * Tool execution errors marked `providerExecuted: true` bypass this callback.
+   * Their strings pass through unchanged; other values are JSON-stringified to
+   * preserve provider error data for model-message round trips and harness
+   * runtime error messages. Stream errors and invalid tool calls still use it.
+   *
    * @returns error message to include in the data stream.
    */
   onError?: (error: unknown) => string;

package/src/generate-video/generate-video.ts

@@ -29,6 +29,8 @@ import { resolveVideoModel } from '../model/resolve-model';
 import type { VideoModel } from '../types/video-model';
 import type { VideoModelResponseMetadata } from '../types/video-model-response-metadata';
 import type { Warning } from '../types/warning';
+import { getOwn } from '../util/get-own';
+import { setOwn } from '../util/set-own';
 import { createDownload } from '../util/download/create-download';
 import { prepareRetries } from '../util/prepare-retries';
 import { VERSION } from '../version';
@@ -697,17 +699,17 @@ function mergeProviderMetadata(
   source: SharedV4ProviderMetadata,
 ): void {
   for (const [providerName, metadataValue] of Object.entries(source)) {
-    const existingMetadata = target[providerName];
+    const existingMetadata = getOwn(target, providerName);
     if (
       existingMetadata != null &&
       typeof existingMetadata === 'object' &&
       metadataValue != null &&
       typeof metadataValue === 'object'
     ) {
-      target[providerName] = {
+      setOwn(target, providerName, {
         ...existingMetadata,
         ...metadataValue,
-      };
+      });
 
       if (
         'videos' in existingMetadata &&
@@ -721,7 +723,7 @@ function mergeProviderMetadata(
         ];
       }
     } else {
-      target[providerName] = metadataValue;
+      setOwn(target, providerName, metadataValue);
     }
   }
 }

package/src/middleware/extract-reasoning-middleware.ts

@@ -116,20 +116,15 @@ export function extractReasoningMiddleware({
                 return;
               }
 
-              if (
-                chunk.type === 'text-end' &&
-                delayedTextStarts[chunk.id] != null
-              ) {
-                controller.enqueue(delayedTextStarts[chunk.id]);
-                delete delayedTextStarts[chunk.id];
-              }
-
-              if (chunk.type !== 'text-delta') {
+              if (chunk.type !== 'text-delta' && chunk.type !== 'text-end') {
                 controller.enqueue(chunk);
                 return;
               }
 
-              if (reasoningExtractions[chunk.id] == null) {
+              if (
+                chunk.type === 'text-delta' &&
+                reasoningExtractions[chunk.id] == null
+              ) {
                 reasoningExtractions[chunk.id] = {
                   isFirstReasoning: true,
                   isFirstText: true,
@@ -143,7 +138,14 @@ export function extractReasoningMiddleware({
 
               const activeExtraction = reasoningExtractions[chunk.id];
 
-              activeExtraction.buffer += chunk.delta;
+              if (activeExtraction == null) {
+                if (delayedTextStarts[chunk.id] != null) {
+                  controller.enqueue(delayedTextStarts[chunk.id]);
+                  delete delayedTextStarts[chunk.id];
+                }
+                controller.enqueue(chunk);
+                return;
+              }
 
               function getReasoningId() {
                 return (activeExtraction.reasoningId ??= `reasoning-${reasoningIdCounter++}`);
@@ -199,6 +201,20 @@ export function extractReasoningMiddleware({
                 }
               }
 
+              if (chunk.type === 'text-end') {
+                publish(activeExtraction.buffer);
+                activeExtraction.buffer = '';
+
+                if (delayedTextStarts[chunk.id] != null) {
+                  controller.enqueue(delayedTextStarts[chunk.id]);
+                  delete delayedTextStarts[chunk.id];
+                }
+                controller.enqueue(chunk);
+                return;
+              }
+
+              activeExtraction.buffer += chunk.delta;
+
               do {
                 const nextTag = activeExtraction.isReasoning
                   ? closingTag

package/src/registry/provider-registry.ts

@@ -213,7 +213,7 @@ class DefaultProviderRegistry<
       keyof PROVIDERS,
       ProviderV4 & ProviderWithOptionalVideoModel & EvaluationProvider
     >
-  > = {};
+  > = Object.create(null);
   private separator: SEPARATOR;
   private languageModelMiddleware?:
     | LanguageModelMiddleware

package/src/ui/chat.ts

@@ -818,6 +818,14 @@ export abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
       responseMessageIndex === -1
         ? lastMessage
         : this.state.messages[responseMessageIndex];
+    const resumableResponseMessage =
+      trigger === 'resume-stream' &&
+      responseMessage?.role === 'assistant' &&
+      responseMessage.parts.some(
+        part => isToolUIPart(part) && part.state === 'input-streaming',
+      )
+        ? this.state.snapshot(responseMessage)
+        : undefined;
     const usesEarlierAssistantMessage =
       responseMessageIndex !== -1 &&
       responseMessageIndex < this.state.messages.length - 1 &&
@@ -835,10 +843,11 @@ export abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
             ? this.resumableStreamState
             : createStreamingUIMessageState({
                 lastMessage:
-                  trigger === 'resume-stream' ||
-                  trigger === 'regenerate-message'
-                    ? undefined
-                    : this.state.snapshot(responseMessage),
+                  trigger === 'resume-stream'
+                    ? resumableResponseMessage
+                    : trigger === 'regenerate-message'
+                      ? undefined
+                      : this.state.snapshot(responseMessage),
                 messageId: this.generateId(),
               }),
         abortController,

package/src/ui/convert-to-model-messages.ts

@@ -59,16 +59,28 @@ export async function convertToModelMessages<UI_MESSAGE extends UIMessage>(
 
   warnIfUIMessageHasDeprecatedRawInput(messages);
 
-  if (options?.ignoreIncompleteToolCalls) {
-    messages = messages.map(message => ({
+  // A later user message supersedes unresolved approval requests. Keeping
+  // those requests would leave unmatched tool calls at the user boundary.
+  const lastUserMessageIndex = messages.reduce(
+    (lastIndex, message, index) =>
+      message.role === 'user' ? index : lastIndex,
+    -1,
+  );
+
+  if (options?.ignoreIncompleteToolCalls || lastUserMessageIndex > 0) {
+    messages = messages.map((message, messageIndex) => ({
       ...message,
       parts: message.parts.filter(
         part =>
           !isToolUIPart(part) ||
-          part.state === 'approval-responded' ||
-          (part.state === 'output-available' && part.preliminary !== true) ||
-          part.state === 'output-error' ||
-          part.state === 'output-denied',
+          ((part.state !== 'approval-requested' ||
+            messageIndex >= lastUserMessageIndex) &&
+            (!options?.ignoreIncompleteToolCalls ||
+              part.state === 'approval-responded' ||
+              (part.state === 'output-available' &&
+                part.preliminary !== true) ||
+              part.state === 'output-error' ||
+              part.state === 'output-denied')),
       ),
     }));
   }