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

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

@@ -2,15 +2,29 @@
 "use strict";
 import {
   OpenAILogger
-} from "./chunk-6XZERB6P.js";
+} from "./chunk-3GM5DLBI.js";
 import {
   areSensitiveSpanAttributesEnabled
-} from "./chunk-O5AZPHYZ.js";
+} from "./chunk-K34GJQOZ.js";
 import {
   OpenAIContentConverter,
   openaiRequestCaptureContext
-} from "./chunk-P2UCMHDT.js";
+} from "./chunk-XDRXOSAD.js";
 import "./chunk-2J3OJGTL.js";
+import {
+  retryContext
+} from "./chunk-P3QQPMQA.js";
+import "./chunk-D7QGE3RT.js";
+import {
+  getGenAiUsageProvenance
+} from "./chunk-QLTATTPS.js";
+import {
+  runtimeDiagnostics
+} from "./chunk-GLCZKT5V.js";
+import {
+  createGenAiExchange
+} from "./chunk-GZDWTBT3.js";
+import "./chunk-NLFLYSS4.js";
 import {
   ApiErrorEvent,
   ApiRequestEvent,
@@ -20,63 +34,49 @@ import {
   logApiRequest,
   logApiResponse,
   subagentNameContext
-} from "./chunk-HB6QW4LM.js";
+} from "./chunk-4KM2SYK5.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 {
-  retryContext
-} from "./chunk-P3QQPMQA.js";
-import "./chunk-KPVVWKF3.js";
-import "./chunk-XWUQ4IH5.js";
+import "./chunk-G6MUFRNI.js";
+import "./chunk-LSRI3ND3.js";
+import "./chunk-PVXEJB66.js";
+import "./chunk-YIGGWOJE.js";
+import "./chunk-KWX56CHZ.js";
 import "./chunk-F6WFNA7U.js";
-import "./chunk-F6AOBFUN.js";
-import {
-  getGenAiUsageProvenance
-} from "./chunk-GLWWPFTW.js";
-import {
-  createGenAiExchange
-} from "./chunk-7SUQZ7QH.js";
-import {
-  runtimeDiagnostics
-} from "./chunk-GLCZKT5V.js";
-import "./chunk-GJJQV4PY.js";
 import "./chunk-46UV252V.js";
 import "./chunk-FPGTNKCP.js";
-import "./chunk-EFIMD5VA.js";
+import "./chunk-4AOVQPJU.js";
+import "./chunk-PZW46OTB.js";
+import "./chunk-YBHUXEC6.js";
 import {
   API_CALL_ABORTED_SPAN_STATUS_MESSAGE,
   API_CALL_FAILED_SPAN_STATUS_MESSAGE,
   endLLMRequestSpan,
-  startLLMRequestSpan
-} from "./chunk-E5BWLU5J.js";
+  startLLMRequestSpanWithContext
+} from "./chunk-N4SVADAV.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-HOSVOUDK.js";
 import "./chunk-VOQXFAY5.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
 import {
   GenerateContentResponse
-} from "./chunk-LHOG4E6Y.js";
-import "./chunk-AMDSOFFV.js";
-import "./chunk-E3GLDLYB.js";
+} from "./chunk-22C7BQ6D.js";
+import "./chunk-TYAMGABM.js";
 import "./chunk-FCMNKVXT.js";
+import "./chunk-AMDSOFFV.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
         );
@@ -449,13 +474,14 @@ var LoggingContentGenerator = class {
     } catch (error) {
       const durationMs = Date.now() - startTime;
       const observedFinishReasons = exchange.controller.finalize(false);
-      const aborted = req.config?.abortSignal?.aborted ?? false;
+      const cancelled = (req.config?.abortSignal?.aborted ?? false) && isAbortError(error);
       endLLMRequestSpan(llmSpan, {
         success: false,
+        cancelled,
         durationMs,
-        error: aborted ? API_CALL_ABORTED_SPAN_STATUS_MESSAGE : API_CALL_FAILED_SPAN_STATUS_MESSAGE,
-        errorType: getErrorType(error),
-        errorStatusCode: getErrorStatus(error),
+        error: cancelled ? API_CALL_ABORTED_SPAN_STATUS_MESSAGE : API_CALL_FAILED_SPAN_STATUS_MESSAGE,
+        errorType: cancelled ? void 0 : getErrorType(error),
+        errorStatusCode: cancelled ? void 0 : getErrorStatus(error),
         finishReasons: observedFinishReasons,
         subagentName: subagentNameContext.getStore() || void 0,
         ...retrySnapshot,
@@ -468,6 +494,7 @@ var LoggingContentGenerator = class {
           error,
           req.model,
           userPromptId,
+          requestSessionId,
           req.config?.abortSignal
         );
         try {
@@ -486,24 +513,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 +546,8 @@ var LoggingContentGenerator = class {
           this.logApiRequest(
             this.toContents(req.contents),
             req.model,
-            userPromptId
+            userPromptId,
+            requestSessionId
           );
         }
         return session.wrap(async () => {
@@ -541,16 +570,18 @@ var LoggingContentGenerator = class {
           error,
           req.model,
           userPromptId,
+          requestSessionId,
           req.config?.abortSignal
         )
       );
-      const aborted = req.config?.abortSignal?.aborted ?? false;
+      const cancelled = (req.config?.abortSignal?.aborted ?? false) && isAbortError(error);
       endLLMRequestSpan(llmSpan, {
         success: false,
+        cancelled,
         durationMs,
-        error: aborted ? API_CALL_ABORTED_SPAN_STATUS_MESSAGE : API_CALL_FAILED_SPAN_STATUS_MESSAGE,
-        errorType: getErrorType(error),
-        errorStatusCode: getErrorStatus(error),
+        error: cancelled ? API_CALL_ABORTED_SPAN_STATUS_MESSAGE : API_CALL_FAILED_SPAN_STATUS_MESSAGE,
+        errorType: cancelled ? void 0 : getErrorType(error),
+        errorStatusCode: cancelled ? void 0 : getErrorStatus(error),
         finishReasons: observedFinishReasons,
         subagentName: subagentNameContext.getStore() || void 0,
         ...retrySnapshot,
@@ -573,21 +604,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 +631,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 = [];
@@ -616,13 +647,17 @@ var LoggingContentGenerator = class {
     }, "refreshLateUsageMetadata");
     let errorOccurred = false;
     let streamCompleted = false;
+    let abortedBeforeStreamCompletion = abortSignal?.aborted ?? false;
+    const markStreamAborted = /* @__PURE__ */ __name(() => {
+      if (!streamCompleted) abortedBeforeStreamCompletion = true;
+    }, "markStreamAborted");
+    abortSignal?.addEventListener("abort", markStreamAborted, { once: true });
     const finishReasons = /* @__PURE__ */ new Map();
     let lastError;
     const subagentName = subagentNameContext.getStore();
     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 +752,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,50 +775,49 @@ 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;
     } finally {
+      abortSignal?.removeEventListener("abort", markStreamAborted);
       if (spanEndTimeout !== void 0) {
         clearTimeout(spanEndTimeout);
       }
       refreshLateUsageMetadata();
       if (span && !spanEndedByTimeout) {
-        const aborted = abortSignal?.aborted ?? false;
+        const cancelled = abortedBeforeStreamCompletion && (lastError === void 0 || isAbortError(lastError));
         const observedFinishReasons = exchangeController?.finalize(
-          !errorOccurred && streamCompleted
+          !errorOccurred && !cancelled && streamCompleted
         );
         endLLMRequestSpan(span, {
-          success: !errorOccurred,
+          success: !errorOccurred && !cancelled,
+          cancelled,
           ...usageSpanMetadata(lastUsageMetadata),
           ttftMs,
           durationMs: Date.now() - startTime,
-          error: errorOccurred ? aborted ? API_CALL_ABORTED_SPAN_STATUS_MESSAGE : API_CALL_FAILED_SPAN_STATUS_MESSAGE : void 0,
+          error: cancelled ? API_CALL_ABORTED_SPAN_STATUS_MESSAGE : errorOccurred ? API_CALL_FAILED_SPAN_STATUS_MESSAGE : void 0,
           responseId: firstResponseId || void 0,
           responseModel: firstModelVersion || 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,
-          errorStatusCode: lastError ? getErrorStatus(lastError) : void 0,
+          errorType: lastError && !cancelled ? getErrorType(lastError) : void 0,
+          errorStatusCode: lastError && !cancelled ? getErrorStatus(lastError) : void 0,
           ...retrySnapshot,
           config: this.config
         });

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

@@ -4,10 +4,10 @@ import {
   WAKEUP_MAX_SECONDS,
   WAKEUP_MIN_SECONDS,
   clampWakeupSeconds
-} from "./chunk-QTI7SRXI.js";
+} from "./chunk-QPBFRWCP.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-XLQS3VI6.js";
+import "./chunk-AKBFSOC5.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-YIGGWOJE.js";
+import "./chunk-YBHUXEC6.js";
 import {
   getErrorMessage
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-HOSVOUDK.js";
 import "./chunk-QUGAUQGJ.js";
 import {
   init_esbuild_shims

package/chunks/{ls-FSHISLLA.js → ls-6W2D7TKU.js}

@@ -1,17 +1,17 @@
 // Force strict mode and setup for ESM
 "use strict";
-import {
-  getMemoryBaseDir
-} from "./chunk-732MOPEM.js";
 import {
   DEFAULT_FILE_FILTERING_OPTIONS
-} from "./chunk-V3LXMASR.js";
+} from "./chunk-FRHQQC2Z.js";
+import {
+  getMemoryBaseDir
+} from "./chunk-G6MUFRNI.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-XTH2OMDS.js";
+} from "./chunk-YIGGWOJE.js";
 import {
   Storage,
   createDebugLogger,
@@ -20,7 +20,7 @@ import {
   makeRelative,
   shortenPath,
   unescapePath
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-HOSVOUDK.js";
 import "./chunk-QUGAUQGJ.js";
 import {
   init_esbuild_shims

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

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