claude-use 11.58.0 → 11.59.0

package/dist/cli.cjs

@@ -634,14 +634,14 @@ function codePointLength(str) {
   const units = str.length;
   if (!highSurrogate.test(str))
     return units;
-  let count = units;
+  let count2 = units;
   for (let i10 = 0; i10 < units - 1; i10++) {
     if ((str.charCodeAt(i10) & 64512) === 55296 && (str.charCodeAt(i10 + 1) & 64512) === 56320) {
-      count--;
+      count2--;
       i10++;
     }
   }
-  return count;
+  return count2;
 }
 function getLengthableOrigin(input2) {
   if (Array.isArray(input2))
@@ -2265,13 +2265,13 @@ function isValidBase64URL(data) {
 function isLuhnAlgo(digits) {
   let length = digits.length;
   let bit = 1;
-  let sum = 0;
+  let sum2 = 0;
   while (length) {
     const value2 = digits.charCodeAt(--length) - 48;
     bit ^= 1;
-    sum += bit ? [0, 2, 4, 6, 8, 1, 3, 5, 7, 9][value2] : value2;
+    sum2 += bit ? [0, 2, 4, 6, 8, 1, 3, 5, 7, 9][value2] : value2;
   }
-  return sum % 10 === 0;
+  return sum2 % 10 === 0;
 }
 function isValidCreditCard(input2) {
   if (!creditCard.test(input2))
@@ -5104,8 +5104,8 @@ var init_az = __esm({
 });
 
 // node_modules/.pnpm/zod@4.6.5/node_modules/zod/v4/locales/be.js
-function getBelarusianPlural(count, one2, few, many) {
-  const absCount = Math.abs(count);
+function getBelarusianPlural(count2, one2, few, many) {
+  const absCount = Math.abs(count2);
   const lastDigit = absCount % 10;
   const lastTwoDigits = absCount % 100;
   if (lastTwoDigits >= 11 && lastTwoDigits <= 19) {
@@ -7878,8 +7878,8 @@ var init_hu = __esm({
 });
 
 // node_modules/.pnpm/zod@4.6.5/node_modules/zod/v4/locales/hy.js
-function getArmenianPlural(count, one2, many) {
-  return Math.abs(count) === 1 ? one2 : many;
+function getArmenianPlural(count2, one2, many) {
+  return Math.abs(count2) === 1 ? one2 : many;
 }
 function withDefiniteArticle(word) {
   if (!word)
@@ -10754,8 +10754,8 @@ var init_ro = __esm({
 });
 
 // node_modules/.pnpm/zod@4.6.5/node_modules/zod/v4/locales/ru.js
-function getRussianPlural(count, one2, few, many) {
-  const absCount = Math.abs(count);
+function getRussianPlural(count2, one2, few, many) {
+  const absCount = Math.abs(count2);
   const lastDigit = absCount % 10;
   const lastTwoDigits = absCount % 100;
   if (lastTwoDigits >= 11 && lastTwoDigits <= 19) {
@@ -20523,9 +20523,9 @@ var require_common = __commonJS({
       }
       return target;
     }
-    function repeat(string4, count) {
+    function repeat(string4, count2) {
       let result = "";
-      for (let cycle = 0; cycle < count; cycle += 1) {
+      for (let cycle = 0; cycle < count2; cycle += 1) {
         result += string4;
       }
       return result;
@@ -21894,11 +21894,11 @@ var require_loader = __commonJS({
       }
       return false;
     }
-    function writeFoldedLines(state, count) {
-      if (count === 1) {
+    function writeFoldedLines(state, count2) {
+      if (count2 === 1) {
         state.result += " ";
-      } else if (count > 1) {
-        state.result += common.repeat("\n", count - 1);
+      } else if (count2 > 1) {
+        state.result += common.repeat("\n", count2 - 1);
       }
     }
     function readPlainScalar(state, nodeIndent, withinFlowCollection) {
@@ -25353,27 +25353,41 @@ function distinctList(member) {
 function isSingleVisibleGrapheme(text5) {
   return graphemesOf(text5).length === 1 && stringWidth(text5) === 1 && !/[\p{C}\p{Z}]/u.test(text5) && !drawsNothing(text5);
 }
+function unsettable(setting) {
+  return setting.unwrap().nullable().optional().describe(`${setting.description ?? ""} ${UNSET_NOTE}`);
+}
 function isPlainObject2(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
 function mergeStatuslineSettings(base, over) {
-  if (!isPlainObject2(base) || !isPlainObject2(over)) {
+  if (!isPlainObject2(over)) {
     return over === void 0 ? base : over;
   }
-  const merged = { ...base };
+  const merged = isPlainObject2(base) ? { ...base } : {};
   for (const [key, value2] of Object.entries(over)) {
-    merged[key] = key in base ? mergeStatuslineSettings(base[key], value2) : value2;
+    if (value2 === null) {
+      Reflect.deleteProperty(merged, key);
+    } else {
+      merged[key] = mergeStatuslineSettings(merged[key], value2);
+    }
   }
   return merged;
 }
+function contextBands({ bands, context }) {
+  return { warnAt: context.warnAt ?? bands.warnAt, criticalAt: context.criticalAt ?? bands.criticalAt };
+}
 function resolveStatusline(settings2) {
   const resolved = ResolvedStatuslineSchema.parse(mergeStatuslineSettings(STATUSLINE_DEFAULTS, settings2));
   if (resolved.bands.warnAt >= resolved.bands.criticalAt) {
     throw new RangeError(`statusline bands.warnAt (${String(resolved.bands.warnAt)}) must be below bands.criticalAt (${String(resolved.bands.criticalAt)})`);
   }
+  const forContext = contextBands(resolved);
+  if (forContext.warnAt >= forContext.criticalAt) {
+    throw new RangeError(`statusline context.warnAt (${String(forContext.warnAt)}) must be below context.criticalAt (${String(forContext.criticalAt)}), each following bands while it is unset`);
+  }
   return resolved;
 }
-var STATUSLINE_HEADER_SEGMENTS, STATUSLINE_ROWS, STATUSLINE_SESSION_TIME_PARTS, PROMPT_CACHE_TTL_SECONDS, STATUSLINE_COLOUR_NAMES, DEFAULT_HEADER_SEGMENTS, DEFAULT_ROWS, STATUSLINE_PATH_LEVELS, STATUSLINE_USAGE_VALUES, STATUSLINE_TIME_FORMATS, STATUSLINE_HOUR_CYCLES, MAX_PERCENT, MAX_STATUSLINE_PALETTE_INDEX, MAX_STATUSLINE_LABEL_COLUMNS, MAX_BAR_CELLS, MAX_ACCOUNT_USER_CHARS, MAX_DISPLAY_TEXT_CHARS, LABEL_RE2, OPTIONAL_LABEL_RE, colourValue, barCharacter, labelText, overrideText, wholePercent, thresholdPercent, SHAPES, StatuslineSchema, ResolvedStatuslineSchema, STATUSLINE_DEFAULTS, STATUSLINE_ENV;
+var STATUSLINE_HEADER_SEGMENTS, STATUSLINE_ROWS, STATUSLINE_SESSION_TIME_PARTS, PROMPT_CACHE_TTL_SECONDS, STATUSLINE_COLOUR_NAMES, DEFAULT_HEADER_SEGMENTS, DEFAULT_ROWS, STATUSLINE_PATH_LEVELS, STATUSLINE_USAGE_VALUES, STATUSLINE_TIME_FORMATS, STATUSLINE_HOUR_CYCLES, MAX_PERCENT, MAX_STATUSLINE_PALETTE_INDEX, MAX_STATUSLINE_LABEL_COLUMNS, MAX_BAR_CELLS, MAX_ACCOUNT_USER_CHARS, MAX_DISPLAY_TEXT_CHARS, LABEL_RE2, OPTIONAL_LABEL_RE, colourValue, barCharacter, STATUSLINE_CONTEXT_VALUES, STATUSLINE_CONTEXT_ESTIMATES, AUTOCOMPACT_RESERVE_FRACTION, AUTOCOMPACT_RESERVE_RAMP_START, AUTOCOMPACT_RESERVE_RAMP_END, labelText, overrideText, wholePercent, thresholdPercent, SHAPES, UNSET_NOTE, StatuslineSchema, ResolvedStatuslineSchema, STATUSLINE_DEFAULTS, STATUSLINE_ENV;
 var init_statusline = __esm({
   "src/config/statusline.ts"() {
     "use strict";
@@ -25382,7 +25396,7 @@ var init_statusline = __esm({
     init_blank();
     init_graphemes();
     STATUSLINE_HEADER_SEGMENTS = ["model", "provider", "route", "account", "identity", "headroom", "project", "vcs", "effort", "advisor", "version", "outputStyle", "cost", "dailyCost", "sessionName", "duration", "speed"];
-    STATUSLINE_ROWS = ["context", "quota", "addedDirs", "gitFiles", "memory", "environment", "sessionTime", "promptCache", "compactions"];
+    STATUSLINE_ROWS = ["context", "quota", "addedDirs", "gitFiles", "memory", "environment", "sessionTime", "promptCache", "compactions", "tokens"];
     STATUSLINE_SESSION_TIME_PARTS = ["started", "lastReply"];
     PROMPT_CACHE_TTL_SECONDS = { fiveMinutes: 300, oneHour: 3600 };
     STATUSLINE_COLOUR_NAMES = [
@@ -25421,6 +25435,11 @@ var init_statusline = __esm({
     OPTIONAL_LABEL_RE = /^(?:[^\p{C}\p{Z}]+(?: [^\p{C}\p{Z}]+)*)?$/u;
     colourValue = external_exports.union([external_exports.enum(STATUSLINE_COLOUR_NAMES), external_exports.number().int().min(0).max(MAX_STATUSLINE_PALETTE_INDEX), external_exports.string().regex(/^#[0-9a-fA-F]{6}$/, "must be a colour name, a palette index from 0 to 255 or #rrggbb")]);
     barCharacter = external_exports.string().refine(isSingleVisibleGrapheme, "must be a single visible character that takes one terminal column");
+    STATUSLINE_CONTEXT_VALUES = ["both", "percent", "tokens", "remaining"];
+    STATUSLINE_CONTEXT_ESTIMATES = ["never", "raw", "buffered"];
+    AUTOCOMPACT_RESERVE_FRACTION = 0.165;
+    AUTOCOMPACT_RESERVE_RAMP_START = 0.05;
+    AUTOCOMPACT_RESERVE_RAMP_END = 0.5;
     labelText = external_exports.string().refine((text5) => stringWidth(text5) <= MAX_STATUSLINE_LABEL_COLUMNS, `must take no more than ${String(MAX_STATUSLINE_LABEL_COLUMNS)} terminal columns`).refine((text5) => !drawsNothing(text5), "must show something: a label of only combining marks or blank characters draws nothing").regex(LABEL_RE2, "must be visible text without control characters");
     overrideText = external_exports.string().max(MAX_DISPLAY_TEXT_CHARS).regex(OPTIONAL_LABEL_RE, "must be visible text without control characters");
     wholePercent = external_exports.number().int().min(1).max(MAX_PERCENT);
@@ -25448,6 +25467,15 @@ var init_statusline = __esm({
       advisor: {
         override: overrideText.describe("A name to show for the advisor model in place of the one the session's transcript records; empty shows the transcript's, prettified.")
       },
+      context: {
+        bar: external_exports.enum(["shown", "hidden"]).describe("Whether the context row draws its bar, or only its figures on one line of text."),
+        value: external_exports.enum(STATUSLINE_CONTEXT_VALUES).describe("The context figure: both (the tokens held against the window, then the percentage), percent, tokens, or remaining (the percentage of the window left)."),
+        warnAt: wholePercent.optional().describe("The whole percentage of the context window at which the context bar turns yellow; while it is unset the context bar follows bands.warnAt."),
+        criticalAt: wholePercent.optional().describe("The whole percentage of the context window at which the context bar turns red and, with context.breakdown set to critical, the token breakdown appears; while it is unset the context bar follows bands.criticalAt."),
+        autoCompactWindow: external_exports.number().int().positive().optional().describe("A window in tokens to measure the context against instead of the model's, matching the figure /context gives once Claude Code compacts before the window is full. While it is set, the row draws nothing until the client reports the tokens held, since without them there is nothing to measure against it; while it is unset the model's own window is used."),
+        estimate: external_exports.enum(STATUSLINE_CONTEXT_ESTIMATES).describe(`What to draw when the client reports no percentage of the window in use, or reports 0 while tokens are already held (which is how a client says it has not worked it out yet): never (nothing is estimated: a percentage reported, 0 included, is drawn as it is, and none reported draws nothing), raw (the tokens held over the window), or buffered (that, plus the ${String(AUTOCOMPACT_RESERVE_FRACTION * MAX_PERCENT)}% of the window Claude Code reserves for compaction, rising from nothing at ${String(AUTOCOMPACT_RESERVE_RAMP_START * MAX_PERCENT)}% of the window held to the whole reserve at ${String(AUTOCOMPACT_RESERVE_RAMP_END * MAX_PERCENT)}%).`),
+        breakdown: external_exports.enum(["never", "critical"]).describe("Whether to add the input and cache tokens of the last request to the context row once its use reaches context.criticalAt.")
+      },
       bands: {
         warnAt: wholePercent.describe("The whole percentage of use at which a bar turns yellow; it must be below criticalAt."),
         criticalAt: wholePercent.describe("The whole percentage of use at which a bar turns red.")
@@ -25519,6 +25547,7 @@ var init_statusline = __esm({
         showConflicts: external_exports.boolean().describe("Whether the segment shows !conflict when the working-copy commit has an unresolved conflict.")
       }
     };
+    UNSET_NOTE = "A layer may write null to return it to unset when a shallower layer sets it.";
     StatuslineSchema = external_exports.strictObject({
       layout: external_exports.strictObject(SHAPES.layout).partial().optional(),
       model: external_exports.strictObject(SHAPES.model).partial().optional(),
@@ -25526,6 +25555,7 @@ var init_statusline = __esm({
       account: external_exports.strictObject(SHAPES.account).partial().optional(),
       effort: external_exports.strictObject(SHAPES.effort).partial().optional(),
       advisor: external_exports.strictObject(SHAPES.advisor).partial().optional(),
+      context: external_exports.strictObject({ ...SHAPES.context, warnAt: unsettable(SHAPES.context.warnAt), criticalAt: unsettable(SHAPES.context.criticalAt), autoCompactWindow: unsettable(SHAPES.context.autoCompactWindow) }).partial().optional(),
       bands: external_exports.strictObject(SHAPES.bands).partial().optional(),
       labels: external_exports.strictObject(SHAPES.labels).partial().optional(),
       bar: external_exports.strictObject(SHAPES.bar).partial().optional(),
@@ -25547,6 +25577,7 @@ var init_statusline = __esm({
       account: external_exports.strictObject(SHAPES.account),
       effort: external_exports.strictObject(SHAPES.effort),
       advisor: external_exports.strictObject(SHAPES.advisor),
+      context: external_exports.strictObject(SHAPES.context),
       bands: external_exports.strictObject(SHAPES.bands),
       labels: external_exports.strictObject(SHAPES.labels),
       bar: external_exports.strictObject(SHAPES.bar),
@@ -25568,6 +25599,7 @@ var init_statusline = __esm({
       account: { parts: ["user", "organisation", "plan"], userLength: 0 },
       effort: { format: "full" },
       advisor: { override: "" },
+      context: { bar: "shown", value: "both", estimate: "never", breakdown: "never" },
       bands: { warnAt: 70, criticalAt: 90 },
       labels: { fiveHour: "5h", sevenDay: "Wk" },
       bar: { width: 10, filled: "\u2588", empty: "\u2591" },
@@ -29502,11 +29534,11 @@ function realIsFrontDoorSupervisor(pid) {
   return result.status === 0 && parseFrontDoorSupervisorPids(result.stdout).includes(pid);
 }
 function leadingContinuationBytes(bytes) {
-  let count = 0;
-  while (count < bytes.length && (bytes.readUInt8(count) & UTF8_CONTINUATION_MASK) === UTF8_CONTINUATION_BITS) {
-    count += 1;
+  let count2 = 0;
+  while (count2 < bytes.length && (bytes.readUInt8(count2) & UTF8_CONTINUATION_MASK) === UTF8_CONTINUATION_BITS) {
+    count2 += 1;
   }
-  return count;
+  return count2;
 }
 function realFileSize(filePath) {
   try {
@@ -30395,12 +30427,12 @@ var require_src = __commonJS({
         else if (y10 > 0) ret += `${CSI2}${y10}B`;
         return ret;
       },
-      up: (count = 1) => `${CSI2}${count}A`,
-      down: (count = 1) => `${CSI2}${count}B`,
-      forward: (count = 1) => `${CSI2}${count}C`,
-      backward: (count = 1) => `${CSI2}${count}D`,
-      nextLine: (count = 1) => `${CSI2}E`.repeat(count),
-      prevLine: (count = 1) => `${CSI2}F`.repeat(count),
+      up: (count2 = 1) => `${CSI2}${count2}A`,
+      down: (count2 = 1) => `${CSI2}${count2}B`,
+      forward: (count2 = 1) => `${CSI2}${count2}C`,
+      backward: (count2 = 1) => `${CSI2}${count2}D`,
+      nextLine: (count2 = 1) => `${CSI2}E`.repeat(count2),
+      prevLine: (count2 = 1) => `${CSI2}F`.repeat(count2),
       left: `${CSI2}G`,
       hide: `${CSI2}?25l`,
       show: `${CSI2}?25h`,
@@ -30408,21 +30440,21 @@ var require_src = __commonJS({
       restore: `${ESC2}8`
     };
     var scroll = {
-      up: (count = 1) => `${CSI2}S`.repeat(count),
-      down: (count = 1) => `${CSI2}T`.repeat(count)
+      up: (count2 = 1) => `${CSI2}S`.repeat(count2),
+      down: (count2 = 1) => `${CSI2}T`.repeat(count2)
     };
     var erase3 = {
       screen: `${CSI2}2J`,
-      up: (count = 1) => `${CSI2}1J`.repeat(count),
-      down: (count = 1) => `${CSI2}J`.repeat(count),
+      up: (count2 = 1) => `${CSI2}1J`.repeat(count2),
+      down: (count2 = 1) => `${CSI2}J`.repeat(count2),
       line: `${CSI2}2K`,
       lineEnd: `${CSI2}K`,
       lineStart: `${CSI2}1K`,
-      lines(count) {
+      lines(count2) {
         let clear = "";
-        for (let i10 = 0; i10 < count; i10++)
-          clear += this.line + (i10 < count - 1 ? cursor3.up() : "");
-        if (count)
+        for (let i10 = 0; i10 < count2; i10++)
+          clear += this.line + (i10 < count2 - 1 ? cursor3.up() : "");
+        if (count2)
           clear += cursor3.left;
         return clear;
       }
@@ -30769,16 +30801,16 @@ var require_scan = __commonJS({
       let token = { value: "", depth: 0, isGlob: false };
       const eos = () => index >= length;
       const peek = () => str.charCodeAt(index + 1);
-      const advance2 = () => {
+      const advance3 = () => {
         prev = code;
         return str.charCodeAt(++index);
       };
       while (index < length) {
-        code = advance2();
+        code = advance3();
         let next;
         if (code === CHAR_BACKWARD_SLASH) {
           backslashes = token.backslashes = true;
-          code = advance2();
+          code = advance3();
           if (code === CHAR_LEFT_CURLY_BRACE) {
             braceEscaped = true;
           }
@@ -30786,17 +30818,17 @@ var require_scan = __commonJS({
         }
         if (braceEscaped === true || code === CHAR_LEFT_CURLY_BRACE) {
           braces++;
-          while (eos() !== true && (code = advance2())) {
+          while (eos() !== true && (code = advance3())) {
             if (code === CHAR_BACKWARD_SLASH) {
               backslashes = token.backslashes = true;
-              advance2();
+              advance3();
               continue;
             }
             if (code === CHAR_LEFT_CURLY_BRACE) {
               braces++;
               continue;
             }
-            if (braceEscaped !== true && code === CHAR_DOT && (code = advance2()) === CHAR_DOT) {
+            if (braceEscaped !== true && code === CHAR_DOT && (code = advance3()) === CHAR_DOT) {
               isBrace = token.isBrace = true;
               isGlob = token.isGlob = true;
               finished = true;
@@ -30852,10 +30884,10 @@ var require_scan = __commonJS({
             }
             if (scanToEnd === true) {
               let parens = 0;
-              while (eos() !== true && (code = advance2())) {
+              while (eos() !== true && (code = advance3())) {
                 if (code === CHAR_BACKWARD_SLASH) {
                   backslashes = token.backslashes = true;
-                  advance2();
+                  advance3();
                   continue;
                 }
                 if (code === CHAR_LEFT_PARENTHESES) {
@@ -30890,10 +30922,10 @@ var require_scan = __commonJS({
           break;
         }
         if (code === CHAR_LEFT_SQUARE_BRACKET) {
-          while (eos() !== true && (next = advance2())) {
+          while (eos() !== true && (next = advance3())) {
             if (next === CHAR_BACKWARD_SLASH) {
               backslashes = token.backslashes = true;
-              advance2();
+              advance3();
               continue;
             }
             if (next === CHAR_RIGHT_SQUARE_BRACKET) {
@@ -30917,10 +30949,10 @@ var require_scan = __commonJS({
           isGlob = token.isGlob = true;
           if (scanToEnd === true) {
             let parens = 1;
-            while (eos() !== true && (code = advance2())) {
+            while (eos() !== true && (code = advance3())) {
               if (code === CHAR_BACKWARD_SLASH) {
                 backslashes = token.backslashes = true;
-                advance2();
+                advance3();
                 continue;
               }
               if (code === CHAR_LEFT_PARENTHESES) {
@@ -31356,7 +31388,7 @@ var require_parse = __commonJS({
       let value2;
       const eos = () => state.index === len - 1;
       const peek = state.peek = (n10 = 1) => input2[state.index + n10];
-      const advance2 = state.advance = () => input2[++state.index] || "";
+      const advance3 = state.advance = () => input2[++state.index] || "";
       const remaining = () => input2.slice(state.index + 1);
       const consume = (value3 = "", num = 0) => {
         state.consumed += value3;
@@ -31367,13 +31399,13 @@ var require_parse = __commonJS({
         consume(token.value);
       };
       const negate = () => {
-        let count = 1;
+        let count2 = 1;
         while (peek() === "!" && (peek(2) !== "(" || peek(3) === "?")) {
-          advance2();
+          advance3();
           state.start++;
-          count++;
+          count2++;
         }
-        if (count % 2 === 0) {
+        if (count2 % 2 === 0) {
           return false;
         }
         state.negated = true;
@@ -31423,7 +31455,7 @@ var require_parse = __commonJS({
         const output2 = (opts.capture ? "(" : "") + token.open;
         increment("parens");
         push({ type: type2, value: value3, output: state.output ? "" : ONE_CHAR });
-        push({ type: "paren", extglob: true, value: advance2(), output: output2 });
+        push({ type: "paren", extglob: true, value: advance3(), output: output2 });
         extglobs.push(token);
       };
       const extglobClose = (token) => {
@@ -31512,7 +31544,7 @@ var require_parse = __commonJS({
         return state;
       }
       while (!eos()) {
-        value2 = advance2();
+        value2 = advance3();
         if (value2 === "\0") {
           continue;
         }
@@ -31539,9 +31571,9 @@ var require_parse = __commonJS({
             }
           }
           if (opts.unescape === true) {
-            value2 = advance2();
+            value2 = advance3();
           } else {
-            value2 += advance2();
+            value2 += advance3();
           }
           if (state.brackets === 0) {
             push({ type: "text", value: value2 });
@@ -31561,7 +31593,7 @@ var require_parse = __commonJS({
                 if (posix) {
                   prev.value = pre2 + posix;
                   state.backtrack = true;
-                  advance2();
+                  advance3();
                   if (!bos.output && tokens.indexOf(prev) === 1) {
                     bos.output = ONE_CHAR;
                   }
@@ -31897,7 +31929,7 @@ var require_parse = __commonJS({
             prev.value += value2;
             state.output += prior.output + prev.output;
             state.globstar = true;
-            consume(value2 + advance2());
+            consume(value2 + advance3());
             push({ type: "slash", value: "/", output: "" });
             continue;
           }
@@ -31907,7 +31939,7 @@ var require_parse = __commonJS({
             prev.output = `(?:^|${SLASH_LITERAL}|${globstar(opts)}${SLASH_LITERAL})`;
             state.output = prev.output;
             state.globstar = true;
-            consume(value2 + advance2());
+            consume(value2 + advance3());
             push({ type: "slash", value: "/", output: "" });
             continue;
           }
@@ -32462,8 +32494,10 @@ function valueAt(source, path72) {
   }
   return current;
 }
-function keyOf(path72, leaf) {
-  const common = { path: path72.join("."), description: leaf.description ?? "", defaultValue: valueAt(STATUSLINE_DEFAULTS, path72) };
+function keyOf(path72, declared) {
+  const optional2 = declared instanceof external_exports.ZodOptional;
+  const leaf = optional2 ? declared.unwrap() : declared;
+  const common = { path: path72.join("."), description: declared.description ?? "", defaultValue: valueAt(STATUSLINE_DEFAULTS, path72), optional: optional2 };
   if (leaf instanceof external_exports.ZodNumber) {
     return { ...common, kind: "integer", choices: [] };
   }
@@ -32493,7 +32527,7 @@ function statuslineKeys() {
 function formatStatuslineKeys(keys) {
   return keys.map((key) => {
     const takes = key.kind === "choice" || key.kind === "list" || key.kind === "colour" ? `${key.kind} of ${key.choices.join(", ")}` : key.kind;
-    return `${key.path}  (${takes}; default ${JSON.stringify(key.defaultValue)})
+    return `${key.path}  (${takes}; ${key.optional ? "no default; none unsets it over shallower layers" : `default ${JSON.stringify(key.defaultValue)}`})
     ${key.description}`;
   }).join("\n");
 }
@@ -32521,6 +32555,9 @@ function parseStatuslineAssignment(text5) {
   const path72 = text5.slice(0, split);
   const raw = text5.slice(split + 1);
   const key = keyNamed(path72);
+  if (key.optional && raw === UNSET_WORD) {
+    return { path: path72, value: null };
+  }
   switch (key.kind) {
     case "integer": {
       const number6 = Number(raw);
@@ -32592,12 +32629,14 @@ function applyStatuslineChange(existing, change) {
   }
   return Object.keys(result.data).length === 0 ? void 0 : result.data;
 }
+var UNSET_WORD;
 var init_change = __esm({
   "src/statusline/change.ts"() {
     "use strict";
     init_cliError();
     init_statusline();
     init_keys();
+    UNSET_WORD = "none";
   }
 });
 
@@ -33281,15 +33320,15 @@ function parseDuration(value2) {
   if (parts === null) {
     throw new Error(`"${value2}" is not a valid duration. Expected a count followed by ms, s, m, h, d, or w.`);
   }
-  const [, count, unit] = parts;
-  if (count === void 0 || unit === void 0) {
+  const [, count2, unit] = parts;
+  if (count2 === void 0 || unit === void 0) {
     throw new Error(`"${value2}" is not a valid duration.`);
   }
   const multiplier = MILLISECONDS_PER_UNIT[unit];
   if (multiplier === void 0) {
     throw new Error(`"${value2}" is not a valid duration.`);
   }
-  return Number(count) * multiplier;
+  return Number(count2) * multiplier;
 }
 function windowValues(prefix, windows) {
   const values = {};
@@ -35765,12 +35804,12 @@ function readElement(buffer2, offset) {
   let length = first;
   let contentStart = offset + 2;
   if ((first & HIGH_BIT) !== 0) {
-    const count = first & BASE_128_PAYLOAD_MASK;
+    const count2 = first & BASE_128_PAYLOAD_MASK;
     length = 0;
-    for (let index = 0; index < count; index += 1) {
+    for (let index = 0; index < count2; index += 1) {
       length = length * (BYTE_MASK + 1) + (buffer2[offset + 2 + index] ?? 0);
     }
-    contentStart = offset + 2 + count;
+    contentStart = offset + 2 + count2;
   }
   return { tag, start: offset, contentStart, end: contentStart + length };
 }
@@ -36818,7 +36857,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "claude-use",
-      version: "11.58.0",
+      version: "11.59.0",
       description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
       license: "MIT",
       author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -37556,7 +37595,7 @@ function utilisationPerBilledToken(records) {
   if (first === void 0 || last === void 0 || last.utilization <= first.utilization) {
     return void 0;
   }
-  const billed = current.slice(1).reduce((sum, point) => sum + point.billed, 0);
+  const billed = current.slice(1).reduce((sum2, point) => sum2 + point.billed, 0);
   return billed > 0 ? (last.utilization - first.utilization) / billed : void 0;
 }
 function windowRatio(records) {
@@ -37920,7 +37959,7 @@ function summariseUsage(records) {
         modelCounts.set(record2.model, (modelCounts.get(record2.model) ?? 0) + 1);
       }
     }
-    const sum = (field) => group.reduce((total, record2) => total + (record2.usage?.[field] ?? 0), 0);
+    const sum2 = (field) => group.reduce((total, record2) => total + (record2.usage?.[field] ?? 0), 0);
     return [
       {
         identity: first.identity,
@@ -37932,10 +37971,10 @@ function summariseUsage(records) {
           "quota-exhausted": group.filter((record2) => record2.limit?.kind === "quota-exhausted").length
         },
         tokens: {
-          inputTokens: sum("inputTokens"),
-          outputTokens: sum("outputTokens"),
-          cacheCreationInputTokens: sum("cacheCreationInputTokens"),
-          cacheReadInputTokens: sum("cacheReadInputTokens")
+          inputTokens: sum2("inputTokens"),
+          outputTokens: sum2("outputTokens"),
+          cacheCreationInputTokens: sum2("cacheCreationInputTokens"),
+          cacheReadInputTokens: sum2("cacheReadInputTokens")
         },
         firstAt: first.at,
         lastAt: last.at,
@@ -64567,15 +64606,15 @@ ${value2}`;
           pos = 0;
         }
       }
-      discardLeadingBytes(count) {
-        while (count > 0 && this.lineChunkIndex < this.chunks.length) {
+      discardLeadingBytes(count2) {
+        while (count2 > 0 && this.lineChunkIndex < this.chunks.length) {
           const chunk2 = this.chunks[this.lineChunkIndex];
           const remaining = chunk2.length - this.linePos;
-          if (count < remaining) {
-            this.linePos += count;
-            count = 0;
+          if (count2 < remaining) {
+            this.linePos += count2;
+            count2 = 0;
           } else {
-            count -= remaining;
+            count2 -= remaining;
             this.lineChunkIndex++;
             this.linePos = 0;
           }
@@ -66746,7 +66785,7 @@ function routingRows(facts) {
   ];
 }
 function farmRow(links, builtDirectories, adopted) {
-  const counted2 = (count, singular, plural2) => `${String(count)} ${count === 1 ? singular : plural2}`;
+  const counted2 = (count2, singular, plural2) => `${String(count2)} ${count2 === 1 ? singular : plural2}`;
   const parts = [counted2(links, "link", "links"), counted2(builtDirectories, "built directory", "built directories"), ...adopted === 0 ? [] : [`${String(adopted)} adopted`]];
   return { label: "farm", value: "resynced", detail: parts.join(", ") };
 }
@@ -105291,20 +105330,20 @@ var require_resolve = __commonJS({
       return false;
     }
     function countKeys(schema) {
-      let count = 0;
+      let count2 = 0;
       for (const key in schema) {
         if (key === "$ref")
           return Infinity;
-        count++;
+        count2++;
         if (SIMPLE_INLINED.has(key))
           continue;
         if (typeof schema[key] == "object") {
-          (0, util_1.eachItem)(schema[key], (sch) => count += countKeys(sch));
+          (0, util_1.eachItem)(schema[key], (sch) => count2 += countKeys(sch));
         }
-        if (count === Infinity)
+        if (count2 === Infinity)
           return Infinity;
       }
-      return count;
+      return count2;
     }
     function getFullPath(resolver, id2 = "", normalize) {
       if (normalize !== false)
@@ -108786,8 +108825,8 @@ var require_contains = __commonJS({
         cxt.result(valid, () => cxt.reset());
         function validateItemsWithCount() {
           const schValid = gen.name("_valid");
-          const count = gen.let("count", 0);
-          validateItems(schValid, () => gen.if(schValid, () => checkLimits(count)));
+          const count2 = gen.let("count", 0);
+          validateItems(schValid, () => gen.if(schValid, () => checkLimits(count2)));
         }
         function validateItems(_valid, block2) {
           gen.forRange("i", 0, len, (i10) => {
@@ -108800,16 +108839,16 @@ var require_contains = __commonJS({
             block2();
           });
         }
-        function checkLimits(count) {
-          gen.code((0, codegen_1._)`${count}++`);
+        function checkLimits(count2) {
+          gen.code((0, codegen_1._)`${count2}++`);
           if (max === void 0) {
-            gen.if((0, codegen_1._)`${count} >= ${min}`, () => gen.assign(valid, true).break());
+            gen.if((0, codegen_1._)`${count2} >= ${min}`, () => gen.assign(valid, true).break());
           } else {
-            gen.if((0, codegen_1._)`${count} > ${max}`, () => gen.assign(valid, false).break());
+            gen.if((0, codegen_1._)`${count2} > ${max}`, () => gen.assign(valid, false).break());
             if (min === 1)
               gen.assign(valid, true);
             else
-              gen.if((0, codegen_1._)`${count} >= ${min}`, () => gen.assign(valid, true));
+              gen.if((0, codegen_1._)`${count2} >= ${min}`, () => gen.assign(valid, true));
           }
         }
       }
@@ -118532,9 +118571,9 @@ function observationOf(records) {
   const completed = records.filter((record2) => record2.outcome === "completed");
   const latencies = completed.map((record2) => record2.latencyMs);
   const usage = records.flatMap((record2) => record2.usage === void 0 ? [] : [record2.usage]);
-  const input2 = usage.reduce((sum, entry) => sum + (entry.inputTokens ?? 0), 0);
-  const output2 = usage.reduce((sum, entry) => sum + (entry.outputTokens ?? 0), 0);
-  const cacheRead = usage.reduce((sum, entry) => sum + (entry.cacheReadInputTokens ?? 0), 0);
+  const input2 = usage.reduce((sum2, entry) => sum2 + (entry.inputTokens ?? 0), 0);
+  const output2 = usage.reduce((sum2, entry) => sum2 + (entry.outputTokens ?? 0), 0);
+  const cacheRead = usage.reduce((sum2, entry) => sum2 + (entry.cacheReadInputTokens ?? 0), 0);
   return {
     latencyMs: median(latencies),
     successRate: records.length === 0 ? void 0 : completed.length / records.length,
@@ -119465,13 +119504,13 @@ function usageOf(record2) {
   if (!isRecord10(raw)) {
     return void 0;
   }
-  const totalTokens = numberField(raw, "total_tokens");
+  const totalTokens2 = numberField(raw, "total_tokens");
   const toolUses = numberField(raw, "tool_uses");
   const durationMs = numberField(raw, "duration_ms");
-  if (totalTokens === void 0 && toolUses === void 0 && durationMs === void 0) {
+  if (totalTokens2 === void 0 && toolUses === void 0 && durationMs === void 0) {
     return void 0;
   }
-  return { ...totalTokens === void 0 ? {} : { totalTokens }, ...toolUses === void 0 ? {} : { toolUses }, ...durationMs === void 0 ? {} : { durationMs } };
+  return { ...totalTokens2 === void 0 ? {} : { totalTokens: totalTokens2 }, ...toolUses === void 0 ? {} : { toolUses }, ...durationMs === void 0 ? {} : { durationMs } };
 }
 function overlay(base, fields) {
   const defined = Object.fromEntries(Object.entries(fields).filter(([, value2]) => value2 !== void 0));
@@ -136605,7 +136644,9 @@ init_probe();
 var DOOR_STALL_BOUND_MS = 2 * FRONTDOOR_PROBE_ATTEMPTS * PROBE_TIMEOUT_MS;
 var DOOR_AWAIT_PID_ENV = "AGENT_SHIM_FRONTDOOR_AWAIT_PID";
 var DOOR_RESPAWN_GENERATION_ENV = "AGENT_SHIM_FRONTDOOR_RESPAWN_GENERATION";
+var DOOR_RESPAWN_DELAY_ENV = "AGENT_SHIM_FRONTDOOR_RESPAWN_DELAY_MS";
 var DOOR_RESPAWN_MAX_GENERATIONS = 3;
+var DOOR_RESPAWN_COOLDOWN_CAP_MS = DOOR_STALL_BOUND_MS * DOOR_RESPAWN_MAX_GENERATIONS;
 var CHECKS_PER_PROBE_DEADLINE = 2;
 var DOOR_WATCHDOG_CHECK_MS = PROBE_TIMEOUT_MS / CHECKS_PER_PROBE_DEADLINE;
 var WATCHDOG_SOURCE = `
@@ -136613,7 +136654,7 @@ const { workerData, parentPort } = require("node:worker_threads");
 const fs = require("node:fs");
 const os = require("node:os");
 const inspector = require("node:inspector");
-const { shared, boundMs, checkEveryMs, pauseWaitMs, stateFile, ownPid, action, logFile, respawn, respawnGeneration, respawnMaxGeneration, startLockFile, awaitPidEnv, respawnGenerationEnv } = workerData;
+const { shared, boundMs, checkEveryMs, pauseWaitMs, stateFile, ownPid, action, logFile, respawn, respawnGeneration, respawnMaxGeneration, cooldownStepMs, cooldownCapMs, startLockFile, awaitPidEnv, respawnGenerationEnv, delayEnv, nativeSample } = workerData;
 const counter = new Int32Array(shared);
 let lastValue = Atomics.load(counter, 0);
 let lastChangeAt = Date.now();
@@ -136710,10 +136751,8 @@ const claimStartLock = (holder) => {
 };
 const spawnReplacement = () => {
   if (respawn === undefined || logFile === undefined) return;
-  if (respawnGeneration >= respawnMaxGeneration) {
-    log("not starting another replacement: this door was replacement generation " + String(respawnGeneration) + " of " + String(respawnMaxGeneration) + ", so the stall has recurred through consecutive doors and the machine, not the door, is the one refusing to serve; leaving the next launch's ensure to start one");
-    return;
-  }
+  const nextGeneration = respawnGeneration + 1;
+  const cooldownMs = Math.min(Math.max(0, nextGeneration - respawnMaxGeneration) * cooldownStepMs, cooldownCapMs);
   const startingBy = liveLockHolder();
   if (startingBy !== undefined) {
     log("not starting a replacement: process " + String(startingBy) + " holds the start lock, so a door is already being started and a second one would race it for the sticky ports");
@@ -136721,7 +136760,7 @@ const spawnReplacement = () => {
   }
   try {
     const out = fs.openSync(logFile, "a");
-    const child = require("node:child_process").spawn(respawn.command, respawn.args, { detached: true, stdio: ["ignore", out, out], env: Object.assign({}, respawn.env, { [awaitPidEnv]: String(ownPid), [respawnGenerationEnv]: String(respawnGeneration + 1) }) });
+    const child = require("node:child_process").spawn(respawn.command, respawn.args, { detached: true, stdio: ["ignore", out, out], env: Object.assign({}, respawn.env, { [awaitPidEnv]: String(ownPid), [respawnGenerationEnv]: String(nextGeneration), [delayEnv]: String(cooldownMs) }) });
     child.unref();
     fs.closeSync(out);
     if (!claimStartLock(child.pid)) {
@@ -136730,11 +136769,33 @@ const spawnReplacement = () => {
       log("withdrew replacement door " + String(child.pid) + ": a launcher took the start lock first and its door is the one starting");
       return;
     }
-    log("started replacement door " + String(child.pid) + " of generation " + String(respawnGeneration + 1) + ", which binds once this process is gone");
+    log("started replacement door " + String(child.pid) + " of generation " + String(nextGeneration) + ", which binds once this process is gone" + (cooldownMs > 0 ? " and a " + String(cooldownMs) + "ms cooldown has passed, since the stall has recurred through " + String(respawnMaxGeneration) + " consecutive replacements" : ""));
   } catch (error) {
     log("could not start a replacement door: " + (error instanceof Error ? error.message : String(error)));
   }
 };
+// Captures where a main thread that could not be paused is held natively, with the platform's own sampler, so a stall the inspector cannot name still leaves a stack to read. The wait is bounded by the sampling time plus its start-up, and the capture never delays the process ending beyond that.
+const takeNativeSample = () => new Promise((resolve) => {
+  if (nativeSample === undefined) { resolve(); return; }
+  try {
+    fs.mkdirSync(nativeSample.directory, { recursive: true });
+    const file = require("node:path").join(nativeSample.directory, String(ownPid) + ".txt");
+    const args = nativeSample.args.map((arg) => arg.replace("{pid}", String(ownPid)).replace("{seconds}", String(nativeSample.seconds)).replace("{file}", file));
+    const child = require("node:child_process").spawn(nativeSample.command, args, { stdio: "ignore" });
+    const giveUp = setTimeout(() => { child.kill(); log("the native sampler did not finish in time"); resolve(); }, (nativeSample.seconds + 2) * 1000);
+    child.once("error", (error) => { clearTimeout(giveUp); log("could not sample the main thread natively: " + error.message); resolve(); });
+    child.once("close", () => {
+      clearTimeout(giveUp);
+      log("native stack of the blocked main thread written to " + file);
+      const kept = fs.readdirSync(nativeSample.directory).filter((name) => name.endsWith(".txt")).map((name) => ({ name, at: fs.statSync(require("node:path").join(nativeSample.directory, name)).mtimeMs })).sort((a, b) => b.at - a.at);
+      for (const old of kept.slice(nativeSample.keep)) fs.rmSync(require("node:path").join(nativeSample.directory, old.name), { force: true });
+      resolve();
+    });
+  } catch (error) {
+    log("could not sample the main thread natively: " + (error instanceof Error ? error.message : String(error)));
+    resolve();
+  }
+});
 const timer = setInterval(() => {
   if (stopped) return;
   const now = Date.now();
@@ -136755,8 +136816,9 @@ const timer = setInterval(() => {
     const [oneMinute, fiveMinutes, fifteenMinutes] = os.loadavg();
     log("machine load at the stall: " + oneMinute.toFixed(1) + " (1m), " + fiveMinutes.toFixed(1) + " (5m), " + fifteenMinutes.toFixed(1) + " (15m) across " + String(os.cpus().length) + " cpus");
     spawnReplacement();
-    describeMainThread(pauseWaitMs, action !== "kill-process").then((where) => {
+    describeMainThread(pauseWaitMs, action !== "kill-process").then(async (where) => {
       log(where);
+      if (where.startsWith("the main thread could not be paused")) await takeNativeSample();
       if (action === "kill-process") {
         process.kill(ownPid, "SIGKILL");
       } else {
@@ -136778,7 +136840,7 @@ function startThreadWatchdog(params) {
   const counter = new Int32Array(shared);
   const worker = new import_node_worker_threads2.Worker(WATCHDOG_SOURCE, {
     eval: true,
-    workerData: { shared, boundMs: params.boundMs, checkEveryMs: params.checkEveryMs, pauseWaitMs: params.pauseWaitMs, stateFile: params.stateFile, ownPid: params.ownPid, action: params.action, logFile: params.logFile, respawn: params.respawn, respawnGeneration: params.respawnGeneration, respawnMaxGeneration: params.respawnMaxGeneration, startLockFile: params.startLockFile, awaitPidEnv: DOOR_AWAIT_PID_ENV, respawnGenerationEnv: DOOR_RESPAWN_GENERATION_ENV }
+    workerData: { shared, boundMs: params.boundMs, checkEveryMs: params.checkEveryMs, pauseWaitMs: params.pauseWaitMs, stateFile: params.stateFile, ownPid: params.ownPid, action: params.action, logFile: params.logFile, respawn: params.respawn, respawnGeneration: params.respawnGeneration, respawnMaxGeneration: params.respawnMaxGeneration, cooldownStepMs: params.cooldownStepMs, cooldownCapMs: params.cooldownCapMs, startLockFile: params.startLockFile, awaitPidEnv: DOOR_AWAIT_PID_ENV, respawnGenerationEnv: DOOR_RESPAWN_GENERATION_ENV, delayEnv: DOOR_RESPAWN_DELAY_ENV, nativeSample: params.nativeSample }
   });
   worker.unref();
   worker.on("message", (message) => {
@@ -136911,6 +136973,12 @@ function createRealQuotaRefresher(params) {
 
 // src/frontdoor/commands.ts
 init_store2();
+var MACOS_SAMPLER = "/usr/bin/sample";
+var MS_PER_SECOND16 = 1e3;
+function readRespawnDelayMs() {
+  const delay = Number(process.env[DOOR_RESPAWN_DELAY_ENV]);
+  return Number.isInteger(delay) && delay > 0 ? delay : 0;
+}
 function readRespawnGeneration() {
   const generation = Number(process.env[DOOR_RESPAWN_GENERATION_ENV]);
   return Number.isInteger(generation) && generation > 0 ? generation : 0;
@@ -137378,7 +137446,10 @@ function realFrontDoorSupervisorPorts(paths, respawnGeneration, retire, trackTun
       respawn: respawnInvocation(paths),
       respawnGeneration,
       respawnMaxGeneration: DOOR_RESPAWN_MAX_GENERATIONS,
-      startLockFile: paths.frontdoorLockFile
+      cooldownStepMs: DOOR_STALL_BOUND_MS,
+      cooldownCapMs: DOOR_RESPAWN_COOLDOWN_CAP_MS,
+      startLockFile: paths.frontdoorLockFile,
+      ...process.platform === "darwin" ? { nativeSample: { command: MACOS_SAMPLER, args: ["{pid}", "{seconds}", "-file", "{file}"], directory: import_node_path54.default.join(import_node_path54.default.dirname(paths.frontdoorLogPath), "stall-samples"), seconds: Math.max(1, Math.ceil(DOOR_WATCHDOG_CHECK_MS / MS_PER_SECOND16)), keep: DOOR_RESPAWN_MAX_GENERATIONS + 1 } } : {}
     }),
     // The launch lifecycle publisher over the same backbone the typed API serves: the tick's registry facts go in here, and the door's own register, prune and end moments come out as source-tagged events.
     observeLaunchRegistry: createLaunchEventPublisher(doorEvents, () => Date.now()).observe,
@@ -137432,12 +137503,14 @@ function registerFrontDoorCommand(program2, deps) {
     const idleShutdownMinutes = readGlobalConfig(paths)?.frontdoor?.idleShutdownMinutes ?? FRONTDOOR_DEFAULT_IDLE_SHUTDOWN_MINUTES;
     const awaited = Number(process.env[DOOR_AWAIT_PID_ENV]);
     const respawnGeneration = readRespawnGeneration();
+    const respawnDelayMs = readRespawnDelayMs();
     Reflect.deleteProperty(process.env, DOOR_AWAIT_PID_ENV);
     Reflect.deleteProperty(process.env, DOOR_RESPAWN_GENERATION_ENV);
+    Reflect.deleteProperty(process.env, DOOR_RESPAWN_DELAY_ENV);
     const retire = new AbortController();
     let openTunnels = () => 0;
-    const supervisorPorts = realFrontDoorSupervisorPorts(paths, respawnGeneration, retire.signal, (count) => {
-      openTunnels = count;
+    const supervisorPorts = realFrontDoorSupervisorPorts(paths, respawnGeneration, retire.signal, (count2) => {
+      openTunnels = count2;
     });
     const ownPid = process.pid;
     process.on("exit", (code) => {
@@ -137461,6 +137534,10 @@ function registerFrontDoorCommand(program2, deps) {
       const waitedMs = await awaitPidExit(awaited, supervisorPorts);
       supervisorPorts.log(`frontdoor ${String(ownPid)}: stalled door ${String(awaited)} released the sticky ports after ${String(waitedMs)}ms`);
     }
+    if (respawnDelayMs > 0) {
+      supervisorPorts.log(`frontdoor ${String(ownPid)}: waiting ${String(respawnDelayMs)}ms before binding, since the stall has recurred through every immediate replacement`);
+      await supervisorPorts.sleep(respawnDelayMs);
+    }
     declareThisProcessTheFrontDoor();
     deps.exit(await runFrontDoorSupervisor(idleShutdownMinutes, supervisorPorts));
   });
@@ -137574,7 +137651,7 @@ var realHeadroomGet = async (target, requestPath, timeoutMs) => {
 // src/statusline/enrich.ts
 init_quota();
 var FULL_PERCENT2 = 100;
-var MS_PER_SECOND16 = 1e3;
+var MS_PER_SECOND17 = 1e3;
 function identityOf(env) {
   const headers = env.ANTHROPIC_CUSTOM_HEADERS;
   if (headers !== void 0) {
@@ -137638,7 +137715,7 @@ function payloadWindow(rateLimits, key) {
   const resetsAt = window.resets_at;
   return {
     used: Math.min(FULL_PERCENT2, Math.max(0, window.used_percentage)),
-    resetAt: typeof resetsAt === "number" && Number.isFinite(resetsAt) ? new Date(resetsAt * MS_PER_SECOND16).toISOString() : void 0
+    resetAt: typeof resetsAt === "number" && Number.isFinite(resetsAt) ? new Date(resetsAt * MS_PER_SECOND17).toISOString() : void 0
   };
 }
 function payloadWindowsOf(payload) {
@@ -137666,7 +137743,7 @@ function antigravityQuotaMapOf(payload) {
 function bucketView(bucket, nowMs) {
   return {
     used: bucket?.remaining_fraction === void 0 || !Number.isFinite(bucket.remaining_fraction) ? void 0 : (1 - Math.min(1, Math.max(0, bucket.remaining_fraction))) * FULL_PERCENT2,
-    resetAt: bucket?.reset_in_seconds === void 0 || !Number.isFinite(bucket.reset_in_seconds) ? void 0 : new Date(nowMs + bucket.reset_in_seconds * MS_PER_SECOND16).toISOString()
+    resetAt: bucket?.reset_in_seconds === void 0 || !Number.isFinite(bucket.reset_in_seconds) ? void 0 : new Date(nowMs + bucket.reset_in_seconds * MS_PER_SECOND17).toISOString()
   };
 }
 function antigravityWindowsOf(payload, nowMs) {
@@ -137742,7 +137819,7 @@ function enrichStatuslinePayload(params) {
         window.measures,
         {
           remaining_fraction: 1 - window.utilization,
-          ...window.resetsAt === void 0 ? {} : { reset_in_seconds: (Date.parse(window.resetsAt) - params.nowMs) / MS_PER_SECOND16 }
+          ...window.resetsAt === void 0 ? {} : { reset_in_seconds: (Date.parse(window.resetsAt) - params.nowMs) / MS_PER_SECOND17 }
         }
       ])
     );
@@ -138367,7 +138444,7 @@ function recordDailySpend(ports, nowMs, sessionId, cost) {
     const entry = parseEntry3(ports.readText(import_node_path57.default.join(todayDirectory, name)));
     return entry === void 0 ? [] : [entry];
   });
-  return entries.length === 0 ? void 0 : entries.reduce((sum, entry) => sum + (entry.totalUsd - entry.baselineUsd), 0);
+  return entries.length === 0 ? void 0 : entries.reduce((sum2, entry) => sum2 + (entry.totalUsd - entry.baselineUsd), 0);
 }
 
 // src/statusline/elements/header/cost.ts
@@ -138384,12 +138461,12 @@ function dailyCostSegment(context) {
 }
 
 // src/statusline/elements/sessionFormat.ts
-var MS_PER_SECOND17 = 1e3;
+var MS_PER_SECOND18 = 1e3;
 var SECONDS_PER_MINUTE2 = 60;
 var MINUTES_PER_HOUR4 = 60;
 var HOURS_PER_DAY9 = 24;
 function formatElapsed(ms2) {
-  const minutes = Math.floor(ms2 / (MS_PER_SECOND17 * SECONDS_PER_MINUTE2));
+  const minutes = Math.floor(ms2 / (MS_PER_SECOND18 * SECONDS_PER_MINUTE2));
   if (minutes < 1) {
     return "<1m";
   }
@@ -138398,14 +138475,14 @@ function formatElapsed(ms2) {
   }
   return `${String(Math.floor(minutes / MINUTES_PER_HOUR4))}h ${String(minutes % MINUTES_PER_HOUR4)}m`;
 }
-function twoUnits(larger, smaller, largerUnit, smallerUnit) {
-  return smaller > 0 ? `${String(larger)}${largerUnit} ${String(smaller)}${smallerUnit}` : `${String(larger)}${largerUnit}`;
+function twoUnits(larger2, smaller, largerUnit, smallerUnit) {
+  return smaller > 0 ? `${String(larger2)}${largerUnit} ${String(smaller)}${smallerUnit}` : `${String(larger2)}${largerUnit}`;
 }
 function formatAgo(ms2) {
   if (ms2 < 0) {
     return "just now";
   }
-  const seconds = Math.floor(ms2 / MS_PER_SECOND17);
+  const seconds = Math.floor(ms2 / MS_PER_SECOND18);
   if (seconds < SECONDS_PER_MINUTE2) {
     return `${String(seconds)}s ago`;
   }
@@ -138755,8 +138832,8 @@ var RETENTION_DAYS = 30;
 var HOURS_PER_DAY10 = 24;
 var MINUTES_PER_HOUR6 = 60;
 var SECONDS_PER_MINUTE4 = 60;
-var MS_PER_SECOND18 = 1e3;
-var CACHE_RETENTION_MS = RETENTION_DAYS * HOURS_PER_DAY10 * MINUTES_PER_HOUR6 * SECONDS_PER_MINUTE4 * MS_PER_SECOND18;
+var MS_PER_SECOND19 = 1e3;
+var CACHE_RETENTION_MS = RETENTION_DAYS * HOURS_PER_DAY10 * MINUTES_PER_HOUR6 * SECONDS_PER_MINUTE4 * MS_PER_SECOND19;
 function pruneCache(ports, cutoffMs) {
   const directory = cacheDirectory(ports);
   const names = ports.listDirectory(directory);
@@ -138799,7 +138876,7 @@ var MIN_SPEED_GAP_MS = 500;
 var TRANSCRIPT_BYTES_PER_TOKEN = 4;
 var SpeedSampleSchema = external_exports.strictObject({ at: external_exports.number(), outputTokens: external_exports.number().optional(), transcriptBytes: external_exports.number().optional() });
 var CACHE_KIND = "speed";
-var MS_PER_SECOND19 = 1e3;
+var MS_PER_SECOND20 = 1e3;
 function tokensOf(sample, basis) {
   const value2 = sample[basis];
   return basis === "transcriptBytes" && value2 !== void 0 ? value2 / TRANSCRIPT_BYTES_PER_TOKEN : value2;
@@ -138821,7 +138898,7 @@ function speedBetween(previous, current) {
   if (gapMs < MIN_SPEED_GAP_MS) {
     return { tokensPerSecond: void 0, remember: false };
   }
-  return { tokensPerSecond: (now - before) / (gapMs / MS_PER_SECOND19), remember: true };
+  return { tokensPerSecond: (now - before) / (gapMs / MS_PER_SECOND20), remember: true };
 }
 function trackSpeed(ports, transcriptPath, current) {
   const file2 = cacheFileFor(ports, CACHE_KIND, transcriptPath);
@@ -139136,6 +139213,9 @@ function compactionsRow(context) {
   return { kind: "text", lines: [context.palette.paint("label", `Compactions: ${String(transcript.session.compactions)}${transcript.complete ? "" : "+"}`)] };
 }
 
+// src/statusline/elements/rows/context.ts
+init_statusline();
+
 // src/statusline/elements/context.ts
 function barStyleOf({ settings: settings2, palette }, okRole) {
   return { bands: settings2.bands, palette, okRole, filled: settings2.bar.filled, empty: settings2.bar.empty };
@@ -139157,19 +139237,87 @@ function cacheShareText(view, style) {
   }
   return "";
 }
+function windowTokensOf({ settings: settings2, view }) {
+  return settings2.context.autoCompactWindow ?? view.contextWindowTokens;
+}
+function bufferedPercent(tokens, windowTokens) {
+  const held = tokens / windowTokens;
+  const ramp = Math.max(0, Math.min(1, (held - AUTOCOMPACT_RESERVE_RAMP_START) / (AUTOCOMPACT_RESERVE_RAMP_END - AUTOCOMPACT_RESERVE_RAMP_START)));
+  return Math.min(FULL_PERCENT3, (held + AUTOCOMPACT_RESERVE_FRACTION * ramp) * FULL_PERCENT3);
+}
+function usedPercentOf(context) {
+  const { settings: settings2, view } = context;
+  const tokens = view.contextTotalTokens;
+  const windowTokens = windowTokensOf(context);
+  if (settings2.context.autoCompactWindow !== void 0) {
+    return tokens === void 0 ? void 0 : Math.min(FULL_PERCENT3, tokens / settings2.context.autoCompactWindow * FULL_PERCENT3);
+  }
+  const estimated = settings2.context.estimate === "never" || tokens === void 0 || windowTokens === void 0 || windowTokens <= 0 ? void 0 : estimateOf(settings2.context.estimate, tokens, windowTokens);
+  const reported = view.contextUsedPercentage;
+  const reportedUnworked = reported === 0 && tokens !== void 0 && tokens > 0;
+  return reported === void 0 || reportedUnworked && estimated !== void 0 ? estimated : reported;
+}
+function estimateOf(kind, tokens, windowTokens) {
+  return kind === "buffered" ? bufferedPercent(tokens, windowTokens) : Math.min(FULL_PERCENT3, tokens / windowTokens * FULL_PERCENT3);
+}
+function breakdownText({ payload }) {
+  const usage = payload.context_window?.current_usage;
+  if (usage === void 0) {
+    return void 0;
+  }
+  const cached2 = (usage.cache_creation_input_tokens ?? 0) + (usage.cache_read_input_tokens ?? 0);
+  return ` (in: ${formatTokens(usage.input_tokens ?? 0)}, cache: ${formatTokens(cached2)})`;
+}
 function contextRow(context) {
-  const { view, palette } = context;
+  const { view, palette, settings: settings2 } = context;
+  const percent2 = usedPercentOf(context);
+  if (percent2 === void 0) {
+    return settings2.context.bar === "shown" ? { kind: "bars", cells: [] } : { kind: "text", lines: [] };
+  }
   const style = barStyleOf(context, "context");
-  const cells = [];
-  if (view.contextUsedPercentage !== void 0) {
-    const fraction = Math.max(0, Math.min(1, view.contextUsedPercentage / FULL_PERCENT3));
-    const color = statusColor(fraction, true, style);
-    const percent2 = withColor(color, `${view.contextUsedPercentage.toFixed(1)}%`);
-    const tokens = view.contextTotalTokens !== void 0 && view.contextWindowTokens !== void 0 ? `${formatTokens(view.contextTotalTokens)}/${formatTokens(view.contextWindowTokens)} ` : "";
-    const cache = cacheShareText(view, style);
-    cells.push(barCell(palette.paint("label", `Ctx ${tokens}`), ` ${percent2}${cache}`, fraction, style));
+  const bands = contextBands(settings2);
+  const fraction = Math.max(0, Math.min(1, percent2 / FULL_PERCENT3));
+  const color = statusColor(fraction, true, { ...style, bands });
+  const windowTokens = windowTokensOf(context);
+  const tokens = view.contextTotalTokens;
+  const heldAgainstWindow = tokens === void 0 || windowTokens === void 0 ? void 0 : `${formatTokens(tokens)}/${formatTokens(windowTokens)}`;
+  const percentText = withColor(color, `${percent2.toFixed(1)}%`);
+  const beforeBar = [];
+  const afterBar = [];
+  switch (settings2.context.value) {
+    case "both":
+      if (heldAgainstWindow !== void 0) {
+        beforeBar.push(heldAgainstWindow);
+      }
+      afterBar.push(percentText);
+      break;
+    case "percent":
+      afterBar.push(percentText);
+      break;
+    case "tokens": {
+      const held = heldAgainstWindow ?? (tokens === void 0 ? void 0 : formatTokens(tokens));
+      if (held !== void 0) {
+        afterBar.push(withColor(color, held));
+      }
+      break;
+    }
+    case "remaining":
+      afterBar.push(withColor(color, `${Math.max(0, FULL_PERCENT3 - percent2).toFixed(1)}%`));
+      break;
+    default:
+      return settings2.context.value;
   }
-  return { kind: "bars", cells };
+  const high = settings2.context.breakdown === "critical" && percent2 >= bands.criticalAt ? breakdownText(context) : void 0;
+  if (settings2.context.bar === "hidden" && afterBar.length === 0) {
+    return { kind: "text", lines: [] };
+  }
+  const trailer = `${cacheShareText(view, style)}${high === void 0 ? "" : palette.paint("label", high)}`;
+  const label2 = ["Ctx", ...beforeBar].join(" ");
+  if (settings2.context.bar === "shown") {
+    const suffix = afterBar.length === 0 ? trailer : ` ${afterBar.join(" ")}${trailer}`;
+    return { kind: "bars", cells: [barCell(palette.paint("label", `${label2} `), suffix, fraction, { ...style, bands })] };
+  }
+  return { kind: "text", lines: [`${[palette.paint("label", label2), ...afterBar].join(" ")}${trailer}`] };
 }
 
 // src/statusline/elements/rows/gitFiles.ts
@@ -139274,7 +139422,7 @@ function countRules(ports, root) {
     if (names === void 0) {
       return 0;
     }
-    let count = 0;
+    let count2 = 0;
     for (const name of names) {
       if (entries >= MAX_RULE_ENTRIES) {
         break;
@@ -139283,16 +139431,16 @@ function countRules(ports, root) {
       const entry = import_node_path61.default.join(real, name);
       const kind = followedKind(ports, entry);
       if (kind === "directory") {
-        count += walk3(entry);
+        count2 += walk3(entry);
       } else if (kind === "other" && name.endsWith(".md")) {
         const target = ports.realPath(entry);
         if (target !== void 0 && !visited.has(target)) {
           visited.add(target);
-          count += 1;
+          count2 += 1;
         }
       }
     }
-    return count;
+    return count2;
   };
   return walk3(root);
 }
@@ -139356,7 +139504,7 @@ function justify(texts, maxWidth, separator) {
     return texts.join(separator);
   }
   const separatorLength = visibleLength(separator);
-  const total = texts.reduce((sum, text5) => sum + visibleLength(text5), 0) + separatorLength * (texts.length - 1);
+  const total = texts.reduce((sum2, text5) => sum2 + visibleLength(text5), 0) + separatorLength * (texts.length - 1);
   const spare = maxWidth - total;
   if (spare <= 0) {
     return texts.join(separator);
@@ -139405,8 +139553,8 @@ function layoutHeader(texts, maxWidth, separator) {
 }
 
 // src/statusline/elements/rows/environment.ts
-function counted(count, singular, plural2) {
-  return count === 0 ? void 0 : `${String(count)} ${count === 1 ? singular : plural2}`;
+function counted(count2, singular, plural2) {
+  return count2 === 0 ? void 0 : `${String(count2)} ${count2 === 1 ? singular : plural2}`;
 }
 function environmentRow(context) {
   const { payload, settings: settings2, palette, ports } = context;
@@ -139459,7 +139607,7 @@ function formatWallClock(atMs, nowMs, clock, settings2) {
 }
 
 // src/statusline/elements/rows/promptCache.ts
-var MS_PER_SECOND20 = 1e3;
+var MS_PER_SECOND21 = 1e3;
 var MIN_WARNING_SECONDS = 60;
 var WARNING_FRACTION_DENOMINATOR = 5;
 function warningSecondsOf(ttlSeconds) {
@@ -139472,13 +139620,13 @@ function promptCacheRow(context) {
   }
   const { palette, nowMs, settings: settings2 } = context;
   const ttlSeconds = cache.ttlSeconds ?? settings2.promptCache.ttlSeconds;
-  const expiresAtMs = cache.anchorAtMs + ttlSeconds * MS_PER_SECOND20;
+  const expiresAtMs = cache.anchorAtMs + ttlSeconds * MS_PER_SECOND21;
   const remainingMs = expiresAtMs - nowMs;
   const name = palette.paint("label", "Cache");
   if (remainingMs <= 0) {
     return { kind: "text", lines: [`${name} ${palette.paint("label", "\u23F1 expired")}`] };
   }
-  const role = remainingMs <= warningSecondsOf(ttlSeconds) * MS_PER_SECOND20 ? "warning" : "context";
+  const role = remainingMs <= warningSecondsOf(ttlSeconds) * MS_PER_SECOND21 ? "warning" : "context";
   return { kind: "text", lines: [`${name} ${palette.paint(role, `\u23F1 until ${formatWallClock(expiresAtMs, nowMs, context.ports.clock, settings2.clock)}`)}`] };
 }
 
@@ -139617,6 +139765,77 @@ function sessionTimeRow(context) {
   return { kind: "text", lines: parts.length === 0 ? [] : [parts.join(` ${palette.paint("label", "\u2502")} `)] };
 }
 
+// src/statusline/transcript/tokens.ts
+init_zod();
+var tokenCount = external_exports.number().nonnegative();
+var SessionTokensSchema = external_exports.strictObject({ inputTokens: tokenCount, outputTokens: tokenCount, cacheCreationTokens: tokenCount, cacheReadTokens: tokenCount });
+var TokenStateSchema = external_exports.strictObject({
+  totals: SessionTokensSchema,
+  open: external_exports.strictObject({ key: external_exports.string(), usage: SessionTokensSchema }).optional()
+});
+var NO_TOKENS = { inputTokens: 0, outputTokens: 0, cacheCreationTokens: 0, cacheReadTokens: 0 };
+var EMPTY_TOKEN_STATE = { totals: NO_TOKENS };
+function totalTokens(tokens) {
+  return tokens.inputTokens + tokens.outputTokens + tokens.cacheCreationTokens + tokens.cacheReadTokens;
+}
+function increase(from, to2) {
+  return {
+    inputTokens: Math.max(0, to2.inputTokens - from.inputTokens),
+    outputTokens: Math.max(0, to2.outputTokens - from.outputTokens),
+    cacheCreationTokens: Math.max(0, to2.cacheCreationTokens - from.cacheCreationTokens),
+    cacheReadTokens: Math.max(0, to2.cacheReadTokens - from.cacheReadTokens)
+  };
+}
+function sum(left, right) {
+  return {
+    inputTokens: left.inputTokens + right.inputTokens,
+    outputTokens: left.outputTokens + right.outputTokens,
+    cacheCreationTokens: left.cacheCreationTokens + right.cacheCreationTokens,
+    cacheReadTokens: left.cacheReadTokens + right.cacheReadTokens
+  };
+}
+function larger(left, right) {
+  return {
+    inputTokens: Math.max(left.inputTokens, right.inputTokens),
+    outputTokens: Math.max(left.outputTokens, right.outputTokens),
+    cacheCreationTokens: Math.max(left.cacheCreationTokens, right.cacheCreationTokens),
+    cacheReadTokens: Math.max(left.cacheReadTokens, right.cacheReadTokens)
+  };
+}
+function foldTokens(state, record2) {
+  const usage = record2.message?.usage;
+  if (record2.type !== "assistant" || usage === void 0) {
+    return state;
+  }
+  const counts = {
+    inputTokens: usage.input_tokens ?? 0,
+    outputTokens: usage.output_tokens ?? 0,
+    cacheCreationTokens: usage.cache_creation_input_tokens ?? 0,
+    cacheReadTokens: usage.cache_read_input_tokens ?? 0
+  };
+  const key = record2.message?.id ?? `${String(counts.inputTokens)}|${String(counts.outputTokens)}|${String(counts.cacheCreationTokens)}|${String(counts.cacheReadTokens)}`;
+  if (state.open?.key === key) {
+    return { totals: sum(state.totals, increase(state.open.usage, counts)), open: { key, usage: larger(state.open.usage, counts) } };
+  }
+  return { totals: sum(state.totals, counts), open: { key, usage: counts } };
+}
+
+// src/statusline/elements/rows/tokens.ts
+function tokensRow({ palette, transcript }) {
+  const facts = transcript();
+  const total = facts === void 0 ? 0 : totalTokens(facts.tokens);
+  if (facts === void 0 || total === 0) {
+    return { kind: "text", lines: [] };
+  }
+  const { tokens } = facts;
+  const parts = [`in: ${formatTokens(tokens.inputTokens)}`, `out: ${formatTokens(tokens.outputTokens)}`];
+  const cached2 = tokens.cacheCreationTokens + tokens.cacheReadTokens;
+  if (cached2 > 0) {
+    parts.push(`cache: ${formatTokens(cached2)}`);
+  }
+  return { kind: "text", lines: [palette.paint("label", `Tokens ${formatTokens(total)}${facts.complete ? "" : "+"} (${parts.join(", ")})`)] };
+}
+
 // src/statusline/elements/registry.ts
 var HEADER_ROLES = {
   model: "model",
@@ -139657,7 +139876,7 @@ var ELEMENTS = {
     duration: durationSegment,
     speed: speedSegment
   },
-  rows: { context: contextRow, quota: quotaRow, addedDirs: addedDirsRow, gitFiles: gitFilesRow, memory: memoryRow, environment: environmentRow, sessionTime: sessionTimeRow, promptCache: promptCacheRow, compactions: compactionsRow }
+  rows: { context: contextRow, quota: quotaRow, addedDirs: addedDirsRow, gitFiles: gitFilesRow, memory: memoryRow, environment: environmentRow, sessionTime: sessionTimeRow, promptCache: promptCacheRow, compactions: compactionsRow, tokens: tokensRow }
 };
 
 // src/statusline/identityTranscript.ts
@@ -139758,6 +139977,7 @@ init_zod();
 init_zod();
 var text4 = external_exports.string().optional().catch(void 0);
 var number5 = external_exports.number().optional().catch(void 0);
+var count = external_exports.number().nonnegative().optional().catch(void 0);
 var ContentBlockSchema2 = external_exports.looseObject({ type: text4, text: text4 });
 var TranscriptRecordSchema = external_exports.looseObject({
   type: text4,
@@ -139773,8 +139993,14 @@ var TranscriptRecordSchema = external_exports.looseObject({
   /** Shared by the records one API request produced. */
   requestId: text4,
   message: external_exports.looseObject({
+    /** The API response the record belongs to; the records of one response share it. */
+    id: external_exports.string().min(1).optional().catch(void 0),
     content: external_exports.union([external_exports.string(), external_exports.array(ContentBlockSchema2)]).optional().catch(void 0),
     usage: external_exports.looseObject({
+      input_tokens: count,
+      output_tokens: count,
+      cache_creation_input_tokens: count,
+      cache_read_input_tokens: count,
       cache_creation: external_exports.looseObject({ ephemeral_5m_input_tokens: number5, ephemeral_1h_input_tokens: number5 }).optional().catch(void 0)
     }).optional().catch(void 0)
   }).optional().catch(void 0)
@@ -139809,18 +140035,22 @@ var PromptCacheClockSchema = external_exports.strictObject({
   /** The time of a request that has been sent and not yet answered: it has already refreshed the cache. */
   pendingAtMs: external_exports.number().optional()
 });
-var SessionStateSchema2 = external_exports.strictObject({
+var CumulativeStateSchema = external_exports.strictObject({
   startedAtMs: external_exports.number().optional(),
   /** True once the start of the transcript was read and held no timestamp, so a timestamp met later is not the session's start. */
   startUnknown: external_exports.literal(true).optional(),
+  compactions: external_exports.number().int().nonnegative()
+});
+var LatestStateSchema = external_exports.strictObject({
   lastAssistantAtMs: external_exports.number().optional(),
-  compactions: external_exports.number().int().nonnegative(),
   customTitle: external_exports.string().optional(),
   slug: external_exports.string().optional(),
   aiTitle: external_exports.string().optional(),
   cache: PromptCacheClockSchema
 });
-var EMPTY_SESSION_STATE = { compactions: 0, cache: {} };
+var SessionStateSchema2 = external_exports.strictObject({ cumulative: CumulativeStateSchema, latest: LatestStateSchema });
+var EMPTY_SESSION_STATE = { cumulative: { compactions: 0 }, latest: { cache: {} } };
+var EMPTY_LATEST_STATE = EMPTY_SESSION_STATE.latest;
 var LOCAL_ONLY_USER_TEXT_PREFIXES = ["<command-name>", "<command-message>", "<local-command-", "[Request interrupted by user"];
 function isLocalOnlyUserText(text5) {
   return LOCAL_ONLY_USER_TEXT_PREFIXES.some((prefix) => text5.startsWith(prefix));
@@ -139859,7 +140089,18 @@ function foldPromptCache(cache, record2, atMs) {
   }
   return { ...next, previousMainAtMs: atMs };
 }
-function foldSession(state, record2) {
+function foldCumulative(state, record2) {
+  const atMs = recordTimeMs(record2);
+  const next = { ...state };
+  if (record2.type === "system" && record2.subtype === "compact_boundary" && atMs !== void 0) {
+    next.compactions += 1;
+  }
+  if (atMs !== void 0 && next.startedAtMs === void 0 && next.startUnknown !== true) {
+    next.startedAtMs = atMs;
+  }
+  return next;
+}
+function foldLatest(state, record2) {
   const atMs = recordTimeMs(record2);
   const next = { ...state };
   if (record2.type === "custom-title" && record2.customTitle !== void 0) {
@@ -139869,12 +140110,6 @@ function foldSession(state, record2) {
   } else if (record2.slug !== void 0) {
     next.slug = record2.slug;
   }
-  if (record2.type === "system" && record2.subtype === "compact_boundary" && atMs !== void 0) {
-    next.compactions += 1;
-  }
-  if (atMs !== void 0 && next.startedAtMs === void 0 && next.startUnknown !== true) {
-    next.startedAtMs = atMs;
-  }
   if (record2.type === "assistant" && atMs !== void 0) {
     next.lastAssistantAtMs = atMs;
   }
@@ -139883,14 +140118,22 @@ function foldSession(state, record2) {
   }
   return next;
 }
-function sessionFactsOf(state) {
-  const { cache } = state;
+function foldSession(state, record2) {
+  return { cumulative: foldCumulative(state.cumulative, record2), latest: foldLatest(state.latest, record2) };
+}
+function hasRequest(cache) {
+  return cache.anchorAtMs !== void 0 || cache.pendingAtMs !== void 0;
+}
+function sessionFactsOf(state, newer) {
+  const { cumulative } = state;
+  const latest = newer === void 0 ? state.latest : { ...state.latest, ...newer, cache: hasRequest(newer.cache) ? { ...newer.cache, ttlSeconds: newer.cache.ttlSeconds ?? state.latest.cache.ttlSeconds } : state.latest.cache };
+  const { cache } = latest;
   const anchorAtMs = cache.pendingAtMs !== void 0 && (cache.anchorAtMs === void 0 || cache.pendingAtMs > cache.anchorAtMs) ? cache.pendingAtMs : cache.anchorAtMs;
   return {
-    title: [state.customTitle, state.slug, state.aiTitle].flatMap((name) => name === void 0 ? [] : visibleDisplayText(name)).find((name) => name !== ""),
-    startedAtMs: state.startedAtMs,
-    lastResponseAtMs: state.lastAssistantAtMs,
-    compactions: state.compactions,
+    title: [latest.customTitle, latest.slug, latest.aiTitle].flatMap((name) => name === void 0 ? [] : visibleDisplayText(name)).find((name) => name !== ""),
+    startedAtMs: cumulative.startedAtMs,
+    lastResponseAtMs: latest.lastAssistantAtMs,
+    compactions: cumulative.compactions,
     promptCache: anchorAtMs === void 0 ? void 0 : { anchorAtMs, ttlSeconds: cache.ttlSeconds }
   };
 }
@@ -139900,88 +140143,107 @@ var MAX_TRANSCRIPT_READ_BYTES = 4194304;
 var FINGERPRINT_BYTES = 4096;
 var NEWLINE2 = 10;
 var CACHE_KIND2 = "transcript";
-var CACHE_VERSION = 2;
+var CACHE_VERSION = 5;
 var TranscriptCacheSchema = external_exports.strictObject({
   version: external_exports.literal(CACHE_VERSION),
   /** A digest of the transcript's first line when this was written: another file at the same path has another one. */
   fingerprint: external_exports.string(),
-  /** How far into the transcript the state has been folded: always the start of a line. */
+  /** How far into the transcript the state has been folded: the start of a line, except while `skipping`. */
   offset: external_exports.number().int().nonnegative(),
-  /** False once bytes were left unread, so the state may be missing records from before the part read. */
+  /** False once a line was skipped without being folded, so the state is missing what it said for good. */
   complete: external_exports.boolean(),
-  session: SessionStateSchema2
-});
-function foldLines(state, bytes) {
+  /** True while the offset lies inside a line that was too big to read, which is passed a window at a time until its end. */
+  skipping: external_exports.literal(true).optional(),
+  session: SessionStateSchema2,
+  tokens: TokenStateSchema,
+  /** While the cumulative facts are being caught up, the latest-state facts folded from the end of the transcript, and where that fold has read to. Absent once the cumulative fold has reached the end, when it holds them itself. */
+  newer: external_exports.strictObject({ offset: external_exports.number().int().nonnegative(), state: LatestStateSchema }).optional()
+});
+function eachRecord(bytes, visit2) {
   const end = bytes.lastIndexOf(NEWLINE2) + 1;
-  let folded = state;
   for (const line of new TextDecoder().decode(bytes.subarray(0, end)).split("\n")) {
     const record2 = line === "" ? void 0 : parseTranscriptRecord(line);
     if (record2 !== void 0) {
-      folded = foldSession(folded, record2);
+      visit2(record2);
     }
   }
-  return { state: folded, consumed: end };
+  return end;
 }
-function startOf(head) {
-  const end = head.lastIndexOf(NEWLINE2) + 1;
-  const decoder = new TextDecoder();
-  let from = 0;
-  while (from < end) {
-    const lineEnd = head.indexOf(NEWLINE2, from);
-    const record2 = parseTranscriptRecord(decoder.decode(head.subarray(from, lineEnd)));
-    const atMs = record2 === void 0 ? void 0 : recordTimeMs(record2);
-    if (atMs !== void 0) {
-      return atMs;
-    }
-    from = lineEnd + 1;
-  }
-  return void 0;
+function foldLines(state, bytes) {
+  let session = state.session;
+  let tokens = state.tokens;
+  const consumed = eachRecord(bytes, (record2) => {
+    session = foldSession(session, record2);
+    tokens = foldTokens(tokens, record2);
+  });
+  return { session, tokens, consumed };
 }
 function fingerprintOf(head) {
   const newline = head.subarray(0, FINGERPRINT_BYTES).indexOf(NEWLINE2);
   return (0, import_node_crypto27.createHash)("sha256").update(head.subarray(0, newline === -1 ? FINGERPRINT_BYTES : newline + 1)).digest("hex");
 }
-function readTail(ports, file2, size) {
-  const from = Math.max(0, size - MAX_TRANSCRIPT_READ_BYTES - 1);
-  const range2 = ports.readRange(file2, from, MAX_TRANSCRIPT_READ_BYTES + 1);
-  if (range2 === void 0) {
-    return void 0;
-  }
-  const firstLine = from === 0 ? 0 : range2.bytes.indexOf(NEWLINE2) + 1;
-  return firstLine === 0 && from > 0 ? void 0 : { bytes: range2.bytes.subarray(firstLine), offset: from + firstLine };
-}
-function factsOf(range2, cache) {
-  return { bytes: range2.size, complete: cache.complete, session: sessionFactsOf(cache.session) };
+function factsOf(size, cache, reachedEnd) {
+  return { bytes: size, complete: cache.complete && reachedEnd, session: sessionFactsOf(cache.session, cache.newer?.state), tokens: cache.tokens.totals };
 }
 var START_UNKNOWN = { startUnknown: true };
+function advance2(cache, window, reachedEnd) {
+  let offset = cache.offset;
+  let bytes = window;
+  if (cache.skipping === true) {
+    const lineEnd = bytes.indexOf(NEWLINE2);
+    if (lineEnd === -1) {
+      return { ...cache, offset: offset + bytes.length };
+    }
+    offset += lineEnd + 1;
+    bytes = bytes.subarray(lineEnd + 1);
+  }
+  const { session: folded, tokens, consumed } = foldLines(cache, bytes);
+  if (consumed === 0 && bytes.length > 0 && !reachedEnd) {
+    const { cumulative } = cache.session;
+    const session = cumulative.startedAtMs === void 0 ? { ...cache.session, cumulative: { ...cumulative, ...START_UNKNOWN } } : cache.session;
+    return { ...cache, offset: offset + bytes.length, complete: false, skipping: true, session };
+  }
+  return { version: cache.version, fingerprint: cache.fingerprint, offset: offset + consumed, complete: cache.complete, session: folded, tokens };
+}
 function readTranscript(ports, transcriptPath, nowMs) {
   const file2 = cacheFileFor(ports, CACHE_KIND2, transcriptPath);
   const loaded = loadCache(ports, file2, TranscriptCacheSchema);
   const head = loaded === void 0 ? void 0 : ports.readRange(transcriptPath, 0, FINGERPRINT_BYTES);
   const cached2 = loaded !== void 0 && head !== void 0 && head.size >= loaded.offset && fingerprintOf(head.bytes) === loaded.fingerprint ? loaded : void 0;
   const from = cached2?.offset ?? 0;
-  const first = ports.readRange(transcriptPath, from, MAX_TRANSCRIPT_READ_BYTES);
-  if (first === void 0) {
+  const window = ports.readRange(transcriptPath, from, MAX_TRANSCRIPT_READ_BYTES);
+  if (window === void 0) {
     return void 0;
   }
-  const base = cached2 ?? { version: CACHE_VERSION, fingerprint: "", offset: 0, complete: true, session: EMPTY_SESSION_STATE };
-  const fold = { ports, file: file2, nowMs, range: first, created: cached2 === void 0, head: cached2 === void 0 ? first.bytes : void 0 };
-  if (first.size - from <= MAX_TRANSCRIPT_READ_BYTES) {
-    return foldInto({ ...fold, base, source: { bytes: first.bytes, offset: from } });
+  const { newer: previousNewer, ...base } = cached2 ?? { version: CACHE_VERSION, fingerprint: "", offset: 0, complete: true, session: EMPTY_SESSION_STATE, tokens: EMPTY_TOKEN_STATE };
+  const reachedEnd = window.size - from <= MAX_TRANSCRIPT_READ_BYTES;
+  const advanced = advance2(base, window.bytes, reachedEnd);
+  const newer = reachedEnd ? void 0 : newerFrom(ports, transcriptPath, window.size, previousNewer);
+  const next = { ...advanced, ...newer === void 0 ? {} : { newer } };
+  if (next.offset > base.offset) {
+    saveCache(ports, file2, { ...next, fingerprint: cached2 === void 0 ? fingerprintOf(window.bytes) : base.fingerprint }, nowMs);
   }
-  const startedAtMs = base.session.startedAtMs ?? (cached2 === void 0 ? startOf(first.bytes) : void 0);
-  const unread = { ...base, complete: false, session: startedAtMs === void 0 ? { ...base.session, ...START_UNKNOWN } : { ...base.session, startedAtMs } };
-  const tail = readTail(ports, transcriptPath, first.size);
-  return tail === void 0 ? factsOf(first, unread) : foldInto({ ...fold, base: unread, source: tail });
+  return factsOf(window.size, next, reachedEnd);
 }
-function foldInto({ ports, file: file2, nowMs, range: range2, created, head, base, source }) {
-  const { state, consumed } = foldLines(base.session, source.bytes);
-  const next = { ...base, offset: source.offset + consumed, session: state };
-  const fingerprint = created && head !== void 0 ? fingerprintOf(head) : base.fingerprint;
-  if (next.offset > base.offset) {
-    saveCache(ports, file2, { ...next, fingerprint }, nowMs);
+function newerFrom(ports, transcriptPath, size, previous) {
+  if (previous !== void 0 && previous.offset <= size && size - previous.offset <= MAX_TRANSCRIPT_READ_BYTES) {
+    const appended = ports.readRange(transcriptPath, previous.offset, MAX_TRANSCRIPT_READ_BYTES);
+    return appended === void 0 ? void 0 : foldNewer(previous.state, appended.bytes, previous.offset);
+  }
+  const from = Math.max(0, size - MAX_TRANSCRIPT_READ_BYTES - 1);
+  const tail = ports.readRange(transcriptPath, from, MAX_TRANSCRIPT_READ_BYTES + 1);
+  if (tail === void 0) {
+    return void 0;
   }
-  return factsOf(range2, next);
+  const firstLine = from === 0 ? 0 : tail.bytes.indexOf(NEWLINE2) + 1;
+  return firstLine === 0 && from > 0 ? void 0 : foldNewer(EMPTY_LATEST_STATE, tail.bytes.subarray(firstLine), from + firstLine);
+}
+function foldNewer(state, bytes, offset) {
+  let folded = state;
+  const consumed = eachRecord(bytes, (record2) => {
+    folded = foldLatest(folded, record2);
+  });
+  return { offset: offset + consumed, state: folded };
 }
 
 // src/statusline/render.ts
@@ -140167,7 +140429,7 @@ function registerStatuslineCommand(program2, deps) {
 }
 function registerStatuslineKeys(statusline) {
   withExamples(
-    statusline.command("keys").description("List every setting of the built-in statusline with its kind, its default and what it does.").option("--json", "Print the settings as JSON."),
+    statusline.command("keys").description("List every setting of the built-in statusline with its kind, its default (if it has one) and what it does.").option("--json", "Print the settings as JSON."),
     ["agent-shim statusline keys", "agent-shim statusline keys --json"]
   ).action((options) => {
     if (options.json === true) {
@@ -149040,7 +149302,7 @@ var ExperimentalMcpServerTasks = class {
 // node_modules/.pnpm/@modelcontextprotocol+sdk@1.32.0_supports-color@7.2.0_zod@4.6.5/node_modules/@modelcontextprotocol/sdk/dist/esm/server/mcp.js
 init_zod();
 function toolInputElementCount(value2, max) {
-  let count = 0;
+  let count2 = 0;
   const stack = [value2];
   while (stack.length > 0) {
     const node2 = stack.pop();
@@ -149048,8 +149310,8 @@ function toolInputElementCount(value2, max) {
       continue;
     if (Array.isArray(node2)) {
       for (const child of node2) {
-        if (++count > max)
-          return count;
+        if (++count2 > max)
+          return count2;
         if (child !== null && typeof child === "object")
           stack.push(child);
       }
@@ -149057,15 +149319,15 @@ function toolInputElementCount(value2, max) {
       for (const key in node2) {
         if (!Object.prototype.hasOwnProperty.call(node2, key))
           continue;
-        if (++count > max)
-          return count;
+        if (++count2 > max)
+          return count2;
         const child = node2[key];
         if (child !== null && typeof child === "object")
           stack.push(child);
       }
     }
   }
-  return count;
+  return count2;
 }
 function resolveMaxToolInputElements(value2) {
   if (value2 === void 0 || value2 === Infinity)
@@ -152624,7 +152886,7 @@ function triggerReason(input2) {
     return void 0;
   }
   const remaining = Math.max(0, 1 - five.utilization);
-  const cost = input2.sessions.reduce((sum, session) => sum + (session.state?.contextTokens ?? 0), 0) * perToken;
+  const cost = input2.sessions.reduce((sum2, session) => sum2 + (session.state?.contextTokens ?? 0), 0) * perToken;
   return remaining < cost ? `the 5h window has ${asPercent(remaining)} left, and compacting every session on this member would use about ${asPercent(cost)}` : void 0;
 }
 function decideCompaction(input2) {
@@ -152633,11 +152895,11 @@ function decideCompaction(input2) {
   if (tokens === void 0) {
     return { compact: false, reason: "the session is mid-turn, has no context recorded yet, or was already compacted on this member" };
   }
-  const larger = input2.sessions.some((session) => {
+  const larger2 = input2.sessions.some((session) => {
     const other = compactableTokens(session.state);
     return session.sessionId !== input2.sessionId && other !== void 0 && (other > tokens || other === tokens && session.sessionId < input2.sessionId);
   });
-  if (larger) {
+  if (larger2) {
     return { compact: false, reason: "a larger session on this member compacts first" };
   }
   const reason = triggerReason(input2);