ai 6.0.284 → 6.0.286

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

@@ -665,7 +665,16 @@ function createOutputTransformStream<
   let text = '';
   let textChunk = '';
   let textProviderMetadata: ProviderMetadata | undefined = undefined;
-  let lastPublishedValue = '';
+  let lastPublishedValue: string | undefined = undefined;
+  let hasPublishedValue = false;
+
+  function resetOutputState() {
+    firstTextChunkId = undefined;
+    text = '';
+    textChunk = '';
+    textProviderMetadata = undefined;
+    lastPublishedValue = '';
+  }
 
   function publishTextChunk({
     controller,
@@ -693,6 +702,10 @@ function createOutputTransformStream<
     EnrichedStreamPart<TOOLS, InferPartialOutput<OUTPUT>>
   >({
     async transform(chunk, controller) {
+      if (chunk.type === 'start-step') {
+        resetOutputState();
+      }
+
       // ensure that we publish the last text chunk before the step finish:
       if (chunk.type === 'finish-step' && textChunk.length > 0) {
         publishTextChunk({ controller });
@@ -749,9 +762,10 @@ function createOutputTransformStream<
           typeof result.partial === 'string'
             ? result.partial
             : JSON.stringify(result.partial);
-        if (currentValue !== lastPublishedValue) {
+        if (!hasPublishedValue || currentValue !== lastPublishedValue) {
           publishTextChunk({ controller, partialOutput: result.partial });
           lastPublishedValue = currentValue;
+          hasPublishedValue = true;
         }
       }
     },
@@ -916,6 +930,7 @@ class DefaultStreamTextResult<
     const recordedSteps: StepResult<TOOLS>[] = [];
     let recordedNoOutputError: NoOutputGeneratedError | undefined;
     let currentStepToolSet = tools;
+    let currentStepModel = model;
 
     // provider-assigned text/reasoning part IDs are only unique within a
     // single model call (e.g. Anthropic uses the content block index, which
@@ -1156,7 +1171,10 @@ class DefaultStreamTextResult<
           // Add step information (after response messages are updated):
           const currentStepResult: StepResult<TOOLS> = new DefaultStepResult({
             stepNumber: recordedSteps.length,
-            model: modelInfo,
+            model: {
+              provider: currentStepModel.provider,
+              modelId: currentStepModel.modelId,
+            },
             ...callbackTelemetryProps,
             experimental_context,
             content: recordedContent,
@@ -1179,8 +1197,8 @@ class DefaultStreamTextResult<
 
           logWarnings({
             warnings: recordedWarnings,
-            provider: modelInfo.provider,
-            model: modelInfo.modelId,
+            provider: currentStepModel.provider,
+            model: currentStepModel.modelId,
           });
 
           recordedSteps.push(currentStepResult);
@@ -1763,6 +1781,7 @@ class DefaultStreamTextResult<
             const stepModel = resolveLanguageModel(
               prepareStepResult?.model ?? model,
             );
+            currentStepModel = stepModel;
             const stepModelInfo = {
               provider: stepModel.provider,
               modelId: stepModel.modelId,
@@ -1775,6 +1794,7 @@ class DefaultStreamTextResult<
               },
               supportedUrls: await stepModel.supportedUrls,
               download,
+              abortSignal,
             });
 
             const stepActiveTools =
@@ -1965,7 +1985,7 @@ class DefaultStreamTextResult<
               {
                 id: generateId(),
                 timestamp: new Date(),
-                modelId: modelInfo.modelId,
+                modelId: stepModelInfo.modelId,
               };
 
             // raw text as it comes from the provider. recorded for telemetry.
@@ -2652,7 +2672,7 @@ class DefaultStreamTextResult<
           InferPartialOutput<OUTPUT>
         >({
           transform({ partialOutput }, controller) {
-            if (partialOutput != null) {
+            if (partialOutput !== undefined) {
               controller.enqueue(partialOutput);
             }
           },

package/src/middleware/simulate-streaming-middleware.ts

@@ -25,7 +25,13 @@ export function simulateStreamingMiddleware(): LanguageModelMiddleware {
             switch (part.type) {
               case 'text': {
                 if (part.text.length > 0) {
-                  controller.enqueue({ type: 'text-start', id: String(id) });
+                  controller.enqueue({
+                    type: 'text-start',
+                    id: String(id),
+                    ...(part.providerMetadata != null
+                      ? { providerMetadata: part.providerMetadata }
+                      : {}),
+                  });
                   controller.enqueue({
                     type: 'text-delta',
                     id: String(id),

package/src/prompt/convert-to-language-model-prompt.ts

@@ -38,15 +38,17 @@ import { MissingToolResultsError } from '../error/missing-tool-result-error';
 export async function convertToLanguageModelPrompt({
   prompt,
   supportedUrls,
-  download = createDefaultDownloadFunction(),
+  download,
+  abortSignal,
 }: {
   prompt: StandardizedPrompt;
   supportedUrls: Record<string, RegExp[]>;
   download: DownloadFunction | undefined;
+  abortSignal?: AbortSignal;
 }): Promise<LanguageModelV3Prompt> {
   const downloadedAssets = await downloadAssets(
     prompt.messages,
-    download,
+    download ?? createDefaultDownloadFunction(undefined, abortSignal),
     supportedUrls,
   );
 

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

@@ -65,11 +65,17 @@ export function readUIMessageStream<UI_MESSAGE extends UIMessage>({
 }): AsyncIterableStream<UI_MESSAGE> {
   let controller: ReadableStreamDefaultController<UI_MESSAGE> | undefined;
   let hasErrored = false;
+  let isCancelled = false;
+  const abortController = new AbortController();
 
   const outputStream = new ReadableStream<UI_MESSAGE>({
     start(controllerParam) {
       controller = controllerParam;
     },
+    cancel() {
+      isCancelled = true;
+      abortController.abort();
+    },
   });
 
   const state = createStreamingUIMessageState<UI_MESSAGE>({
@@ -98,17 +104,20 @@ export function readUIMessageStream<UI_MESSAGE extends UIMessage>({
         return job({
           state,
           write: () => {
-            controller?.enqueue(createUIMessageSnapshot(state.message));
+            if (!isCancelled) {
+              controller?.enqueue(createUIMessageSnapshot(state.message));
+            }
           },
         });
       },
       onError: handleError,
     }),
     onError: handleError,
+    abortSignal: abortController.signal,
   }).finally(() => {
-    // Only close if no error occurred. Calling close() on an errored controller
-    // throws "Invalid state: Controller is already closed" TypeError.
-    if (!hasErrored) {
+    // Only close if no error or cancellation occurred. Both erroring and
+    // cancelling a stream close its controller.
+    if (!hasErrored && !isCancelled) {
       controller?.close();
     }
   });

package/src/util/download/download-function.ts

@@ -34,12 +34,15 @@ export type DownloadFunction = (
  * Downloads the file if it is not supported by the model.
  */
 export const createDefaultDownloadFunction =
-  (download: typeof originalDownload = originalDownload): DownloadFunction =>
+  (
+    download: typeof originalDownload = originalDownload,
+    abortSignal?: AbortSignal,
+  ): DownloadFunction =>
   requestedDownloads =>
     Promise.all(
       requestedDownloads.map(async requestedDownload =>
         requestedDownload.isUrlSupportedByModel
           ? null
-          : download(requestedDownload),
+          : await download({ ...requestedDownload, abortSignal }),
       ),
     );