ai 3.4.2 → 3.4.3

package/dist/index.mjs

@@ -2990,7 +2990,8 @@ async function generateText({
   maxAutomaticRoundtrips = 0,
   maxToolRoundtrips = maxAutomaticRoundtrips,
   maxSteps = maxToolRoundtrips != null ? maxToolRoundtrips + 1 : 1,
-  experimental_continuationSteps: continuationSteps = false,
+  experimental_continuationSteps,
+  experimental_continueSteps: continueSteps = experimental_continuationSteps != null ? experimental_continuationSteps : false,
   experimental_telemetry: telemetry,
   experimental_providerMetadata: providerMetadata,
   _internal: {
@@ -3034,7 +3035,7 @@ async function generateText({
     }),
     tracer,
     fn: async (span) => {
-      var _a12, _b, _c, _d, _e, _f;
+      var _a12, _b, _c, _d, _e, _f, _g;
       const retry = retryWithExponentialBackoff({ maxRetries });
       const validatedPrompt = validatePrompt({
         system,
@@ -3161,12 +3162,13 @@ async function generateText({
         usage.completionTokens += currentUsage.completionTokens;
         usage.promptTokens += currentUsage.promptTokens;
         usage.totalTokens += currentUsage.totalTokens;
-        if (stepType === "continuation") {
-          text += " " + ((_b = currentModelResponse.text) != null ? _b : "");
+        if (stepType === "continue") {
+          text += (_b = currentModelResponse.text) != null ? _b : "";
         } else {
           text = (_c = currentModelResponse.text) != null ? _c : "";
         }
         const currentStep = {
+          stepType,
           text: (_d = currentModelResponse.text) != null ? _d : "",
           toolCalls: currentToolCalls,
           toolResults: currentToolResults,
@@ -3182,14 +3184,14 @@ async function generateText({
         };
         steps.push(currentStep);
         await (onStepFinish == null ? void 0 : onStepFinish(currentStep));
-        if (stepType === "continuation") {
+        if (stepType === "continue") {
           const lastResponseMessage = responseMessages.pop();
           promptMessages.pop();
           if (typeof lastResponseMessage.content === "string") {
             lastResponseMessage.content = text;
           } else {
             lastResponseMessage.content.push({
-              text: " " + currentModelResponse.text,
+              text: (_f = currentModelResponse.text) != null ? _f : "",
               type: "text"
             });
           }
@@ -3212,9 +3214,9 @@ async function generateText({
         }
         if (++stepCount >= maxSteps) {
           stepType = "done";
-        } else if (continuationSteps === true && currentStep.finishReason === "length" && // only use continuation when there are no tool calls:
+        } else if (continueSteps && currentStep.finishReason === "length" && // only use continue when there are no tool calls:
         currentToolCalls.length === 0) {
-          stepType = "continuation";
+          stepType = "continue";
         } else if (
           // there are tool calls:
           currentToolCalls.length > 0 && // all current tool calls have results:
@@ -3258,7 +3260,7 @@ async function generateText({
         warnings: currentModelResponse.warnings,
         response: {
           ...currentModelResponse.response,
-          headers: (_f = currentModelResponse.rawResponse) == null ? void 0 : _f.headers
+          headers: (_g = currentModelResponse.rawResponse) == null ? void 0 : _g.headers
         },
         logprobs: currentModelResponse.logprobs,
         responseMessages,
@@ -3704,6 +3706,7 @@ async function streamText({
   headers,
   maxToolRoundtrips = 0,
   maxSteps = maxToolRoundtrips != null ? maxToolRoundtrips + 1 : 1,
+  experimental_continueSteps: continueSteps = false,
   experimental_telemetry: telemetry,
   experimental_providerMetadata: providerMetadata,
   experimental_toolCallStreaming: toolCallStreaming = false,
@@ -3848,6 +3851,7 @@ async function streamText({
         telemetry,
         startTimestampMs,
         maxSteps,
+        continueSteps,
         startStep,
         promptMessages,
         modelId: model.modelId,
@@ -3871,6 +3875,7 @@ var DefaultStreamTextResult = class {
     telemetry,
     startTimestampMs,
     maxSteps,
+    continueSteps,
     startStep,
     promptMessages,
     modelId,
@@ -3922,7 +3927,9 @@ var DefaultStreamTextResult = class {
         promptTokens: 0,
         completionTokens: 0,
         totalTokens: 0
-      }
+      },
+      stepType,
+      previousStepText = ""
     }) {
       const stepToolCalls = [];
       const stepToolResults = [];
@@ -3935,6 +3942,7 @@ var DefaultStreamTextResult = class {
       let stepProviderMetadata;
       let stepFirstChunk = true;
       let stepText = "";
+      let fullStepText = stepType === "continue" ? previousStepText : "";
       let stepLogProbs;
       let stepResponse = {
         id: generateId3(),
@@ -3968,6 +3976,7 @@ var DefaultStreamTextResult = class {
                 case "text-delta": {
                   controller.enqueue(chunk);
                   stepText += chunk.textDelta;
+                  fullStepText += chunk.textDelta;
                   await (onChunk == null ? void 0 : onChunk({ chunk }));
                   break;
                 }
@@ -4067,6 +4076,7 @@ var DefaultStreamTextResult = class {
                 response: stepResponse
               });
               const stepResult = {
+                stepType,
                 text: stepText,
                 toolCalls: stepToolCalls,
                 toolResults: stepToolResults,
@@ -4085,21 +4095,37 @@ var DefaultStreamTextResult = class {
                 completionTokens: usage.completionTokens + stepUsage.completionTokens,
                 totalTokens: usage.totalTokens + stepUsage.totalTokens
               };
-              if (
-                // there are tool calls:
-                stepToolCalls.length > 0 && // all current tool calls have results:
-                stepToolResults.length === stepToolCalls.length && // the number of steps is less than the maximum:
-                currentStep + 1 < maxSteps
-              ) {
-                promptMessages2.push(
-                  ...toResponseMessages({
+              let nextStepType = "done";
+              if (currentStep + 1 < maxSteps) {
+                if (continueSteps && stepFinishReason === "length" && // only use continue when there are no tool calls:
+                stepToolCalls.length === 0) {
+                  nextStepType = "continue";
+                } else if (
+                  // there are tool calls:
+                  stepToolCalls.length > 0 && // all current tool calls have results:
+                  stepToolResults.length === stepToolCalls.length
+                ) {
+                  nextStepType = "tool-result";
+                }
+              }
+              if (nextStepType !== "done") {
+                if (stepType === "continue") {
+                  const lastPromptMessage = promptMessages2[promptMessages2.length - 1];
+                  lastPromptMessage.content.push({
                     text: stepText,
-                    toolCalls: stepToolCalls,
-                    toolResults: stepToolResults
-                  }).map(
-                    (message) => convertToLanguageModelMessage(message, null)
-                  )
-                );
+                    type: "text"
+                  });
+                } else {
+                  promptMessages2.push(
+                    ...toResponseMessages({
+                      text: stepText,
+                      toolCalls: stepToolCalls,
+                      toolResults: stepToolResults
+                    }).map(
+                      (message) => convertToLanguageModelMessage(message, null)
+                    )
+                  );
+                }
                 const {
                   result,
                   doStreamSpan: doStreamSpan3,
@@ -4116,7 +4142,9 @@ var DefaultStreamTextResult = class {
                   doStreamSpan: doStreamSpan3,
                   currentStep: currentStep + 1,
                   promptMessages: promptMessages2,
-                  usage: combinedUsage
+                  usage: combinedUsage,
+                  stepType: nextStepType,
+                  previousStepText: fullStepText
                 });
                 return;
               }
@@ -4135,7 +4163,7 @@ var DefaultStreamTextResult = class {
                     telemetry,
                     attributes: {
                       "ai.response.finishReason": stepFinishReason,
-                      "ai.response.text": { output: () => stepText },
+                      "ai.response.text": { output: () => fullStepText },
                       "ai.response.toolCalls": {
                         output: () => stepToolCallsJson
                       },
@@ -4143,27 +4171,38 @@ var DefaultStreamTextResult = class {
                       "ai.usage.completionTokens": combinedUsage.completionTokens,
                       // deprecated
                       "ai.finishReason": stepFinishReason,
-                      "ai.result.text": { output: () => stepText },
+                      "ai.result.text": { output: () => fullStepText },
                       "ai.result.toolCalls": {
                         output: () => stepToolCallsJson
                       }
                     }
                   })
                 );
-                const responseMessages = stepResults.reduce(
-                  (responseMessages2, step) => [
+                const responseMessages = stepResults.reduce((responseMessages2, step) => {
+                  if (step.stepType === "continue") {
+                    const lastResponseMessage = responseMessages2.pop();
+                    if (typeof lastResponseMessage.content === "string") {
+                      lastResponseMessage.content += step.text;
+                    } else {
+                      lastResponseMessage.content.push({
+                        text: step.text,
+                        type: "text"
+                      });
+                    }
+                    return [...responseMessages2, lastResponseMessage];
+                  }
+                  return [
                     ...responseMessages2,
                     ...toResponseMessages({
                       text: step.text,
                       toolCalls: step.toolCalls,
                       toolResults: step.toolResults
                     })
-                  ],
-                  []
-                );
+                  ];
+                }, []);
                 resolveUsage(combinedUsage);
                 resolveFinishReason(stepFinishReason);
-                resolveText(stepText);
+                resolveText(fullStepText);
                 resolveToolCalls(stepToolCalls);
                 resolveProviderMetadata(stepProviderMetadata);
                 resolveToolResults(stepToolResults);
@@ -4177,7 +4216,7 @@ var DefaultStreamTextResult = class {
                   finishReason: stepFinishReason,
                   logprobs: stepLogProbs,
                   usage: combinedUsage,
-                  text: stepText,
+                  text: fullStepText,
                   toolCalls: stepToolCalls,
                   // The tool results are inferred as a never[] type, because they are
                   // optional and the execute method with an inferred result type is
@@ -4210,7 +4249,8 @@ var DefaultStreamTextResult = class {
       doStreamSpan,
       currentStep: 0,
       promptMessages,
-      usage: void 0
+      usage: void 0,
+      stepType: "initial"
     });
   }
   /**