@qwen-code/qwen-code 0.21.12-preview.3 → 0.21.12-preview.5

package/chunks/{loggingContentGenerator-D4URLH2A.js → loggingContentGenerator-E2QENFPH.js}

@@ -2,14 +2,14 @@
 "use strict";
 import {
   OpenAILogger
-} from "./chunk-6XZERB6P.js";
+} from "./chunk-VPZMLGD3.js";
 import {
   areSensitiveSpanAttributesEnabled
-} from "./chunk-O5AZPHYZ.js";
+} from "./chunk-U5C2GIN2.js";
 import {
   OpenAIContentConverter,
   openaiRequestCaptureContext
-} from "./chunk-P2UCMHDT.js";
+} from "./chunk-IJCZP2MA.js";
 import "./chunk-2J3OJGTL.js";
 import {
   ApiErrorEvent,
@@ -20,49 +20,50 @@ import {
   logApiRequest,
   logApiResponse,
   subagentNameContext
-} from "./chunk-HB6QW4LM.js";
+} from "./chunk-UAAWNTOC.js";
 import "./chunk-YRLW2MSX.js";
 import "./chunk-VGC4I5JJ.js";
-import "./chunk-732MOPEM.js";
-import "./chunk-CTQE2NB2.js";
-import "./chunk-NC4O6UE6.js";
-import "./chunk-IEP44U2R.js";
-import "./chunk-XTH2OMDS.js";
+import "./chunk-6OJDN5ZT.js";
+import "./chunk-JRTJEGSP.js";
+import "./chunk-O6SLWH4X.js";
+import "./chunk-C2DR57L6.js";
+import "./chunk-ZRT36RSF.js";
 import {
   retryContext
 } from "./chunk-P3QQPMQA.js";
-import "./chunk-KPVVWKF3.js";
-import "./chunk-XWUQ4IH5.js";
+import "./chunk-PSTHNTHF.js";
+import "./chunk-VGGNHRYZ.js";
 import "./chunk-F6WFNA7U.js";
-import "./chunk-F6AOBFUN.js";
+import "./chunk-NW7SPXVG.js";
 import {
   getGenAiUsageProvenance
-} from "./chunk-GLWWPFTW.js";
+} from "./chunk-6SU6OW5Z.js";
 import {
   createGenAiExchange
-} from "./chunk-7SUQZ7QH.js";
+} from "./chunk-V3NMFQD2.js";
 import {
   runtimeDiagnostics
 } from "./chunk-GLCZKT5V.js";
-import "./chunk-GJJQV4PY.js";
+import "./chunk-KK3FEHPJ.js";
 import "./chunk-46UV252V.js";
 import "./chunk-FPGTNKCP.js";
-import "./chunk-EFIMD5VA.js";
+import "./chunk-H6BFLALJ.js";
 import {
   API_CALL_ABORTED_SPAN_STATUS_MESSAGE,
   API_CALL_FAILED_SPAN_STATUS_MESSAGE,
   endLLMRequestSpan,
-  startLLMRequestSpan
-} from "./chunk-E5BWLU5J.js";
+  startLLMRequestSpanWithContext
+} from "./chunk-3MJ44LNC.js";
 import "./chunk-HHJLM3WQ.js";
-import "./chunk-L2GTEEEU.js";
+import "./chunk-K5IDV3PC.js";
 import {
   createDebugLogger,
   getErrorMessage,
   getErrorStatus,
   getErrorType,
+  getSessionIdFromContext,
   isAbortError
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-YMB77M76.js";
 import "./chunk-VOQXFAY5.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
@@ -75,8 +76,7 @@ import "./chunk-E3GLDLYB.js";
 import "./chunk-FCMNKVXT.js";
 import {
   context,
-  init_esm,
-  trace
+  init_esm
 } from "./chunk-QUGAUQGJ.js";
 import {
   init_esbuild_shims
@@ -241,6 +241,17 @@ function snapshotRetryMetadata() {
   };
 }
 __name(snapshotRetryMetadata, "snapshotRetryMetadata");
+function bindAsyncGeneratorToContext(stream, scopedContext) {
+  return {
+    next: /* @__PURE__ */ __name((...args) => context.with(scopedContext, () => stream.next(...args)), "next"),
+    return: /* @__PURE__ */ __name((value) => context.with(scopedContext, () => stream.return(value)), "return"),
+    throw: /* @__PURE__ */ __name((error) => context.with(scopedContext, () => stream.throw(error)), "throw"),
+    [Symbol.asyncIterator]() {
+      return this;
+    }
+  };
+}
+__name(bindAsyncGeneratorToContext, "bindAsyncGeneratorToContext");
 function usageSpanMetadata(usage) {
   const provenance = getGenAiUsageProvenance(usage);
   return {
@@ -302,7 +313,7 @@ var LoggingContentGenerator = class {
   getWrapped() {
     return this.wrapped;
   }
-  logApiRequest(contents, model, promptId) {
+  logApiRequest(contents, model, promptId, sessionId) {
     const requestText = JSON.stringify(contents);
     logApiRequest(
       this.config,
@@ -311,10 +322,11 @@ var LoggingContentGenerator = class {
         promptId,
         requestText,
         subagentNameContext.getStore()
-      )
+      ),
+      sessionId
     );
   }
-  _logApiResponse(responseId, durationMs, model, prompt_id, usageMetadata, responseText, ttftMs) {
+  _logApiResponse(responseId, durationMs, model, prompt_id, sessionId, usageMetadata, responseText, ttftMs) {
     logApiResponse(
       this.config,
       new ApiResponseEvent(
@@ -327,10 +339,11 @@ var LoggingContentGenerator = class {
         responseText,
         subagentNameContext.getStore(),
         ttftMs
-      )
+      ),
+      sessionId
     );
   }
-  _logApiError(responseId, durationMs, error, model, prompt_id) {
+  _logApiError(responseId, durationMs, error, model, prompt_id, sessionId) {
     const errorMessage = getErrorMessage(error);
     const errorType = getErrorType(error);
     const errorResponseId = error?.requestID || error?.request_id || responseId;
@@ -347,26 +360,35 @@ var LoggingContentGenerator = class {
         errorType,
         statusCode: errorStatus,
         subagentName: subagentNameContext.getStore()
-      })
+      }),
+      sessionId
     );
   }
-  safelyLogApiError(responseId, durationMs, error, model, prompt_id, abortSignal) {
+  safelyLogApiError(responseId, durationMs, error, model, prompt_id, sessionId, abortSignal) {
     if (abortSignal?.aborted && isAbortError(error)) {
       return;
     }
     try {
-      this._logApiError(responseId, durationMs, error, model, prompt_id);
+      this._logApiError(
+        responseId,
+        durationMs,
+        error,
+        model,
+        prompt_id,
+        sessionId
+      );
     } catch (loggingError) {
       debugLogger.warn("Failed to log API error:", loggingError);
     }
   }
-  safelyLogApiResponse(responseId, durationMs, model, prompt_id, usageMetadata, responseText, ttftMs) {
+  safelyLogApiResponse(responseId, durationMs, model, prompt_id, sessionId, usageMetadata, responseText, ttftMs) {
     try {
       this._logApiResponse(
         responseId,
         durationMs,
         model,
         prompt_id,
+        sessionId,
         usageMetadata,
         responseText,
         ttftMs
@@ -377,20 +399,21 @@ var LoggingContentGenerator = class {
   }
   async generateContent(req, userPromptId) {
     const retrySnapshot = snapshotRetryMetadata();
-    const llmSpan = startLLMRequestSpan(req.model, userPromptId, {
+    const ownerSessionId = this.config.getSessionId();
+    const ownerUserId = this.config.getTelemetryUserId();
+    const { span: llmSpan, context: llmContext } = startLLMRequestSpanWithContext(req.model, userPromptId, {
       operationName: this.genAiOperationName,
       providerName: this.genAiProviderName,
-      outputType: resolveGenAiOutputType(this.generatorAuthType, req.config)
+      outputType: resolveGenAiOutputType(this.generatorAuthType, req.config),
+      sessionId: ownerSessionId,
+      userId: ownerUserId
     });
+    const requestSessionId = getSessionIdFromContext(llmContext) ?? ownerSessionId;
     const isInternal = isInternalPromptId(userPromptId);
-    const exchange = createGenAiExchange(
-      trace.setSpan(context.active(), llmSpan),
-      llmSpan,
-      {
-        captureContent: !isInternal && this.shouldCollectSensitiveSpanAttributes(),
-        sensitiveAttributeMaxLength: this.config.getTelemetrySensitiveSpanAttributeMaxLength()
-      }
-    );
+    const exchange = createGenAiExchange(llmContext, llmSpan, {
+      captureContent: !isInternal && this.shouldCollectSensitiveSpanAttributes(),
+      sensitiveAttributeMaxLength: this.config.getTelemetrySensitiveSpanAttributeMaxLength()
+    });
     const spanContext = exchange.context;
     const startTime = Date.now();
     const session = this.startCaptureSession();
@@ -404,7 +427,8 @@ var LoggingContentGenerator = class {
           this.logApiRequest(
             this.toContents(req.contents),
             req.model,
-            userPromptId
+            userPromptId,
+            requestSessionId
           );
         }
         const result = await session.wrap(
@@ -417,6 +441,7 @@ var LoggingContentGenerator = class {
           durationMs,
           result.modelVersion || req.model,
           userPromptId,
+          requestSessionId,
           result.usageMetadata,
           responseText
         );
@@ -468,6 +493,7 @@ var LoggingContentGenerator = class {
           error,
           req.model,
           userPromptId,
+          requestSessionId,
           req.config?.abortSignal
         );
         try {
@@ -486,24 +512,25 @@ var LoggingContentGenerator = class {
   }
   async generateContentStream(req, userPromptId) {
     const retrySnapshot = snapshotRetryMetadata();
-    const llmSpan = startLLMRequestSpan(req.model, userPromptId, {
+    const ownerSessionId = this.config.getSessionId();
+    const ownerUserId = this.config.getTelemetryUserId();
+    const { span: llmSpan, context: llmContext } = startLLMRequestSpanWithContext(req.model, userPromptId, {
       operationName: this.genAiOperationName,
       providerName: this.genAiProviderName,
-      outputType: resolveGenAiOutputType(this.generatorAuthType, req.config)
+      outputType: resolveGenAiOutputType(this.generatorAuthType, req.config),
+      sessionId: ownerSessionId,
+      userId: ownerUserId
     });
+    const requestSessionId = getSessionIdFromContext(llmContext) ?? ownerSessionId;
     try {
       llmSpan.setAttribute("gen_ai.request.stream", true);
     } catch {
     }
     const isInternal = isInternalPromptId(userPromptId);
-    const exchange = createGenAiExchange(
-      trace.setSpan(context.active(), llmSpan),
-      llmSpan,
-      {
-        captureContent: !isInternal && this.shouldCollectSensitiveSpanAttributes(),
-        sensitiveAttributeMaxLength: this.config.getTelemetrySensitiveSpanAttributeMaxLength()
-      }
-    );
+    const exchange = createGenAiExchange(llmContext, llmSpan, {
+      captureContent: !isInternal && this.shouldCollectSensitiveSpanAttributes(),
+      sensitiveAttributeMaxLength: this.config.getTelemetrySensitiveSpanAttributeMaxLength()
+    });
     const spanContext = exchange.context;
     const startTime = Date.now();
     const session = this.startCaptureSession();
@@ -518,7 +545,8 @@ var LoggingContentGenerator = class {
           this.logApiRequest(
             this.toContents(req.contents),
             req.model,
-            userPromptId
+            userPromptId,
+            requestSessionId
           );
         }
         return session.wrap(async () => {
@@ -541,6 +569,7 @@ var LoggingContentGenerator = class {
           error,
           req.model,
           userPromptId,
+          requestSessionId,
           req.config?.abortSignal
         )
       );
@@ -573,21 +602,21 @@ var LoggingContentGenerator = class {
       debugLogger.warn("Failed to resolve OpenAI request:", loggingError);
       return void 0;
     }) : void 0;
-    return context.with(
-      spanContext,
-      () => this.loggingStreamWrapper(
+    return bindAsyncGeneratorToContext(
+      this.loggingStreamWrapper(
         stream,
         startTime,
         requestIssuedAtMs,
         userPromptId,
         req.model,
+        requestSessionId,
         openaiRequestPromise,
         llmSpan,
-        spanContext,
         req.config?.abortSignal,
         retrySnapshot,
         exchange.controller
-      )
+      ),
+      spanContext
     );
   }
   startCaptureSession() {
@@ -600,7 +629,7 @@ var LoggingContentGenerator = class {
       resolve: /* @__PURE__ */ __name(async (req) => this.openaiLogger ? captured ?? await this.buildOpenAIRequestForLogging(req) : void 0, "resolve")
     };
   }
-  async *loggingStreamWrapper(stream, startTime, requestIssuedAtMs, userPromptId, model, openaiRequestPromise, span, spanContext, abortSignal, retrySnapshot, exchangeController) {
+  async *loggingStreamWrapper(stream, startTime, requestIssuedAtMs, userPromptId, model, sessionId, openaiRequestPromise, span, abortSignal, retrySnapshot, exchangeController) {
     const isInternal = isInternalPromptId(userPromptId);
     const shouldCollectResponses = !isInternal || !!this.openaiLogger;
     const responses = [];
@@ -622,7 +651,6 @@ var LoggingContentGenerator = class {
     let ttftMs;
     let firstChunkObserved = false;
     let spanEndedByTimeout = false;
-    const runInSpan = /* @__PURE__ */ __name((fn) => spanContext ? context.with(spanContext, fn) : fn(), "runInSpan");
     const STREAM_IDLE_TIMEOUT_MS = 5 * 6e4;
     let spanEndTimeout;
     const resetSpanTimeout = span ? () => {
@@ -717,25 +745,22 @@ var LoggingContentGenerator = class {
         MAX_RESPONSE_TEXT_LENGTH
       );
       if (!spanEndedByTimeout) {
-        runInSpan(
-          () => this.safelyLogApiResponse(
-            firstResponseId,
-            durationMs,
-            firstModelVersion || model,
-            userPromptId,
-            lastUsageMetadata,
-            streamResponseText,
-            ttftMs
-          )
+        this.safelyLogApiResponse(
+          firstResponseId,
+          durationMs,
+          firstModelVersion || model,
+          userPromptId,
+          sessionId,
+          lastUsageMetadata,
+          streamResponseText,
+          ttftMs
         );
         const openaiRequest = await openaiRequestPromise;
-        await runInSpan(
-          () => this.safelyLogOpenAIInteraction(
-            openaiRequest,
-            consolidatedResponse,
-            void 0,
-            userPromptId
-          )
+        await this.safelyLogOpenAIInteraction(
+          openaiRequest,
+          consolidatedResponse,
+          void 0,
+          userPromptId
         );
       }
     } catch (error) {
@@ -743,24 +768,21 @@ var LoggingContentGenerator = class {
       lastError = error;
       if (!spanEndedByTimeout) {
         const durationMs = Date.now() - startTime;
-        runInSpan(
-          () => this.safelyLogApiError(
-            firstResponseId,
-            durationMs,
-            error,
-            firstModelVersion || model,
-            userPromptId,
-            abortSignal
-          )
+        this.safelyLogApiError(
+          firstResponseId,
+          durationMs,
+          error,
+          firstModelVersion || model,
+          userPromptId,
+          sessionId,
+          abortSignal
         );
         const openaiRequest = await openaiRequestPromise;
-        await runInSpan(
-          () => this.safelyLogOpenAIInteraction(
-            openaiRequest,
-            void 0,
-            error,
-            userPromptId
-          )
+        await this.safelyLogOpenAIInteraction(
+          openaiRequest,
+          void 0,
+          error,
+          userPromptId
         );
       }
       throw error;

package/chunks/{loop-wakeup-HOQI3K5D.js → loop-wakeup-OV65FEGR.js}

@@ -4,10 +4,10 @@ import {
   WAKEUP_MAX_SECONDS,
   WAKEUP_MIN_SECONDS,
   clampWakeupSeconds
-} from "./chunk-QTI7SRXI.js";
+} from "./chunk-NM33GGOM.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-XLQS3VI6.js";
+import "./chunk-AAZWJAPQ.js";
 import {
   todoWorkChainContext
 } from "./chunk-O6GEWCJA.js";
@@ -17,11 +17,11 @@ import {
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-XTH2OMDS.js";
-import "./chunk-F6AOBFUN.js";
+} from "./chunk-ZRT36RSF.js";
+import "./chunk-NW7SPXVG.js";
 import {
   getErrorMessage
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-YMB77M76.js";
 import "./chunk-QUGAUQGJ.js";
 import {
   init_esbuild_shims

package/chunks/{ls-FSHISLLA.js → ls-RPRSX26R.js}

@@ -2,16 +2,16 @@
 "use strict";
 import {
   getMemoryBaseDir
-} from "./chunk-732MOPEM.js";
+} from "./chunk-6OJDN5ZT.js";
 import {
   DEFAULT_FILE_FILTERING_OPTIONS
-} from "./chunk-V3LXMASR.js";
+} from "./chunk-UHF5VBKO.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-XTH2OMDS.js";
+} from "./chunk-ZRT36RSF.js";
 import {
   Storage,
   createDebugLogger,
@@ -20,7 +20,7 @@ import {
   makeRelative,
   shortenPath,
   unescapePath
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-YMB77M76.js";
 import "./chunk-QUGAUQGJ.js";
 import {
   init_esbuild_shims

package/chunks/{lsp-APQJ5ZEZ.js → lsp-IWTJWFLT.js}

@@ -5,10 +5,10 @@ import {
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-XTH2OMDS.js";
+} from "./chunk-ZRT36RSF.js";
 import {
   unescapePath
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-YMB77M76.js";
 import "./chunk-QUGAUQGJ.js";
 import {
   init_esbuild_shims

package/chunks/{managed-npm-update-2O7XSAWJ.js → managed-npm-update-MX2OPCW4.js}

@@ -2,84 +2,84 @@
 "use strict";
 import {
   require_semver
-} from "./chunk-DP3IHZGG.js";
+} from "./chunk-2AUM35J5.js";
 import {
   getNpmCliPath
-} from "./chunk-N5ULBHP3.js";
-import "./chunk-URK542T4.js";
-import "./chunk-M6HXP2SG.js";
+} from "./chunk-YMIQ24FR.js";
+import "./chunk-NF5J2WFA.js";
+import "./chunk-T7YMWGFY.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-CQ35AJ4Z.js";
-import "./chunk-QTI7SRXI.js";
-import "./chunk-KT4OWAAZ.js";
-import "./chunk-IX7CFQGA.js";
-import "./chunk-N7NBMAMW.js";
+import "./chunk-NM33GGOM.js";
+import "./chunk-A4BAHMJF.js";
+import "./chunk-ZPZANKVP.js";
+import "./chunk-A6GQUQ7I.js";
 import "./chunk-6PVPNMXU.js";
-import "./chunk-I4XSOFH2.js";
+import "./chunk-OZTGLK53.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-XLQS3VI6.js";
-import "./chunk-NWPO6I7V.js";
+import "./chunk-AAZWJAPQ.js";
+import "./chunk-7WUMS2UA.js";
 import "./chunk-O6GEWCJA.js";
 import "./chunk-T26EAKDL.js";
 import "./chunk-ZPJWUGCS.js";
 import "./chunk-CPBF7KYF.js";
-import "./chunk-6LYDH7VT.js";
-import "./chunk-2AZMF6G5.js";
+import "./chunk-SNHBRO4C.js";
+import "./chunk-KTWUFHS4.js";
 import {
   require_proper_lockfile
 } from "./chunk-KRXPRVGL.js";
-import "./chunk-GZGDJ4E6.js";
-import "./chunk-T6W4KACQ.js";
-import "./chunk-MWZYNOCG.js";
-import "./chunk-SAQHDAUJ.js";
-import "./chunk-6XZERB6P.js";
-import "./chunk-O5AZPHYZ.js";
+import "./chunk-2ASWIM4A.js";
+import "./chunk-67F2BEYW.js";
+import "./chunk-TNETSI2A.js";
+import "./chunk-B66LYK4B.js";
+import "./chunk-VPZMLGD3.js";
+import "./chunk-U5C2GIN2.js";
 import "./chunk-SAH4BD2J.js";
-import "./chunk-5PWLQ7SK.js";
-import "./chunk-EYS3GGM3.js";
+import "./chunk-2RTRFLWH.js";
+import "./chunk-SKRHR6N2.js";
 import "./chunk-S6LOFUVP.js";
 import "./chunk-2J3OJGTL.js";
-import "./chunk-HB6QW4LM.js";
+import "./chunk-UAAWNTOC.js";
 import "./chunk-YRLW2MSX.js";
 import "./chunk-VGC4I5JJ.js";
-import "./chunk-732MOPEM.js";
-import "./chunk-CTQE2NB2.js";
-import "./chunk-NC4O6UE6.js";
-import "./chunk-IEP44U2R.js";
-import "./chunk-ZV4XVYL3.js";
+import "./chunk-6OJDN5ZT.js";
+import "./chunk-JRTJEGSP.js";
+import "./chunk-O6SLWH4X.js";
+import "./chunk-C2DR57L6.js";
+import "./chunk-TROB4PZY.js";
 import "./chunk-K623ENWT.js";
 import "./chunk-AQ37AY7B.js";
-import "./chunk-V3LXMASR.js";
-import "./chunk-XTH2OMDS.js";
-import "./chunk-TBVNYG5B.js";
+import "./chunk-UHF5VBKO.js";
+import "./chunk-ZRT36RSF.js";
+import "./chunk-CDDLHCC2.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-5HBFERG5.js";
-import "./chunk-EYW54TBD.js";
+import "./chunk-YI5G32RU.js";
+import "./chunk-QEWAHAW2.js";
 import "./chunk-P3QQPMQA.js";
-import "./chunk-O4BBDP2G.js";
-import "./chunk-KPVVWKF3.js";
-import "./chunk-XWUQ4IH5.js";
+import "./chunk-FTGU6G45.js";
+import "./chunk-PSTHNTHF.js";
+import "./chunk-VGGNHRYZ.js";
 import "./chunk-F6WFNA7U.js";
-import "./chunk-F6AOBFUN.js";
+import "./chunk-NW7SPXVG.js";
 import "./chunk-KM73TBQ4.js";
 import "./chunk-MPHPFVKK.js";
 import "./chunk-AXMWHKXA.js";
 import "./chunk-GLCZKT5V.js";
-import "./chunk-GJJQV4PY.js";
+import "./chunk-KK3FEHPJ.js";
 import "./chunk-46UV252V.js";
 import "./chunk-FPGTNKCP.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-EFIMD5VA.js";
-import "./chunk-E5BWLU5J.js";
+import "./chunk-H6BFLALJ.js";
+import "./chunk-3MJ44LNC.js";
 import "./chunk-HHJLM3WQ.js";
-import "./chunk-L2GTEEEU.js";
+import "./chunk-K5IDV3PC.js";
 import {
   Storage,
   createDebugLogger
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-YMB77M76.js";
 import "./chunk-VOQXFAY5.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";