ai 3.3.21 → 3.3.23

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # ai
 
+## 3.3.23
+
+### Patch Changes
+
+- b55e6f7: fix (ai/core): streamObject text stream in array mode must not include elements: prefix.
+
+## 3.3.22
+
+### Patch Changes
+
+- a5a56fd: fix (ai/core): only send roundtrip-finish event after async tool calls are done
+
 ## 3.3.21
 
 ### Patch Changes

package/dist/index.js

@@ -1491,8 +1491,8 @@ function createAsyncIterableStream(source, transformer) {
 var noSchemaOutputStrategy = {
   type: "no-schema",
   jsonSchema: void 0,
-  validatePartialResult({ value }) {
-    return { success: true, value };
+  validatePartialResult({ value, textDelta }) {
+    return { success: true, value: { partial: value, textDelta } };
   },
   validateFinalResult(value) {
     return value === void 0 ? { success: false, error: new NoObjectGeneratedError() } : { success: true, value };
@@ -1506,8 +1506,15 @@ var noSchemaOutputStrategy = {
 var objectOutputStrategy = (schema) => ({
   type: "object",
   jsonSchema: schema.jsonSchema,
-  validatePartialResult({ value }) {
-    return { success: true, value };
+  validatePartialResult({ value, textDelta }) {
+    return {
+      success: true,
+      value: {
+        // Note: currently no validation of partial results:
+        partial: value,
+        textDelta
+      }
+    };
   },
   validateFinalResult(value) {
     return (0, import_provider_utils5.safeValidateTypes)({ value, schema });
@@ -1521,7 +1528,7 @@ var objectOutputStrategy = (schema) => ({
 var arrayOutputStrategy = (schema) => {
   const { $schema, ...itemSchema } = schema.jsonSchema;
   return {
-    type: "object",
+    type: "array",
     // wrap in object that contains array of elements, since most LLMs will not
     // be able to generate an array directly:
     // possible future optimization: use arrays directly when model supports grammar-guided generation
@@ -1534,10 +1541,8 @@ var arrayOutputStrategy = (schema) => {
       required: ["elements"],
       additionalProperties: false
     },
-    validatePartialResult({
-      value,
-      parseState
-    }) {
+    validatePartialResult({ value, latestObject, isFirstDelta, isFinalDelta }) {
+      var _a11;
       if (!(0, import_provider9.isJSONObject)(value) || !(0, import_provider9.isJSONArray)(value.elements)) {
         return {
           success: false,
@@ -1552,7 +1557,7 @@ var arrayOutputStrategy = (schema) => {
       for (let i = 0; i < inputArray.length; i++) {
         const element = inputArray[i];
         const result = (0, import_provider_utils5.safeValidateTypes)({ value: element, schema });
-        if (i === inputArray.length - 1 && (!result.success || parseState !== "successful-parse")) {
+        if (i === inputArray.length - 1 && !isFinalDelta) {
           continue;
         }
         if (!result.success) {
@@ -1560,7 +1565,25 @@ var arrayOutputStrategy = (schema) => {
         }
         resultArray.push(result.value);
       }
-      return { success: true, value: resultArray };
+      const publishedElementCount = (_a11 = latestObject == null ? void 0 : latestObject.length) != null ? _a11 : 0;
+      let textDelta = "";
+      if (isFirstDelta) {
+        textDelta += "[";
+      }
+      if (publishedElementCount > 0) {
+        textDelta += ",";
+      }
+      textDelta += resultArray.slice(publishedElementCount).map((element) => JSON.stringify(element)).join(",");
+      if (isFinalDelta) {
+        textDelta += "]";
+      }
+      return {
+        success: true,
+        value: {
+          partial: resultArray,
+          textDelta
+        }
+      };
     },
     validateFinalResult(value) {
       if (!(0, import_provider9.isJSONObject)(value) || !(0, import_provider9.isJSONArray)(value.elements)) {
@@ -2301,17 +2324,18 @@ var DefaultStreamObjectResult = class {
     let object;
     let error;
     let accumulatedText = "";
-    let delta = "";
+    let textDelta = "";
     let latestObjectJson = void 0;
     let latestObject = void 0;
-    let firstChunk = true;
+    let isFirstChunk = true;
+    let isFirstDelta = true;
     const self = this;
     this.originalStream = stream.pipeThrough(
       new TransformStream({
         async transform(chunk, controller) {
-          if (firstChunk) {
+          if (isFirstChunk) {
             const msToFirstChunk = performance.now() - startTimestamp;
-            firstChunk = false;
+            isFirstChunk = false;
             doStreamSpan.addEvent("ai.stream.firstChunk", {
               "ai.stream.msToFirstChunk": msToFirstChunk
             });
@@ -2321,36 +2345,37 @@ var DefaultStreamObjectResult = class {
           }
           if (typeof chunk === "string") {
             accumulatedText += chunk;
-            delta += chunk;
+            textDelta += chunk;
             const { value: currentObjectJson, state: parseState } = (0, import_ui_utils2.parsePartialJson)(accumulatedText);
             if (currentObjectJson !== void 0 && !(0, import_ui_utils2.isDeepEqualData)(latestObjectJson, currentObjectJson)) {
               const validationResult = outputStrategy.validatePartialResult({
                 value: currentObjectJson,
-                parseState
+                textDelta,
+                latestObject,
+                isFirstDelta,
+                isFinalDelta: parseState === "successful-parse"
               });
-              if (validationResult.success && !(0, import_ui_utils2.isDeepEqualData)(latestObject, validationResult.value)) {
+              if (validationResult.success && !(0, import_ui_utils2.isDeepEqualData)(latestObject, validationResult.value.partial)) {
                 latestObjectJson = currentObjectJson;
-                latestObject = validationResult.value;
+                latestObject = validationResult.value.partial;
                 controller.enqueue({
                   type: "object",
                   object: latestObject
                 });
                 controller.enqueue({
                   type: "text-delta",
-                  textDelta: delta
+                  textDelta: validationResult.value.textDelta
                 });
-                delta = "";
+                textDelta = "";
+                isFirstDelta = false;
               }
             }
             return;
           }
           switch (chunk.type) {
             case "finish": {
-              if (delta !== "") {
-                controller.enqueue({
-                  type: "text-delta",
-                  textDelta: delta
-                });
+              if (textDelta !== "") {
+                controller.enqueue({ type: "text-delta", textDelta });
               }
               finishReason = chunk.finishReason;
               usage = calculateCompletionTokenUsage(chunk.usage);
@@ -3560,13 +3585,6 @@ var DefaultStreamTextResult = class {
                   roundtripFinishReason = chunk.finishReason;
                   roundtripProviderMetadata = chunk.experimental_providerMetadata;
                   roundtripLogProbs = chunk.logprobs;
-                  controller.enqueue({
-                    type: "roundtrip-finish",
-                    finishReason: chunk.finishReason,
-                    usage: chunk.usage,
-                    experimental_providerMetadata: chunk.experimental_providerMetadata,
-                    logprobs: chunk.logprobs
-                  });
                   break;
                 case "tool-call-streaming-start":
                 case "tool-call-delta": {
@@ -3586,6 +3604,13 @@ var DefaultStreamTextResult = class {
             },
             // invoke onFinish callback and resolve toolResults promise when the stream is about to close:
             async flush(controller) {
+              controller.enqueue({
+                type: "roundtrip-finish",
+                finishReason: roundtripFinishReason,
+                usage: roundtripUsage,
+                experimental_providerMetadata: roundtripProviderMetadata,
+                logprobs: roundtripLogProbs
+              });
               const telemetryToolCalls = roundtripToolCalls.length > 0 ? JSON.stringify(roundtripToolCalls) : void 0;
               try {
                 doStreamSpan2.setAttributes(