ai 5.0.0-alpha.2 → 5.0.0-alpha.4

package/dist/index.js

@@ -47,6 +47,7 @@ __export(src_exports, {
   NoSuchToolError: () => NoSuchToolError,
   Output: () => output_exports,
   RetryError: () => RetryError,
+  TextStreamChatTransport: () => TextStreamChatTransport,
   ToolCallRepairError: () => ToolCallRepairError,
   ToolExecutionError: () => ToolExecutionError,
   TypeValidationError: () => import_provider16.TypeValidationError,
@@ -92,7 +93,6 @@ __export(src_exports, {
   isAssistantMessageWithCompletedToolCalls: () => isAssistantMessageWithCompletedToolCalls,
   isDeepEqualData: () => isDeepEqualData,
   jsonSchema: () => import_provider_utils26.jsonSchema,
-  maxSteps: () => maxSteps,
   modelMessageSchema: () => modelMessageSchema,
   parsePartialJson: () => parsePartialJson,
   pipeTextStreamToResponse: () => pipeTextStreamToResponse,
@@ -101,6 +101,7 @@ __export(src_exports, {
   simulateReadableStream: () => simulateReadableStream,
   simulateStreamingMiddleware: () => simulateStreamingMiddleware,
   smoothStream: () => smoothStream,
+  stepCountIs: () => stepCountIs,
   streamObject: () => streamObject,
   streamText: () => streamText,
   systemModelMessageSchema: () => systemModelMessageSchema,
@@ -591,9 +592,8 @@ var uiMessageStreamPartSchema = import_zod.z.union([
     providerMetadata: import_zod.z.record(import_zod.z.any()).optional()
   }),
   import_zod.z.object({
-    type: import_zod.z.literal("source"),
-    sourceType: import_zod.z.literal("url"),
-    id: import_zod.z.string(),
+    type: import_zod.z.literal("source-url"),
+    sourceId: import_zod.z.string(),
     url: import_zod.z.string(),
     title: import_zod.z.string().optional(),
     providerMetadata: import_zod.z.any().optional()
@@ -1147,16 +1147,13 @@ function processUIMessageStream({
               write();
               break;
             }
-            case "source": {
+            case "source-url": {
               state.message.parts.push({
-                type: "source",
-                source: {
-                  sourceType: "url",
-                  id: part.id,
-                  url: part.url,
-                  title: part.title,
-                  providerMetadata: part.providerMetadata
-                }
+                type: "source-url",
+                sourceId: part.sourceId,
+                url: part.url,
+                title: part.title,
+                providerMetadata: part.providerMetadata
               });
               write();
               break;
@@ -1339,7 +1336,6 @@ var getOriginalFetch = () => fetch;
 async function fetchUIMessageStream({
   api,
   body,
-  streamProtocol = "ui-message",
   credentials,
   headers,
   abortController,
@@ -1373,9 +1369,7 @@ async function fetchUIMessageStream({
   if (!response.body) {
     throw new Error("The response body is empty.");
   }
-  return streamProtocol === "text" ? transformTextToUiMessageStream({
-    stream: response.body.pipeThrough(new TextDecoderStream())
-  }) : (0, import_provider_utils3.parseJsonEventStream)({
+  return (0, import_provider_utils3.parseJsonEventStream)({
     stream: response.body,
     schema: uiMessageStreamPartSchema
   }).pipeThrough(
@@ -1389,6 +1383,46 @@ async function fetchUIMessageStream({
     })
   );
 }
+async function fetchTextStream({
+  api,
+  body,
+  credentials,
+  headers,
+  abortController,
+  fetch: fetch2 = getOriginalFetch(),
+  requestType = "generate"
+}) {
+  var _a17, _b, _c;
+  const response = requestType === "resume" ? await fetch2(`${api}?chatId=${body.chatId}`, {
+    method: "GET",
+    headers: {
+      "Content-Type": "application/json",
+      ...headers
+    },
+    signal: (_a17 = abortController == null ? void 0 : abortController()) == null ? void 0 : _a17.signal,
+    credentials
+  }) : await fetch2(api, {
+    method: "POST",
+    body: JSON.stringify(body),
+    headers: {
+      "Content-Type": "application/json",
+      ...headers
+    },
+    signal: (_b = abortController == null ? void 0 : abortController()) == null ? void 0 : _b.signal,
+    credentials
+  });
+  if (!response.ok) {
+    throw new Error(
+      (_c = await response.text()) != null ? _c : "Failed to fetch the chat response."
+    );
+  }
+  if (!response.body) {
+    throw new Error("The response body is empty.");
+  }
+  return transformTextToUiMessageStream({
+    stream: response.body.pipeThrough(new TextDecoderStream())
+  });
+}
 async function consumeUIMessageStream({
   stream,
   onUpdate,
@@ -1439,10 +1473,17 @@ async function callChatApi({
   requestType = "generate",
   messageMetadataSchema
 }) {
-  const stream = await fetchUIMessageStream({
+  const stream = streamProtocol === "text" ? await fetchTextStream({
+    api,
+    body,
+    credentials,
+    headers,
+    abortController,
+    fetch: fetch2,
+    requestType
+  }) : await fetchUIMessageStream({
     api,
     body,
-    streamProtocol,
     credentials,
     headers,
     abortController,
@@ -1629,18 +1670,18 @@ var SerialJobExecutor = class {
 function shouldResubmitMessages({
   originalMaxToolInvocationStep,
   originalMessageCount,
-  maxSteps: maxSteps2,
+  maxSteps,
   messages
 }) {
   var _a17;
   const lastMessage = messages[messages.length - 1];
   return (
     // check if the feature is enabled:
-    maxSteps2 > 1 && // ensure there is a last message:
+    maxSteps > 1 && // ensure there is a last message:
     lastMessage != null && // ensure we actually have new steps (to prevent infinite loops in case of errors):
     (messages.length > originalMessageCount || extractMaxToolInvocationStep(getToolInvocations(lastMessage)) !== originalMaxToolInvocationStep) && // check that next step is possible:
     isAssistantMessageWithCompletedToolCalls(lastMessage) && // limit the number of automatic steps:
-    ((_a17 = extractMaxToolInvocationStep(getToolInvocations(lastMessage))) != null ? _a17 : 0) < maxSteps2
+    ((_a17 = extractMaxToolInvocationStep(getToolInvocations(lastMessage))) != null ? _a17 : 0) < maxSteps
   );
 }
 function isAssistantMessageWithCompletedToolCalls(message) {
@@ -1680,7 +1721,7 @@ var ChatStore = class {
     chats = {},
     generateId: generateId3,
     transport,
-    maxSteps: maxSteps2 = 1,
+    maxSteps = 1,
     messageMetadataSchema,
     dataPartSchemas
   }) {
@@ -1696,7 +1737,7 @@ var ChatStore = class {
         }
       ])
     );
-    this.maxSteps = maxSteps2;
+    this.maxSteps = maxSteps;
     this.transport = transport;
     this.subscribers = /* @__PURE__ */ new Set();
     this.generateId = generateId3 != null ? generateId3 : import_provider_utils5.generateId;
@@ -1994,7 +2035,6 @@ var DefaultChatTransport = class {
     credentials,
     headers,
     body,
-    streamProtocol,
     fetch: fetch2,
     prepareRequestBody
   }) {
@@ -2002,7 +2042,6 @@ var DefaultChatTransport = class {
     this.credentials = credentials;
     this.headers = headers;
     this.body = body;
-    this.streamProtocol = streamProtocol;
     this.fetch = fetch2;
     this.prepareRequestBody = prepareRequestBody;
   }
@@ -2032,7 +2071,55 @@ var DefaultChatTransport = class {
         ...this.body,
         ...body
       },
-      streamProtocol: this.streamProtocol,
+      credentials: this.credentials,
+      abortController: () => abortController,
+      fetch: this.fetch,
+      requestType
+    });
+  }
+};
+var TextStreamChatTransport = class {
+  constructor({
+    api,
+    credentials,
+    headers,
+    body,
+    fetch: fetch2,
+    prepareRequestBody
+  }) {
+    this.api = api;
+    this.credentials = credentials;
+    this.headers = headers;
+    this.body = body;
+    this.fetch = fetch2;
+    this.prepareRequestBody = prepareRequestBody;
+  }
+  submitMessages({
+    chatId,
+    messages,
+    abortController,
+    body,
+    headers,
+    requestType
+  }) {
+    var _a17, _b;
+    return fetchTextStream({
+      api: this.api,
+      headers: {
+        ...this.headers,
+        ...headers
+      },
+      body: (_b = (_a17 = this.prepareRequestBody) == null ? void 0 : _a17.call(this, {
+        chatId,
+        messages,
+        ...this.body,
+        ...body
+      })) != null ? _b : {
+        chatId,
+        messages,
+        ...this.body,
+        ...body
+      },
       credentials: this.credentials,
       abortController: () => abortController,
       fetch: this.fetch,
@@ -2232,7 +2319,6 @@ var import_provider_utils6 = require("@ai-sdk/provider-utils");
 function defaultChatStore({
   api,
   fetch: fetch2,
-  streamProtocol = "ui-message",
   credentials,
   headers,
   body,
@@ -2240,14 +2326,13 @@ function defaultChatStore({
   generateId: generateId3 = import_provider_utils6.generateId,
   dataPartSchemas,
   messageMetadataSchema,
-  maxSteps: maxSteps2 = 1,
+  maxSteps = 1,
   chats
 }) {
   return new ChatStore({
     transport: new DefaultChatTransport({
       api,
       fetch: fetch2,
-      streamProtocol,
       credentials,
       headers,
       body,
@@ -2256,7 +2341,7 @@ function defaultChatStore({
     generateId: generateId3,
     messageMetadataSchema,
     dataPartSchemas,
-    maxSteps: maxSteps2,
+    maxSteps,
     chats
   });
 }
@@ -4745,11 +4830,11 @@ var DelayedPromise = class {
     this._resolve = void 0;
     this._reject = void 0;
   }
-  get value() {
-    if (this.promise) {
-      return this.promise;
+  get promise() {
+    if (this._promise) {
+      return this._promise;
     }
-    this.promise = new Promise((resolve, reject) => {
+    this._promise = new Promise((resolve, reject) => {
       if (this.status.type === "resolved") {
         resolve(this.status.value);
       } else if (this.status.type === "rejected") {
@@ -4758,19 +4843,19 @@ var DelayedPromise = class {
       this._resolve = resolve;
       this._reject = reject;
     });
-    return this.promise;
+    return this._promise;
   }
   resolve(value) {
     var _a17;
     this.status = { type: "resolved", value };
-    if (this.promise) {
+    if (this._promise) {
       (_a17 = this._resolve) == null ? void 0 : _a17.call(this, value);
     }
   }
   reject(error) {
     var _a17;
     this.status = { type: "rejected", error };
-    if (this.promise) {
+    if (this._promise) {
       (_a17 = this._reject) == null ? void 0 : _a17.call(this, error);
     }
   }
@@ -4865,12 +4950,12 @@ var DefaultStreamObjectResult = class {
     currentDate,
     now: now2
   }) {
-    this.objectPromise = new DelayedPromise();
-    this.usagePromise = new DelayedPromise();
-    this.providerMetadataPromise = new DelayedPromise();
-    this.warningsPromise = new DelayedPromise();
-    this.requestPromise = new DelayedPromise();
-    this.responsePromise = new DelayedPromise();
+    this._object = new DelayedPromise();
+    this._usage = new DelayedPromise();
+    this._providerMetadata = new DelayedPromise();
+    this._warnings = new DelayedPromise();
+    this._request = new DelayedPromise();
+    this._response = new DelayedPromise();
     const { maxRetries, retry } = prepareRetries({
       maxRetries: maxRetriesArg
     });
@@ -4989,7 +5074,7 @@ var DefaultStreamObjectResult = class {
             })
           })
         );
-        self.requestPromise.resolve(request != null ? request : {});
+        self._request.resolve(request != null ? request : {});
         let warnings;
         let usage = {
           inputTokens: void 0,
@@ -5082,9 +5167,9 @@ var DefaultStreamObjectResult = class {
                     usage,
                     response: fullResponse
                   });
-                  self.usagePromise.resolve(usage);
-                  self.providerMetadataPromise.resolve(providerMetadata);
-                  self.responsePromise.resolve({
+                  self._usage.resolve(usage);
+                  self._providerMetadata.resolve(providerMetadata);
+                  self._response.resolve({
                     ...fullResponse,
                     headers: response == null ? void 0 : response.headers
                   });
@@ -5098,7 +5183,7 @@ var DefaultStreamObjectResult = class {
                   );
                   if (validationResult.success) {
                     object2 = validationResult.value;
-                    self.objectPromise.resolve(object2);
+                    self._object.resolve(object2);
                   } else {
                     error = new NoObjectGeneratedError({
                       message: "No object generated: response did not match schema.",
@@ -5108,7 +5193,7 @@ var DefaultStreamObjectResult = class {
                       usage,
                       finishReason
                     });
-                    self.objectPromise.reject(error);
+                    self._object.reject(error);
                   }
                   break;
                 }
@@ -5203,22 +5288,22 @@ var DefaultStreamObjectResult = class {
     this.outputStrategy = outputStrategy;
   }
   get object() {
-    return this.objectPromise.value;
+    return this._object.promise;
   }
   get usage() {
-    return this.usagePromise.value;
+    return this._usage.promise;
   }
   get providerMetadata() {
-    return this.providerMetadataPromise.value;
+    return this._providerMetadata.promise;
   }
   get warnings() {
-    return this.warningsPromise.value;
+    return this._warnings.promise;
   }
   get request() {
-    return this.requestPromise.value;
+    return this._request.promise;
   }
   get response() {
-    return this.responsePromise.value;
+    return this._response.promise;
   }
   get partialObjectStream() {
     return createAsyncIterableStream(
@@ -5380,6 +5465,11 @@ var DefaultSpeechResult = class {
 // core/generate-text/generate-text.ts
 var import_provider_utils19 = require("@ai-sdk/provider-utils");
 
+// src/util/as-array.ts
+function asArray(value) {
+  return value === void 0 ? [] : Array.isArray(value) ? value : [value];
+}
+
 // core/prompt/prepare-tools-and-tool-choice.ts
 var import_provider_utils17 = require("@ai-sdk/provider-utils");
 
@@ -5597,8 +5687,8 @@ var DefaultStepResult = class {
 };
 
 // core/generate-text/stop-condition.ts
-function maxSteps(maxSteps2) {
-  return ({ steps }) => steps.length >= maxSteps2;
+function stepCountIs(stepCount) {
+  return ({ steps }) => steps.length === stepCount;
 }
 function hasToolCall(toolName) {
   return ({ steps }) => {
@@ -5608,6 +5698,12 @@ function hasToolCall(toolName) {
     )) != null ? _c : false;
   };
 }
+async function isStopConditionMet({
+  stopConditions,
+  steps
+}) {
+  return (await Promise.all(stopConditions.map((condition) => condition({ steps })))).some((result) => result);
+}
 
 // core/generate-text/to-response-messages.ts
 function toResponseMessages({
@@ -5682,12 +5778,14 @@ async function generateText({
   maxRetries: maxRetriesArg,
   abortSignal,
   headers,
-  continueUntil = maxSteps(1),
+  stopWhen = stepCountIs(1),
   experimental_output: output,
   experimental_telemetry: telemetry,
   providerOptions,
-  experimental_activeTools: activeTools,
-  experimental_prepareStep: prepareStep,
+  experimental_activeTools,
+  activeTools = experimental_activeTools,
+  experimental_prepareStep,
+  prepareStep = experimental_prepareStep,
   experimental_repairToolCall: repairToolCall,
   _internal: {
     generateId: generateId3 = originalGenerateId3,
@@ -5696,6 +5794,7 @@ async function generateText({
   onStepFinish,
   ...settings
 }) {
+  const stopConditions = asArray(stopWhen);
   const { maxRetries, retry } = prepareRetries({ maxRetries: maxRetriesArg });
   const callSettings = prepareCallSettings(settings);
   const baseTelemetryAttributes = getBaseTelemetryAttributes({
@@ -5759,7 +5858,7 @@ async function generateText({
         const { toolChoice: stepToolChoice, tools: stepTools } = prepareToolsAndToolChoice({
           tools,
           toolChoice: (_b = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _b : toolChoice,
-          activeTools: (_c = prepareStepResult == null ? void 0 : prepareStepResult.experimental_activeTools) != null ? _c : activeTools
+          activeTools: (_c = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _c : activeTools
         });
         currentModelResponse = await retry(
           () => {
@@ -5904,8 +6003,8 @@ async function generateText({
       } while (
         // there are tool calls:
         currentToolCalls.length > 0 && // all current tool calls have results:
-        currentToolResults.length === currentToolCalls.length && // continue until the stop condition is met:
-        !await continueUntil({ steps })
+        currentToolResults.length === currentToolCalls.length && // continue until a stop condition is met:
+        !await isStopConditionMet({ stopConditions, steps })
       );
       span.setAttributes(
         selectTelemetryAttributes({
@@ -6251,11 +6350,6 @@ function smoothStream({
 // core/generate-text/stream-text.ts
 var import_provider_utils23 = require("@ai-sdk/provider-utils");
 
-// src/util/as-array.ts
-function asArray(value) {
-  return value === void 0 ? [] : Array.isArray(value) ? value : [value];
-}
-
 // core/generate-text/run-tools-transformation.ts
 var import_provider_utils22 = require("@ai-sdk/provider-utils");
 function runToolsTransformation({
@@ -6466,13 +6560,15 @@ function streamText({
   maxRetries,
   abortSignal,
   headers,
-  maxSteps: maxSteps2 = 1,
+  stopWhen = stepCountIs(1),
   experimental_output: output,
   experimental_telemetry: telemetry,
+  prepareStep,
   providerOptions,
   experimental_toolCallStreaming = false,
   toolCallStreaming = experimental_toolCallStreaming,
-  experimental_activeTools: activeTools,
+  experimental_activeTools,
+  activeTools = experimental_activeTools,
   experimental_repairToolCall: repairToolCall,
   experimental_transform: transform,
   onChunk,
@@ -6502,9 +6598,10 @@ function streamText({
     transforms: asArray(transform),
     activeTools,
     repairToolCall,
-    maxSteps: maxSteps2,
+    stopConditions: asArray(stopWhen),
     output,
     providerOptions,
+    prepareStep,
     onChunk,
     onError,
     onFinish,
@@ -6579,9 +6676,10 @@ var DefaultStreamTextResult = class {
     transforms,
     activeTools,
     repairToolCall,
-    maxSteps: maxSteps2,
+    stopConditions,
     output,
     providerOptions,
+    prepareStep,
     now: now2,
     currentDate,
     generateId: generateId3,
@@ -6590,18 +6688,12 @@ var DefaultStreamTextResult = class {
     onFinish,
     onStepFinish
   }) {
-    this.totalUsagePromise = new DelayedPromise();
-    this.finishReasonPromise = new DelayedPromise();
-    this.stepsPromise = new DelayedPromise();
-    if (maxSteps2 < 1) {
-      throw new InvalidArgumentError({
-        parameter: "maxSteps",
-        value: maxSteps2,
-        message: "maxSteps must be at least 1"
-      });
-    }
+    this._totalUsage = new DelayedPromise();
+    this._finishReason = new DelayedPromise();
+    this._steps = new DelayedPromise();
     this.output = output;
     this.generateId = generateId3;
+    let stepFinish;
     let activeReasoningPart = void 0;
     let recordedContent = [];
     const recordedResponseMessages = [];
@@ -6683,6 +6775,7 @@ var DefaultStreamTextResult = class {
           recordedContent = [];
           activeReasoningPart = void 0;
           recordedResponseMessages.push(...stepMessages);
+          stepFinish.resolve();
         }
         if (part.type === "finish") {
           recordedTotalUsage = part.totalUsage;
@@ -6700,9 +6793,9 @@ var DefaultStreamTextResult = class {
             outputTokens: void 0,
             totalTokens: void 0
           };
-          self.finishReasonPromise.resolve(finishReason);
-          self.totalUsagePromise.resolve(totalUsage);
-          self.stepsPromise.resolve(recordedSteps);
+          self._finishReason.resolve(finishReason);
+          self._totalUsage.resolve(totalUsage);
+          self._steps.resolve(recordedSteps);
           const finalStep = recordedSteps[recordedSteps.length - 1];
           await (onFinish == null ? void 0 : onFinish({
             finishReason,
@@ -6793,8 +6886,7 @@ var DefaultStreamTextResult = class {
           // specific settings that only make sense on the outer level:
           "ai.prompt": {
             input: () => JSON.stringify({ system, prompt, messages })
-          },
-          "ai.settings.maxSteps": maxSteps2
+          }
         }
       }),
       tracer,
@@ -6806,6 +6898,8 @@ var DefaultStreamTextResult = class {
           responseMessages,
           usage
         }) {
+          var _a17, _b, _c;
+          stepFinish = new DelayedPromise();
           const initialPrompt = await standardizePrompt({
             system,
             prompt,
@@ -6815,6 +6909,11 @@ var DefaultStreamTextResult = class {
             ...initialPrompt.messages,
             ...responseMessages
           ];
+          const prepareStepResult = await (prepareStep == null ? void 0 : prepareStep({
+            model,
+            steps: recordedSteps,
+            stepNumber: recordedSteps.length
+          }));
           const promptMessages = await convertToLanguageModelPrompt({
             prompt: {
               system: initialPrompt.system,
@@ -6822,9 +6921,12 @@ var DefaultStreamTextResult = class {
             },
             supportedUrls: await model.supportedUrls
           });
-          const toolsAndToolChoice = {
-            ...prepareToolsAndToolChoice({ tools, toolChoice, activeTools })
-          };
+          const stepModel = (_a17 = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _a17 : model;
+          const { toolChoice: stepToolChoice, tools: stepTools } = prepareToolsAndToolChoice({
+            tools,
+            toolChoice: (_b = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _b : toolChoice,
+            activeTools: (_c = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _c : activeTools
+          });
           const {
             result: { stream: stream2, response, request },
             doStreamSpan,
@@ -6840,24 +6942,23 @@ var DefaultStreamTextResult = class {
                     telemetry
                   }),
                   ...baseTelemetryAttributes,
+                  // model:
+                  "ai.model.provider": stepModel.provider,
+                  "ai.model.id": stepModel.modelId,
+                  // prompt:
                   "ai.prompt.messages": {
                     input: () => JSON.stringify(promptMessages)
                   },
                   "ai.prompt.tools": {
                     // convert the language model level tools:
-                    input: () => {
-                      var _a17;
-                      return (_a17 = toolsAndToolChoice.tools) == null ? void 0 : _a17.map(
-                        (tool2) => JSON.stringify(tool2)
-                      );
-                    }
+                    input: () => stepTools == null ? void 0 : stepTools.map((tool2) => JSON.stringify(tool2))
                   },
                   "ai.prompt.toolChoice": {
-                    input: () => toolsAndToolChoice.toolChoice != null ? JSON.stringify(toolsAndToolChoice.toolChoice) : void 0
+                    input: () => stepToolChoice != null ? JSON.stringify(stepToolChoice) : void 0
                   },
                   // standardized gen-ai llm span attributes:
-                  "gen_ai.system": model.provider,
-                  "gen_ai.request.model": model.modelId,
+                  "gen_ai.system": stepModel.provider,
+                  "gen_ai.request.model": stepModel.modelId,
                   "gen_ai.request.frequency_penalty": callSettings.frequencyPenalty,
                   "gen_ai.request.max_tokens": callSettings.maxOutputTokens,
                   "gen_ai.request.presence_penalty": callSettings.presencePenalty,
@@ -6874,9 +6975,10 @@ var DefaultStreamTextResult = class {
                   startTimestampMs: now2(),
                   // get before the call
                   doStreamSpan: doStreamSpan2,
-                  result: await model.doStream({
+                  result: await stepModel.doStream({
                     ...callSettings,
-                    ...toolsAndToolChoice,
+                    tools: stepTools,
+                    toolChoice: stepToolChoice,
                     responseFormat: output == null ? void 0 : output.responseFormat,
                     prompt: promptMessages,
                     providerOptions,
@@ -6887,7 +6989,7 @@ var DefaultStreamTextResult = class {
               }
             })
           );
-          const transformedStream = runToolsTransformation({
+          const streamWithToolResults = runToolsTransformation({
             tools,
             generatorStream: stream2,
             toolCallStreaming,
@@ -6926,10 +7028,10 @@ var DefaultStreamTextResult = class {
             stepText += chunk.text;
           }
           self.addStream(
-            transformedStream.pipeThrough(
+            streamWithToolResults.pipeThrough(
               new TransformStream({
                 async transform(chunk, controller) {
-                  var _a17, _b, _c, _d;
+                  var _a18, _b2, _c2, _d;
                   if (chunk.type === "stream-start") {
                     warnings = chunk.warnings;
                     return;
@@ -6992,9 +7094,9 @@ var DefaultStreamTextResult = class {
                     }
                     case "response-metadata": {
                       stepResponse = {
-                        id: (_a17 = chunk.id) != null ? _a17 : stepResponse.id,
-                        timestamp: (_b = chunk.timestamp) != null ? _b : stepResponse.timestamp,
-                        modelId: (_c = chunk.modelId) != null ? _c : stepResponse.modelId
+                        id: (_a18 = chunk.id) != null ? _a18 : stepResponse.id,
+                        timestamp: (_b2 = chunk.timestamp) != null ? _b2 : stepResponse.timestamp,
+                        modelId: (_c2 = chunk.modelId) != null ? _c2 : stepResponse.modelId
                       };
                       break;
                     }
@@ -7081,9 +7183,13 @@ var DefaultStreamTextResult = class {
                     }
                   });
                   const combinedUsage = addLanguageModelUsage(usage, stepUsage);
-                  if (currentStep + 1 < maxSteps2 && // there are tool calls:
-                  stepToolCalls.length > 0 && // all current tool calls have results:
-                  stepToolResults.length === stepToolCalls.length) {
+                  await stepFinish.promise;
+                  if (stepToolCalls.length > 0 && // all current tool calls have results:
+                  stepToolResults.length === stepToolCalls.length && // continue until a stop condition is met:
+                  !await isStopConditionMet({
+                    stopConditions,
+                    steps: recordedSteps
+                  })) {
                     responseMessages.push(
                       ...toResponseMessages({
                         content: stepContent,
@@ -7131,7 +7237,7 @@ var DefaultStreamTextResult = class {
     });
   }
   get steps() {
-    return this.stepsPromise.value;
+    return this._steps.promise;
   }
   get finalStep() {
     return this.steps.then((steps) => steps[steps.length - 1]);
@@ -7176,10 +7282,10 @@ var DefaultStreamTextResult = class {
     return this.finalStep.then((step) => step.response);
   }
   get totalUsage() {
-    return this.totalUsagePromise.value;
+    return this._totalUsage.promise;
   }
   get finishReason() {
-    return this.finishReasonPromise.value;
+    return this._finishReason.promise;
   }
   /**
   Split out a new stream from the original stream.
@@ -7299,9 +7405,8 @@ var DefaultStreamTextResult = class {
             case "source": {
               if (sendSources) {
                 controller.enqueue({
-                  type: "source",
-                  sourceType: part.sourceType,
-                  id: part.id,
+                  type: "source-url",
+                  sourceId: part.id,
                   url: part.url,
                   title: part.title,
                   providerMetadata: part.providerMetadata
@@ -8531,6 +8636,7 @@ var DefaultTranscriptionResult = class {
   NoSuchToolError,
   Output,
   RetryError,
+  TextStreamChatTransport,
   ToolCallRepairError,
   ToolExecutionError,
   TypeValidationError,
@@ -8576,7 +8682,6 @@ var DefaultTranscriptionResult = class {
   isAssistantMessageWithCompletedToolCalls,
   isDeepEqualData,
   jsonSchema,
-  maxSteps,
   modelMessageSchema,
   parsePartialJson,
   pipeTextStreamToResponse,
@@ -8585,6 +8690,7 @@ var DefaultTranscriptionResult = class {
   simulateReadableStream,
   simulateStreamingMiddleware,
   smoothStream,
+  stepCountIs,
   streamObject,
   streamText,
   systemModelMessageSchema,