ai 6.0.36 → 6.0.37

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # ai
 
+## 6.0.37
+
+### Patch Changes
+
+- b5dab9b: fix(ai): maintain OpenTelemetry context across async generator yields
+
+  Fixes an issue where OpenTelemetry context was lost at async generator yield boundaries, causing nested ToolLoopAgent spans to escape to the parent agent's level in observability platforms.
+
+  The fix ensures that when `recordSpan` is used with async generators (e.g., in tool execution), the active context is explicitly maintained using `context.with()`, preventing span hierarchy corruption in nested agent scenarios.
+
+  Closes #11720
+
 ## 6.0.36
 
 ### Patch Changes

package/dist/index.js

@@ -1049,7 +1049,7 @@ var import_provider_utils3 = require("@ai-sdk/provider-utils");
 var import_provider_utils4 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.36" : "0.0.0-test";
+var VERSION = true ? "6.0.37" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({ url }) => {
@@ -2093,8 +2093,9 @@ async function recordSpan({
     name17,
     { attributes: await attributes },
     async (span) => {
+      const ctx = import_api2.context.active();
       try {
-        const result = await fn(span);
+        const result = await import_api2.context.with(ctx, () => fn(span));
         if (endWhenDone) {
           span.end();
         }
@@ -3046,16 +3047,16 @@ var object = ({
       ...name17 != null && { name: name17 },
       ...description != null && { description }
     })),
-    async parseCompleteOutput({ text: text2 }, context) {
+    async parseCompleteOutput({ text: text2 }, context2) {
       const parseResult = await (0, import_provider_utils13.safeParseJSON)({ text: text2 });
       if (!parseResult.success) {
         throw new NoObjectGeneratedError({
           message: "No object generated: could not parse the response.",
           cause: parseResult.error,
           text: text2,
-          response: context.response,
-          usage: context.usage,
-          finishReason: context.finishReason
+          response: context2.response,
+          usage: context2.usage,
+          finishReason: context2.finishReason
         });
       }
       const validationResult = await (0, import_provider_utils13.safeValidateTypes)({
@@ -3067,9 +3068,9 @@ var object = ({
           message: "No object generated: response did not match schema.",
           cause: validationResult.error,
           text: text2,
-          response: context.response,
-          usage: context.usage,
-          finishReason: context.finishReason
+          response: context2.response,
+          usage: context2.usage,
+          finishReason: context2.finishReason
         });
       }
       return validationResult.value;
@@ -3121,16 +3122,16 @@ var array = ({
         ...description != null && { description }
       };
     }),
-    async parseCompleteOutput({ text: text2 }, context) {
+    async parseCompleteOutput({ text: text2 }, context2) {
       const parseResult = await (0, import_provider_utils13.safeParseJSON)({ text: text2 });
       if (!parseResult.success) {
         throw new NoObjectGeneratedError({
           message: "No object generated: could not parse the response.",
           cause: parseResult.error,
           text: text2,
-          response: context.response,
-          usage: context.usage,
-          finishReason: context.finishReason
+          response: context2.response,
+          usage: context2.usage,
+          finishReason: context2.finishReason
         });
       }
       const outerValue = parseResult.value;
@@ -3142,9 +3143,9 @@ var array = ({
             cause: "response must be an object with an elements array"
           }),
           text: text2,
-          response: context.response,
-          usage: context.usage,
-          finishReason: context.finishReason
+          response: context2.response,
+          usage: context2.usage,
+          finishReason: context2.finishReason
         });
       }
       for (const element of outerValue.elements) {
@@ -3157,9 +3158,9 @@ var array = ({
             message: "No object generated: response did not match schema.",
             cause: validationResult.error,
             text: text2,
-            response: context.response,
-            usage: context.usage,
-            finishReason: context.finishReason
+            response: context2.response,
+            usage: context2.usage,
+            finishReason: context2.finishReason
           });
         }
       }
@@ -3229,16 +3230,16 @@ var choice = ({
       ...name17 != null && { name: name17 },
       ...description != null && { description }
     }),
-    async parseCompleteOutput({ text: text2 }, context) {
+    async parseCompleteOutput({ text: text2 }, context2) {
       const parseResult = await (0, import_provider_utils13.safeParseJSON)({ text: text2 });
       if (!parseResult.success) {
         throw new NoObjectGeneratedError({
           message: "No object generated: could not parse the response.",
           cause: parseResult.error,
           text: text2,
-          response: context.response,
-          usage: context.usage,
-          finishReason: context.finishReason
+          response: context2.response,
+          usage: context2.usage,
+          finishReason: context2.finishReason
         });
       }
       const outerValue = parseResult.value;
@@ -3250,9 +3251,9 @@ var choice = ({
             cause: "response must be an object that contains a choice value."
           }),
           text: text2,
-          response: context.response,
-          usage: context.usage,
-          finishReason: context.finishReason
+          response: context2.response,
+          usage: context2.usage,
+          finishReason: context2.finishReason
         });
       }
       return outerValue.result;
@@ -3297,16 +3298,16 @@ var json = ({
       ...name17 != null && { name: name17 },
       ...description != null && { description }
     }),
-    async parseCompleteOutput({ text: text2 }, context) {
+    async parseCompleteOutput({ text: text2 }, context2) {
       const parseResult = await (0, import_provider_utils13.safeParseJSON)({ text: text2 });
       if (!parseResult.success) {
         throw new NoObjectGeneratedError({
           message: "No object generated: could not parse the response.",
           cause: parseResult.error,
           text: text2,
-          response: context.response,
-          usage: context.usage,
-          finishReason: context.finishReason
+          response: context2.response,
+          usage: context2.usage,
+          finishReason: context2.finishReason
         });
       }
       return parseResult.value;
@@ -8853,15 +8854,15 @@ var noSchemaOutputStrategy = {
   async validatePartialResult({ value, textDelta }) {
     return { success: true, value: { partial: value, textDelta } };
   },
-  async validateFinalResult(value, context) {
+  async validateFinalResult(value, context2) {
     return value === void 0 ? {
       success: false,
       error: new NoObjectGeneratedError({
         message: "No object generated: response did not match schema.",
-        text: context.text,
-        response: context.response,
-        usage: context.usage,
-        finishReason: context.finishReason
+        text: context2.text,
+        response: context2.response,
+        usage: context2.usage,
+        finishReason: context2.finishReason
       })
     } : { success: true, value };
   },
@@ -9107,24 +9108,24 @@ function getOutputStrategy({
 // src/generate-object/parse-and-validate-object-result.ts
 var import_provider28 = require("@ai-sdk/provider");
 var import_provider_utils27 = require("@ai-sdk/provider-utils");
-async function parseAndValidateObjectResult(result, outputStrategy, context) {
+async function parseAndValidateObjectResult(result, outputStrategy, context2) {
   const parseResult = await (0, import_provider_utils27.safeParseJSON)({ text: result });
   if (!parseResult.success) {
     throw new NoObjectGeneratedError({
       message: "No object generated: could not parse the response.",
       cause: parseResult.error,
       text: result,
-      response: context.response,
-      usage: context.usage,
-      finishReason: context.finishReason
+      response: context2.response,
+      usage: context2.usage,
+      finishReason: context2.finishReason
     });
   }
   const validationResult = await outputStrategy.validateFinalResult(
     parseResult.value,
     {
       text: result,
-      response: context.response,
-      usage: context.usage
+      response: context2.response,
+      usage: context2.usage
     }
   );
   if (!validationResult.success) {
@@ -9132,16 +9133,16 @@ async function parseAndValidateObjectResult(result, outputStrategy, context) {
       message: "No object generated: response did not match schema.",
       cause: validationResult.error,
       text: result,
-      response: context.response,
-      usage: context.usage,
-      finishReason: context.finishReason
+      response: context2.response,
+      usage: context2.usage,
+      finishReason: context2.finishReason
     });
   }
   return validationResult.value;
 }
-async function parseAndValidateObjectResultWithRepair(result, outputStrategy, repairText, context) {
+async function parseAndValidateObjectResultWithRepair(result, outputStrategy, repairText, context2) {
   try {
-    return await parseAndValidateObjectResult(result, outputStrategy, context);
+    return await parseAndValidateObjectResult(result, outputStrategy, context2);
   } catch (error) {
     if (repairText != null && NoObjectGeneratedError.isInstance(error) && (import_provider28.JSONParseError.isInstance(error.cause) || import_provider28.TypeValidationError.isInstance(error.cause))) {
       const repairedText = await repairText({
@@ -9154,7 +9155,7 @@ async function parseAndValidateObjectResultWithRepair(result, outputStrategy, re
       return await parseAndValidateObjectResult(
         repairedText,
         outputStrategy,
-        context
+        context2
       );
     }
     throw error;