@qwen-code/qwen-code 0.17.1 → 0.18.0-preview.1

package/chunks/{chunk-C5CUHYSM.js → chunk-F6FLCHCS.js}

@@ -14,30 +14,25 @@ import {
 import {
   require_hasown
 } from "./chunk-UWCTAVOD.js";
-import {
-  safeJsonStringify
-} from "./chunk-W57YDFU5.js";
 import {
   DEFAULT_QWEN_MODEL,
   MAINLINE_CODER_MODEL
 } from "./chunk-OFEVLU4C.js";
 import {
-  isAutoMemPath
-} from "./chunk-NQ3E7YLD.js";
+  isAnyAutoMemPath
+} from "./chunk-AVLOK27J.js";
 import {
   InstallationManager
-} from "./chunk-OJFMTECH.js";
+} from "./chunk-JSYEZAYV.js";
 import {
   STRUCTURED_OUTPUT_REDACTED_ARGS
-} from "./chunk-SOGUPKP6.js";
+} from "./chunk-5RNZ2QKF.js";
 import {
+  BaseDeclarativeTool,
+  BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-6RQTH7UQ.js";
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation
-} from "./chunk-JKUAX6UT.js";
+} from "./chunk-G763GDO6.js";
 import {
   DEFAULT_OPENAI_BASE_URL,
   convertSchema,
@@ -45,7 +40,7 @@ import {
   runtimeDiagnostics,
   safeJsonParse,
   tokenLimit
-} from "./chunk-TDZCEIK6.js";
+} from "./chunk-D46KOV3C.js";
 import {
   FinishReason,
   GenerateContentResponse
@@ -65,7 +60,7 @@ import {
   setSessionContext,
   shortenPath,
   unescapePath
-} from "./chunk-ACBGEKB7.js";
+} from "./chunk-R5PDRHEF.js";
 import {
   require_dist
 } from "./chunk-ZERZSAZL.js";
@@ -86,7 +81,7 @@ import {
   isSpanContextValid,
   metrics,
   trace
-} from "./chunk-QWSRH265.js";
+} from "./chunk-WFVXF3OM.js";
 import {
   __qwen_dirname,
   init_esbuild_shims
@@ -48138,19 +48133,19 @@ var require_getMachineId = __commonJS({
       if (!getMachineIdImpl) {
         switch (process3.platform) {
           case "darwin":
-            getMachineIdImpl = (await import("./getMachineId-darwin-ZQB4Q7EW.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-darwin-T73DJL27.js")).getMachineId;
             break;
           case "linux":
-            getMachineIdImpl = (await import("./getMachineId-linux-JQ4NN4DN.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-linux-MKQTFPQM.js")).getMachineId;
             break;
           case "freebsd":
-            getMachineIdImpl = (await import("./getMachineId-bsd-GS3V2GK7.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-bsd-F7GNPTER.js")).getMachineId;
             break;
           case "win32":
-            getMachineIdImpl = (await import("./getMachineId-win-VHUZGBQ3.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-win-CDYFC6ZM.js")).getMachineId;
             break;
           default:
-            getMachineIdImpl = (await import("./getMachineId-unsupported-U7H4V4HJ.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-unsupported-MUR5KOQE.js")).getMachineId;
             break;
         }
       }
@@ -62731,6 +62726,7 @@ var EVENT_IDE_CONNECTION = "qwen-code.ide_connection";
 var EVENT_CHAT_COMPRESSION = "qwen-code.chat_compression";
 var EVENT_CONTENT_RETRY = "qwen-code.chat.content_retry";
 var EVENT_CONTENT_RETRY_FAILURE = "qwen-code.chat.content_retry_failure";
+var EVENT_API_RETRY = "qwen-code.api_retry";
 var EVENT_CONVERSATION_FINISHED = "qwen-code.conversation_finished";
 var EVENT_FILE_OPERATION = "qwen-code.file_operation";
 var EVENT_MODEL_SLASH_COMMAND = "qwen-code.slash_command.model";
@@ -62752,6 +62748,7 @@ var SPAN_TOOL = "qwen-code.tool";
 var SPAN_TOOL_EXECUTION = "qwen-code.tool.execution";
 var SPAN_TOOL_BLOCKED_ON_USER = "qwen-code.tool.blocked_on_user";
 var SPAN_HOOK = "qwen-code.hook";
+var SPAN_SUBAGENT = "qwen-code.subagent";
 
 // packages/core/src/telemetry/metrics.ts
 var TOOL_CALL_COUNT = `${SERVICE_NAME}.tool.call.count`;
@@ -62764,6 +62761,7 @@ var FILE_OPERATION_COUNT = `${SERVICE_NAME}.file.operation.count`;
 var INVALID_CHUNK_COUNT = `${SERVICE_NAME}.chat.invalid_chunk.count`;
 var CONTENT_RETRY_COUNT = `${SERVICE_NAME}.chat.content_retry.count`;
 var CONTENT_RETRY_FAILURE_COUNT = `${SERVICE_NAME}.chat.content_retry_failure.count`;
+var API_RETRY_COUNT = `${SERVICE_NAME}.api.retry.count`;
 var MODEL_SLASH_COMMAND_CALL_COUNT = `${SERVICE_NAME}.slash_command.model.call_count`;
 var SUBAGENT_EXECUTION_COUNT = `${SERVICE_NAME}.subagent.execution.count`;
 var ARENA_SESSION_COUNT = `${SERVICE_NAME}.arena.session.count`;
@@ -62853,6 +62851,12 @@ var COUNTER_DEFINITIONS = {
     assign: /* @__PURE__ */ __name((c) => contentRetryFailureCounter = c, "assign"),
     attributes: {}
   },
+  [API_RETRY_COUNT]: {
+    description: "Counts HTTP-status retries (429/5xx) at LLM call sites, emitted by retryWithBackoff onRetry callback.",
+    valueType: ValueType.INT,
+    assign: /* @__PURE__ */ __name((c) => apiRetryCounter = c, "assign"),
+    attributes: {}
+  },
   [MODEL_SLASH_COMMAND_CALL_COUNT]: {
     description: "Counts model slash command calls.",
     valueType: ValueType.INT,
@@ -63010,6 +63014,7 @@ var chatCompressionCounter;
 var invalidChunkCounter;
 var contentRetryCounter;
 var contentRetryFailureCounter;
+var apiRetryCounter;
 var subagentExecutionCounter;
 var modelSlashCommandCallCounter;
 var startupTimeHistogram;
@@ -63216,6 +63221,14 @@ function recordContentRetryFailure(config) {
   );
 }
 __name(recordContentRetryFailure, "recordContentRetryFailure");
+function recordApiRetry(config, attributes) {
+  if (!apiRetryCounter || !isMetricsInitialized) return;
+  apiRetryCounter.add(1, {
+    ...baseMetricDefinition.getCommonAttributes(config),
+    ...attributes
+  });
+}
+__name(recordApiRetry, "recordApiRetry");
 function recordModelSlashCommand(config, event) {
   if (!modelSlashCommandCallCounter || !isMetricsInitialized) return;
   modelSlashCommandCallCounter.add(1, {
@@ -63591,6 +63604,30 @@ function isInternalPromptId(promptId) {
 }
 __name(isInternalPromptId, "isInternalPromptId");
 
+// packages/core/src/utils/safeJsonStringify.ts
+init_esbuild_shims();
+function safeJsonStringify(obj, space) {
+  const ancestors = [];
+  return JSON.stringify(
+    obj,
+    function(_key, value) {
+      if (typeof value !== "object" || value === null) {
+        return value;
+      }
+      while (ancestors.length > 0 && ancestors[ancestors.length - 1] !== this) {
+        ancestors.pop();
+      }
+      if (ancestors.includes(value)) {
+        return "[Circular]";
+      }
+      ancestors.push(value);
+      return value;
+    },
+    space
+  );
+}
+__name(safeJsonStringify, "safeJsonStringify");
+
 // packages/core/src/telemetry/qwen-logger/qwen-logger.ts
 init_esbuild_shims();
 var import_https_proxy_agent = __toESM(require_dist(), 1);
@@ -64738,6 +64775,50 @@ var ContentRetryEvent = class {
     this.model = model;
   }
 };
+var ApiRetryEvent = class {
+  static {
+    __name(this, "ApiRetryEvent");
+  }
+  "event.name";
+  "event.timestamp";
+  // ISO 8601
+  model;
+  prompt_id;
+  attempt_number;
+  // 1-based monotonic counter (matches ALS retryContext.attempt)
+  error_type;
+  error_message;
+  status_code;
+  retry_delay_ms;
+  /**
+   * Reports the backoff delay following this failed attempt (NOT the attempt's
+   * own duration — that lives on the corresponding `qwen-code.llm_request`
+   * span's `duration_ms` attribute). Set equal to `retry_delay_ms` so the
+   * LogToSpanProcessor bridge span visualises the sleep window between the
+   * failed and next attempt in the trace timeline.
+   */
+  duration_ms;
+  /**
+   * Name of the subagent that issued the retrying request, or undefined when
+   * the request originates from the main conversation. Read from
+   * `subagentNameContext.getStore()` at the caller site (subagentNameContext
+   * is still active inside `retry.ts`'s catch block where `onRetry` fires).
+   */
+  subagent_name;
+  constructor(opts) {
+    this["event.name"] = "api_retry";
+    this["event.timestamp"] = (/* @__PURE__ */ new Date()).toISOString();
+    this.model = opts.model;
+    this.prompt_id = opts.promptId;
+    this.attempt_number = opts.attemptNumber;
+    this.error_message = opts.error instanceof Error ? opts.error.message : String(opts.error ?? "unknown error");
+    this.error_type = opts.error instanceof Error ? opts.error.constructor.name : void 0;
+    this.status_code = opts.statusCode;
+    this.retry_delay_ms = opts.retryDelayMs;
+    this.duration_ms = opts.retryDelayMs;
+    this.subagent_name = opts.subagentName;
+  }
+};
 var ContentRetryFailureEvent = class {
   static {
     __name(this, "ContentRetryFailureEvent");
@@ -66692,367 +66773,6 @@ function randomHexString(length) {
 }
 __name(randomHexString, "randomHexString");
 
-// packages/core/src/telemetry/log-to-span-processor.ts
-var EXPORT_TIMEOUT_MS = 3e4;
-var DEFAULT_MAX_BUFFER_SIZE = 1e4;
-var BUFFER_OVERFLOW_WARNING_INTERVAL_MS = 3e4;
-var LOG_EVENT_ERROR_STATUS_MESSAGE = "Log event recorded error";
-var DEFAULT_LOG_SPAN_NAME = "log.event";
-var MAX_SPAN_NAME_LENGTH = 128;
-var SENSITIVE_ATTRIBUTE_KEYS = /* @__PURE__ */ new Set([
-  "error",
-  "error.message",
-  "error_message",
-  "prompt",
-  "function_args",
-  "response_text"
-]);
-var defaultDiagnosticsSink = /* @__PURE__ */ __name((message) => {
-  process.stderr.write(`${message}
-`);
-}, "defaultDiagnosticsSink");
-var LogToSpanProcessor = class {
-  constructor(spanExporter, flushIntervalMsOrOptions = 5e3, maxBufferSize = DEFAULT_MAX_BUFFER_SIZE) {
-    this.spanExporter = spanExporter;
-    if (typeof flushIntervalMsOrOptions === "number") {
-      this.flushIntervalMs = flushIntervalMsOrOptions;
-      this.includeSensitiveSpanAttributes = false;
-      this.maxBufferSize = normalizeMaxBufferSize(maxBufferSize);
-      this.diagnosticsSink = defaultDiagnosticsSink;
-    } else {
-      this.flushIntervalMs = flushIntervalMsOrOptions.flushIntervalMs ?? 5e3;
-      this.includeSensitiveSpanAttributes = flushIntervalMsOrOptions.includeSensitiveSpanAttributes ?? false;
-      this.maxBufferSize = normalizeMaxBufferSize(
-        flushIntervalMsOrOptions.maxBufferSize
-      );
-      this.diagnosticsSink = flushIntervalMsOrOptions.diagnosticsSink ?? defaultDiagnosticsSink;
-    }
-    this.flushTimer = setInterval(() => {
-      void this.flush();
-    }, this.flushIntervalMs);
-    this.flushTimer.unref();
-  }
-  static {
-    __name(this, "LogToSpanProcessor");
-  }
-  buffer = [];
-  flushTimer;
-  inFlightExport;
-  flushIntervalMs;
-  cachedSessionId;
-  cachedTraceId;
-  includeSensitiveSpanAttributes;
-  maxBufferSize;
-  diagnosticsSink;
-  lastBufferOverflowWarningMs;
-  droppedSpansSinceLastBufferWarning = 0;
-  totalDroppedSpans = 0;
-  isShutdown = false;
-  onEmit(logRecord) {
-    if (this.isShutdown) {
-      return;
-    }
-    const name = deriveSpanName(logRecord);
-    const startTime = logRecord.hrTime;
-    const attributes = {};
-    if (logRecord.attributes) {
-      for (const [key, value] of Object.entries(logRecord.attributes)) {
-        if (value !== void 0 && value !== null && (this.includeSensitiveSpanAttributes || !SENSITIVE_ATTRIBUTE_KEYS.has(key))) {
-          attributes[key] = typeof value === "object" ? safeStringify(value) : value;
-        }
-      }
-    }
-    attributes["log.bridge"] = true;
-    if (logRecord.severityNumber !== void 0) {
-      attributes["log.severity_number"] = logRecord.severityNumber;
-    }
-    if (logRecord.severityText) {
-      attributes["log.severity_text"] = logRecord.severityText;
-    }
-    let endTime = startTime;
-    const durationMs = logRecord.attributes?.["duration_ms"];
-    if (typeof durationMs === "number" && Number.isFinite(durationMs) && durationMs > 0) {
-      const [secs, nanos] = startTime;
-      const durationNanos = durationMs * 1e6;
-      const endNanos = nanos + durationNanos;
-      endTime = [secs + Math.floor(endNanos / 1e9), endNanos % 1e9];
-    }
-    const parentSpanContext = getValidParentSpanContext(logRecord.spanContext);
-    const sessionId = logRecord.attributes?.["session.id"] || getCurrentSessionId();
-    let traceId;
-    if (parentSpanContext) {
-      traceId = parentSpanContext.traceId;
-    } else if (sessionId) {
-      const sid = String(sessionId);
-      if (sid !== this.cachedSessionId) {
-        this.cachedSessionId = sid;
-        this.cachedTraceId = deriveTraceId(sid);
-      }
-      traceId = this.cachedTraceId;
-    } else {
-      traceId = randomHexString(32);
-    }
-    const spanId = randomSpanId();
-    this.buffer.push({
-      name,
-      kind: SpanKind.INTERNAL,
-      spanContext: /* @__PURE__ */ __name(() => ({
-        traceId,
-        spanId,
-        traceFlags: parentSpanContext?.traceFlags ?? TraceFlags.SAMPLED
-      }), "spanContext"),
-      startTime,
-      endTime,
-      duration: hrTimeDiff(startTime, endTime),
-      attributes,
-      status: deriveSpanStatus(logRecord.attributes),
-      events: [],
-      links: [],
-      resource: logRecord.resource ?? (0, import_resources.resourceFromAttributes)({}),
-      instrumentationScope: logRecord.instrumentationScope ?? {
-        name: SERVICE_NAME,
-        version: ""
-      },
-      ended: true,
-      parentSpanContext,
-      droppedAttributesCount: 0,
-      droppedEventsCount: 0,
-      droppedLinksCount: 0,
-      recordException: /* @__PURE__ */ __name(() => {
-      }, "recordException")
-    });
-    if (this.buffer.length > this.maxBufferSize) {
-      const droppedSpanCount = this.buffer.length - this.maxBufferSize;
-      this.buffer.splice(0, droppedSpanCount);
-      this.warnBufferOverflow(droppedSpanCount);
-    }
-  }
-  warnBufferOverflow(droppedSpanCount) {
-    this.droppedSpansSinceLastBufferWarning += droppedSpanCount;
-    this.totalDroppedSpans += droppedSpanCount;
-    const now = Date.now();
-    if (this.lastBufferOverflowWarningMs !== void 0 && now - this.lastBufferOverflowWarningMs < BUFFER_OVERFLOW_WARNING_INTERVAL_MS) {
-      return;
-    }
-    this.emitBufferOverflowWarning(now);
-  }
-  emitBufferOverflowWarning(now = Date.now()) {
-    if (this.droppedSpansSinceLastBufferWarning === 0) {
-      return;
-    }
-    const droppedSinceLastWarning = this.droppedSpansSinceLastBufferWarning;
-    this.droppedSpansSinceLastBufferWarning = 0;
-    this.lastBufferOverflowWarningMs = now;
-    this.emitDiagnostic(
-      `[LogToSpan] buffer exceeded max size (${this.maxBufferSize}); dropped ${droppedSinceLastWarning} oldest span(s) since last warning, ${this.totalDroppedSpans} total`
-    );
-  }
-  /**
-   * Route a diagnostic message to the configured sink, swallowing any sink
-   * error so a misbehaving sink can never interrupt telemetry ingestion.
-   *
-   * Tradeoff: when the sink itself is broken (e.g. file-logger failing on
-   * EACCES), bridge-specific diagnostics go dark. We accept that — the host
-   * surfaces overall logging health via `isDebugLoggingDegraded()`, and
-   * falling back to stderr here would re-introduce the TUI-pollution this
-   * sink injection was added to prevent.
-   */
-  emitDiagnostic(message) {
-    try {
-      this.diagnosticsSink(message);
-    } catch {
-    }
-  }
-  flush() {
-    if (this.inFlightExport) return this.inFlightExport;
-    if (this.buffer.length === 0) return Promise.resolve();
-    const spans = this.buffer.splice(0);
-    const exportPromise = new Promise((resolve2) => {
-      const timeout = setTimeout(() => {
-        this.emitDiagnostic(
-          `[LogToSpan] export timeout after ${EXPORT_TIMEOUT_MS}ms (${spans.length} span(s))`
-        );
-        resolve2();
-      }, EXPORT_TIMEOUT_MS);
-      timeout.unref();
-      try {
-        this.spanExporter.export(
-          spans,
-          (result) => {
-            clearTimeout(timeout);
-            if (result.code !== 0) {
-              this.emitDiagnostic(
-                `[LogToSpan] export failed: code=${result.code} ${formatExportError(result.error)}`
-              );
-            }
-            resolve2();
-          }
-        );
-      } catch (err) {
-        clearTimeout(timeout);
-        const detail = err instanceof Error ? formatExportError(err) : `error=${JSON.stringify(String(err))}`;
-        this.emitDiagnostic(`[LogToSpan] export threw: ${detail}`);
-        resolve2();
-      }
-    });
-    this.inFlightExport = exportPromise.finally(() => {
-      this.inFlightExport = void 0;
-    });
-    return this.inFlightExport;
-  }
-  async shutdown() {
-    if (this.isShutdown) {
-      return;
-    }
-    this.isShutdown = true;
-    if (this.flushTimer) {
-      clearInterval(this.flushTimer);
-      this.flushTimer = void 0;
-    }
-    if (this.inFlightExport) {
-      await this.inFlightExport;
-    }
-    await this.flush();
-    this.emitBufferOverflowWarning();
-    await this.spanExporter.shutdown();
-  }
-  async forceFlush() {
-    if (this.isShutdown) {
-      return;
-    }
-    if (this.inFlightExport) {
-      await this.inFlightExport;
-    }
-    await this.flush();
-    await this.spanExporter.forceFlush?.();
-  }
-};
-function normalizeMaxBufferSize(value) {
-  if (typeof value !== "number" || !Number.isFinite(value) || value < 1) {
-    return DEFAULT_MAX_BUFFER_SIZE;
-  }
-  return Math.floor(value);
-}
-__name(normalizeMaxBufferSize, "normalizeMaxBufferSize");
-function deriveSpanName(logRecord) {
-  const eventName = logRecord.attributes?.["event.name"] ?? logRecord.eventName;
-  if (typeof eventName === "string" && eventName.trim().length > 0) {
-    return sanitizeSpanName(eventName);
-  }
-  return DEFAULT_LOG_SPAN_NAME;
-}
-__name(deriveSpanName, "deriveSpanName");
-function sanitizeSpanName(body) {
-  const rawName = String(body ?? "unknown");
-  return rawName.length > MAX_SPAN_NAME_LENGTH ? `${rawName.slice(0, MAX_SPAN_NAME_LENGTH)}...` : rawName;
-}
-__name(sanitizeSpanName, "sanitizeSpanName");
-function getValidParentSpanContext(spanContext) {
-  if (!spanContext || !isSpanContextValid(spanContext)) {
-    return void 0;
-  }
-  return spanContext;
-}
-__name(getValidParentSpanContext, "getValidParentSpanContext");
-function safeStringify(value) {
-  try {
-    return JSON.stringify(value);
-  } catch {
-    return "[unserializable]";
-  }
-}
-__name(safeStringify, "safeStringify");
-function deriveSpanStatus(attrs) {
-  if (!attrs) return { code: SpanStatusCode.OK };
-  if (!!attrs["error"] || !!attrs["error.message"] || !!attrs["error_message"] || !!attrs["error_type"]) {
-    return {
-      code: SpanStatusCode.ERROR,
-      message: LOG_EVENT_ERROR_STATUS_MESSAGE
-    };
-  }
-  return { code: SpanStatusCode.OK };
-}
-__name(deriveSpanStatus, "deriveSpanStatus");
-function formatExportError(err) {
-  if (!err) return 'error="unknown"';
-  const extra = err;
-  const msg = err.message || err.name || "unknown";
-  const parts = [`error=${JSON.stringify(msg)}`];
-  if (typeof extra.code === "number") parts.push(`httpCode=${extra.code}`);
-  if (typeof extra.data === "string" && extra.data.length > 0) {
-    parts.push(`data=${JSON.stringify(extra.data.slice(0, 200))}`);
-  }
-  return parts.join(" ");
-}
-__name(formatExportError, "formatExportError");
-function hrTimeDiff(start, end) {
-  let secs = end[0] - start[0];
-  let nanos = end[1] - start[1];
-  if (nanos < 0) {
-    secs -= 1;
-    nanos += 1e9;
-  }
-  return [secs, nanos];
-}
-__name(hrTimeDiff, "hrTimeDiff");
-
-// packages/core/src/telemetry/tracer.ts
-init_esbuild_shims();
-init_esm();
-var tracer = trace.getTracer(SERVICE_NAME);
-var debugLogger7 = createDebugLogger("OTEL_TRACER");
-var TELEMETRY_WARNING_INTERVAL_MS = 3e4;
-var API_CALL_FAILED_SPAN_STATUS_MESSAGE = "API call failed";
-var API_CALL_ABORTED_SPAN_STATUS_MESSAGE = "API call aborted";
-var lastTelemetryWarningMs;
-var suppressedTelemetryWarnings = 0;
-function warnTelemetryOperationFailed(operation, error) {
-  const now = Date.now();
-  if (lastTelemetryWarningMs !== void 0 && now - lastTelemetryWarningMs < TELEMETRY_WARNING_INTERVAL_MS) {
-    suppressedTelemetryWarnings += 1;
-    return;
-  }
-  const suppressedSuffix = suppressedTelemetryWarnings > 0 ? `; suppressed ${suppressedTelemetryWarnings} similar warning(s)` : "";
-  suppressedTelemetryWarnings = 0;
-  lastTelemetryWarningMs = now;
-  try {
-    debugLogger7.warn(
-      `OTel span ${operation} failed: ${error instanceof Error ? error.message : String(error)}${suppressedSuffix}`
-    );
-  } catch {
-  }
-}
-__name(warnTelemetryOperationFailed, "warnTelemetryOperationFailed");
-function safeSetStatus(span, status) {
-  try {
-    span.setStatus(status);
-  } catch (error) {
-    warnTelemetryOperationFailed("setStatus", error);
-  }
-}
-__name(safeSetStatus, "safeSetStatus");
-function shouldForceSampled() {
-  const sampler = process.env["OTEL_TRACES_SAMPLER"]?.trim().toLowerCase() ?? "";
-  if (!sampler || sampler.startsWith("parentbased_")) {
-    if (sampler.includes("always_off")) return false;
-    return true;
-  }
-  return sampler === "always_on";
-}
-__name(shouldForceSampled, "shouldForceSampled");
-function createSessionRootContext(sessionId) {
-  const traceId = deriveTraceId(sessionId);
-  const spanId = randomSpanId();
-  const rootSpan = trace.wrapSpanContext({
-    traceId,
-    spanId,
-    traceFlags: shouldForceSampled() ? TraceFlags.SAMPLED : TraceFlags.NONE,
-    isRemote: false
-  });
-  return trace.setSpan(ROOT_CONTEXT, rootSpan);
-}
-__name(createSessionRootContext, "createSessionRootContext");
-
 // packages/core/src/telemetry/session-tracing.ts
 init_esbuild_shims();
 init_esm();
@@ -67200,7 +66920,7 @@ function clearDetailedSpanState() {
 __name(clearDetailedSpanState, "clearDetailedSpanState");
 
 // packages/core/src/telemetry/session-tracing.ts
-var debugLogger8 = createDebugLogger("SESSION_TRACING");
+var debugLogger7 = createDebugLogger("SESSION_TRACING");
 function resolveParentContext(parent) {
   if (parent) {
     return trace.setSpan(context.active(), parent.span);
@@ -67219,54 +66939,85 @@ var NOOP_SPAN = trace.wrapSpanContext({
 });
 var interactionContext = new AsyncLocalStorage3();
 var toolContext = new AsyncLocalStorage3();
+var subagentContext = new AsyncLocalStorage3();
+function isInNativeSubagentSpan() {
+  const ctx = subagentContext.getStore();
+  return ctx !== void 0 && !ctx.ended;
+}
+__name(isInNativeSubagentSpan, "isInNativeSubagentSpan");
 var activeSpans = /* @__PURE__ */ new Map();
 var strongSpans = /* @__PURE__ */ new Map();
 var interactionSequence = 0;
 var lastInteractionCtx;
 var cleanupIntervalStarted = false;
-var SPAN_TTL_MS = 30 * 60 * 1e3;
+var SPAN_TTL_MS_DEFAULT = 30 * 60 * 1e3;
+var SPAN_TTL_MS_LONG = 4 * 60 * 60 * 1e3;
+var LONG_TTL_SUBAGENT_KINDS = /* @__PURE__ */ new Set([
+  "fork",
+  "background"
+]);
+function ttlFor(ctx) {
+  if (ctx.type === "subagent") {
+    const kind = ctx.attributes["qwen-code.subagent.invocation_kind"];
+    if (typeof kind === "string" && LONG_TTL_SUBAGENT_KINDS.has(kind)) {
+      return SPAN_TTL_MS_LONG;
+    }
+  }
+  return SPAN_TTL_MS_DEFAULT;
+}
+__name(ttlFor, "ttlFor");
 function sweepStaleSpans(now) {
-  const cutoff = now - SPAN_TTL_MS;
   for (const [spanId, weakRef] of activeSpans) {
     const ctx = weakRef.deref();
     if (ctx === void 0) {
       activeSpans.delete(spanId);
       strongSpans.delete(spanId);
-    } else if (ctx.startTime < cutoff) {
-      if (!ctx.ended) {
-        ctx.ended = true;
-        const ageMs = now - ctx.startTime;
-        const toolName = ctx.attributes["tool.name"];
-        const callId = ctx.attributes["tool.call_id"];
-        try {
-          ctx.span.setAttributes({
-            "qwen-code.span.ttl_expired": true,
-            "qwen-code.span.duration_ms": ageMs,
-            ...ctx.type === "tool.blocked_on_user" ? {
-              decision: "aborted",
-              source: "system"
-            } : {}
-          });
-        } catch (error) {
-          debugLogger8.warn(
-            `Failed to stamp TTL attrs on stale span ${spanId}: ${error instanceof Error ? error.message : String(error)}`
-          );
-        }
-        const ctxLabel = toolName && callId ? `${ctx.type} (tool.name=${toolName}, tool.call_id=${callId})` : ctx.type;
-        debugLogger8.warn(
-          `Stale ${ctxLabel} span ended by TTL safety net (age=${ageMs}ms, spanId=${spanId})`
+      continue;
+    }
+    if (now - ctx.startTime < ttlFor(ctx)) continue;
+    if (!ctx.ended) {
+      ctx.ended = true;
+      const ageMs = now - ctx.startTime;
+      const toolName = ctx.attributes["tool.name"];
+      const callId = ctx.attributes["tool.call_id"];
+      try {
+        ctx.span.setAttributes({
+          "qwen-code.span.ttl_expired": true,
+          "qwen-code.span.duration_ms": ageMs,
+          ...ctx.type === "tool.blocked_on_user" ? {
+            decision: "aborted",
+            source: "system"
+          } : {},
+          ...ctx.type === "subagent" ? {
+            "qwen-code.subagent.status": "aborted",
+            "qwen-code.subagent.terminate_reason": "ttl_swept",
+            // Mirror the subagent-specific duration_ms key that
+            // endSubagentSpan stamps so dashboards querying that
+            // namespace see TTL-swept spans too (they currently
+            // only get the generic qwen-code.span.duration_ms
+            // above). wenshao @ #4410.
+            "qwen-code.subagent.duration_ms": ageMs
+          } : {}
+        });
+      } catch (error) {
+        debugLogger7.warn(
+          `Failed to stamp TTL attrs on stale span ${spanId}: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+      const ctxLabel = toolName && callId ? `${ctx.type} (tool.name=${toolName}, tool.call_id=${callId})` : ctx.type;
+      debugLogger7.warn(
+        `Stale ${ctxLabel} span ended by TTL safety net (age=${ageMs}ms, spanId=${spanId})`
+      );
+      try {
+        ctx.span.end();
+      } catch (error) {
+        debugLogger7.warn(
+          `Failed to end stale span ${spanId}: ${error instanceof Error ? error.message : String(error)}`
         );
-        try {
-          ctx.span.end();
-        } catch (error) {
-          debugLogger8.warn(
-            `Failed to end stale span ${spanId}: ${error instanceof Error ? error.message : String(error)}`
-          );
-        }
       }
-      activeSpans.delete(spanId);
-      strongSpans.delete(spanId);
     }
+    activeSpans.delete(spanId);
+    strongSpans.delete(spanId);
   }
 }
 __name(sweepStaleSpans, "sweepStaleSpans");
@@ -67329,7 +67080,13 @@ function startInteractionSpan(config, options) {
 __name(startInteractionSpan, "startInteractionSpan");
 function endInteractionSpan(status, metadata) {
   const spanCtx = interactionContext.getStore() ?? lastInteractionCtx;
-  if (!spanCtx || spanCtx.ended) return;
+  if (!spanCtx) return;
+  if (spanCtx.ended) {
+    debugLogger7.debug(
+      `endInteractionSpan: span ${getSpanId(spanCtx.span)} already ended (possible TTL sweep race)`
+    );
+    return;
+  }
   spanCtx.ended = true;
   lastInteractionCtx = void 0;
   const duration = Date.now() - spanCtx.startTime;
@@ -67356,12 +67113,12 @@ function startLLMRequestSpan(model, promptId) {
   if (!isTelemetrySdkInitialized()) {
     return NOOP_SPAN;
   }
-  const parentCtx = interactionContext.getStore();
+  const parentCtx = subagentContext.getStore() ?? interactionContext.getStore();
   const ctx = resolveParentContext(parentCtx);
   const attributes = {
     "qwen-code.model": model,
     "qwen-code.prompt_id": promptId,
-    "llm_request.context": parentCtx ? "interaction" : "standalone",
+    "llm_request.context": subagentContext.getStore() ? "subagent" : interactionContext.getStore() ? "interaction" : "standalone",
     // Dual-emit OTel GenAI semantic convention (Stable). Private name
     // (qwen-code.model) remains authoritative; gen_ai.* is a compat layer
     // for spec-aware backends. See docs/design/telemetry-llm-request-timing-design.md (D8).
@@ -67387,7 +67144,13 @@ __name(startLLMRequestSpan, "startLLMRequestSpan");
 function endLLMRequestSpan(span, metadata) {
   const spanId = getSpanId(span);
   const spanCtx = activeSpans.get(spanId)?.deref();
-  if (!spanCtx || spanCtx.ended) return;
+  if (!spanCtx) return;
+  if (spanCtx.ended) {
+    debugLogger7.debug(
+      `endLLMRequestSpan: span ${spanId} already ended (possible TTL sweep race)`
+    );
+    return;
+  }
   spanCtx.ended = true;
   try {
     const duration = metadata?.durationMs ?? Date.now() - spanCtx.startTime;
@@ -67419,10 +67182,7 @@ function endLLMRequestSpan(span, metadata) {
         endAttributes["retry_total_delay_ms"] = metadata.retryTotalDelayMs;
       }
       if (metadata.ttftMs !== void 0) {
-        const samplingMs = Math.max(
-          0,
-          duration - metadata.ttftMs - (metadata.requestSetupMs ?? 0)
-        );
+        const samplingMs = Math.max(0, duration - metadata.ttftMs);
         endAttributes["sampling_ms"] = samplingMs;
         if (samplingMs > 0 && metadata.outputTokens !== void 0) {
           endAttributes["output_tokens_per_second"] = Math.round(metadata.outputTokens / (samplingMs / 1e3) * 100) / 100;
@@ -67442,14 +67202,14 @@ function endLLMRequestSpan(span, metadata) {
       });
     }
   } catch (error) {
-    debugLogger8.warn(
+    debugLogger7.warn(
       `Failed to update LLM request span attributes/status: ${error instanceof Error ? error.message : String(error)}`
     );
   }
   try {
     spanCtx.span.end();
   } catch (error) {
-    debugLogger8.warn(
+    debugLogger7.warn(
       `Failed to end LLM request span: ${error instanceof Error ? error.message : String(error)}`
     );
   }
@@ -67461,7 +67221,7 @@ function startToolSpan(toolName, attrs) {
   if (!isTelemetrySdkInitialized()) {
     return NOOP_SPAN;
   }
-  const parentCtx = interactionContext.getStore();
+  const parentCtx = subagentContext.getStore() ?? interactionContext.getStore();
   const ctx = resolveParentContext(parentCtx);
   const attributes = {
     "tool.name": toolName,
@@ -67495,7 +67255,13 @@ __name(runInToolSpanContext, "runInToolSpanContext");
 function endToolSpan(span, metadata) {
   const spanId = getSpanId(span);
   const spanCtx = activeSpans.get(spanId)?.deref();
-  if (!spanCtx || spanCtx.ended) return;
+  if (!spanCtx) return;
+  if (spanCtx.ended) {
+    debugLogger7.debug(
+      `endToolSpan: span ${spanId} already ended (possible TTL sweep race)`
+    );
+    return;
+  }
   spanCtx.ended = true;
   try {
     const duration = Date.now() - spanCtx.startTime;
@@ -67518,14 +67284,14 @@ function endToolSpan(span, metadata) {
       }
     }
   } catch (error) {
-    debugLogger8.warn(
+    debugLogger7.warn(
       `Failed to update tool span attributes/status: ${error instanceof Error ? error.message : String(error)}`
     );
   }
   try {
     spanCtx.span.end();
   } catch (error) {
-    debugLogger8.warn(
+    debugLogger7.warn(
       `Failed to end tool span: ${error instanceof Error ? error.message : String(error)}`
     );
   }
@@ -67539,7 +67305,7 @@ function startToolExecutionSpan() {
   }
   const parentCtx = toolContext.getStore();
   if (!parentCtx) {
-    debugLogger8.warn(
+    debugLogger7.warn(
       "startToolExecutionSpan called outside runInToolSpanContext \u2014 span will not be parented to tool span"
     );
   }
@@ -67564,7 +67330,13 @@ __name(startToolExecutionSpan, "startToolExecutionSpan");
 function endToolExecutionSpan(span, metadata) {
   const spanId = getSpanId(span);
   const spanCtx = activeSpans.get(spanId)?.deref();
-  if (!spanCtx || spanCtx.ended) return;
+  if (!spanCtx) return;
+  if (spanCtx.ended) {
+    debugLogger7.debug(
+      `endToolExecutionSpan: span ${spanId} already ended (possible TTL sweep race)`
+    );
+    return;
+  }
   spanCtx.ended = true;
   try {
     const duration = Date.now() - spanCtx.startTime;
@@ -67587,14 +67359,14 @@ function endToolExecutionSpan(span, metadata) {
       }
     }
   } catch (error) {
-    debugLogger8.warn(
+    debugLogger7.warn(
       `Failed to update tool execution span attributes/status: ${error instanceof Error ? error.message : String(error)}`
     );
   }
   try {
     spanCtx.span.end();
   } catch (error) {
-    debugLogger8.warn(
+    debugLogger7.warn(
       `Failed to end tool execution span: ${error instanceof Error ? error.message : String(error)}`
     );
   }
@@ -67610,7 +67382,7 @@ function startToolBlockedOnUserSpan(toolSpan, attrs) {
   const parentSpanId = getSpanId(toolSpan);
   const parentSpanCtx = activeSpans.get(parentSpanId)?.deref();
   if (!parentSpanCtx) {
-    debugLogger8.debug(
+    debugLogger7.debug(
       "startToolBlockedOnUserSpan: tool span not in activeSpans (already ended?) \u2014 using resolveParentContext fallback"
     );
   }
@@ -67638,7 +67410,13 @@ __name(startToolBlockedOnUserSpan, "startToolBlockedOnUserSpan");
 function endToolBlockedOnUserSpan(span, metadata) {
   const spanId = getSpanId(span);
   const spanCtx = activeSpans.get(spanId)?.deref();
-  if (!spanCtx || spanCtx.ended) return;
+  if (!spanCtx) return;
+  if (spanCtx.ended) {
+    debugLogger7.debug(
+      `endToolBlockedOnUserSpan: span ${spanId} already ended (possible TTL sweep race)`
+    );
+    return;
+  }
   spanCtx.ended = true;
   try {
     const duration = Date.now() - spanCtx.startTime;
@@ -67649,14 +67427,14 @@ function endToolBlockedOnUserSpan(span, metadata) {
       endAttributes["source"] = metadata.source;
     spanCtx.span.setAttributes(endAttributes);
   } catch (error) {
-    debugLogger8.warn(
+    debugLogger7.warn(
       `Failed to update blocked_on_user span attributes: ${error instanceof Error ? error.message : String(error)}`
     );
   }
   try {
     spanCtx.span.end();
   } catch (error) {
-    debugLogger8.warn(
+    debugLogger7.warn(
       `Failed to end blocked_on_user span: ${error instanceof Error ? error.message : String(error)}`
     );
   }
@@ -67669,7 +67447,7 @@ function startHookSpan(opts) {
     return NOOP_SPAN;
   }
   ensureCleanupInterval();
-  const parentCtx = toolContext.getStore() ?? interactionContext.getStore() ?? void 0;
+  const parentCtx = toolContext.getStore() ?? subagentContext.getStore() ?? interactionContext.getStore() ?? void 0;
   const ctx = resolveParentContext(parentCtx);
   const attributes = {
     hook_event: opts.hookEvent,
@@ -67698,7 +67476,13 @@ __name(startHookSpan, "startHookSpan");
 function endHookSpan(span, metadata) {
   const spanId = getSpanId(span);
   const spanCtx = activeSpans.get(spanId)?.deref();
-  if (!spanCtx || spanCtx.ended) return;
+  if (!spanCtx) return;
+  if (spanCtx.ended) {
+    debugLogger7.debug(
+      `endHookSpan: span ${spanId} already ended (possible TTL sweep race)`
+    );
+    return;
+  }
   spanCtx.ended = true;
   try {
     const duration = Date.now() - spanCtx.startTime;
@@ -67731,14 +67515,14 @@ function endHookSpan(span, metadata) {
       });
     }
   } catch (error) {
-    debugLogger8.warn(
+    debugLogger7.warn(
       `Failed to update hook span attributes/status: ${error instanceof Error ? error.message : String(error)}`
     );
   }
   try {
     spanCtx.span.end();
   } catch (error) {
-    debugLogger8.warn(
+    debugLogger7.warn(
       `Failed to end hook span: ${error instanceof Error ? error.message : String(error)}`
     );
   }
@@ -67746,6 +67530,139 @@ function endHookSpan(span, metadata) {
   strongSpans.delete(spanId);
 }
 __name(endHookSpan, "endHookSpan");
+function startSubagentSpan(opts) {
+  if (!isTelemetrySdkInitialized()) return NOOP_SPAN;
+  ensureCleanupInterval();
+  const attributes = {
+    // Spec-aligned (OTel GenAI Agent Spans, Development status).
+    "gen_ai.operation.name": "invoke_agent",
+    "gen_ai.provider.name": SERVICE_NAME,
+    "gen_ai.agent.id": opts.agentId,
+    "gen_ai.agent.name": opts.subagentName,
+    "gen_ai.conversation.id": opts.sessionId,
+    // Vendor (qwen-code-specific). Dual-emit id/name so dashboards already
+    // querying spec keys still work.
+    "qwen-code.subagent.id": opts.agentId,
+    "qwen-code.subagent.name": opts.subagentName,
+    "qwen-code.subagent.invocation_kind": opts.invocationKind,
+    "qwen-code.subagent.is_built_in": opts.isBuiltIn,
+    "qwen-code.subagent.depth": opts.depth
+  };
+  if (opts.modelOverride !== void 0) {
+    attributes["gen_ai.request.model"] = opts.modelOverride;
+  }
+  if (opts.parentAgentId !== void 0) {
+    attributes["qwen-code.subagent.parent_agent_id"] = opts.parentAgentId;
+  }
+  if (opts.invokingRequestId !== void 0) {
+    attributes["qwen-code.subagent.invoking_request_id"] = opts.invokingRequestId;
+  }
+  const tracer2 = getTracer();
+  let span;
+  if (opts.invocationKind === "foreground") {
+    span = tracer2.startSpan(SPAN_SUBAGENT, {
+      kind: SpanKind.INTERNAL,
+      attributes
+    });
+  } else {
+    span = tracer2.startSpan(SPAN_SUBAGENT, {
+      kind: SpanKind.INTERNAL,
+      attributes,
+      root: true,
+      links: opts.invokerSpanContext ? [
+        {
+          context: opts.invokerSpanContext,
+          attributes: { "qwen-code.link.kind": "invoker" }
+        }
+      ] : void 0
+    });
+  }
+  const spanId = getSpanId(span);
+  const spanContextObj = {
+    span,
+    startTime: Date.now(),
+    attributes,
+    type: "subagent"
+  };
+  activeSpans.set(spanId, new WeakRef(spanContextObj));
+  strongSpans.set(spanId, spanContextObj);
+  return span;
+}
+__name(startSubagentSpan, "startSubagentSpan");
+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);
+  return subagentContext.run(
+    spanCtx,
+    () => toolContext.run(void 0, () => context.with(otelCtxWithSpan, fn))
+  );
+}
+__name(runInSubagentSpanContext, "runInSubagentSpanContext");
+function endSubagentSpan(span, metadata) {
+  const spanId = getSpanId(span);
+  const spanCtx = activeSpans.get(spanId)?.deref();
+  if (!spanCtx) {
+    if (isTelemetrySdkInitialized()) {
+      debugLogger7.warn(
+        `endSubagentSpan: span ${spanId} not found in activeSpans (already swept?) \u2014 intended status=${metadata.status}, reason=${metadata.terminateReason ?? "none"}`
+      );
+    }
+    return;
+  }
+  if (spanCtx.ended) {
+    debugLogger7.warn(
+      `endSubagentSpan: span ${spanId} already ended \u2014 intended status=${metadata.status}, reason=${metadata.terminateReason ?? "none"} (possible TTL sweep race)`
+    );
+    return;
+  }
+  spanCtx.ended = true;
+  try {
+    const duration = Date.now() - spanCtx.startTime;
+    const endAttributes = {
+      duration_ms: duration,
+      "qwen-code.subagent.duration_ms": duration,
+      "qwen-code.subagent.status": metadata.status
+    };
+    if (metadata.terminateReason !== void 0) {
+      endAttributes["qwen-code.subagent.terminate_reason"] = metadata.terminateReason;
+    }
+    if (metadata.resultSummaryPresent !== void 0) {
+      endAttributes["qwen-code.subagent.result_summary_present"] = metadata.resultSummaryPresent;
+    }
+    if (metadata.error !== void 0) {
+      const truncated = truncateSpanError(metadata.error);
+      endAttributes["exception.message"] = truncated;
+    }
+    if (metadata.errorType !== void 0) {
+      endAttributes["error.type"] = metadata.errorType;
+    }
+    spanCtx.span.setAttributes(endAttributes);
+    if (metadata.status === "completed") {
+      spanCtx.span.setStatus({ code: SpanStatusCode.OK });
+    } else if (metadata.status === "failed") {
+      spanCtx.span.setStatus({
+        code: SpanStatusCode.ERROR,
+        message: metadata.error ? truncateSpanError(metadata.error) : "subagent failed"
+      });
+    }
+  } catch (error) {
+    debugLogger7.warn(
+      `Failed to update subagent span attributes/status: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+  try {
+    spanCtx.span.end();
+  } catch (error) {
+    debugLogger7.warn(
+      `Failed to end subagent span: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+  activeSpans.delete(spanId);
+  strongSpans.delete(spanId);
+}
+__name(endSubagentSpan, "endSubagentSpan");
 function getActiveInteractionSpan() {
   const ctx = interactionContext.getStore() ?? lastInteractionCtx;
   if (!ctx || ctx.ended) return void 0;
@@ -67753,6 +67670,372 @@ function getActiveInteractionSpan() {
 }
 __name(getActiveInteractionSpan, "getActiveInteractionSpan");
 
+// packages/core/src/telemetry/log-to-span-processor.ts
+var BRIDGE_SKIP_EVENT_NAMES = /* @__PURE__ */ new Set([EVENT_SUBAGENT_EXECUTION]);
+var EXPORT_TIMEOUT_MS = 3e4;
+var DEFAULT_MAX_BUFFER_SIZE = 1e4;
+var BUFFER_OVERFLOW_WARNING_INTERVAL_MS = 3e4;
+var LOG_EVENT_ERROR_STATUS_MESSAGE = "Log event recorded error";
+var DEFAULT_LOG_SPAN_NAME = "log.event";
+var MAX_SPAN_NAME_LENGTH = 128;
+var SENSITIVE_ATTRIBUTE_KEYS = /* @__PURE__ */ new Set([
+  "error",
+  "error.message",
+  "error_message",
+  "prompt",
+  "function_args",
+  "response_text"
+]);
+var defaultDiagnosticsSink = /* @__PURE__ */ __name((message) => {
+  process.stderr.write(`${message}
+`);
+}, "defaultDiagnosticsSink");
+var LogToSpanProcessor = class {
+  constructor(spanExporter, flushIntervalMsOrOptions = 5e3, maxBufferSize = DEFAULT_MAX_BUFFER_SIZE) {
+    this.spanExporter = spanExporter;
+    if (typeof flushIntervalMsOrOptions === "number") {
+      this.flushIntervalMs = flushIntervalMsOrOptions;
+      this.includeSensitiveSpanAttributes = false;
+      this.maxBufferSize = normalizeMaxBufferSize(maxBufferSize);
+      this.diagnosticsSink = defaultDiagnosticsSink;
+    } else {
+      this.flushIntervalMs = flushIntervalMsOrOptions.flushIntervalMs ?? 5e3;
+      this.includeSensitiveSpanAttributes = flushIntervalMsOrOptions.includeSensitiveSpanAttributes ?? false;
+      this.maxBufferSize = normalizeMaxBufferSize(
+        flushIntervalMsOrOptions.maxBufferSize
+      );
+      this.diagnosticsSink = flushIntervalMsOrOptions.diagnosticsSink ?? defaultDiagnosticsSink;
+    }
+    this.flushTimer = setInterval(() => {
+      void this.flush();
+    }, this.flushIntervalMs);
+    this.flushTimer.unref();
+  }
+  static {
+    __name(this, "LogToSpanProcessor");
+  }
+  buffer = [];
+  flushTimer;
+  inFlightExport;
+  flushIntervalMs;
+  cachedSessionId;
+  cachedTraceId;
+  includeSensitiveSpanAttributes;
+  maxBufferSize;
+  diagnosticsSink;
+  lastBufferOverflowWarningMs;
+  droppedSpansSinceLastBufferWarning = 0;
+  totalDroppedSpans = 0;
+  isShutdown = false;
+  onEmit(logRecord) {
+    if (this.isShutdown) {
+      return;
+    }
+    const eventName = logRecord.attributes?.["event.name"];
+    if (typeof eventName === "string" && BRIDGE_SKIP_EVENT_NAMES.has(eventName) && isInNativeSubagentSpan()) {
+      return;
+    }
+    const name = deriveSpanName(logRecord);
+    const startTime = logRecord.hrTime;
+    const attributes = {};
+    if (logRecord.attributes) {
+      for (const [key, value] of Object.entries(logRecord.attributes)) {
+        if (value !== void 0 && value !== null && (this.includeSensitiveSpanAttributes || !SENSITIVE_ATTRIBUTE_KEYS.has(key))) {
+          attributes[key] = typeof value === "object" ? safeStringify(value) : value;
+        }
+      }
+    }
+    attributes["log.bridge"] = true;
+    if (logRecord.severityNumber !== void 0) {
+      attributes["log.severity_number"] = logRecord.severityNumber;
+    }
+    if (logRecord.severityText) {
+      attributes["log.severity_text"] = logRecord.severityText;
+    }
+    let endTime = startTime;
+    const durationMs = logRecord.attributes?.["duration_ms"];
+    if (typeof durationMs === "number" && Number.isFinite(durationMs) && durationMs > 0) {
+      const [secs, nanos] = startTime;
+      const durationNanos = durationMs * 1e6;
+      const endNanos = nanos + durationNanos;
+      endTime = [secs + Math.floor(endNanos / 1e9), endNanos % 1e9];
+    }
+    const parentSpanContext = getValidParentSpanContext(logRecord.spanContext);
+    const sessionId = logRecord.attributes?.["session.id"] || getCurrentSessionId();
+    let traceId;
+    if (parentSpanContext) {
+      traceId = parentSpanContext.traceId;
+    } else if (sessionId) {
+      const sid = String(sessionId);
+      if (sid !== this.cachedSessionId) {
+        this.cachedSessionId = sid;
+        this.cachedTraceId = deriveTraceId(sid);
+      }
+      traceId = this.cachedTraceId;
+    } else {
+      traceId = randomHexString(32);
+    }
+    const spanId = randomSpanId();
+    this.buffer.push({
+      name,
+      kind: SpanKind.INTERNAL,
+      spanContext: /* @__PURE__ */ __name(() => ({
+        traceId,
+        spanId,
+        traceFlags: parentSpanContext?.traceFlags ?? TraceFlags.SAMPLED
+      }), "spanContext"),
+      startTime,
+      endTime,
+      duration: hrTimeDiff(startTime, endTime),
+      attributes,
+      status: deriveSpanStatus(logRecord.attributes),
+      events: [],
+      links: [],
+      resource: logRecord.resource ?? (0, import_resources.resourceFromAttributes)({}),
+      instrumentationScope: logRecord.instrumentationScope ?? {
+        name: SERVICE_NAME,
+        version: ""
+      },
+      ended: true,
+      parentSpanContext,
+      droppedAttributesCount: 0,
+      droppedEventsCount: 0,
+      droppedLinksCount: 0,
+      recordException: /* @__PURE__ */ __name(() => {
+      }, "recordException")
+    });
+    if (this.buffer.length > this.maxBufferSize) {
+      const droppedSpanCount = this.buffer.length - this.maxBufferSize;
+      this.buffer.splice(0, droppedSpanCount);
+      this.warnBufferOverflow(droppedSpanCount);
+    }
+  }
+  warnBufferOverflow(droppedSpanCount) {
+    this.droppedSpansSinceLastBufferWarning += droppedSpanCount;
+    this.totalDroppedSpans += droppedSpanCount;
+    const now = Date.now();
+    if (this.lastBufferOverflowWarningMs !== void 0 && now - this.lastBufferOverflowWarningMs < BUFFER_OVERFLOW_WARNING_INTERVAL_MS) {
+      return;
+    }
+    this.emitBufferOverflowWarning(now);
+  }
+  emitBufferOverflowWarning(now = Date.now()) {
+    if (this.droppedSpansSinceLastBufferWarning === 0) {
+      return;
+    }
+    const droppedSinceLastWarning = this.droppedSpansSinceLastBufferWarning;
+    this.droppedSpansSinceLastBufferWarning = 0;
+    this.lastBufferOverflowWarningMs = now;
+    this.emitDiagnostic(
+      `[LogToSpan] buffer exceeded max size (${this.maxBufferSize}); dropped ${droppedSinceLastWarning} oldest span(s) since last warning, ${this.totalDroppedSpans} total`
+    );
+  }
+  /**
+   * Route a diagnostic message to the configured sink, swallowing any sink
+   * error so a misbehaving sink can never interrupt telemetry ingestion.
+   *
+   * Tradeoff: when the sink itself is broken (e.g. file-logger failing on
+   * EACCES), bridge-specific diagnostics go dark. We accept that — the host
+   * surfaces overall logging health via `isDebugLoggingDegraded()`, and
+   * falling back to stderr here would re-introduce the TUI-pollution this
+   * sink injection was added to prevent.
+   */
+  emitDiagnostic(message) {
+    try {
+      this.diagnosticsSink(message);
+    } catch {
+    }
+  }
+  flush() {
+    if (this.inFlightExport) return this.inFlightExport;
+    if (this.buffer.length === 0) return Promise.resolve();
+    const spans = this.buffer.splice(0);
+    const exportPromise = new Promise((resolve2) => {
+      const timeout = setTimeout(() => {
+        this.emitDiagnostic(
+          `[LogToSpan] export timeout after ${EXPORT_TIMEOUT_MS}ms (${spans.length} span(s))`
+        );
+        resolve2();
+      }, EXPORT_TIMEOUT_MS);
+      timeout.unref();
+      try {
+        this.spanExporter.export(
+          spans,
+          (result) => {
+            clearTimeout(timeout);
+            if (result.code !== 0) {
+              this.emitDiagnostic(
+                `[LogToSpan] export failed: code=${result.code} ${formatExportError(result.error)}`
+              );
+            }
+            resolve2();
+          }
+        );
+      } catch (err) {
+        clearTimeout(timeout);
+        const detail = err instanceof Error ? formatExportError(err) : `error=${JSON.stringify(String(err))}`;
+        this.emitDiagnostic(`[LogToSpan] export threw: ${detail}`);
+        resolve2();
+      }
+    });
+    this.inFlightExport = exportPromise.finally(() => {
+      this.inFlightExport = void 0;
+    });
+    return this.inFlightExport;
+  }
+  async shutdown() {
+    if (this.isShutdown) {
+      return;
+    }
+    this.isShutdown = true;
+    if (this.flushTimer) {
+      clearInterval(this.flushTimer);
+      this.flushTimer = void 0;
+    }
+    if (this.inFlightExport) {
+      await this.inFlightExport;
+    }
+    await this.flush();
+    this.emitBufferOverflowWarning();
+    await this.spanExporter.shutdown();
+  }
+  async forceFlush() {
+    if (this.isShutdown) {
+      return;
+    }
+    if (this.inFlightExport) {
+      await this.inFlightExport;
+    }
+    await this.flush();
+    await this.spanExporter.forceFlush?.();
+  }
+};
+function normalizeMaxBufferSize(value) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 1) {
+    return DEFAULT_MAX_BUFFER_SIZE;
+  }
+  return Math.floor(value);
+}
+__name(normalizeMaxBufferSize, "normalizeMaxBufferSize");
+function deriveSpanName(logRecord) {
+  const eventName = logRecord.attributes?.["event.name"] ?? logRecord.eventName;
+  if (typeof eventName === "string" && eventName.trim().length > 0) {
+    return sanitizeSpanName(eventName);
+  }
+  return DEFAULT_LOG_SPAN_NAME;
+}
+__name(deriveSpanName, "deriveSpanName");
+function sanitizeSpanName(body) {
+  const rawName = String(body ?? "unknown");
+  return rawName.length > MAX_SPAN_NAME_LENGTH ? `${rawName.slice(0, MAX_SPAN_NAME_LENGTH)}...` : rawName;
+}
+__name(sanitizeSpanName, "sanitizeSpanName");
+function getValidParentSpanContext(spanContext) {
+  if (!spanContext || !isSpanContextValid(spanContext)) {
+    return void 0;
+  }
+  return spanContext;
+}
+__name(getValidParentSpanContext, "getValidParentSpanContext");
+function safeStringify(value) {
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return "[unserializable]";
+  }
+}
+__name(safeStringify, "safeStringify");
+function deriveSpanStatus(attrs) {
+  if (!attrs) return { code: SpanStatusCode.OK };
+  if (!!attrs["error"] || !!attrs["error.message"] || !!attrs["error_message"] || !!attrs["error_type"]) {
+    return {
+      code: SpanStatusCode.ERROR,
+      message: LOG_EVENT_ERROR_STATUS_MESSAGE
+    };
+  }
+  return { code: SpanStatusCode.OK };
+}
+__name(deriveSpanStatus, "deriveSpanStatus");
+function formatExportError(err) {
+  if (!err) return 'error="unknown"';
+  const extra = err;
+  const msg = err.message || err.name || "unknown";
+  const parts = [`error=${JSON.stringify(msg)}`];
+  if (typeof extra.code === "number") parts.push(`httpCode=${extra.code}`);
+  if (typeof extra.data === "string" && extra.data.length > 0) {
+    parts.push(`data=${JSON.stringify(extra.data.slice(0, 200))}`);
+  }
+  return parts.join(" ");
+}
+__name(formatExportError, "formatExportError");
+function hrTimeDiff(start, end) {
+  let secs = end[0] - start[0];
+  let nanos = end[1] - start[1];
+  if (nanos < 0) {
+    secs -= 1;
+    nanos += 1e9;
+  }
+  return [secs, nanos];
+}
+__name(hrTimeDiff, "hrTimeDiff");
+
+// packages/core/src/telemetry/tracer.ts
+init_esbuild_shims();
+init_esm();
+var tracer = trace.getTracer(SERVICE_NAME);
+var debugLogger8 = createDebugLogger("OTEL_TRACER");
+var TELEMETRY_WARNING_INTERVAL_MS = 3e4;
+var API_CALL_FAILED_SPAN_STATUS_MESSAGE = "API call failed";
+var API_CALL_ABORTED_SPAN_STATUS_MESSAGE = "API call aborted";
+var lastTelemetryWarningMs;
+var suppressedTelemetryWarnings = 0;
+function warnTelemetryOperationFailed(operation, error) {
+  const now = Date.now();
+  if (lastTelemetryWarningMs !== void 0 && now - lastTelemetryWarningMs < TELEMETRY_WARNING_INTERVAL_MS) {
+    suppressedTelemetryWarnings += 1;
+    return;
+  }
+  const suppressedSuffix = suppressedTelemetryWarnings > 0 ? `; suppressed ${suppressedTelemetryWarnings} similar warning(s)` : "";
+  suppressedTelemetryWarnings = 0;
+  lastTelemetryWarningMs = now;
+  try {
+    debugLogger8.warn(
+      `OTel span ${operation} failed: ${error instanceof Error ? error.message : String(error)}${suppressedSuffix}`
+    );
+  } catch {
+  }
+}
+__name(warnTelemetryOperationFailed, "warnTelemetryOperationFailed");
+function safeSetStatus(span, status) {
+  try {
+    span.setStatus(status);
+  } catch (error) {
+    warnTelemetryOperationFailed("setStatus", error);
+  }
+}
+__name(safeSetStatus, "safeSetStatus");
+function shouldForceSampled() {
+  const sampler = process.env["OTEL_TRACES_SAMPLER"]?.trim().toLowerCase() ?? "";
+  if (!sampler || sampler.startsWith("parentbased_")) {
+    if (sampler.includes("always_off")) return false;
+    return true;
+  }
+  return sampler === "always_on";
+}
+__name(shouldForceSampled, "shouldForceSampled");
+function createSessionRootContext(sessionId) {
+  const traceId = deriveTraceId(sessionId);
+  const spanId = randomSpanId();
+  const rootSpan = trace.wrapSpanContext({
+    traceId,
+    spanId,
+    traceFlags: shouldForceSampled() ? TraceFlags.SAMPLED : TraceFlags.NONE,
+    isRemote: false
+  });
+  return trace.setSpan(ROOT_CONTEXT, rootSpan);
+}
+__name(createSessionRootContext, "createSessionRootContext");
+
 // packages/core/src/telemetry/sdk.ts
 function createTelemetryDiagLogger() {
   const debugLogger12 = createDebugLogger("OTEL");
@@ -68540,7 +68823,21 @@ function isUserVisiblePart(part) {
 }
 __name(isUserVisiblePart, "isUserVisiblePart");
 
+// packages/core/src/utils/retryContext.ts
+init_esbuild_shims();
+import { AsyncLocalStorage as AsyncLocalStorage4 } from "node:async_hooks";
+var retryContext = new AsyncLocalStorage4();
+
 // packages/core/src/core/loggingContentGenerator/loggingContentGenerator.ts
+function snapshotRetryMetadata() {
+  const ctx = retryContext.getStore();
+  return {
+    attempt: ctx?.attempt ?? 1,
+    requestSetupMs: ctx?.requestSetupMs,
+    retryTotalDelayMs: ctx?.retryTotalDelayMs
+  };
+}
+__name(snapshotRetryMetadata, "snapshotRetryMetadata");
 var debugLogger9 = createDebugLogger("LOGGING_CONTENT_GENERATOR");
 var MAX_RESPONSE_TEXT_LENGTH = 4096;
 var RESPONSE_TEXT_TRUNCATION_SUFFIX = "...[truncated]";
@@ -68638,6 +68935,7 @@ var LoggingContentGenerator = class {
     }
   }
   async generateContent(req, userPromptId) {
+    const retrySnapshot = snapshotRetryMetadata();
     const llmSpan = startLLMRequestSpan(req.model, userPromptId);
     try {
       llmSpan.setAttribute("llm_request.stream", false);
@@ -68705,7 +69003,8 @@ var LoggingContentGenerator = class {
         inputTokens: response.usageMetadata?.promptTokenCount,
         outputTokens: response.usageMetadata?.candidatesTokenCount,
         cachedInputTokens: response.usageMetadata?.cachedContentTokenCount,
-        durationMs: Date.now() - startTime
+        durationMs: Date.now() - startTime,
+        ...retrySnapshot
       });
       return response;
     } catch (error) {
@@ -68714,7 +69013,8 @@ var LoggingContentGenerator = class {
       endLLMRequestSpan(llmSpan, {
         success: false,
         durationMs,
-        error: aborted ? API_CALL_ABORTED_SPAN_STATUS_MESSAGE : API_CALL_FAILED_SPAN_STATUS_MESSAGE
+        error: aborted ? API_CALL_ABORTED_SPAN_STATUS_MESSAGE : API_CALL_FAILED_SPAN_STATUS_MESSAGE,
+        ...retrySnapshot
       });
       await context.with(spanContext, async () => {
         this.safelyLogApiError("", durationMs, error, req.model, userPromptId);
@@ -68733,6 +69033,7 @@ var LoggingContentGenerator = class {
     }
   }
   async generateContentStream(req, userPromptId) {
+    const retrySnapshot = snapshotRetryMetadata();
     const llmSpan = startLLMRequestSpan(req.model, userPromptId);
     try {
       llmSpan.setAttribute("llm_request.stream", true);
@@ -68782,7 +69083,8 @@ var LoggingContentGenerator = class {
       endLLMRequestSpan(llmSpan, {
         success: false,
         durationMs,
-        error: aborted ? API_CALL_ABORTED_SPAN_STATUS_MESSAGE : API_CALL_FAILED_SPAN_STATUS_MESSAGE
+        error: aborted ? API_CALL_ABORTED_SPAN_STATUS_MESSAGE : API_CALL_FAILED_SPAN_STATUS_MESSAGE,
+        ...retrySnapshot
       });
       try {
         await this.safelyLogOpenAIInteraction(
@@ -68814,7 +69116,8 @@ var LoggingContentGenerator = class {
         resolvedRequest,
         llmSpan,
         spanContext,
-        req.config?.abortSignal
+        req.config?.abortSignal,
+        retrySnapshot
       )
     );
   }
@@ -68828,7 +69131,7 @@ 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) {
+  async *loggingStreamWrapper(stream, startTime, userPromptId, model, openaiRequest, span, spanContext, abortSignal, retrySnapshot) {
     const isInternal = isInternalPromptId(userPromptId);
     const shouldCollectResponses = !isInternal || !!this.openaiLogger;
     const responses = [];
@@ -68852,7 +69155,8 @@ var LoggingContentGenerator = class {
         endLLMRequestSpan(span, {
           success: false,
           durationMs: Date.now() - startTime,
-          error: "Stream span timed out (idle)"
+          error: "Stream span timed out (idle)",
+          ...retrySnapshot
         });
         spanEndedByTimeout = true;
       }, STREAM_IDLE_TIMEOUT_MS);
@@ -68945,7 +69249,8 @@ var LoggingContentGenerator = class {
           cachedInputTokens: lastUsageMetadata?.cachedContentTokenCount,
           ttftMs,
           durationMs: Date.now() - startTime,
-          error: errorOccurred ? aborted ? API_CALL_ABORTED_SPAN_STATUS_MESSAGE : API_CALL_FAILED_SPAN_STATUS_MESSAGE : void 0
+          error: errorOccurred ? aborted ? API_CALL_ABORTED_SPAN_STATUS_MESSAGE : API_CALL_FAILED_SPAN_STATUS_MESSAGE : void 0,
+          ...retrySnapshot
         });
       }
     }
@@ -69335,9 +69640,10 @@ var MODALITY_PATTERNS = [
   // -------------------
   // Alibaba / Qwen
   // -------------------
-  // Qwen3.5-Plus, Qwen3.6-Plus: image + video support
+  // Qwen Plus models: image + video support (Max models are text-only)
   [/^qwen3\.5-plus/, { image: true, video: true }],
   [/^qwen3\.6-plus/, { image: true, video: true }],
+  [/^qwen3\.7-plus/, { image: true, video: true }],
   [/^coder-model$/, { image: true, video: true }],
   // Qwen VL (vision-language) models: image + video
   [/^qwen-vl-/, { image: true, video: true }],
@@ -69379,6 +69685,20 @@ function defaultModalities(model) {
 }
 __name(defaultModalities, "defaultModalities");
 
+// packages/core/src/utils/runtimeModelPrefix.ts
+init_esbuild_shims();
+var RUNTIME_SNAPSHOT_PREFIX = "$runtime|";
+function stripRuntimeSnapshotPrefix(modelId) {
+  let id = modelId;
+  while (id.startsWith(RUNTIME_SNAPSHOT_PREFIX)) {
+    const stripped = id.split("|").slice(2).join("|");
+    if (!stripped) break;
+    id = stripped;
+  }
+  return id;
+}
+__name(stripRuntimeSnapshotPrefix, "stripRuntimeSnapshotPrefix");
+
 // packages/core/src/models/modelRegistry.ts
 init_esbuild_shims();
 
@@ -69836,6 +70156,17 @@ var ModelsConfig = class _ModelsConfig {
   getResolvedModel(authType, modelId) {
     return this.modelRegistry.getModel(authType, modelId);
   }
+  /**
+   * Get the display name for a model by its id.
+   * Looks up the model in the registry using the current authType and returns
+   * its resolved name. Falls back to the raw model id when the model is not
+   * found in the registry (e.g. runtime models or unknown models).
+   */
+  getModelDisplayName(modelId) {
+    if (!this.currentAuthType) return modelId;
+    const resolved = this.modelRegistry.getModel(this.currentAuthType, modelId);
+    return resolved?.name ?? modelId;
+  }
   /**
    * Set model programmatically (e.g., VLM auto-switch, fallback).
    * Supports both registry models and raw model IDs.
@@ -69960,11 +70291,6 @@ var ModelsConfig = class _ModelsConfig {
       throw error;
     }
   }
-  /**
-   * Prefix used to identify RuntimeModelSnapshot IDs.
-   * Chosen to avoid conflicts with real model IDs which may contain `-` or `:`.
-   */
-  static RUNTIME_SNAPSHOT_PREFIX = "$runtime|";
   /**
    * Build a RuntimeModelSnapshot ID from authType and modelId.
    * The format is: `$runtime|${authType}|${modelId}`
@@ -69977,7 +70303,7 @@ var ModelsConfig = class _ModelsConfig {
    * @returns The snapshot ID in format `$runtime|${authType}|${modelId}`
    */
   buildRuntimeModelSnapshotId(authType, modelId) {
-    return `${_ModelsConfig.RUNTIME_SNAPSHOT_PREFIX}${authType}|${modelId}`;
+    return `${RUNTIME_SNAPSHOT_PREFIX}${authType}|${modelId}`;
   }
   /**
    * Extract RuntimeModelSnapshot ID from modelId if it's a runtime model reference.
@@ -69994,7 +70320,7 @@ var ModelsConfig = class _ModelsConfig {
    * @returns The RuntimeModelSnapshot ID if found, undefined otherwise
    */
   extractRuntimeModelSnapshotId(modelId) {
-    if (modelId.startsWith(_ModelsConfig.RUNTIME_SNAPSHOT_PREFIX)) {
+    if (modelId.startsWith(RUNTIME_SNAPSHOT_PREFIX)) {
       if (this.runtimeModelSnapshots.has(modelId)) {
         return modelId;
       }
@@ -70305,6 +70631,10 @@ var ModelsConfig = class _ModelsConfig {
       const isUnchanged = previousAuthType === authType && this._generationConfig.model === modelId && !isProviderChanged;
       const savedApiKey = isUnchanged ? this._generationConfig.apiKey : void 0;
       const savedApiKeySource = isUnchanged ? this.generationConfigSources["apiKey"] ? { ...this.generationConfigSources["apiKey"] } : void 0 : void 0;
+      const baseUrlSource2 = this.generationConfigSources["baseUrl"];
+      const shouldPreserveResolvedBaseUrl = isUnchanged && !!this._generationConfig.baseUrl && (baseUrlSource2?.kind === "cli" || baseUrlSource2?.kind === "env" || baseUrlSource2?.kind === "settings");
+      const savedBaseUrl = shouldPreserveResolvedBaseUrl ? this._generationConfig.baseUrl : void 0;
+      const savedBaseUrlSource = shouldPreserveResolvedBaseUrl ? baseUrlSource2 ? { ...baseUrlSource2 } : void 0 : void 0;
       this.applyResolvedModelDefaults(resolved);
       if (isUnchanged && !this._generationConfig.apiKey && savedApiKey) {
         this._generationConfig.apiKey = savedApiKey;
@@ -70312,6 +70642,12 @@ var ModelsConfig = class _ModelsConfig {
           this.generationConfigSources["apiKey"] = savedApiKeySource;
         }
       }
+      if (savedBaseUrl) {
+        this._generationConfig.baseUrl = savedBaseUrl;
+        if (savedBaseUrlSource) {
+          this.generationConfigSources["baseUrl"] = savedBaseUrlSource;
+        }
+      }
       this.strictModelProviderSelection = true;
       this.activeRuntimeModelSnapshotId = void 0;
       return;
@@ -70675,6 +71011,17 @@ function createContentGeneratorConfig(config, authType, generationConfig) {
   ).config;
 }
 __name(createContentGeneratorConfig, "createContentGeneratorConfig");
+function getModuleNotFoundError(error) {
+  let current = error;
+  while (current instanceof Error) {
+    if ("code" in current && current.code === "ERR_MODULE_NOT_FOUND") {
+      return current;
+    }
+    current = current.cause;
+  }
+  return void 0;
+}
+__name(getModuleNotFoundError, "getModuleNotFoundError");
 async function createContentGenerator(generatorConfig, config, isInitialAuth) {
   const validation = validateModelConfig(generatorConfig, false);
   if (!validation.valid) {
@@ -70685,37 +71032,50 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
     throw new Error("ContentGeneratorConfig must have an authType");
   }
   let baseGenerator;
-  if (authType === "openai" /* USE_OPENAI */) {
-    const { createOpenAIContentGenerator } = await import("./openaiContentGenerator-N3O3MYIT.js");
-    baseGenerator = createOpenAIContentGenerator(generatorConfig, config);
-  } else if (authType === "qwen-oauth" /* QWEN_OAUTH */) {
-    const { getQwenOAuthClient: getQwenOauthClient } = await import("./qwenOAuth2-LKXG7XVO.js");
-    const { QwenContentGenerator } = await import("./qwenContentGenerator-DEOIWKVH.js");
-    try {
-      const qwenClient = await getQwenOauthClient(
-        config,
-        isInitialAuth ? { requireCachedCredentials: true } : void 0
-      );
-      baseGenerator = new QwenContentGenerator(
-        qwenClient,
-        generatorConfig,
-        config
+  try {
+    if (authType === "openai" /* USE_OPENAI */) {
+      const { createOpenAIContentGenerator } = await import("./openaiContentGenerator-4QNV3CHM.js");
+      baseGenerator = createOpenAIContentGenerator(generatorConfig, config);
+    } else if (authType === "qwen-oauth" /* QWEN_OAUTH */) {
+      const { getQwenOAuthClient: getQwenOauthClient } = await import("./qwenOAuth2-KRJT35QH.js");
+      const { QwenContentGenerator } = await import("./qwenContentGenerator-3XOCEMQO.js");
+      try {
+        const qwenClient = await getQwenOauthClient(
+          config,
+          isInitialAuth ? { requireCachedCredentials: true } : void 0
+        );
+        baseGenerator = new QwenContentGenerator(
+          qwenClient,
+          generatorConfig,
+          config
+        );
+      } catch (error) {
+        if (getModuleNotFoundError(error)) {
+          throw error;
+        }
+        throw new Error(error instanceof Error ? error.message : String(error));
+      }
+    } else if (authType === "anthropic" /* USE_ANTHROPIC */) {
+      const { createAnthropicContentGenerator } = await import("./anthropicContentGenerator-4QBVSFSJ.js");
+      baseGenerator = createAnthropicContentGenerator(generatorConfig, config);
+    } else if (authType === "gemini" /* USE_GEMINI */ || authType === "vertex-ai" /* USE_VERTEX_AI */) {
+      const { createGeminiContentGenerator } = await import("./geminiContentGenerator-CR2WGARL.js");
+      baseGenerator = createGeminiContentGenerator(generatorConfig, config);
+    } else {
+      throw new Error(
+        `Error creating contentGenerator: Unsupported authType: ${authType}`
       );
-    } catch (error) {
+    }
+  } catch (error) {
+    const moduleNotFoundError = getModuleNotFoundError(error);
+    if (moduleNotFoundError) {
       throw new Error(
-        `${error instanceof Error ? error.message : String(error)}`
+        `Qwen Code was updated in the background and needs to be restarted.
+Please exit and restart Qwen Code to use the '${authType}' provider.`,
+        { cause: moduleNotFoundError }
       );
     }
-  } else if (authType === "anthropic" /* USE_ANTHROPIC */) {
-    const { createAnthropicContentGenerator } = await import("./anthropicContentGenerator-M45RXZVS.js");
-    baseGenerator = createAnthropicContentGenerator(generatorConfig, config);
-  } else if (authType === "gemini" /* USE_GEMINI */ || authType === "vertex-ai" /* USE_VERTEX_AI */) {
-    const { createGeminiContentGenerator } = await import("./geminiContentGenerator-3LR7MKCQ.js");
-    baseGenerator = createGeminiContentGenerator(generatorConfig, config);
-  } else {
-    throw new Error(
-      `Error creating contentGenerator: Unsupported authType: ${authType}`
-    );
+    throw error;
   }
   return new LoggingContentGenerator(baseGenerator, config, generatorConfig);
 }
@@ -71413,6 +71773,23 @@ var QwenLogger = class _QwenLogger {
     this.enqueueLogEvent(rumEvent);
     this.flushIfNeeded();
   }
+  // Phase 4b — HTTP-status retry from retryWithBackoff (429/5xx). Distinct from
+  // logContentRetryEvent which is fired by geminiChat's content-recovery loop.
+  logApiRetryEvent(event) {
+    const rumEvent = this.createActionEvent("misc", "api_retry", {
+      properties: {
+        model: event.model,
+        prompt_id: event.prompt_id ?? "",
+        attempt_number: event.attempt_number,
+        error_type: event.error_type ?? "unknown",
+        status_code: event.status_code !== void 0 ? String(event.status_code) : "",
+        retry_delay_ms: event.retry_delay_ms,
+        subagent_name: event.subagent_name ?? ""
+      }
+    });
+    this.enqueueLogEvent(rumEvent);
+    this.flushIfNeeded();
+  }
   // arena events
   logArenaSessionStartedEvent(event) {
     const rumEvent = this.createActionEvent("arena", "arena_session_started", {
@@ -72018,6 +72395,23 @@ function logContentRetryFailure(config, event) {
   recordContentRetryFailure(config);
 }
 __name(logContentRetryFailure, "logContentRetryFailure");
+function logApiRetry(config, event) {
+  QwenLogger.getInstance(config)?.logApiRetryEvent(event);
+  if (!isTelemetrySdkInitialized()) return;
+  const attributes = {
+    ...getCommonAttributes(config),
+    ...event,
+    "event.name": EVENT_API_RETRY
+  };
+  const logger = import_api_logs.logs.getLogger(SERVICE_NAME);
+  const logRecord = {
+    body: `API retry attempt ${event.attempt_number} for ${event.model} (status ${event.status_code ?? "unknown"}).`,
+    attributes
+  };
+  logger.emit(logRecord);
+  recordApiRetry(config, { model: event.model });
+}
+__name(logApiRetry, "logApiRetry");
 function logSubagentExecution(config, event) {
   QwenLogger.getInstance(config)?.logSubagentExecutionEvent(event);
   if (!isTelemetrySdkInitialized()) return;
@@ -72506,10 +72900,11 @@ var ReadFileToolInvocation = class extends BaseToolInvocation {
       ...this.config.storage.getUserSkillsDirs(),
       Storage.getUserExtensionsDir()
     ];
-    if (workspaceContext.isPathWithinWorkspace(filePath) || isSubpaths(allowedRoots, filePath) || // isAutoMemPath uses the narrower managed auto-memory root for this
-    // project — not the broad getMemoryBaseDir() — to avoid exposing
-    // sensitive ~/.qwen files such as settings.json or OAuth credentials.
-    isAutoMemPath(filePath, this.config.getTargetDir())) {
+    if (workspaceContext.isPathWithinWorkspace(filePath) || isSubpaths(allowedRoots, filePath) || // isAnyAutoMemPath narrows to the managed auto-memory roots
+    // (per-project + user-level under ~/.qwen/memories/) — never the
+    // broad getMemoryBaseDir() — to avoid exposing sensitive ~/.qwen
+    // files such as settings.json or OAuth credentials.
+    isAnyAutoMemPath(filePath, this.config.getTargetDir())) {
       return "allow";
     }
     return "ask";
@@ -72517,7 +72912,7 @@ var ReadFileToolInvocation = class extends BaseToolInvocation {
   async execute() {
     const absPath = path7.resolve(this.params.file_path);
     const projectRoot = this.config.getTargetDir();
-    const isAutoMem = isAutoMemPath(absPath, projectRoot);
+    const isAutoMem = isAnyAutoMemPath(absPath, projectRoot);
     const cacheEnabled = !this.config.getFileReadCacheDisabled();
     const useFastPath = cacheEnabled && !isAutoMem;
     const cache = this.config.getFileReadCache();
@@ -72736,6 +73131,7 @@ export {
   subagentNameContext,
   UiTelemetryService,
   uiTelemetryService,
+  safeJsonStringify,
   require_safer,
   iconvEncode,
   iconvEncodingExists,
@@ -72802,6 +73198,7 @@ export {
   recordInvalidChunk,
   recordContentRetry,
   recordContentRetryFailure,
+  recordApiRetry,
   recordStartupPerformance,
   recordMemoryUsage,
   recordCpuUsage,
@@ -72823,7 +73220,6 @@ export {
   SemanticAttributes,
   sanitizeHookName,
   QwenLogger,
-  safeSetStatus,
   truncateContent,
   addUserPromptAttributes,
   addSystemPromptAttributes,
@@ -72846,7 +73242,11 @@ export {
   endToolBlockedOnUserSpan,
   startHookSpan,
   endHookSpan,
+  startSubagentSpan,
+  runInSubagentSpanContext,
+  endSubagentSpan,
   getActiveInteractionSpan,
+  safeSetStatus,
   isTelemetrySdkInitialized,
   initializeTelemetry,
   refreshSessionContext,
@@ -72873,6 +73273,7 @@ export {
   logKittySequenceOverflow,
   logContentRetry,
   logContentRetryFailure,
+  logApiRetry,
   logSubagentExecution,
   logModelSlashCommand,
   logHookCall,
@@ -72922,6 +73323,7 @@ export {
   KittySequenceOverflowEvent,
   FileOperationEvent,
   ContentRetryEvent,
+  ApiRetryEvent,
   ContentRetryFailureEvent,
   ExtensionInstallEvent,
   ToolOutputTruncatedEvent,
@@ -72956,7 +73358,10 @@ export {
   TelemetryTarget,
   DEFAULT_TELEMETRY_TARGET,
   DEFAULT_OTLP_ENDPOINT,
+  retryContext,
   defaultModalities,
+  RUNTIME_SNAPSHOT_PREFIX,
+  stripRuntimeSnapshotPrefix,
   MODEL_GENERATION_CONFIG_FIELDS,
   AUTH_ENV_MAPPINGS,
   DEFAULT_MODELS,