ai 3.4.3 → 3.4.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # ai
 
+## 3.4.4
+
+### Patch Changes
+
+- 4db074b: fix (ai/core): correct whitespace in generateText continueSteps
+- 1297e1b: fix (ai/core): correct whitespace in streamText continueSteps
+
 ## 3.4.3
 
 ### Patch Changes

package/dist/index.js

@@ -2977,6 +2977,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
 var import_provider_utils8 = require("@ai-sdk/provider-utils");
 var import_ui_utils4 = require("@ai-sdk/ui-utils");
@@ -3097,7 +3110,7 @@ async function generateText({
     }),
     tracer,
     fn: async (span) => {
-      var _a12, _b, _c, _d, _e, _f, _g;
+      var _a12, _b, _c, _d, _e;
       const retry = retryWithExponentialBackoff({ maxRetries });
       const validatedPrompt = validatePrompt({
         system,
@@ -3157,7 +3170,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,
@@ -3170,7 +3183,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({
@@ -3224,14 +3237,24 @@ async function generateText({
         usage.completionTokens += currentUsage.completionTokens;
         usage.promptTokens += currentUsage.promptTokens;
         usage.totalTokens += currentUsage.totalTokens;
-        if (stepType === "continue") {
-          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 = {
           stepType,
-          text: (_d = currentModelResponse.text) != null ? _d : "",
+          text: stepText,
           toolCalls: currentToolCalls,
           toolResults: currentToolResults,
           finishReason: currentModelResponse.finishReason,
@@ -3240,7 +3263,7 @@ 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
         };
@@ -3253,7 +3276,7 @@ async function generateText({
             lastResponseMessage.content = text;
           } else {
             lastResponseMessage.content.push({
-              text: (_f = currentModelResponse.text) != null ? _f : "",
+              text: stepText,
               type: "text"
             });
           }
@@ -3261,6 +3284,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,
@@ -3274,20 +3309,7 @@ async function generateText({
             )
           );
         }
-        if (++stepCount >= maxSteps) {
-          stepType = "done";
-        } else if (continueSteps && currentStep.finishReason === "length" && // only use continue when there are no tool calls:
-        currentToolCalls.length === 0) {
-          stepType = "continue";
-        } 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({
@@ -3322,7 +3344,7 @@ async function generateText({
         warnings: currentModelResponse.warnings,
         response: {
           ...currentModelResponse.response,
-          headers: (_g = currentModelResponse.rawResponse) == null ? void 0 : _g.headers
+          headers: (_e = currentModelResponse.rawResponse) == null ? void 0 : _e.headers
         },
         logprobs: currentModelResponse.logprobs,
         responseMessages,
@@ -4011,6 +4033,18 @@ var DefaultStreamTextResult = class {
         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({
@@ -4036,10 +4070,22 @@ var DefaultStreamTextResult = class {
               const chunkType = chunk.type;
               switch (chunkType) {
                 case "text-delta": {
-                  controller.enqueue(chunk);
-                  stepText += chunk.textDelta;
-                  fullStepText += 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": {
@@ -4095,6 +4141,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({
@@ -4157,19 +4227,6 @@ var DefaultStreamTextResult = class {
                 completionTokens: usage.completionTokens + stepUsage.completionTokens,
                 totalTokens: usage.totalTokens + stepUsage.totalTokens
               };
-              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];