ai 5.0.0-alpha.3 → 5.0.0-alpha.4

package/dist/index.js

@@ -93,7 +93,6 @@ __export(src_exports, {
   isAssistantMessageWithCompletedToolCalls: () => isAssistantMessageWithCompletedToolCalls,
   isDeepEqualData: () => isDeepEqualData,
   jsonSchema: () => import_provider_utils26.jsonSchema,
-  maxSteps: () => maxSteps,
   modelMessageSchema: () => modelMessageSchema,
   parsePartialJson: () => parsePartialJson,
   pipeTextStreamToResponse: () => pipeTextStreamToResponse,
@@ -102,6 +101,7 @@ __export(src_exports, {
   simulateReadableStream: () => simulateReadableStream,
   simulateStreamingMiddleware: () => simulateStreamingMiddleware,
   smoothStream: () => smoothStream,
+  stepCountIs: () => stepCountIs,
   streamObject: () => streamObject,
   streamText: () => streamText,
   systemModelMessageSchema: () => systemModelMessageSchema,
@@ -1670,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) {
@@ -1721,7 +1721,7 @@ var ChatStore = class {
     chats = {},
     generateId: generateId3,
     transport,
-    maxSteps: maxSteps2 = 1,
+    maxSteps = 1,
     messageMetadataSchema,
     dataPartSchemas
   }) {
@@ -1737,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;
@@ -2326,7 +2326,7 @@ function defaultChatStore({
   generateId: generateId3 = import_provider_utils6.generateId,
   dataPartSchemas,
   messageMetadataSchema,
-  maxSteps: maxSteps2 = 1,
+  maxSteps = 1,
   chats
 }) {
   return new ChatStore({
@@ -2341,7 +2341,7 @@ function defaultChatStore({
     generateId: generateId3,
     messageMetadataSchema,
     dataPartSchemas,
-    maxSteps: maxSteps2,
+    maxSteps,
     chats
   });
 }
@@ -5465,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");
 
@@ -5682,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 }) => {
@@ -5693,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({
@@ -5767,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,
@@ -5781,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({
@@ -5844,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(
           () => {
@@ -5989,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({
@@ -6336,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({
@@ -6551,13 +6560,15 @@ function streamText({
   maxRetries,
   abortSignal,
   headers,
-  continueUntil = maxSteps(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,
@@ -6587,9 +6598,10 @@ function streamText({
     transforms: asArray(transform),
     activeTools,
     repairToolCall,
-    continueUntil,
+    stopConditions: asArray(stopWhen),
     output,
     providerOptions,
+    prepareStep,
     onChunk,
     onError,
     onFinish,
@@ -6664,9 +6676,10 @@ var DefaultStreamTextResult = class {
     transforms,
     activeTools,
     repairToolCall,
-    continueUntil,
+    stopConditions,
     output,
     providerOptions,
+    prepareStep,
     now: now2,
     currentDate,
     generateId: generateId3,
@@ -6885,6 +6898,7 @@ var DefaultStreamTextResult = class {
           responseMessages,
           usage
         }) {
+          var _a17, _b, _c;
           stepFinish = new DelayedPromise();
           const initialPrompt = await standardizePrompt({
             system,
@@ -6895,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,
@@ -6902,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,
@@ -6920,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,
@@ -6954,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,
@@ -7009,7 +7031,7 @@ var DefaultStreamTextResult = class {
             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;
@@ -7072,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;
                     }
@@ -7163,7 +7185,11 @@ var DefaultStreamTextResult = class {
                   const combinedUsage = addLanguageModelUsage(usage, stepUsage);
                   await stepFinish.promise;
                   if (stepToolCalls.length > 0 && // all current tool calls have results:
-                  stepToolResults.length === stepToolCalls.length && !await continueUntil({ steps: recordedSteps })) {
+                  stepToolResults.length === stepToolCalls.length && // continue until a stop condition is met:
+                  !await isStopConditionMet({
+                    stopConditions,
+                    steps: recordedSteps
+                  })) {
                     responseMessages.push(
                       ...toResponseMessages({
                         content: stepContent,
@@ -8656,7 +8682,6 @@ var DefaultTranscriptionResult = class {
   isAssistantMessageWithCompletedToolCalls,
   isDeepEqualData,
   jsonSchema,
-  maxSteps,
   modelMessageSchema,
   parsePartialJson,
   pipeTextStreamToResponse,
@@ -8665,6 +8690,7 @@ var DefaultTranscriptionResult = class {
   simulateReadableStream,
   simulateStreamingMiddleware,
   smoothStream,
+  stepCountIs,
   streamObject,
   streamText,
   systemModelMessageSchema,