@qwen-code/qwen-code 0.22.1 → 0.22.2-nightly.20260828.7357136dd1

package/chunks/{chunk-2ZV3CZKI.js → chunk-AJGR6E6Z.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-3SH53ANB.js";
 import {
   theme
-} from "./chunk-FPH6TXD3.js";
+} from "./chunk-WAOIHTJS.js";
 import {
   require_jsx_runtime
 } from "./chunk-SV5PQVQE.js";
@@ -14,17 +14,17 @@ import {
   Text,
   use_is_screen_reader_enabled_default
 } from "./chunk-5Q372OFJ.js";
-import {
-  collectInlineImages,
-  extractInlineContentRuns
-} from "./chunk-EC5BONC3.js";
 import {
   require_react
 } from "./chunk-5QWWOFGG.js";
+import {
+  collectInlineImages,
+  extractInlineContentRuns
+} from "./chunk-TPI7O7HR.js";
 import {
   formatHistoryGapNotice,
   indexGapsByChild
-} from "./chunk-L436XFLJ.js";
+} from "./chunk-7VD6IPQM.js";
 import {
   stringWidth
 } from "./chunk-2MIN6GRR.js";
@@ -33,24 +33,26 @@ import {
 } from "./chunk-QHTIBUWB.js";
 import {
   t
-} from "./chunk-W2WRNJKX.js";
+} from "./chunk-RWZB422L.js";
 import {
   isGoalCheckpointBookkeepingRecord
-} from "./chunk-VMDURMFY.js";
+} from "./chunk-W6DUQ5GA.js";
 import {
   getToolResponseDisplayText
-} from "./chunk-XYX474JQ.js";
+} from "./chunk-EWIQ3NAE.js";
 import {
   stripAnsi
 } from "./chunk-TWPJO254.js";
 import {
   GoalPersistenceUnavailableError,
-  parseGoalStateRecordPayloadV2,
+  parseGoalStateRecordPayloadV2
+} from "./chunk-XLLQJRAH.js";
+import {
   projectUserTranscriptForDisplay
-} from "./chunk-FN5C6C7G.js";
+} from "./chunk-7J6OTNGO.js";
 import {
   ToolDisplayNames
-} from "./chunk-KOJ6MHD5.js";
+} from "./chunk-UTLCH2FK.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -2423,7 +2425,7 @@ var ICON = {
 // packages/cli/src/ui/components/shared/ToolStatusIndicator.tsx
 init_esbuild_shims();
 
-// packages/cli/src/ui/components/GeminiRespondingSpinner.tsx
+// packages/cli/src/ui/components/RespondingSpinner.tsx
 init_esbuild_shims();
 var import_react3 = __toESM(require_react(), 1);
 
@@ -2473,27 +2475,24 @@ var SCREEN_READER_MODEL_PREFIX = "Model: ";
 var SCREEN_READER_LOADING = "loading";
 var SCREEN_READER_RESPONDING = "responding";
 
-// packages/cli/src/ui/components/GeminiRespondingSpinner.tsx
+// packages/cli/src/ui/components/RespondingSpinner.tsx
 var import_jsx_runtime = __toESM(require_jsx_runtime(), 1);
 var TMUX_SPINNER_INTERVAL_MS = 750;
 var TMUX_SPINNER_FRAMES = [". ", ".."];
-var GeminiRespondingSpinner = /* @__PURE__ */ __name(({ nonRespondingDisplay, spinnerType = "dots" }) => {
+var RespondingSpinner = /* @__PURE__ */ __name(({
+  nonRespondingDisplay,
+  spinnerType = "dots"
+}) => {
   const streamingState = useStreamingContext();
   const isScreenReaderEnabled = use_is_screen_reader_enabled_default();
   if (streamingState === "responding" /* Responding */) {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-      GeminiSpinner,
-      {
-        spinnerType,
-        altText: SCREEN_READER_RESPONDING
-      }
-    );
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner2, { spinnerType, altText: SCREEN_READER_RESPONDING });
   } else if (nonRespondingDisplay) {
     return isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: SCREEN_READER_LOADING }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: theme.text.primary, children: nonRespondingDisplay });
   }
   return null;
-}, "GeminiRespondingSpinner");
-var GeminiSpinner = /* @__PURE__ */ __name(({
+}, "RespondingSpinner");
+var Spinner2 = /* @__PURE__ */ __name(({
   spinnerType = "dots",
   altText
 }) => {
@@ -2516,7 +2515,7 @@ var GeminiSpinner = /* @__PURE__ */ __name(({
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: theme.text.primary, children: TMUX_SPINNER_FRAMES[tmuxFrameIndex] });
   }
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: theme.text.primary, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(build_default, { type: spinnerType }) });
-}, "GeminiSpinner");
+}, "Spinner");
 
 // packages/cli/src/ui/components/shared/ToolStatusIndicator.tsx
 var import_jsx_runtime2 = (
@@ -2534,7 +2533,7 @@ var ToolStatusIndicator = /* @__PURE__ */ __name(({
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Box_default, { minWidth: STATUS_INDICATOR_WIDTH, flexShrink: 0, children: [
     status === "Pending" /* Pending */ && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: theme.status.success, children: TOOL_STATUS.PENDING }),
     status === "Executing" /* Executing */ && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-      GeminiRespondingSpinner,
+      RespondingSpinner,
       {
         spinnerType: "toggle",
         nonRespondingDisplay: TOOL_STATUS.EXECUTING
@@ -2988,11 +2987,29 @@ function shouldDisplayGoalStateCause(cause) {
   }
 }
 __name(shouldDisplayGoalStateCause, "shouldDisplayGoalStateCause");
-async function waitForGoalRuntime(config) {
+async function waitForGoalRuntime(config, options = {}) {
+  const awaitReady = /* @__PURE__ */ __name(async () => {
+    try {
+      await config.getGoalRuntimeReady();
+    } catch (error) {
+      if (!(error instanceof GoalPersistenceUnavailableError)) throw error;
+    }
+  }, "awaitReady");
+  const { timeoutMs } = options;
+  if (timeoutMs == null || timeoutMs <= 0) {
+    await awaitReady();
+    return true;
+  }
+  let timer;
+  const timeout = new Promise((resolve) => {
+    timer = setTimeout(() => resolve("timeout"), timeoutMs);
+    timer.unref?.();
+  });
   try {
-    await config.getGoalRuntimeReady();
-  } catch (error) {
-    if (!(error instanceof GoalPersistenceUnavailableError)) throw error;
+    const winner = await Promise.race([awaitReady(), timeout]);
+    return winner !== "timeout";
+  } finally {
+    if (timer) clearTimeout(timer);
   }
 }
 __name(waitForGoalRuntime, "waitForGoalRuntime");
@@ -3481,8 +3498,8 @@ export {
   build_default,
   StreamingContext,
   useStreamingContext,
-  GeminiRespondingSpinner,
-  GeminiSpinner,
+  RespondingSpinner,
+  Spinner2 as Spinner,
   STATUS_INDICATOR_WIDTH,
   ToolStatusIndicator,
   ToolElapsedTime,

package/chunks/{chunk-HJOWQUE2.js → chunk-AU3MMVJF.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-E7REAOTN.js";
 import {
   formatHistoryGapNotice
-} from "./chunk-L436XFLJ.js";
+} from "./chunk-7VD6IPQM.js";
 import {
   loadUndici
 } from "./chunk-TXASDT2M.js";
@@ -14,26 +14,28 @@ import {
 } from "./chunk-OZ6KS6KW.js";
 import {
   projectGoalStateToLegacy
-} from "./chunk-VMDURMFY.js";
+} from "./chunk-W6DUQ5GA.js";
 import {
   observeToolResultBoundary,
   toolResultBoundaryArtifact
-} from "./chunk-XYX474JQ.js";
+} from "./chunk-EWIQ3NAE.js";
 import {
   parseGoalSnapshotV2,
-  parseGoalStateCause,
+  parseGoalStateCause
+} from "./chunk-XLLQJRAH.js";
+import {
   projectUserTranscriptForDisplay
-} from "./chunk-FN5C6C7G.js";
+} from "./chunk-7J6OTNGO.js";
 import {
   formatVisionBridgeNoticeDisplay,
   isVisionBridgeNoticeDisplay
-} from "./chunk-UX3IFLJM.js";
+} from "./chunk-SZLBBZH4.js";
 import {
   ToolNames
-} from "./chunk-KOJ6MHD5.js";
+} from "./chunk-UTLCH2FK.js";
 import {
   createDebugLogger
-} from "./chunk-2NNTE2ED.js";
+} from "./chunk-UHQFIS7N.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -288,7 +290,7 @@ var GOAL_CHECKPOINT_CLAIM_MAX_CHARACTERS = 2e3;
 var GOAL_CHECKPOINT_CLAIM_MAX_BYTES = 16e3;
 var GOAL_CHECKPOINT_SOURCE_REFERENCE_LIMIT = 32;
 function isGoalLimitKind(value) {
-  return value === "evidence_catalog" || value === "checkpoint_request";
+  return value === "evidence_catalog" || value === "checkpoint_request" || value === "token_budget";
 }
 __name(isGoalLimitKind, "isGoalLimitKind");
 function isGoalEvidenceProofKind(value) {
@@ -375,13 +377,15 @@ function parseGoalRecord(value) {
     "turnCount",
     "activeTimeMs",
     "tokensUsed",
+    "tokenBudget",
+    "windDownTurnId",
     "createdAt",
     "updatedAt",
     "evidenceCheckpoint",
     "checkpointStalls",
     "lastReason",
     "limitKind"
-  ]) || typeof value["goalId"] !== "string" || !value["goalId"] || !isNonNegativeInteger(value["revision"]) || value["revision"] === 0 || typeof value["objective"] !== "string" || !value["objective"].trim() || !isGoalStatus(value["status"]) || !isTranscriptCursor(value["evidenceCursor"]) || !isNonNegativeInteger(value["turnCount"]) || !isNonNegativeNumber(value["activeTimeMs"]) || value["tokensUsed"] !== void 0 && !isNonNegativeNumber(value["tokensUsed"]) || !isFiniteNumber(value["createdAt"]) || !isFiniteNumber(value["updatedAt"]) || !isGoalEvidenceCheckpoint(value["evidenceCheckpoint"]) || value["checkpointStalls"] !== void 0 && !isNonNegativeInteger(value["checkpointStalls"]) || value["lastReason"] !== void 0 && typeof value["lastReason"] !== "string" || value["limitKind"] !== void 0 && (!isGoalLimitKind(value["limitKind"]) || value["status"] !== "usage_limited")) {
+  ]) || typeof value["goalId"] !== "string" || !value["goalId"] || !isNonNegativeInteger(value["revision"]) || value["revision"] === 0 || typeof value["objective"] !== "string" || !value["objective"].trim() || !isGoalStatus(value["status"]) || !isTranscriptCursor(value["evidenceCursor"]) || !isNonNegativeInteger(value["turnCount"]) || !isNonNegativeNumber(value["activeTimeMs"]) || value["tokensUsed"] !== void 0 && !isNonNegativeNumber(value["tokensUsed"]) || value["tokenBudget"] !== void 0 && !isNonNegativeNumber(value["tokenBudget"]) || value["windDownTurnId"] !== void 0 && (typeof value["windDownTurnId"] !== "string" || !value["windDownTurnId"]) || !isFiniteNumber(value["createdAt"]) || !isFiniteNumber(value["updatedAt"]) || !isGoalEvidenceCheckpoint(value["evidenceCheckpoint"]) || value["checkpointStalls"] !== void 0 && !isNonNegativeInteger(value["checkpointStalls"]) || value["lastReason"] !== void 0 && typeof value["lastReason"] !== "string" || value["limitKind"] !== void 0 && (!isGoalLimitKind(value["limitKind"]) || value["status"] !== "usage_limited")) {
     return void 0;
   }
   if (value["evidenceCheckpoint"] && value["evidenceCursor"].recordId !== value["evidenceCheckpoint"].checkpointId) {
@@ -397,6 +401,9 @@ function parseGoalRecord(value) {
     activeTimeMs: value["activeTimeMs"],
     // Goals persisted before `tokensUsed` existed carry no spend to restore.
     tokensUsed: value["tokensUsed"] ?? 0,
+    // And no budget: a Goal from before budgets existed stays unbounded.
+    ...value["tokenBudget"] === void 0 ? {} : { tokenBudget: value["tokenBudget"] },
+    ...value["windDownTurnId"] === void 0 ? {} : { windDownTurnId: value["windDownTurnId"] },
     createdAt: value["createdAt"],
     updatedAt: value["updatedAt"],
     ...value["evidenceCheckpoint"] === void 0 ? {} : {
@@ -743,12 +750,22 @@ function createTranscriptToolCallResultUpdate(options) {
       }
     })
   };
-  if (options.resultDisplay !== void 0 && !isTruncatedSessionDiffDisplay(options.resultDisplay)) {
-    update["rawOutput"] = options.resultDisplay;
-  }
+  const rawOutput = getReplayRawOutput(options.resultDisplay);
+  if (rawOutput !== void 0) update["rawOutput"] = rawOutput;
   return update;
 }
 __name(createTranscriptToolCallResultUpdate, "createTranscriptToolCallResultUpdate");
+function getReplayRawOutput(resultDisplay) {
+  if (!isTruncatedSessionDiffDisplay(resultDisplay)) return resultDisplay;
+  if (resultDisplay["fileDiffTruncated"] === true || typeof resultDisplay["fileDiff"] !== "string") {
+    return void 0;
+  }
+  return {
+    fileName: resultDisplay["fileName"],
+    fileDiff: resultDisplay["fileDiff"]
+  };
+}
+__name(getReplayRawOutput, "getReplayRawOutput");
 function createTranscriptPlanUpdate(todos, cumulativeUsage, options = {}) {
   const meta = buildUpdateMeta({
     ...options,
@@ -2949,7 +2966,7 @@ async function extractMetadata(conversation, config) {
   const gitBranch = firstRecord?.gitBranch;
   let gitRepo;
   if (cwd) {
-    const { getGitRepoName } = await import("./deferred-core-runtime-GHT3GDOR.js");
+    const { getGitRepoName } = await import("./deferred-core-runtime-LKLGBCGZ.js");
     gitRepo = getGitRepoName(cwd);
   }
   let model;

package/chunks/{chunk-I32QCIK7.js → chunk-AXC26UCQ.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   parseRule
-} from "./chunk-XYX474JQ.js";
+} from "./chunk-EWIQ3NAE.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-7AS7QX72.js → chunk-AY3BNYEQ.js}

@@ -6,7 +6,7 @@ import {
   getNestedProperty,
   getPersistScopeForModelSelection,
   restoreSettingsFromBackup
-} from "./chunk-MDZO5V2O.js";
+} from "./chunk-HPXV655A.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-FVDQ5E67.js → chunk-B466ZSHZ.js}

@@ -2,13 +2,13 @@
 "use strict";
 import {
   delay
-} from "./chunk-V3GINY6K.js";
+} from "./chunk-4QHPPXK2.js";
 import {
   isTlsVerificationDisabled
-} from "./chunk-GTUKW3I6.js";
+} from "./chunk-PPKZ7JOE.js";
 import {
   getErrorMessage
-} from "./chunk-2NNTE2ED.js";
+} from "./chunk-UHQFIS7N.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-OI2DR6QB.js → chunk-B5OUL5EL.js}

@@ -2,10 +2,10 @@
 "use strict";
 import {
   t
-} from "./chunk-W2WRNJKX.js";
+} from "./chunk-RWZB422L.js";
 import {
   createDebugLogger
-} from "./chunk-2NNTE2ED.js";
+} from "./chunk-UHQFIS7N.js";
 import {
   writeStderrLine
 } from "./chunk-KGJGEEVR.js";

package/chunks/{chunk-6US7BF3G.js → chunk-B5PHIJGI.js}

@@ -12,7 +12,7 @@ import {
   setSessionContext,
   setSessionIdOnContext,
   setShellTracePropagation
-} from "./chunk-2NNTE2ED.js";
+} from "./chunk-UHQFIS7N.js";
 import {
   DiagLogLevel,
   ROOT_CONTEXT,
@@ -877,6 +877,168 @@ function redactUrlCredentials(source) {
 }
 __name(redactUrlCredentials, "redactUrlCredentials");
 
+// packages/core/src/telemetry/context-usage.ts
+init_esbuild_shims();
+var CONTEXT_USAGE_ATTRIBUTE = "qwen-code.context.usage";
+var MAX_CONTEXT_USAGE_ATTRIBUTE_LENGTH = 1024;
+var MAX_SERIALIZED_NON_NEGATIVE_NUMBER = 10000000000000002e-22;
+var contextUsageAttributeLengthLimit = MAX_CONTEXT_USAGE_ATTRIBUTE_LENGTH;
+var FIXED_CATEGORY_KEYS = [
+  "system_prompt_tokens",
+  "builtin_tools_tokens",
+  "mcp_tools_tokens",
+  "memory_files_tokens",
+  "skills_tokens"
+];
+var CATEGORY_KEYS = [...FIXED_CATEGORY_KEYS, "messages_tokens"];
+function configureContextUsageAttributeLengthLimit(otelSpanAttributeValueLengthLimit) {
+  contextUsageAttributeLengthLimit = otelSpanAttributeValueLengthLimit !== void 0 && otelSpanAttributeValueLengthLimit > 0 ? Math.min(
+    MAX_CONTEXT_USAGE_ATTRIBUTE_LENGTH,
+    otelSpanAttributeValueLengthLimit
+  ) : MAX_CONTEXT_USAGE_ATTRIBUTE_LENGTH;
+}
+__name(configureContextUsageAttributeLengthLimit, "configureContextUsageAttributeLengthLimit");
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+__name(isRecord, "isRecord");
+function isNonNegativeFinite(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0;
+}
+__name(isNonNegativeFinite, "isNonNegativeFinite");
+function cloneContextUsage(value) {
+  try {
+    if (!isRecord(value)) return void 0;
+    const breakdown = value["breakdown"];
+    if (!isRecord(breakdown)) return void 0;
+    const windowSizeTokens = value["window_size_tokens"];
+    const compactionReserveTokens = value["compaction_reserve_tokens"];
+    const availableBeforeCompactionTokens = value["available_before_compaction_tokens"];
+    const categoryTokens = Object.fromEntries(
+      CATEGORY_KEYS.map((key) => [key, breakdown[key]])
+    );
+    const valid = value["version"] === 1 && value["estimated"] === true && Number.isSafeInteger(windowSizeTokens) && windowSizeTokens > 0 && isNonNegativeFinite(compactionReserveTokens) && (availableBeforeCompactionTokens === void 0 || isNonNegativeFinite(availableBeforeCompactionTokens)) && CATEGORY_KEYS.every(
+      (key) => Number.isSafeInteger(categoryTokens[key]) && categoryTokens[key] >= 0
+    );
+    if (!valid) return void 0;
+    return {
+      version: 1,
+      window_size_tokens: windowSizeTokens,
+      breakdown: {
+        system_prompt_tokens: categoryTokens.system_prompt_tokens,
+        builtin_tools_tokens: categoryTokens.builtin_tools_tokens,
+        mcp_tools_tokens: categoryTokens.mcp_tools_tokens,
+        memory_files_tokens: categoryTokens.memory_files_tokens,
+        skills_tokens: categoryTokens.skills_tokens,
+        messages_tokens: categoryTokens.messages_tokens
+      },
+      compaction_reserve_tokens: compactionReserveTokens,
+      ...availableBeforeCompactionTokens === void 0 ? {} : {
+        available_before_compaction_tokens: availableBeforeCompactionTokens
+      },
+      estimated: true
+    };
+  } catch {
+    return void 0;
+  }
+}
+__name(cloneContextUsage, "cloneContextUsage");
+function isValidContextUsage(value) {
+  return cloneContextUsage(value) !== void 0;
+}
+__name(isValidContextUsage, "isValidContextUsage");
+function normalizeContextUsage(snapshot, providerTotal) {
+  const validSnapshot = cloneContextUsage(snapshot);
+  if (!validSnapshot || !Number.isSafeInteger(providerTotal) || providerTotal < 0) {
+    return snapshot;
+  }
+  const providerTotalBigInt = BigInt(providerTotal);
+  const fixedSum = FIXED_CATEGORY_KEYS.reduce(
+    (sum, key) => sum + BigInt(validSnapshot.breakdown[key]),
+    0n
+  );
+  let fixed;
+  let messagesTokens;
+  if (fixedSum > providerTotalBigInt) {
+    const allocations = FIXED_CATEGORY_KEYS.map((key, index) => {
+      const numerator = BigInt(validSnapshot.breakdown[key]) * providerTotalBigInt;
+      return {
+        key,
+        index,
+        floor: numerator / fixedSum,
+        remainder: numerator % fixedSum
+      };
+    });
+    let remaining = providerTotalBigInt - allocations.reduce((sum, item) => sum + item.floor, 0n);
+    const rankedAllocations = [...allocations].sort((left, right) => {
+      if (left.remainder === right.remainder) {
+        return left.index - right.index;
+      }
+      return left.remainder > right.remainder ? -1 : 1;
+    });
+    for (const allocation of rankedAllocations) {
+      if (remaining === 0n) break;
+      allocation.floor += 1n;
+      remaining -= 1n;
+    }
+    fixed = Object.fromEntries(
+      allocations.map((allocation) => [
+        allocation.key,
+        Number(allocation.floor)
+      ])
+    );
+    messagesTokens = 0;
+  } else {
+    fixed = Object.fromEntries(
+      FIXED_CATEGORY_KEYS.map((key) => [key, validSnapshot.breakdown[key]])
+    );
+    messagesTokens = Number(providerTotalBigInt - fixedSum);
+  }
+  return {
+    ...validSnapshot,
+    breakdown: {
+      ...fixed,
+      messages_tokens: messagesTokens
+    },
+    available_before_compaction_tokens: Math.max(
+      0,
+      validSnapshot.window_size_tokens - validSnapshot.compaction_reserve_tokens - providerTotal
+    )
+  };
+}
+__name(normalizeContextUsage, "normalizeContextUsage");
+function serializeContextUsage(contextUsage) {
+  try {
+    const canonical = cloneContextUsage(contextUsage);
+    if (!canonical) return void 0;
+    return serializeCanonicalContextUsage(canonical);
+  } catch {
+    return void 0;
+  }
+}
+__name(serializeContextUsage, "serializeContextUsage");
+function serializeContextUsageForSpanStart(contextUsage) {
+  const canonical = cloneContextUsage(contextUsage);
+  if (!canonical) return void 0;
+  const serialized = serializeCanonicalContextUsage(canonical);
+  if (!serialized) return void 0;
+  const maximumFinalizedSize = serializeCanonicalContextUsage({
+    ...canonical,
+    breakdown: {
+      ...canonical.breakdown,
+      messages_tokens: Number.MAX_SAFE_INTEGER
+    },
+    available_before_compaction_tokens: MAX_SERIALIZED_NON_NEGATIVE_NUMBER
+  });
+  return maximumFinalizedSize ? serialized : void 0;
+}
+__name(serializeContextUsageForSpanStart, "serializeContextUsageForSpanStart");
+function serializeCanonicalContextUsage(contextUsage) {
+  const serialized = JSON.stringify(contextUsage);
+  return serialized.length <= contextUsageAttributeLengthLimit ? serialized : void 0;
+}
+__name(serializeCanonicalContextUsage, "serializeCanonicalContextUsage");
+
 // packages/core/src/telemetry/session-tracing.ts
 init_esbuild_shims();
 init_esm();
@@ -1054,7 +1216,7 @@ function initializeTelemetry(config) {
   telemetryInitPromise ??= (async () => {
     const debugLogger3 = createDebugLogger("OTEL");
     try {
-      const { startTelemetrySdk } = await import("./sdk-impl-VPNBLV7I.js");
+      const { startTelemetrySdk } = await import("./sdk-impl-UUMVYMAL.js");
       if (telemetryInitialized) return;
       const started = await startTelemetrySdk(config);
       if (!started) return;
@@ -1560,6 +1722,8 @@ function startLLMRequestSpanWithContext(model, promptId, options) {
   const ctx = resolveGenAiParentContext(parentCtx);
   const sessionId = resolveSessionId(parentCtx, options?.sessionId, ctx);
   const userId = resolveGenAiUserId(parentCtx, promptId, options?.userId);
+  const contextUsage = cloneContextUsage(options?.contextUsage);
+  const serializedContextUsage = serializeContextUsageForSpanStart(contextUsage);
   const attributes = {
     ...sessionId ? { "session.id": sessionId } : {},
     ...sessionId ? { "gen_ai.conversation.id": sessionId } : {},
@@ -1570,7 +1734,8 @@ function startLLMRequestSpanWithContext(model, promptId, options) {
     "gen_ai.request.model": model,
     ...options?.operationName ? { "gen_ai.operation.name": options.operationName } : {},
     ...options?.providerName ? { "gen_ai.provider.name": options.providerName } : {},
-    ...options?.outputType ? { "gen_ai.output.type": options.outputType } : {}
+    ...options?.outputType ? { "gen_ai.output.type": options.outputType } : {},
+    ...serializedContextUsage ? { [CONTEXT_USAGE_ATTRIBUTE]: serializedContextUsage } : {}
   };
   const sessionContext = setSessionIdOnContext(ctx, sessionId);
   const span = getTracer().startSpan(
@@ -1583,6 +1748,7 @@ function startLLMRequestSpanWithContext(model, promptId, options) {
     span,
     startTime: Date.now(),
     ...interactionParentCtx ? { interactionOwner: interactionParentCtx } : {},
+    ...serializedContextUsage && contextUsage ? { contextUsage } : {},
     attributes,
     type: "llm_request"
   };
@@ -1609,8 +1775,18 @@ function endLLMRequestSpan(span, metadata) {
     const duration = metadata?.durationMs ?? Date.now() - spanCtx.startTime;
     const endAttributes = { duration_ms: duration };
     if (metadata) {
-      if (metadata.inputTokens !== void 0 && Number.isSafeInteger(metadata.inputTokens) && metadata.inputTokens >= 0) {
-        endAttributes["gen_ai.usage.input_tokens"] = metadata.inputTokens;
+      const inputTokens = metadata.inputTokens;
+      const hasValidInputTokens = inputTokens !== void 0 && Number.isSafeInteger(inputTokens) && inputTokens >= 0;
+      if (hasValidInputTokens) {
+        endAttributes["gen_ai.usage.input_tokens"] = inputTokens;
+        if (spanCtx.contextUsage) {
+          const normalized = serializeContextUsage(
+            normalizeContextUsage(spanCtx.contextUsage, inputTokens)
+          );
+          if (normalized) {
+            endAttributes[CONTEXT_USAGE_ATTRIBUTE] = normalized;
+          }
+        }
       }
       if (metadata.outputTokens !== void 0 && Number.isSafeInteger(metadata.outputTokens) && metadata.outputTokens >= 0) {
         endAttributes["gen_ai.usage.output_tokens"] = metadata.outputTokens;
@@ -2382,6 +2558,8 @@ export {
   isBinary,
   normalizeContent,
   redactUrlCredentials,
+  configureContextUsageAttributeLengthLimit,
+  isValidContextUsage,
   isInNativeSubagentSpan,
   truncateSpanError,
   startInteractionSpan,

package/chunks/{chunk-5T4LWWNX.js → chunk-B7CDU2SL.js}

@@ -6,10 +6,10 @@ import {
   extractGeminiContent,
   extractOpenAiContent,
   stringifyGenAiJson
-} from "./chunk-FJWICLG7.js";
+} from "./chunk-Y3QL45LS.js";
 import {
   createDebugLogger
-} from "./chunk-2NNTE2ED.js";
+} from "./chunk-UHQFIS7N.js";
 import {
   ROOT_CONTEXT,
   context,

package/chunks/{chunk-4TPAG3O7.js → chunk-BFPESSTR.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   atomicWriteFileSync
-} from "./chunk-7QGEJI7M.js";
+} from "./chunk-23RFD54N.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";