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

package/chunks/{channel-worker-manager-4EHJSPRH.js → channel-worker-manager-PWD2UURZ.js}

@@ -2,26 +2,26 @@
 "use strict";
 import {
   ChannelWorkerReconcileError
-} from "./chunk-5TXOGH4I.js";
-import "./chunk-HHGQGTJQ.js";
+} from "./chunk-T4G33L3W.js";
+import "./chunk-UFHPAMAV.js";
 import "./chunk-624NHDGB.js";
 import "./chunk-6PLDPT2C.js";
 import {
   ChannelWorkerStartupError,
   ChannelWorkerStopError
-} from "./chunk-ZGWY4YUB.js";
+} from "./chunk-FVHLDSQS.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-Z7B6SRPM.js";
 import {
   ChannelDeliveryError,
   ChannelWebhookEnqueueError
 } from "./chunk-YP5KH5Y7.js";
-import "./chunk-K7JW6V5O.js";
+import "./chunk-JW5UEE3V.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-HIBNSEJE.js";
 import "./chunk-M5GB774H.js";
 import "./chunk-BKHCW2BI.js";
-import "./chunk-LT532KF4.js";
+import "./chunk-ADJDLEVO.js";
 import "./chunk-IW6RQPQB.js";
 import "./chunk-5HBA2Z7V.js";
 import "./chunk-TWPJO254.js";

package/chunks/{channel-worker-supervisor-DZKHYFHV.js → channel-worker-supervisor-XQJBGFCM.js}

@@ -4,16 +4,16 @@ import {
   ChannelWorkerStartupError,
   ChannelWorkerStopError,
   createChannelWorkerSupervisor
-} from "./chunk-ZGWY4YUB.js";
+} from "./chunk-FVHLDSQS.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-Z7B6SRPM.js";
 import "./chunk-YP5KH5Y7.js";
-import "./chunk-K7JW6V5O.js";
+import "./chunk-JW5UEE3V.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-HIBNSEJE.js";
 import "./chunk-M5GB774H.js";
 import "./chunk-BKHCW2BI.js";
-import "./chunk-LT532KF4.js";
+import "./chunk-ADJDLEVO.js";
 import "./chunk-IW6RQPQB.js";
 import "./chunk-5HBA2Z7V.js";
 import "./chunk-TWPJO254.js";

package/chunks/{chunk-GZGDJ4E6.js → chunk-2ASWIM4A.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   createDebugLogger
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-YMB77M76.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-DP3IHZGG.js → chunk-2AUM35J5.js}

@@ -10,7 +10,7 @@ import {
   require_re,
   require_semver,
   require_valid
-} from "./chunk-URK542T4.js";
+} from "./chunk-NF5J2WFA.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -370,6 +370,48 @@ var require_coerce = __commonJS({
   }
 });
 
+// node_modules/semver/functions/truncate.js
+var require_truncate = __commonJS({
+  "node_modules/semver/functions/truncate.js"(exports, module) {
+    "use strict";
+    init_esbuild_shims();
+    var parse = require_parse();
+    var constants = require_constants();
+    var SemVer = require_semver();
+    var truncate = /* @__PURE__ */ __name((version, truncation, options) => {
+      if (!constants.RELEASE_TYPES.includes(truncation)) {
+        return null;
+      }
+      const clonedVersion = cloneInputVersion(version, options);
+      return clonedVersion && doTruncation(clonedVersion, truncation);
+    }, "truncate");
+    var cloneInputVersion = /* @__PURE__ */ __name((version, options) => {
+      const versionStringToParse = version instanceof SemVer ? version.version : version;
+      return parse(versionStringToParse, options);
+    }, "cloneInputVersion");
+    var doTruncation = /* @__PURE__ */ __name((version, truncation) => {
+      if (isPrerelease(truncation)) {
+        return version.version;
+      }
+      version.prerelease = [];
+      switch (truncation) {
+        case "major":
+          version.minor = 0;
+          version.patch = 0;
+          break;
+        case "minor":
+          version.patch = 0;
+          break;
+      }
+      return version.format();
+    }, "doTruncation");
+    var isPrerelease = /* @__PURE__ */ __name((type) => {
+      return type.startsWith("pre");
+    }, "isPrerelease");
+    module.exports = truncate;
+  }
+});
+
 // node_modules/semver/internal/lrucache.js
 var require_lrucache = __commonJS({
   "node_modules/semver/internal/lrucache.js"(exports, module) {
@@ -486,6 +528,7 @@ var require_range = __commonJS({
         return this.range;
       }
       parseRange(range) {
+        range = range.replace(BUILDSTRIPRE, "");
         const memoOpts = (this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) | (this.options.loose && FLAG_LOOSE);
         const memoKey = memoOpts + ":" + range;
         const cached = cache.get(memoKey);
@@ -568,12 +611,14 @@ var require_range = __commonJS({
     var SemVer = require_semver();
     var {
       safeRe: re,
+      src,
       t,
       comparatorTrimReplace,
       tildeTrimReplace,
       caretTrimReplace
     } = require_re();
     var { FLAG_INCLUDE_PRERELEASE, FLAG_LOOSE } = require_constants();
+    var BUILDSTRIPRE = new RegExp(src[t.BUILD], "g");
     var isNullSet = /* @__PURE__ */ __name((c) => c.value === "<0.0.0-0", "isNullSet");
     var isAny = /* @__PURE__ */ __name((c) => c.value === "", "isAny");
     var isSatisfiable = /* @__PURE__ */ __name((comparators, options) => {
@@ -602,20 +647,22 @@ var require_range = __commonJS({
       return comp;
     }, "parseComparator");
     var isX = /* @__PURE__ */ __name((id) => !id || id.toLowerCase() === "x" || id === "*", "isX");
+    var invalidXRangeOrder = /* @__PURE__ */ __name((M, m, p) => isX(M) && !isX(m) || isX(m) && p && !isX(p), "invalidXRangeOrder");
     var replaceTildes = /* @__PURE__ */ __name((comp, options) => {
       return comp.trim().split(/\s+/).map((c) => replaceTilde(c, options)).join(" ");
     }, "replaceTildes");
     var replaceTilde = /* @__PURE__ */ __name((comp, options) => {
       const r = options.loose ? re[t.TILDELOOSE] : re[t.TILDE];
+      const z = options.includePrerelease ? "-0" : "";
       return comp.replace(r, (_, M, m, p, pr) => {
         debug("tilde", comp, _, M, m, p, pr);
         let ret;
         if (isX(M)) {
           ret = "";
         } else if (isX(m)) {
-          ret = `>=${M}.0.0 <${+M + 1}.0.0-0`;
+          ret = `>=${M}.0.0${z} <${+M + 1}.0.0-0`;
         } else if (isX(p)) {
-          ret = `>=${M}.${m}.0 <${M}.${+m + 1}.0-0`;
+          ret = `>=${M}.${m}.0${z} <${M}.${+m + 1}.0-0`;
         } else if (pr) {
           debug("replaceTilde pr", pr);
           ret = `>=${M}.${m}.${p}-${pr} <${M}.${+m + 1}.0-0`;
@@ -661,9 +708,9 @@ var require_range = __commonJS({
           debug("no pr");
           if (M === "0") {
             if (m === "0") {
-              ret = `>=${M}.${m}.${p}${z} <${M}.${m}.${+p + 1}-0`;
+              ret = `>=${M}.${m}.${p} <${M}.${m}.${+p + 1}-0`;
             } else {
-              ret = `>=${M}.${m}.${p}${z} <${M}.${+m + 1}.0-0`;
+              ret = `>=${M}.${m}.${p} <${M}.${+m + 1}.0-0`;
             }
           } else {
             ret = `>=${M}.${m}.${p} <${+M + 1}.0.0-0`;
@@ -682,6 +729,9 @@ var require_range = __commonJS({
       const r = options.loose ? re[t.XRANGELOOSE] : re[t.XRANGE];
       return comp.replace(r, (ret, gtlt, M, m, p, pr) => {
         debug("xRange", comp, ret, gtlt, M, m, p, pr);
+        if (invalidXRangeOrder(M, m, p)) {
+          return comp;
+        }
         const xM = isX(M);
         const xm = xM || isX(m);
         const xp = xm || isX(p);
@@ -1345,7 +1395,7 @@ var require_subset = __commonJS({
             if (higher === c && higher !== gt) {
               return false;
             }
-          } else if (gt.operator === ">=" && !satisfies(gt.semver, String(c), options)) {
+          } else if (gt.operator === ">=" && !c.test(gt.semver)) {
             return false;
           }
         }
@@ -1360,7 +1410,7 @@ var require_subset = __commonJS({
             if (lower === c && lower !== lt) {
               return false;
             }
-          } else if (lt.operator === "<=" && !satisfies(lt.semver, String(c), options)) {
+          } else if (lt.operator === "<=" && !c.test(lt.semver)) {
             return false;
           }
         }
@@ -1429,6 +1479,7 @@ var require_semver2 = __commonJS({
     var lte = require_lte();
     var cmp = require_cmp();
     var coerce = require_coerce();
+    var truncate = require_truncate();
     var Comparator = require_comparator();
     var Range = require_range();
     var satisfies = require_satisfies();
@@ -1467,6 +1518,7 @@ var require_semver2 = __commonJS({
       lte,
       cmp,
       coerce,
+      truncate,
       Comparator,
       Range,
       satisfies,

package/chunks/{chunk-T4FTABSW.js → chunk-2N6CV4PW.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   createDebugLogger
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-YMB77M76.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-5PWLQ7SK.js → chunk-2RTRFLWH.js}

@@ -18,10 +18,10 @@ import {
 } from "./chunk-FPGTNKCP.js";
 import {
   buildRuntimeFetchOptions
-} from "./chunk-EFIMD5VA.js";
+} from "./chunk-H6BFLALJ.js";
 import {
   createDebugLogger
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-YMB77M76.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -7111,6 +7111,7 @@ var DashScopeOpenAICompatibleProvider = class _DashScopeOpenAICompatibleProvider
    * Covers the official regional hosts (DASHSCOPE_REGIONAL_HOSTS),
    * Token Plan endpoints under token-plan.<region>.maas.aliyuncs.com,
    * internal Alibaba domains (*.alibaba-inc.com, *.aliyun-inc.com),
+   * Alibaba Cloud API Gateway domains (*.alicloudapi.com),
    * and proxy matches.
    *
    * Note: any *.alibaba-inc.com / *.aliyun-inc.com host is treated as a
@@ -7133,11 +7134,12 @@ var DashScopeOpenAICompatibleProvider = class _DashScopeOpenAICompatibleProvider
     );
     const isTokenPlanOrigin = hostname !== null && hostname.startsWith("token-plan.") && hostname.endsWith(".maas.aliyuncs.com");
     const isInternalOrigin = hostname !== null && (hostname.endsWith(".alibaba-inc.com") || hostname.endsWith(".aliyun-inc.com"));
+    const isAliCloudApiOrigin = hostname !== null && hostname.endsWith(".alicloudapi.com");
     const normalizedProxyUrl = DASHSCOPE_PROXY_BASE_URL?.endsWith("/") ? DASHSCOPE_PROXY_BASE_URL.slice(0, -1) : DASHSCOPE_PROXY_BASE_URL;
     const isProxyMatch = Boolean(
       normalizedProxyUrl && normalizedBaseUrl.toLowerCase() === normalizedProxyUrl.toLowerCase()
     );
-    if (normalizedProxyUrl && !isDashscopeOrigin && !isTokenPlanOrigin && !isInternalOrigin && !isProxyMatch) {
+    if (normalizedProxyUrl && !isDashscopeOrigin && !isTokenPlanOrigin && !isInternalOrigin && !isAliCloudApiOrigin && !isProxyMatch) {
       debugLogger.debug(
         `DASHSCOPE_PROXY_BASE_URL is configured but the request baseUrl does not match. DashScope headers/cache control will be skipped.`
       );
@@ -7147,7 +7149,12 @@ var DashScopeOpenAICompatibleProvider = class _DashScopeOpenAICompatibleProvider
         `DashScope provider activated via internal origin: ${hostname}`
       );
     }
-    return isDashscopeOrigin || isTokenPlanOrigin || isInternalOrigin || isProxyMatch;
+    if (isAliCloudApiOrigin) {
+      debugLogger.debug(
+        `DashScope provider activated via alicloudapi origin: ${hostname}`
+      );
+    }
+    return isDashscopeOrigin || isTokenPlanOrigin || isInternalOrigin || isAliCloudApiOrigin || isProxyMatch;
   }
   buildHeaders() {
     const version = this.cliConfig.getCliVersion() || "unknown";

package/chunks/{chunk-TYGKUOEG.js → chunk-2U3UCXZ3.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   MissingCliEntryError
-} from "./chunk-OPBATTFQ.js";
+} from "./chunk-NHZF4VCD.js";
 import {
   redactLogCredentials
 } from "./chunk-M5GB774H.js";
@@ -1141,6 +1141,7 @@ function createSpawnChannelFactory(options = {}) {
         {
           cwd: workspaceCwd,
           stdio: ["pipe", "pipe", "pipe"],
+          windowsHide: true,
           env: childEnv
         }
       );

package/chunks/{chunk-QZ5G26ZE.js → chunk-32SNBMNP.js}

@@ -4,7 +4,7 @@ import {
   OpenAIContentConverter,
   TaggedThinkingParser,
   openaiRequestCaptureContext
-} from "./chunk-P2UCMHDT.js";
+} from "./chunk-IJCZP2MA.js";
 import {
   applyOfficialOpenAIPromptCaching,
   isOfficialOpenAIEndpoint
@@ -12,41 +12,41 @@ import {
 import {
   DashScopeOpenAICompatibleProvider,
   DefaultOpenAICompatibleProvider
-} from "./chunk-5PWLQ7SK.js";
+} from "./chunk-2RTRFLWH.js";
 import {
   getCurrentAgentId
-} from "./chunk-EYS3GGM3.js";
+} from "./chunk-SKRHR6N2.js";
 import {
   InvalidStreamError
 } from "./chunk-2J3OJGTL.js";
 import {
   ProtocolTagSanitizedEvent,
   logProtocolTagSanitized
-} from "./chunk-HB6QW4LM.js";
+} from "./chunk-UAAWNTOC.js";
 import {
   isQwenFamilyWireModel,
   isTieredEffortWireModel
 } from "./chunk-YRLW2MSX.js";
 import {
   isInForkExecution
-} from "./chunk-ZV4XVYL3.js";
+} from "./chunk-TROB4PZY.js";
 import {
   getTransportCode
-} from "./chunk-O4BBDP2G.js";
+} from "./chunk-FTGU6G45.js";
 import {
   getRateLimitErrorDetails
-} from "./chunk-KPVVWKF3.js";
+} from "./chunk-PSTHNTHF.js";
 import {
   RequestTokenizer
-} from "./chunk-QUESTNOP.js";
+} from "./chunk-4JS2QK7P.js";
 import {
   safeJsonParse
-} from "./chunk-GLWWPFTW.js";
+} from "./chunk-6SU6OW5Z.js";
 import {
   reportOpenAiChunk,
   reportOpenAiRequest,
   reportOpenAiResponse
-} from "./chunk-7SUQZ7QH.js";
+} from "./chunk-V3NMFQD2.js";
 import {
   DEFAULT_STREAM_IDLE_TIMEOUT_MS,
   DEFAULT_STREAM_MAX_LIFETIME_MS,
@@ -66,14 +66,14 @@ import {
 } from "./chunk-DJ2GSRLV.js";
 import {
   redactProxyError
-} from "./chunk-EFIMD5VA.js";
+} from "./chunk-H6BFLALJ.js";
 import {
   createDebugLogger,
   getErrorMessage,
   getErrorStatus,
   getErrorType,
   isAbortError
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-YMB77M76.js";
 import {
   GenerateContentResponse
 } from "./chunk-LHOG4E6Y.js";

package/chunks/{chunk-NPE3STIW.js → chunk-3JI5D6RU.js}

@@ -3,17 +3,17 @@
 import {
   resolveModelConfig,
   resolveProviderProtocol
-} from "./chunk-M6HXP2SG.js";
+} from "./chunk-GHOUZ5X4.js";
 import {
   external_exports
 } from "./chunk-CQ35AJ4Z.js";
 import {
   stripRuntimeSnapshotPrefix
-} from "./chunk-I4XSOFH2.js";
+} from "./chunk-JBZYGFIB.js";
 import {
   AuthType,
   MODEL_GENERATION_CONFIG_FIELDS
-} from "./chunk-XWUQ4IH5.js";
+} from "./chunk-XJ6IMYUS.js";
 import {
   REASONING_EFFORT_TIERS,
   normalizeReasoningEffort

package/chunks/{chunk-E5BWLU5J.js → chunk-3MJ44LNC.js}

@@ -14,14 +14,17 @@ import {
   SPAN_TOOL_EXECUTION,
   TOOL_FAILURE_KIND_ATTRIBUTE,
   TOOL_FAILURE_KIND_CANCELLED,
-  require_src
-} from "./chunk-L2GTEEEU.js";
+  require_src,
+  sessionIdContext
+} from "./chunk-K5IDV3PC.js";
 import {
   createDebugLogger,
   getCurrentSessionId,
+  getSessionIdFromContext,
   setSessionContext,
+  setSessionIdOnContext,
   setShellTracePropagation
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-YMB77M76.js";
 import {
   DiagLogLevel,
   ROOT_CONTEXT,
@@ -939,7 +942,7 @@ function initializeTelemetry(config) {
   telemetryInitPromise ??= (async () => {
     const debugLogger3 = createDebugLogger("OTEL");
     try {
-      const { startTelemetrySdk } = await import("./sdk-impl-5W3JUCWF.js");
+      const { startTelemetrySdk } = await import("./sdk-impl-XO4UF6PR.js");
       if (telemetryInitialized) return;
       const started = await startTelemetrySdk(config);
       if (!started) return;
@@ -1090,15 +1093,17 @@ function isInNativeSubagentSpan() {
   return ctx !== void 0 && !ctx.ended;
 }
 __name(isInNativeSubagentSpan, "isInNativeSubagentSpan");
-function resolveSessionId(parentCtx) {
+function resolveSessionId(parentCtx, explicitSessionId, activeContext = context.active()) {
   const fromParent = parentCtx?.attributes?.["session.id"];
-  return typeof fromParent === "string" && fromParent ? fromParent : getCurrentSessionId();
+  if (typeof fromParent === "string" && fromParent) return fromParent;
+  if (explicitSessionId) return explicitSessionId;
+  return getSessionIdFromContext(activeContext) ?? (sessionIdContext.getStore() || getCurrentSessionId());
 }
 __name(resolveSessionId, "resolveSessionId");
-function resolveGenAiUserId(parentCtx, promptId) {
+function resolveGenAiUserId(parentCtx, promptId, explicitUserId) {
   const logicalParent = parentCtx ?? (promptId ? interactionIdentityByPromptId.get(promptId) : void 0);
   const value = logicalParent?.attributes["gen_ai.user.id"];
-  return typeof value === "string" && value ? value : void 0;
+  return typeof value === "string" && value ? value : explicitUserId;
 }
 __name(resolveGenAiUserId, "resolveGenAiUserId");
 var activeSpans = /* @__PURE__ */ new Map();
@@ -1288,9 +1293,10 @@ async function withInteractionSpan(config, options, fn, getResultStatus) {
   if (!isTelemetrySdkInitialized()) return await fn();
   ensureCleanupInterval();
   interactionSequence++;
+  const sessionId = config.getSessionId();
   const userId = config.getTelemetryUserId();
   const attributes = {
-    "session.id": config.getSessionId(),
+    "session.id": sessionId,
     ...userId ? { "gen_ai.user.id": userId } : {},
     "qwen-code.prompt_id": options.promptId,
     "qwen-code.message_type": options.messageType,
@@ -1324,7 +1330,10 @@ async function withInteractionSpan(config, options, fn, getResultStatus) {
   } else {
     interactionIdentityByPromptId.delete(options.promptId);
   }
-  const activeContext = trace.setSpan(parentContext, span);
+  const activeContext = trace.setSpan(
+    setSessionIdOnContext(parentContext, sessionId),
+    span
+  );
   return await context.with(
     activeContext,
     async () => interactionContext.run(spanContextObj, async () => {
@@ -1369,14 +1378,26 @@ async function withInteractionSpan(config, options, fn, getResultStatus) {
   );
 }
 __name(withInteractionSpan, "withInteractionSpan");
-function startLLMRequestSpan(model, promptId, options) {
+function startLLMRequestSpanWithContext(model, promptId, options) {
   if (!isTelemetrySdkInitialized()) {
-    return NOOP_SPAN;
+    return {
+      span: NOOP_SPAN,
+      context: trace.setSpan(context.active(), NOOP_SPAN)
+    };
   }
   const parentCtx = subagentContext.getStore() ?? interactionContext.getStore();
+  const identityParentCtx = subagentContext.getStore() ?? toolContext.getStore() ?? interactionContext.getStore();
   const ctx = resolveParentContext(parentCtx);
-  const sessionId = resolveSessionId(parentCtx);
-  const userId = resolveGenAiUserId(parentCtx, promptId);
+  const sessionId = resolveSessionId(
+    identityParentCtx,
+    options?.sessionId,
+    ctx
+  );
+  const userId = resolveGenAiUserId(
+    identityParentCtx,
+    promptId,
+    options?.userId
+  );
   const attributes = {
     ...sessionId ? { "session.id": sessionId } : {},
     ...sessionId ? { "gen_ai.conversation.id": sessionId } : {},
@@ -1389,10 +1410,11 @@ function startLLMRequestSpan(model, promptId, options) {
     ...options?.providerName ? { "gen_ai.provider.name": options.providerName } : {},
     ...options?.outputType ? { "gen_ai.output.type": options.outputType } : {}
   };
+  const sessionContext = setSessionIdOnContext(ctx, sessionId);
   const span = getTracer().startSpan(
     SPAN_LLM_REQUEST,
     { kind: SpanKind.INTERNAL, attributes },
-    ctx
+    sessionContext
   );
   const spanId = getSpanId(span);
   const spanContextObj = {
@@ -1403,9 +1425,12 @@ function startLLMRequestSpan(model, promptId, options) {
   };
   activeSpans.set(spanId, new WeakRef(spanContextObj));
   strongSpans.set(spanId, spanContextObj);
-  return span;
+  return {
+    span,
+    context: trace.setSpan(sessionContext, span)
+  };
 }
-__name(startLLMRequestSpan, "startLLMRequestSpan");
+__name(startLLMRequestSpanWithContext, "startLLMRequestSpanWithContext");
 function endLLMRequestSpan(span, metadata) {
   const spanId = getSpanId(span);
   const spanCtx = activeSpans.get(spanId)?.deref();
@@ -1540,9 +1565,10 @@ function startToolSpan(toolName, attrs, description, promptId) {
   let span;
   try {
     const parentCtx = subagentContext.getStore() ?? interactionContext.getStore();
+    const identityParentCtx = subagentContext.getStore() ?? toolContext.getStore() ?? interactionContext.getStore();
     const ctx = resolveParentContext(parentCtx);
-    const sessionId = resolveSessionId(parentCtx);
-    const userId = resolveGenAiUserId(parentCtx, promptId);
+    const sessionId = resolveSessionId(identityParentCtx);
+    const userId = resolveGenAiUserId(identityParentCtx, promptId);
     const attributes = {
       ...sessionId ? { "session.id": sessionId } : {},
       ...attrs,
@@ -1588,7 +1614,11 @@ function runInToolSpanContext(span, fn) {
   const spanId = getSpanId(span);
   const spanCtx = activeSpans.get(spanId)?.deref();
   if (!spanCtx) return fn();
-  const otelCtxWithSpan = trace.setSpan(context.active(), span);
+  const sessionId = resolveSessionId(spanCtx);
+  const otelCtxWithSpan = trace.setSpan(
+    setSessionIdOnContext(context.active(), sessionId),
+    span
+  );
   return toolContext.run(spanCtx, () => context.with(otelCtxWithSpan, fn));
 }
 __name(runInToolSpanContext, "runInToolSpanContext");
@@ -1923,12 +1953,14 @@ function startSubagentSpan(opts) {
   if (!isTelemetrySdkInitialized()) return NOOP_SPAN;
   ensureCleanupInterval();
   const parentCtx = subagentContext.getStore() ?? toolContext.getStore() ?? interactionContext.getStore();
+  const sessionId = resolveSessionId(parentCtx, opts.sessionId) ?? opts.sessionId;
   const userId = resolveGenAiUserId(parentCtx);
   const attributes = {
     // Spec-aligned (OTel GenAI Agent Spans, Development status).
     "gen_ai.operation.name": "invoke_agent",
     "gen_ai.agent.name": opts.subagentName,
-    "gen_ai.conversation.id": opts.sessionId,
+    "gen_ai.conversation.id": sessionId,
+    "session.id": sessionId,
     ...userId ? { "gen_ai.user.id": userId } : {},
     // Vendor identity and lifecycle. The per-invocation ID stays private;
     // gen_ai.agent.id is reserved for a stable agent definition identity.
@@ -1988,7 +2020,11 @@ function runInSubagentSpanContext(span, fn) {
   const spanId = getSpanId(span);
   const spanCtx = activeSpans.get(spanId)?.deref();
   if (!spanCtx) return fn();
-  const otelCtxWithSpan = trace.setSpan(context.active(), span);
+  const sessionId = resolveSessionId(spanCtx);
+  const otelCtxWithSpan = trace.setSpan(
+    setSessionIdOnContext(context.active(), sessionId),
+    span
+  );
   return subagentContext.run(
     spanCtx,
     () => toolContext.run(void 0, () => context.with(otelCtxWithSpan, fn))
@@ -2102,7 +2138,7 @@ export {
   startInteractionSpan,
   endInteractionSpan,
   withInteractionSpan,
-  startLLMRequestSpan,
+  startLLMRequestSpanWithContext,
   endLLMRequestSpan,
   startToolSpan,
   runInToolSpanContext,

package/chunks/{chunk-QUESTNOP.js → chunk-4JS2QK7P.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-46UV252V.js";
 import {
   createDebugLogger
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-YMB77M76.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-L7T742G2.js → chunk-4X5J3V2I.js}

@@ -11,14 +11,14 @@ import {
   DEFAULT_TOOL_RESULTS_TOTAL_CHARS_THRESHOLD,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD
-} from "./chunk-M6HXP2SG.js";
+} from "./chunk-GHOUZ5X4.js";
 import {
   DEFAULT_QWEN_CUSTOM_IGNORE_FILE_NAMES
-} from "./chunk-V3LXMASR.js";
+} from "./chunk-UHF5VBKO.js";
 import {
   DEFAULT_SENSITIVE_SPAN_ATTRIBUTE_MAX_LENGTH,
   SENSITIVE_SPAN_ATTRIBUTE_MAX_LENGTH_LIMIT
-} from "./chunk-L2GTEEEU.js";
+} from "./chunk-K5IDV3PC.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -504,6 +504,50 @@ var SETTINGS_SCHEMA = {
       }
     }
   },
+  review: {
+    type: "object",
+    label: "Review",
+    category: "General",
+    requiresRestart: false,
+    default: {},
+    description: "Settings for the /review skill.",
+    showInDialog: false,
+    properties: {
+      attribution: {
+        type: "boolean",
+        label: "Attribution: review",
+        category: "General",
+        requiresRestart: false,
+        default: true,
+        description: 'Append the attribution footer naming the model and CLI version (e.g. "_\u2014 qwen3-coder via Qwen Code /review (v0.21.2)_") to review bodies and inline comments posted to GitHub. Disable to post reviews without AI attribution. Note: with the footer off, presubmit duplicate detection still recognizes earlier posts by the same GitHub account, but footer-less posts from other accounts escape it. Only honored from User, System, and SystemDefaults settings scopes; values set in Workspace settings are ignored, so a repository cannot set review policy for its reviewers.',
+        showInDialog: true
+      },
+      effort: {
+        type: "enum",
+        label: "Default effort: review",
+        category: "General",
+        requiresRestart: false,
+        default: "auto",
+        description: 'Default effort for /review when --effort is not given. "auto" keeps the built-in rule (high for PRs, medium for local changes). An explicit --effort still wins; an effective --comment still forces high and --fix still floors at medium. Only honored from User, System, and SystemDefaults settings scopes; values set in Workspace settings are ignored, so a repository cannot set review policy for its reviewers.',
+        showInDialog: true,
+        options: [
+          { value: "auto", label: "Auto (high for PRs, medium for local)" },
+          { value: "low", label: "Low" },
+          { value: "medium", label: "Medium" },
+          { value: "high", label: "High" }
+        ]
+      },
+      comment: {
+        type: "boolean",
+        label: "Comment by default: review",
+        category: "General",
+        requiresRestart: false,
+        default: false,
+        description: "Treat every PR /review as if --comment was passed: findings are posted to the pull request without the flag. The post still binds to the PR named in the invocation. Enable only if you always want reviews published. Only honored from User, System, and SystemDefaults settings scopes; values set in Workspace settings are ignored, so a repository cannot set review policy for its reviewers.",
+        showInDialog: true
+      }
+    }
+  },
   output: {
     type: "object",
     label: "Output",