@qwen-code/qwen-code 0.21.0 → 0.21.1-simplify-system-prompt.0

package/chunks/{initializer-UWAK5U5O.js → initializer-OVGZ4FLY.js}

@@ -3,20 +3,20 @@
 import {
   connectIdeForStartup,
   initializeApp
-} from "./chunk-K36B6G2O.js";
+} from "./chunk-3HBZKBMQ.js";
 import "./chunk-L5UHQJTJ.js";
-import "./chunk-TEHGS6UP.js";
+import "./chunk-JALU3ZDU.js";
 import "./chunk-RKUWKYED.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
-import "./chunk-LKEJ26GS.js";
-import "./chunk-LH2BYDQ5.js";
+import "./chunk-VV6XU5L7.js";
+import "./chunk-PANH4R3B.js";
 import "./chunk-6PEXNQTX.js";
-import "./chunk-Z2BC6UJ5.js";
+import "./chunk-VCBZUOSI.js";
 import "./chunk-ALGGS7UH.js";
 import "./chunk-MR3PXB6E.js";
 import "./chunk-OWAK7LMW.js";
-import "./chunk-PHOF65IG.js";
+import "./chunk-DM4Q4JJH.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-H6XPXXMH.js";
@@ -29,7 +29,7 @@ import "./chunk-ZOIFNCKL.js";
 import "./chunk-PWTZEM3C.js";
 import "./chunk-KRXPRVGL.js";
 import "./chunk-6PVPNMXU.js";
-import "./chunk-MZAXJAUM.js";
+import "./chunk-PSWQZHEA.js";
 import "./chunk-SZRN75WQ.js";
 import "./chunk-HTO4JFDZ.js";
 import "./chunk-CPBF7KYF.js";
@@ -49,16 +49,17 @@ import "./chunk-XVNQMZ2I.js";
 import "./chunk-FODK6UMO.js";
 import "./chunk-GLNBDYUX.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-ZJHVAS7M.js";
-import "./chunk-NIBLUX3Y.js";
+import "./chunk-YAF5VNU7.js";
+import "./chunk-BO4XCS7P.js";
 import "./chunk-BPJSQIJX.js";
 import "./chunk-P3QQPMQA.js";
 import "./chunk-6FGBXPWM.js";
 import "./chunk-LS77BEZP.js";
-import "./chunk-CIKQ7KKO.js";
+import "./chunk-SQBYH7PX.js";
+import "./chunk-RWS5VYWC.js";
 import "./chunk-VGC4I5JJ.js";
 import "./chunk-MUP3T3AD.js";
-import "./chunk-IKCX4CCL.js";
+import "./chunk-U7TXFVUN.js";
 import "./chunk-46UV252V.js";
 import "./chunk-A4UCTEB5.js";
 import "./chunk-XWRJCPHC.js";
@@ -66,9 +67,9 @@ import "./chunk-UW5EOVUN.js";
 import "./chunk-2JZBVYTU.js";
 import "./chunk-5I2IWRSH.js";
 import "./chunk-A5L3JMUA.js";
-import "./chunk-MB4MZHMJ.js";
-import "./chunk-HTR4WV6U.js";
-import "./chunk-BULDBTYC.js";
+import "./chunk-SRZ6DXVG.js";
+import "./chunk-W4RQUHY3.js";
+import "./chunk-INADJJGW.js";
 import "./chunk-U7ZFW55U.js";
 import "./chunk-UUUTRMI2.js";
 import "./chunk-PR75REBZ.js";

package/chunks/{installationInfo-6O2YAA52.js → installationInfo-5UUQJI6Y.js}

@@ -6,8 +6,8 @@ import {
   getInstallationInfo,
   getNpmCliPath,
   resolveUpdateCommand
-} from "./chunk-ZNAUOR2I.js";
-import "./chunk-PHOF65IG.js";
+} from "./chunk-LNARWLZQ.js";
+import "./chunk-DM4Q4JJH.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-H6XPXXMH.js";
@@ -20,7 +20,7 @@ import "./chunk-ZOIFNCKL.js";
 import "./chunk-PWTZEM3C.js";
 import "./chunk-KRXPRVGL.js";
 import "./chunk-6PVPNMXU.js";
-import "./chunk-MZAXJAUM.js";
+import "./chunk-PSWQZHEA.js";
 import "./chunk-SZRN75WQ.js";
 import "./chunk-HTO4JFDZ.js";
 import "./chunk-CPBF7KYF.js";
@@ -40,16 +40,17 @@ import "./chunk-XVNQMZ2I.js";
 import "./chunk-FODK6UMO.js";
 import "./chunk-GLNBDYUX.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-ZJHVAS7M.js";
-import "./chunk-NIBLUX3Y.js";
+import "./chunk-YAF5VNU7.js";
+import "./chunk-BO4XCS7P.js";
 import "./chunk-BPJSQIJX.js";
 import "./chunk-P3QQPMQA.js";
 import "./chunk-6FGBXPWM.js";
 import "./chunk-LS77BEZP.js";
-import "./chunk-CIKQ7KKO.js";
+import "./chunk-SQBYH7PX.js";
+import "./chunk-RWS5VYWC.js";
 import "./chunk-VGC4I5JJ.js";
 import "./chunk-MUP3T3AD.js";
-import "./chunk-IKCX4CCL.js";
+import "./chunk-U7TXFVUN.js";
 import "./chunk-46UV252V.js";
 import "./chunk-A4UCTEB5.js";
 import "./chunk-XWRJCPHC.js";
@@ -57,9 +58,9 @@ import "./chunk-UW5EOVUN.js";
 import "./chunk-2JZBVYTU.js";
 import "./chunk-5I2IWRSH.js";
 import "./chunk-A5L3JMUA.js";
-import "./chunk-MB4MZHMJ.js";
-import "./chunk-HTR4WV6U.js";
-import "./chunk-BULDBTYC.js";
+import "./chunk-SRZ6DXVG.js";
+import "./chunk-W4RQUHY3.js";
+import "./chunk-INADJJGW.js";
 import "./chunk-U7ZFW55U.js";
 import "./chunk-UUUTRMI2.js";
 import "./chunk-PR75REBZ.js";

package/chunks/{list-GB4ESM3T.js → list-HODU6RXD.js}

@@ -3,22 +3,22 @@
 import {
   handleList,
   listCommand
-} from "./chunk-7MVVZO4N.js";
-import "./chunk-IKYJHJNF.js";
-import "./chunk-PC6JANNU.js";
+} from "./chunk-5U4IPFBR.js";
+import "./chunk-VFSJ5VRH.js";
+import "./chunk-2YZJCM5T.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-TEHGS6UP.js";
+import "./chunk-JALU3ZDU.js";
 import "./chunk-RKUWKYED.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
-import "./chunk-LKEJ26GS.js";
-import "./chunk-LH2BYDQ5.js";
+import "./chunk-VV6XU5L7.js";
+import "./chunk-PANH4R3B.js";
 import "./chunk-6PEXNQTX.js";
-import "./chunk-Z2BC6UJ5.js";
+import "./chunk-VCBZUOSI.js";
 import "./chunk-ALGGS7UH.js";
 import "./chunk-MR3PXB6E.js";
 import "./chunk-OWAK7LMW.js";
-import "./chunk-PHOF65IG.js";
+import "./chunk-DM4Q4JJH.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-H6XPXXMH.js";
@@ -31,7 +31,7 @@ import "./chunk-ZOIFNCKL.js";
 import "./chunk-PWTZEM3C.js";
 import "./chunk-KRXPRVGL.js";
 import "./chunk-6PVPNMXU.js";
-import "./chunk-MZAXJAUM.js";
+import "./chunk-PSWQZHEA.js";
 import "./chunk-SZRN75WQ.js";
 import "./chunk-HTO4JFDZ.js";
 import "./chunk-CPBF7KYF.js";
@@ -51,16 +51,17 @@ import "./chunk-XVNQMZ2I.js";
 import "./chunk-FODK6UMO.js";
 import "./chunk-GLNBDYUX.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-ZJHVAS7M.js";
-import "./chunk-NIBLUX3Y.js";
+import "./chunk-YAF5VNU7.js";
+import "./chunk-BO4XCS7P.js";
 import "./chunk-BPJSQIJX.js";
 import "./chunk-P3QQPMQA.js";
 import "./chunk-6FGBXPWM.js";
 import "./chunk-LS77BEZP.js";
-import "./chunk-CIKQ7KKO.js";
+import "./chunk-SQBYH7PX.js";
+import "./chunk-RWS5VYWC.js";
 import "./chunk-VGC4I5JJ.js";
 import "./chunk-MUP3T3AD.js";
-import "./chunk-IKCX4CCL.js";
+import "./chunk-U7TXFVUN.js";
 import "./chunk-46UV252V.js";
 import "./chunk-A4UCTEB5.js";
 import "./chunk-XWRJCPHC.js";
@@ -68,14 +69,14 @@ import "./chunk-UW5EOVUN.js";
 import "./chunk-2JZBVYTU.js";
 import "./chunk-5I2IWRSH.js";
 import "./chunk-A5L3JMUA.js";
-import "./chunk-MB4MZHMJ.js";
-import "./chunk-HTR4WV6U.js";
-import "./chunk-BULDBTYC.js";
+import "./chunk-SRZ6DXVG.js";
+import "./chunk-W4RQUHY3.js";
+import "./chunk-INADJJGW.js";
 import "./chunk-U7ZFW55U.js";
 import "./chunk-UUUTRMI2.js";
 import "./chunk-PR75REBZ.js";
 import "./chunk-NL7LTRLR.js";
-import "./chunk-PWVFN2LF.js";
+import "./chunk-B4UMZKMU.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";

package/chunks/{loadedSettingsAdapter-OT6JVQ7U.js → loadedSettingsAdapter-TYNLBALY.js}

@@ -2,19 +2,19 @@
 "use strict";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-IO3IX5Q4.js";
-import "./chunk-TEHGS6UP.js";
+} from "./chunk-G4WFQUYQ.js";
+import "./chunk-JALU3ZDU.js";
 import "./chunk-RKUWKYED.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
-import "./chunk-LKEJ26GS.js";
-import "./chunk-LH2BYDQ5.js";
+import "./chunk-VV6XU5L7.js";
+import "./chunk-PANH4R3B.js";
 import "./chunk-6PEXNQTX.js";
-import "./chunk-Z2BC6UJ5.js";
+import "./chunk-VCBZUOSI.js";
 import "./chunk-ALGGS7UH.js";
 import "./chunk-MR3PXB6E.js";
 import "./chunk-OWAK7LMW.js";
-import "./chunk-PHOF65IG.js";
+import "./chunk-DM4Q4JJH.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-H6XPXXMH.js";
@@ -27,7 +27,7 @@ import "./chunk-ZOIFNCKL.js";
 import "./chunk-PWTZEM3C.js";
 import "./chunk-KRXPRVGL.js";
 import "./chunk-6PVPNMXU.js";
-import "./chunk-MZAXJAUM.js";
+import "./chunk-PSWQZHEA.js";
 import "./chunk-SZRN75WQ.js";
 import "./chunk-HTO4JFDZ.js";
 import "./chunk-CPBF7KYF.js";
@@ -47,16 +47,17 @@ import "./chunk-XVNQMZ2I.js";
 import "./chunk-FODK6UMO.js";
 import "./chunk-GLNBDYUX.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-ZJHVAS7M.js";
-import "./chunk-NIBLUX3Y.js";
+import "./chunk-YAF5VNU7.js";
+import "./chunk-BO4XCS7P.js";
 import "./chunk-BPJSQIJX.js";
 import "./chunk-P3QQPMQA.js";
 import "./chunk-6FGBXPWM.js";
 import "./chunk-LS77BEZP.js";
-import "./chunk-CIKQ7KKO.js";
+import "./chunk-SQBYH7PX.js";
+import "./chunk-RWS5VYWC.js";
 import "./chunk-VGC4I5JJ.js";
 import "./chunk-MUP3T3AD.js";
-import "./chunk-IKCX4CCL.js";
+import "./chunk-U7TXFVUN.js";
 import "./chunk-46UV252V.js";
 import "./chunk-A4UCTEB5.js";
 import "./chunk-XWRJCPHC.js";
@@ -64,9 +65,9 @@ import "./chunk-UW5EOVUN.js";
 import "./chunk-2JZBVYTU.js";
 import "./chunk-5I2IWRSH.js";
 import "./chunk-A5L3JMUA.js";
-import "./chunk-MB4MZHMJ.js";
-import "./chunk-HTR4WV6U.js";
-import "./chunk-BULDBTYC.js";
+import "./chunk-SRZ6DXVG.js";
+import "./chunk-W4RQUHY3.js";
+import "./chunk-INADJJGW.js";
 import "./chunk-U7ZFW55U.js";
 import "./chunk-UUUTRMI2.js";
 import "./chunk-PR75REBZ.js";

package/chunks/{loggingContentGenerator-HS3S5H3Q.js → loggingContentGenerator-WGM27QAW.js}

@@ -2,8 +2,10 @@
 "use strict";
 import {
   OpenAILogger
-} from "./chunk-ZJHVAS7M.js";
-import "./chunk-NIBLUX3Y.js";
+} from "./chunk-YAF5VNU7.js";
+import {
+  areSensitiveSpanAttributesEnabled
+} from "./chunk-BO4XCS7P.js";
 import {
   OpenAIContentConverter,
   openaiRequestCaptureContext
@@ -20,8 +22,9 @@ import {
   runtimeDiagnostics
 } from "./chunk-LS77BEZP.js";
 import {
-  createGenAiRequestObserverContext
-} from "./chunk-LEH5C7FV.js";
+  createGenAiExchange
+} from "./chunk-FY3M44RD.js";
+import "./chunk-SQBYH7PX.js";
 import {
   ApiErrorEvent,
   ApiRequestEvent,
@@ -31,10 +34,10 @@ import {
   logApiRequest,
   logApiResponse,
   subagentNameContext
-} from "./chunk-CIKQ7KKO.js";
+} from "./chunk-RWS5VYWC.js";
 import "./chunk-VGC4I5JJ.js";
 import "./chunk-MUP3T3AD.js";
-import "./chunk-IKCX4CCL.js";
+import "./chunk-U7TXFVUN.js";
 import "./chunk-46UV252V.js";
 import "./chunk-A4UCTEB5.js";
 import "./chunk-XWRJCPHC.js";
@@ -45,15 +48,11 @@ import "./chunk-A5L3JMUA.js";
 import {
   API_CALL_ABORTED_SPAN_STATUS_MESSAGE,
   API_CALL_FAILED_SPAN_STATUS_MESSAGE,
-  addModelOutputAttributes,
-  addSystemPromptAttributes,
-  addToolSchemaAttributes,
-  areSensitiveSpanAttributesEnabled,
   endLLMRequestSpan,
   startLLMRequestSpan
-} from "./chunk-MB4MZHMJ.js";
-import "./chunk-HTR4WV6U.js";
-import "./chunk-BULDBTYC.js";
+} from "./chunk-SRZ6DXVG.js";
+import "./chunk-W4RQUHY3.js";
+import "./chunk-INADJJGW.js";
 import "./chunk-U7ZFW55U.js";
 import "./chunk-UUUTRMI2.js";
 import "./chunk-PR75REBZ.js";
@@ -380,30 +379,23 @@ var LoggingContentGenerator = class {
       llmSpan.setAttribute("llm_request.stream", false);
     } catch {
     }
-    const spanContext = createGenAiRequestObserverContext(
+    const isInternal = isInternalPromptId(userPromptId);
+    const exchange = createGenAiExchange(
       trace.setSpan(context.active(), llmSpan),
-      llmSpan
+      llmSpan,
+      {
+        captureContent: !isInternal && this.shouldCollectSensitiveSpanAttributes(),
+        sensitiveAttributeMaxLength: this.config.getTelemetrySensitiveSpanAttributeMaxLength()
+      }
     );
+    const spanContext = exchange.context;
     const startTime = Date.now();
-    const isInternal = isInternalPromptId(userPromptId);
     const session = this.startCaptureSession();
     try {
       runtimeDiagnostics.recordGenerateContentRequest(req, {
         stream: false,
         source: "generateContent"
       });
-      if (!isInternal) {
-        addSystemPromptAttributes(
-          this.config,
-          llmSpan,
-          req.config?.systemInstruction
-        );
-        addToolSchemaAttributes(
-          this.config,
-          llmSpan,
-          req.config?.tools
-        );
-      }
       const response = await context.with(spanContext, async () => {
         if (!isInternal) {
           this.logApiRequest(
@@ -416,15 +408,7 @@ var LoggingContentGenerator = class {
           () => this.wrapped.generateContent(req, userPromptId)
         );
         const durationMs = Date.now() - startTime;
-        const shouldCollectSensitiveSpanAttributes = !isInternal && this.shouldCollectSensitiveSpanAttributes();
-        const modelOutput = shouldCollectSensitiveSpanAttributes ? this.extractResponseTextForSensitiveSpan(
-          result,
-          this.config.getTelemetrySensitiveSpanAttributeMaxLength()
-        ) : void 0;
         const responseText = isInternal ? void 0 : this.extractResponseText(result, MAX_RESPONSE_TEXT_LENGTH);
-        if (shouldCollectSensitiveSpanAttributes) {
-          this.safelyAddModelOutputAttributes(llmSpan, modelOutput);
-        }
         this.safelyLogApiResponse(
           result.responseId ?? "",
           durationMs,
@@ -445,13 +429,14 @@ var LoggingContentGenerator = class {
         }
         return result;
       });
+      const observedFinishReasons = exchange.controller.finalize(true);
       endLLMRequestSpan(llmSpan, {
         success: true,
         ...usageSpanMetadata(response.usageMetadata),
         durationMs: Date.now() - startTime,
         responseId: response.responseId || void 0,
         responseModel: response.modelVersion || void 0,
-        finishReasons: orderedFinishReasons(response),
+        finishReasons: observedFinishReasons ?? orderedFinishReasons(response),
         thoughtsTokenCount: response.usageMetadata?.thoughtsTokenCount,
         subagentName: subagentNameContext.getStore() || void 0,
         ...retrySnapshot,
@@ -460,6 +445,7 @@ var LoggingContentGenerator = class {
       return response;
     } catch (error) {
       const durationMs = Date.now() - startTime;
+      const observedFinishReasons = exchange.controller.finalize(false);
       const aborted = req.config?.abortSignal?.aborted ?? false;
       endLLMRequestSpan(llmSpan, {
         success: false,
@@ -467,6 +453,7 @@ var LoggingContentGenerator = class {
         error: aborted ? API_CALL_ABORTED_SPAN_STATUS_MESSAGE : API_CALL_FAILED_SPAN_STATUS_MESSAGE,
         errorType: getErrorType(error),
         errorStatusCode: getErrorStatus(error),
+        finishReasons: observedFinishReasons,
         subagentName: subagentNameContext.getStore() || void 0,
         ...retrySnapshot,
         config: this.config
@@ -498,12 +485,17 @@ var LoggingContentGenerator = class {
       llmSpan.setAttribute("llm_request.stream", true);
     } catch {
     }
-    const spanContext = createGenAiRequestObserverContext(
+    const isInternal = isInternalPromptId(userPromptId);
+    const exchange = createGenAiExchange(
       trace.setSpan(context.active(), llmSpan),
-      llmSpan
+      llmSpan,
+      {
+        captureContent: !isInternal && this.shouldCollectSensitiveSpanAttributes(),
+        sensitiveAttributeMaxLength: this.config.getTelemetrySensitiveSpanAttributeMaxLength()
+      }
     );
+    const spanContext = exchange.context;
     const startTime = Date.now();
-    const isInternal = isInternalPromptId(userPromptId);
     const session = this.startCaptureSession();
     let stream;
     try {
@@ -511,18 +503,6 @@ var LoggingContentGenerator = class {
         stream: true,
         source: "generateContentStream"
       });
-      if (!isInternal) {
-        addSystemPromptAttributes(
-          this.config,
-          llmSpan,
-          req.config?.systemInstruction
-        );
-        addToolSchemaAttributes(
-          this.config,
-          llmSpan,
-          req.config?.tools
-        );
-      }
       stream = await context.with(spanContext, async () => {
         if (!isInternal) {
           this.logApiRequest(
@@ -537,6 +517,7 @@ var LoggingContentGenerator = class {
       });
     } catch (error) {
       const durationMs = Date.now() - startTime;
+      const observedFinishReasons = exchange.controller.finalize(false);
       context.with(
         spanContext,
         () => this.safelyLogApiError("", durationMs, error, req.model, userPromptId)
@@ -548,6 +529,7 @@ var LoggingContentGenerator = class {
         error: aborted ? API_CALL_ABORTED_SPAN_STATUS_MESSAGE : API_CALL_FAILED_SPAN_STATUS_MESSAGE,
         errorType: getErrorType(error),
         errorStatusCode: getErrorStatus(error),
+        finishReasons: observedFinishReasons,
         subagentName: subagentNameContext.getStore() || void 0,
         ...retrySnapshot,
         config: this.config
@@ -583,7 +565,8 @@ var LoggingContentGenerator = class {
         llmSpan,
         spanContext,
         req.config?.abortSignal,
-        retrySnapshot
+        retrySnapshot,
+        exchange.controller
       )
     );
   }
@@ -597,15 +580,22 @@ var LoggingContentGenerator = class {
       resolve: /* @__PURE__ */ __name(async (req) => this.openaiLogger ? captured ?? await this.buildOpenAIRequestForLogging(req) : void 0, "resolve")
     };
   }
-  async *loggingStreamWrapper(stream, startTime, userPromptId, model, openaiRequest, span, spanContext, abortSignal, retrySnapshot) {
+  async *loggingStreamWrapper(stream, startTime, userPromptId, model, openaiRequest, span, spanContext, abortSignal, retrySnapshot, exchangeController) {
     const isInternal = isInternalPromptId(userPromptId);
     const shouldCollectResponses = !isInternal || !!this.openaiLogger;
     const responses = [];
     let lastResponseForLogging;
     let firstResponseId = "";
     let firstModelVersion = "";
+    let lastResponse;
     let lastUsageMetadata;
+    const refreshLateUsageMetadata = /* @__PURE__ */ __name(() => {
+      if (lastResponse?.usageMetadata) {
+        lastUsageMetadata = lastResponse.usageMetadata;
+      }
+    }, "refreshLateUsageMetadata");
     let errorOccurred = false;
+    let streamCompleted = false;
     const finishReasons = /* @__PURE__ */ new Map();
     let lastError;
     const subagentName = subagentNameContext.getStore();
@@ -618,10 +608,12 @@ var LoggingContentGenerator = class {
       if (spanEndedByTimeout) return;
       if (spanEndTimeout !== void 0) clearTimeout(spanEndTimeout);
       spanEndTimeout = setTimeout(() => {
+        refreshLateUsageMetadata();
         try {
           span.setAttribute("stream.timed_out", true);
         } catch {
         }
+        const observedFinishReasons = exchangeController?.finalize(false);
         endLLMRequestSpan(span, {
           success: false,
           ...usageSpanMetadata(lastUsageMetadata),
@@ -629,7 +621,7 @@ var LoggingContentGenerator = class {
           error: "Stream span timed out (idle)",
           responseId: firstResponseId || void 0,
           responseModel: firstModelVersion || void 0,
-          finishReasons: finishReasons.size > 0 ? [...finishReasons.entries()].sort(([left], [right]) => left - right).map(([, reason]) => reason) : void 0,
+          finishReasons: observedFinishReasons ?? (finishReasons.size > 0 ? [...finishReasons.entries()].sort(([left], [right]) => left - right).map(([, reason]) => reason) : void 0),
           subagentName: subagentName || void 0,
           ...retrySnapshot,
           config: this.config
@@ -641,6 +633,7 @@ var LoggingContentGenerator = class {
     resetSpanTimeout?.();
     try {
       for await (const response of stream) {
+        lastResponse = response;
         if (!firstResponseId && response.responseId) {
           firstResponseId = response.responseId;
         }
@@ -671,6 +664,8 @@ var LoggingContentGenerator = class {
         resetSpanTimeout?.();
         yield response;
       }
+      streamCompleted = true;
+      refreshLateUsageMetadata();
       if (spanEndTimeout !== void 0) {
         clearTimeout(spanEndTimeout);
         spanEndTimeout = void 0;
@@ -683,11 +678,6 @@ var LoggingContentGenerator = class {
       if (consolidatedResponse) {
         consolidatedResponse.usageMetadata = lastUsageMetadata;
       }
-      const shouldCollectSensitiveSpanAttributes = !isInternal && span !== void 0 && this.shouldCollectSensitiveSpanAttributes();
-      const streamModelOutput = shouldCollectSensitiveSpanAttributes ? this.extractResponseTextForSensitiveSpan(
-        consolidatedResponse,
-        this.config.getTelemetrySensitiveSpanAttributeMaxLength()
-      ) : void 0;
       const streamResponseText = isInternal ? void 0 : this.extractResponseText(
         consolidatedResponse,
         MAX_RESPONSE_TEXT_LENGTH
@@ -703,9 +693,6 @@ var LoggingContentGenerator = class {
             streamResponseText
           )
         );
-        if (shouldCollectSensitiveSpanAttributes && span) {
-          this.safelyAddModelOutputAttributes(span, streamModelOutput);
-        }
         await runInSpan(
           () => this.safelyLogOpenAIInteraction(
             openaiRequest,
@@ -743,8 +730,12 @@ var LoggingContentGenerator = class {
       if (spanEndTimeout !== void 0) {
         clearTimeout(spanEndTimeout);
       }
+      refreshLateUsageMetadata();
       if (span && !spanEndedByTimeout) {
         const aborted = abortSignal?.aborted ?? false;
+        const observedFinishReasons = exchangeController?.finalize(
+          !errorOccurred && streamCompleted
+        );
         endLLMRequestSpan(span, {
           success: !errorOccurred,
           ...usageSpanMetadata(lastUsageMetadata),
@@ -753,7 +744,7 @@ var LoggingContentGenerator = class {
           error: errorOccurred ? aborted ? API_CALL_ABORTED_SPAN_STATUS_MESSAGE : API_CALL_FAILED_SPAN_STATUS_MESSAGE : void 0,
           responseId: firstResponseId || void 0,
           responseModel: firstModelVersion || void 0,
-          finishReasons: finishReasons.size > 0 ? [...finishReasons.entries()].sort(([left], [right]) => left - right).map(([, reason]) => reason) : void 0,
+          finishReasons: observedFinishReasons ?? (finishReasons.size > 0 ? [...finishReasons.entries()].sort(([left], [right]) => left - right).map(([, reason]) => reason) : void 0),
           thoughtsTokenCount: lastUsageMetadata?.thoughtsTokenCount,
           subagentName: subagentName || void 0,
           errorType: lastError ? getErrorType(lastError) : void 0,
@@ -936,21 +927,6 @@ var LoggingContentGenerator = class {
     }
     return truncated ? `${text}${RESPONSE_TEXT_TRUNCATION_SUFFIX}` : text;
   }
-  extractResponseTextForSensitiveSpan(response, maxLength) {
-    let text = "";
-    let originalLength = 0;
-    const hasText = this.forEachVisibleResponseText(response, (partText) => {
-      originalLength += partText.length;
-      const remaining = maxLength - text.length;
-      if (remaining > 0) {
-        text += partText.slice(0, remaining);
-      }
-    });
-    if (!hasText) {
-      return void 0;
-    }
-    return { text, originalLength };
-  }
   forEachVisibleResponseText(response, onText) {
     const parts = response?.candidates?.[0]?.content?.parts;
     if (!parts?.length) {
@@ -976,18 +952,6 @@ var LoggingContentGenerator = class {
     }
     return void 0;
   }
-  safelyAddModelOutputAttributes(span, modelOutput) {
-    try {
-      addModelOutputAttributes(
-        this.config,
-        span,
-        modelOutput?.text,
-        modelOutput?.originalLength
-      );
-    } catch (error) {
-      debugLogger.warn("Failed to add model output span attributes:", error);
-    }
-  }
   shouldCollectSensitiveSpanAttributes() {
     return areSensitiveSpanAttributesEnabled(this.config);
   }

package/chunks/{managed-npm-update-JYEMMXA3.js → managed-npm-update-JQ2CG3RH.js}

@@ -5,9 +5,9 @@ import {
 } from "./chunk-DP3IHZGG.js";
 import {
   getNpmCliPath
-} from "./chunk-ZNAUOR2I.js";
+} from "./chunk-LNARWLZQ.js";
 import "./chunk-URK542T4.js";
-import "./chunk-PHOF65IG.js";
+import "./chunk-DM4Q4JJH.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-H6XPXXMH.js";
@@ -22,7 +22,7 @@ import {
   require_proper_lockfile
 } from "./chunk-KRXPRVGL.js";
 import "./chunk-6PVPNMXU.js";
-import "./chunk-MZAXJAUM.js";
+import "./chunk-PSWQZHEA.js";
 import "./chunk-SZRN75WQ.js";
 import "./chunk-HTO4JFDZ.js";
 import "./chunk-CPBF7KYF.js";
@@ -42,16 +42,17 @@ import "./chunk-XVNQMZ2I.js";
 import "./chunk-FODK6UMO.js";
 import "./chunk-GLNBDYUX.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-ZJHVAS7M.js";
-import "./chunk-NIBLUX3Y.js";
+import "./chunk-YAF5VNU7.js";
+import "./chunk-BO4XCS7P.js";
 import "./chunk-BPJSQIJX.js";
 import "./chunk-P3QQPMQA.js";
 import "./chunk-6FGBXPWM.js";
 import "./chunk-LS77BEZP.js";
-import "./chunk-CIKQ7KKO.js";
+import "./chunk-SQBYH7PX.js";
+import "./chunk-RWS5VYWC.js";
 import "./chunk-VGC4I5JJ.js";
 import "./chunk-MUP3T3AD.js";
-import "./chunk-IKCX4CCL.js";
+import "./chunk-U7TXFVUN.js";
 import "./chunk-46UV252V.js";
 import "./chunk-A4UCTEB5.js";
 import "./chunk-XWRJCPHC.js";
@@ -59,9 +60,9 @@ import "./chunk-UW5EOVUN.js";
 import "./chunk-2JZBVYTU.js";
 import "./chunk-5I2IWRSH.js";
 import "./chunk-A5L3JMUA.js";
-import "./chunk-MB4MZHMJ.js";
-import "./chunk-HTR4WV6U.js";
-import "./chunk-BULDBTYC.js";
+import "./chunk-SRZ6DXVG.js";
+import "./chunk-W4RQUHY3.js";
+import "./chunk-INADJJGW.js";
 import "./chunk-U7ZFW55U.js";
 import "./chunk-UUUTRMI2.js";
 import "./chunk-PR75REBZ.js";