ai 3.4.2 → 3.4.4

package/dist/index.mjs

@@ -2915,6 +2915,19 @@ function prepareToolsAndToolChoice({
   };
 }
 
+// core/util/split-on-last-whitespace.ts
+var lastWhitespaceRegexp = /^([\s\S]*?)(\s+)(\S*)$/;
+function splitOnLastWhitespace(text) {
+  const match = text.match(lastWhitespaceRegexp);
+  return match ? { prefix: match[1], whitespace: match[2], suffix: match[3] } : void 0;
+}
+
+// core/util/remove-text-after-last-whitespace.ts
+function removeTextAfterLastWhitespace(text) {
+  const match = splitOnLastWhitespace(text);
+  return match ? match.prefix + match.whitespace : text;
+}
+
 // core/generate-text/parse-tool-call.ts
 import { safeParseJSON as safeParseJSON2, safeValidateTypes as safeValidateTypes3 } from "@ai-sdk/provider-utils";
 import { asSchema as asSchema3 } from "@ai-sdk/ui-utils";
@@ -2990,7 +3003,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 +3048,7 @@ async function generateText({
     }),
     tracer,
     fn: async (span) => {
-      var _a12, _b, _c, _d, _e, _f;
+      var _a12, _b, _c, _d, _e;
       const retry = retryWithExponentialBackoff({ maxRetries });
       const validatedPrompt = validatePrompt({
         system,
@@ -3094,7 +3108,7 @@ async function generateText({
             }),
             tracer,
             fn: async (span2) => {
-              var _a13, _b2, _c2, _d2, _e2, _f2;
+              var _a13, _b2, _c2, _d2, _e2, _f;
               const result = await model.doGenerate({
                 mode,
                 ...callSettings,
@@ -3107,7 +3121,7 @@ async function generateText({
               const responseData = {
                 id: (_b2 = (_a13 = result.response) == null ? void 0 : _a13.id) != null ? _b2 : generateId3(),
                 timestamp: (_d2 = (_c2 = result.response) == null ? void 0 : _c2.timestamp) != null ? _d2 : currentDate(),
-                modelId: (_f2 = (_e2 = result.response) == null ? void 0 : _e2.modelId) != null ? _f2 : model.modelId
+                modelId: (_f = (_e2 = result.response) == null ? void 0 : _e2.modelId) != null ? _f : model.modelId
               };
               span2.setAttributes(
                 selectTelemetryAttributes({
@@ -3161,13 +3175,24 @@ async function generateText({
         usage.completionTokens += currentUsage.completionTokens;
         usage.promptTokens += currentUsage.promptTokens;
         usage.totalTokens += currentUsage.totalTokens;
-        if (stepType === "continuation") {
-          text += " " + ((_b = currentModelResponse.text) != null ? _b : "");
-        } else {
-          text = (_c = currentModelResponse.text) != null ? _c : "";
+        let nextStepType = "done";
+        if (++stepCount < maxSteps) {
+          if (continueSteps && currentModelResponse.finishReason === "length" && // only use continue when there are no tool calls:
+          currentToolCalls.length === 0) {
+            nextStepType = "continue";
+          } else if (
+            // there are tool calls:
+            currentToolCalls.length > 0 && // all current tool calls have results:
+            currentToolResults.length === currentToolCalls.length
+          ) {
+            nextStepType = "tool-result";
+          }
         }
+        const stepText = nextStepType === "continue" ? removeTextAfterLastWhitespace((_b = currentModelResponse.text) != null ? _b : "") : (_c = currentModelResponse.text) != null ? _c : "";
+        text = nextStepType === "continue" || stepType === "continue" ? text + stepText : stepText;
         const currentStep = {
-          text: (_d = currentModelResponse.text) != null ? _d : "",
+          stepType,
+          text: stepText,
           toolCalls: currentToolCalls,
           toolResults: currentToolResults,
           finishReason: currentModelResponse.finishReason,
@@ -3176,20 +3201,20 @@ async function generateText({
           logprobs: currentModelResponse.logprobs,
           response: {
             ...currentModelResponse.response,
-            headers: (_e = currentModelResponse.rawResponse) == null ? void 0 : _e.headers
+            headers: (_d = currentModelResponse.rawResponse) == null ? void 0 : _d.headers
           },
           experimental_providerMetadata: currentModelResponse.providerMetadata
         };
         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: stepText,
               type: "text"
             });
           }
@@ -3197,6 +3222,18 @@ async function generateText({
           promptMessages.push(
             convertToLanguageModelMessage(lastResponseMessage, null)
           );
+        } else if (nextStepType === "continue") {
+          const newResponseMessages = toResponseMessages({
+            text,
+            toolCalls: currentToolCalls,
+            toolResults: currentToolResults
+          });
+          responseMessages.push(...newResponseMessages);
+          promptMessages.push(
+            ...newResponseMessages.map(
+              (message) => convertToLanguageModelMessage(message, null)
+            )
+          );
         } else {
           const newResponseMessages = toResponseMessages({
             text: currentModelResponse.text,
@@ -3210,20 +3247,7 @@ async function generateText({
             )
           );
         }
-        if (++stepCount >= maxSteps) {
-          stepType = "done";
-        } else if (continuationSteps === true && currentStep.finishReason === "length" && // only use continuation when there are no tool calls:
-        currentToolCalls.length === 0) {
-          stepType = "continuation";
-        } else if (
-          // there are tool calls:
-          currentToolCalls.length > 0 && // all current tool calls have results:
-          currentToolResults.length === currentToolCalls.length
-        ) {
-          stepType = "tool-result";
-        } else {
-          stepType = "done";
-        }
+        stepType = nextStepType;
       } while (stepType !== "done");
       span.setAttributes(
         selectTelemetryAttributes({
@@ -3258,7 +3282,7 @@ async function generateText({
         warnings: currentModelResponse.warnings,
         response: {
           ...currentModelResponse.response,
-          headers: (_f = currentModelResponse.rawResponse) == null ? void 0 : _f.headers
+          headers: (_e = currentModelResponse.rawResponse) == null ? void 0 : _e.headers
         },
         logprobs: currentModelResponse.logprobs,
         responseMessages,
@@ -3704,6 +3728,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 +3873,7 @@ async function streamText({
         telemetry,
         startTimestampMs,
         maxSteps,
+        continueSteps,
         startStep,
         promptMessages,
         modelId: model.modelId,
@@ -3871,6 +3897,7 @@ var DefaultStreamTextResult = class {
     telemetry,
     startTimestampMs,
     maxSteps,
+    continueSteps,
     startStep,
     promptMessages,
     modelId,
@@ -3922,7 +3949,9 @@ var DefaultStreamTextResult = class {
         promptTokens: 0,
         completionTokens: 0,
         totalTokens: 0
-      }
+      },
+      stepType,
+      previousStepText = ""
     }) {
       const stepToolCalls = [];
       const stepToolResults = [];
@@ -3935,12 +3964,25 @@ var DefaultStreamTextResult = class {
       let stepProviderMetadata;
       let stepFirstChunk = true;
       let stepText = "";
+      let fullStepText = stepType === "continue" ? previousStepText : "";
       let stepLogProbs;
       let stepResponse = {
         id: generateId3(),
         timestamp: currentDate(),
         modelId
       };
+      let chunkBuffer = "";
+      let chunkTextPublished = false;
+      async function publishTextChunk({
+        controller,
+        chunk
+      }) {
+        controller.enqueue(chunk);
+        stepText += chunk.textDelta;
+        fullStepText += chunk.textDelta;
+        chunkTextPublished = true;
+        await (onChunk == null ? void 0 : onChunk({ chunk }));
+      }
       addStream(
         stream2.pipeThrough(
           new TransformStream({
@@ -3966,9 +4008,22 @@ var DefaultStreamTextResult = class {
               const chunkType = chunk.type;
               switch (chunkType) {
                 case "text-delta": {
-                  controller.enqueue(chunk);
-                  stepText += chunk.textDelta;
-                  await (onChunk == null ? void 0 : onChunk({ chunk }));
+                  if (continueSteps) {
+                    chunkBuffer += chunk.textDelta;
+                    const split = splitOnLastWhitespace(chunkBuffer);
+                    if (split != null) {
+                      chunkBuffer = split.suffix;
+                      await publishTextChunk({
+                        controller,
+                        chunk: {
+                          type: "text-delta",
+                          textDelta: split.prefix + split.whitespace
+                        }
+                      });
+                    }
+                  } else {
+                    await publishTextChunk({ controller, chunk });
+                  }
                   break;
                 }
                 case "tool-call": {
@@ -4024,6 +4079,30 @@ var DefaultStreamTextResult = class {
             // invoke onFinish callback and resolve toolResults promise when the stream is about to close:
             async flush(controller) {
               const stepToolCallsJson = stepToolCalls.length > 0 ? JSON.stringify(stepToolCalls) : void 0;
+              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 (continueSteps && chunkBuffer.length > 0 && (nextStepType !== "continue" || // when the next step is a regular step, publish the buffer
+              stepType === "continue" && !chunkTextPublished)) {
+                await publishTextChunk({
+                  controller,
+                  chunk: {
+                    type: "text-delta",
+                    textDelta: chunkBuffer
+                  }
+                });
+                chunkBuffer = "";
+              }
               try {
                 doStreamSpan2.setAttributes(
                   selectTelemetryAttributes({
@@ -4067,6 +4146,7 @@ var DefaultStreamTextResult = class {
                 response: stepResponse
               });
               const stepResult = {
+                stepType,
                 text: stepText,
                 toolCalls: stepToolCalls,
                 toolResults: stepToolResults,
@@ -4085,21 +4165,24 @@ 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({
+              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 +4199,9 @@ var DefaultStreamTextResult = class {
                   doStreamSpan: doStreamSpan3,
                   currentStep: currentStep + 1,
                   promptMessages: promptMessages2,
-                  usage: combinedUsage
+                  usage: combinedUsage,
+                  stepType: nextStepType,
+                  previousStepText: fullStepText
                 });
                 return;
               }
@@ -4135,7 +4220,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 +4228,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 +4273,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 +4306,8 @@ var DefaultStreamTextResult = class {
       doStreamSpan,
       currentStep: 0,
       promptMessages,
-      usage: void 0
+      usage: void 0,
+      stepType: "initial"
     });
   }
   /**