claude-use 11.50.2 → 11.52.0

package/dist/cli.cjs

@@ -23995,7 +23995,7 @@ var require_merge2 = __commonJS({
     exports2.mergeAll = exports2.hasOwn = void 0;
     exports2.hasOwn = Function.prototype.call.bind(Object.prototype.hasOwnProperty);
     var objToString = Function.prototype.call.bind(Object.prototype.toString);
-    function isPlainObject4(obj) {
+    function isPlainObject5(obj) {
       return objToString(obj) === "[object Object]";
     }
     function merge2(target, source, options) {
@@ -24010,7 +24010,7 @@ var require_merge2 = __commonJS({
               target[key].push(...newValue);
               continue;
             }
-          } else if (isPlainObject4(target[key]) && isPlainObject4(newValue)) {
+          } else if (isPlainObject5(target[key]) && isPlainObject5(newValue)) {
             target[key] = merge2(target[key], newValue, options);
             continue;
           }
@@ -25040,59 +25040,124 @@ var init_proxyBypass = __esm({
 function distinctList(member) {
   return external_exports.array(member).refine((items) => new Set(items).size === items.length, "must not repeat a segment");
 }
+function isSingleVisibleGrapheme(text2) {
+  return [...GRAPHEMES.segment(text2)].length === 1 && !/[\p{C}\p{Z}]/u.test(text2);
+}
+function isPlainObject2(value2) {
+  return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
+}
+function mergeStatuslineSettings(base, over) {
+  if (!isPlainObject2(base) || !isPlainObject2(over)) {
+    return over === void 0 ? base : over;
+  }
+  const merged = { ...base };
+  for (const [key, value2] of Object.entries(over)) {
+    merged[key] = key in base ? mergeStatuslineSettings(base[key], value2) : value2;
+  }
+  return merged;
+}
 function resolveStatusline(settings2) {
-  const resolved = {
-    header: settings2?.header ?? STATUSLINE_DEFAULTS.header,
-    bars: settings2?.bars ?? STATUSLINE_DEFAULTS.bars,
-    warnAt: settings2?.warnAt ?? STATUSLINE_DEFAULTS.warnAt,
-    criticalAt: settings2?.criticalAt ?? STATUSLINE_DEFAULTS.criticalAt,
-    fiveHourLabel: settings2?.fiveHourLabel ?? STATUSLINE_DEFAULTS.fiveHourLabel,
-    sevenDayLabel: settings2?.sevenDayLabel ?? STATUSLINE_DEFAULTS.sevenDayLabel,
-    barWidth: settings2?.barWidth ?? STATUSLINE_DEFAULTS.barWidth
-  };
-  if (resolved.warnAt >= resolved.criticalAt) {
-    throw new RangeError(`statusline warnAt (${String(resolved.warnAt)}) must be below criticalAt (${String(resolved.criticalAt)})`);
+  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)})`);
   }
   return resolved;
 }
-var STATUSLINE_HEADER_SEGMENTS, STATUSLINE_BAR_GROUPS, MAX_PERCENT, MAX_STATUSLINE_LABEL_CHARS, MAX_BAR_CELLS, LABEL_RE2, wholePercent, StatuslineSchema, StatuslineChangeSchema, STATUSLINE_DEFAULTS, STATUSLINE_ENV;
+var STATUSLINE_HEADER_SEGMENTS, STATUSLINE_ROWS, STATUSLINE_COLOUR_NAMES, MAX_PERCENT, MAX_STATUSLINE_PALETTE_INDEX, MAX_STATUSLINE_LABEL_CHARS, MAX_BAR_CELLS, LABEL_RE2, colourValue, GRAPHEMES, barCharacter, labelText, wholePercent, SHAPES, StatuslineSchema, ResolvedStatuslineSchema, STATUSLINE_DEFAULTS, STATUSLINE_ENV;
 var init_statusline = __esm({
   "src/config/statusline.ts"() {
     "use strict";
     init_zod();
     STATUSLINE_HEADER_SEGMENTS = ["model", "provider", "route", "account", "identity", "headroom"];
-    STATUSLINE_BAR_GROUPS = ["context", "quota"];
+    STATUSLINE_ROWS = ["context", "quota"];
+    STATUSLINE_COLOUR_NAMES = [
+      "default",
+      "dim",
+      "black",
+      "red",
+      "green",
+      "yellow",
+      "blue",
+      "magenta",
+      "cyan",
+      "white",
+      "brightBlack",
+      "brightRed",
+      "brightGreen",
+      "brightYellow",
+      "brightBlue",
+      "brightMagenta",
+      "brightCyan",
+      "brightWhite"
+    ];
     MAX_PERCENT = 100;
+    MAX_STATUSLINE_PALETTE_INDEX = 255;
     MAX_STATUSLINE_LABEL_CHARS = 12;
     MAX_BAR_CELLS = 40;
     LABEL_RE2 = /^[^\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")]);
+    GRAPHEMES = new Intl.Segmenter(void 0, { granularity: "grapheme" });
+    barCharacter = external_exports.string().refine(isSingleVisibleGrapheme, "must be a single visible character");
+    labelText = external_exports.string().max(MAX_STATUSLINE_LABEL_CHARS).regex(LABEL_RE2, "must be visible text without control characters");
     wholePercent = external_exports.number().int().min(1).max(MAX_PERCENT);
+    SHAPES = {
+      layout: {
+        header: distinctList(external_exports.enum(STATUSLINE_HEADER_SEGMENTS)).describe("The header segments to draw, in drawing order; a segment left out is hidden, and an empty list hides the header."),
+        rows: distinctList(external_exports.enum(STATUSLINE_ROWS)).describe("The rows to draw below the header, in drawing order; a row left out is hidden, and an empty list hides every row.")
+      },
+      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.")
+      },
+      labels: {
+        fiveHour: labelText.describe("The name of the five-hour subscription window."),
+        sevenDay: labelText.describe("The name of the weekly subscription window.")
+      },
+      bar: {
+        width: external_exports.number().int().min(1).max(MAX_BAR_CELLS).describe("A bar's width in cells before the line's spare width is shared out among the bars."),
+        filled: barCharacter.describe("The character that draws the used part of a bar."),
+        empty: barCharacter.describe("The character that draws the unused part of a bar.")
+      },
+      colours: {
+        context: colourValue.describe("The colour of the context bar and its figures below the warning threshold."),
+        usage: colourValue.describe("The colour of the quota bars and their figures below the warning threshold."),
+        warning: colourValue.describe("The colour of the context bar at or above bands.warnAt, and of a cache hit share that is middling."),
+        usageWarning: colourValue.describe("The colour of a quota bar at or above bands.warnAt."),
+        critical: colourValue.describe("The colour of a bar at or above bands.criticalAt, and of a cache hit share that is nearly nothing."),
+        model: colourValue.describe("The colour of the model and provider segments."),
+        label: colourValue.describe("The colour of labels and secondary text: row labels, and the route, account, identity and headroom segments."),
+        empty: colourValue.describe("The colour of the unused part of a bar.")
+      }
+    };
     StatuslineSchema = external_exports.strictObject({
-      header: distinctList(external_exports.enum(STATUSLINE_HEADER_SEGMENTS)).optional(),
-      bars: distinctList(external_exports.enum(STATUSLINE_BAR_GROUPS)).optional(),
-      warnAt: wholePercent.optional(),
-      criticalAt: wholePercent.optional(),
-      fiveHourLabel: external_exports.string().max(MAX_STATUSLINE_LABEL_CHARS).regex(LABEL_RE2, "must be visible text without control characters").optional(),
-      sevenDayLabel: external_exports.string().max(MAX_STATUSLINE_LABEL_CHARS).regex(LABEL_RE2, "must be visible text without control characters").optional(),
-      barWidth: external_exports.number().int().min(1).max(MAX_BAR_CELLS).optional()
-    });
-    StatuslineChangeSchema = external_exports.strictObject({
-      header: external_exports.union([StatuslineSchema.shape.header.unwrap(), external_exports.literal(false)]).optional(),
-      bars: external_exports.union([StatuslineSchema.shape.bars.unwrap(), external_exports.literal(false)]).optional(),
-      warnAt: external_exports.union([StatuslineSchema.shape.warnAt.unwrap(), external_exports.literal(false)]).optional(),
-      criticalAt: external_exports.union([StatuslineSchema.shape.criticalAt.unwrap(), external_exports.literal(false)]).optional(),
-      fiveHourLabel: external_exports.union([StatuslineSchema.shape.fiveHourLabel.unwrap(), external_exports.literal(false)]).optional(),
-      sevenDayLabel: external_exports.union([StatuslineSchema.shape.sevenDayLabel.unwrap(), external_exports.literal(false)]).optional(),
-      barWidth: external_exports.union([StatuslineSchema.shape.barWidth.unwrap(), external_exports.literal(false)]).optional()
+      layout: external_exports.strictObject(SHAPES.layout).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(),
+      colours: external_exports.strictObject(SHAPES.colours).partial().optional()
+    });
+    ResolvedStatuslineSchema = external_exports.strictObject({
+      layout: external_exports.strictObject(SHAPES.layout),
+      bands: external_exports.strictObject(SHAPES.bands),
+      labels: external_exports.strictObject(SHAPES.labels),
+      bar: external_exports.strictObject(SHAPES.bar),
+      colours: external_exports.strictObject(SHAPES.colours)
     });
     STATUSLINE_DEFAULTS = {
-      header: STATUSLINE_HEADER_SEGMENTS,
-      bars: STATUSLINE_BAR_GROUPS,
-      warnAt: 70,
-      criticalAt: 90,
-      fiveHourLabel: "5h",
-      sevenDayLabel: "Wk",
-      barWidth: 10
+      layout: { header: [...STATUSLINE_HEADER_SEGMENTS], rows: [...STATUSLINE_ROWS] },
+      bands: { warnAt: 70, criticalAt: 90 },
+      labels: { fiveHour: "5h", sevenDay: "Wk" },
+      bar: { width: 10, filled: "\u2588", empty: "\u2591" },
+      colours: {
+        context: "green",
+        usage: "green",
+        warning: "yellow",
+        usageWarning: "yellow",
+        critical: "red",
+        model: "default",
+        label: "default",
+        empty: "brightBlack"
+      }
     };
     STATUSLINE_ENV = "AGENT_SHIM_STATUSLINE";
   }
@@ -31868,6 +31933,148 @@ var init_identity = __esm({
   }
 });
 
+// src/statusline/keys.ts
+function valueAt(source, path66) {
+  let current = source;
+  for (const part of path66) {
+    if (!isPlainObject2(current)) {
+      return void 0;
+    }
+    current = current[part];
+  }
+  return current;
+}
+function keyOf(path66, leaf) {
+  const common = { path: path66.join("."), description: leaf.description ?? "", defaultValue: valueAt(STATUSLINE_DEFAULTS, path66) };
+  if (leaf instanceof external_exports.ZodNumber) {
+    return { ...common, kind: "integer", choices: [] };
+  }
+  if (leaf instanceof external_exports.ZodString) {
+    return { ...common, kind: "text", choices: [] };
+  }
+  if (leaf instanceof external_exports.ZodUnion) {
+    return { ...common, kind: "colour", choices: [...STATUSLINE_COLOUR_NAMES] };
+  }
+  if (leaf instanceof external_exports.ZodEnum) {
+    return { ...common, kind: "choice", choices: Object.values(leaf.enum).map(String) };
+  }
+  if (leaf instanceof external_exports.ZodArray && leaf.element instanceof external_exports.ZodEnum) {
+    return { ...common, kind: "list", choices: Object.values(leaf.element.enum).map(String) };
+  }
+  throw new TypeError(`statusline setting ${path66.join(".")} has a kind the key listing does not describe`);
+}
+function walk(shape, prefix) {
+  return Object.entries(shape).flatMap(([name, schema]) => schema instanceof external_exports.ZodObject ? walk(schema.shape, [...prefix, name]) : [keyOf([...prefix, name], schema)]);
+}
+function statuslineKeys() {
+  return walk(ResolvedStatuslineSchema.shape, []);
+}
+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)})
+    ${key.description}`;
+  }).join("\n");
+}
+var init_keys = __esm({
+  "src/statusline/keys.ts"() {
+    "use strict";
+    init_zod();
+    init_statusline();
+  }
+});
+
+// src/statusline/change.ts
+function keyNamed(path66) {
+  const found = statuslineKeys().find((key) => key.path === path66);
+  if (found === void 0) {
+    throw new UsageError(`"${path66}" is not a statusline setting; \`agent-shim statusline keys\` lists them.`);
+  }
+  return found;
+}
+function parseStatuslineAssignment(text2) {
+  const split = text2.indexOf("=");
+  if (split < 1) {
+    throw new UsageError(`"${text2}" is not <setting>=<value>.`);
+  }
+  const path66 = text2.slice(0, split);
+  const raw = text2.slice(split + 1);
+  const key = keyNamed(path66);
+  switch (key.kind) {
+    case "integer": {
+      const number4 = Number(raw);
+      if (raw.trim() === "" || !Number.isFinite(number4)) {
+        throw new UsageError(`${path66}: "${raw}" is not a number.`);
+      }
+      return { path: path66, value: number4 };
+    }
+    case "text":
+    case "choice":
+      return { path: path66, value: raw };
+    case "colour":
+      return { path: path66, value: /^\d+$/.test(raw) ? Number(raw) : raw };
+    case "list":
+      return { path: path66, value: raw === "" ? [] : raw.split(",") };
+    default:
+      return key.kind;
+  }
+}
+function setAt(target, path66, value2) {
+  const [head, ...rest] = path66;
+  if (head === void 0) {
+    return;
+  }
+  if (rest.length === 0) {
+    target[head] = value2;
+    return;
+  }
+  const child = target[head];
+  const next = isPlainObject2(child) ? child : {};
+  target[head] = next;
+  setAt(next, rest, value2);
+}
+function removeAt(target, path66) {
+  const [head, ...rest] = path66;
+  if (head === void 0) {
+    return;
+  }
+  const child = target[head];
+  if (rest.length === 0) {
+    Reflect.deleteProperty(target, head);
+    return;
+  }
+  if (isPlainObject2(child)) {
+    removeAt(child, rest);
+    if (Object.keys(child).length === 0) {
+      Reflect.deleteProperty(target, head);
+    }
+  }
+}
+function applyStatuslineChange(existing, change) {
+  const draft = structuredClone(existing ?? {});
+  for (const [path66, value2] of Object.entries(change.set ?? {})) {
+    keyNamed(path66);
+    setAt(draft, path66.split("."), value2);
+  }
+  for (const path66 of change.unset ?? []) {
+    keyNamed(path66);
+    removeAt(draft, path66.split("."));
+  }
+  const result = StatuslineSchema.safeParse(draft);
+  if (!result.success) {
+    throw new UsageError(`statusline: ${result.error.issues.map((issue2) => `${issue2.path.join(".")}: ${issue2.message}`).join("; ")}.`);
+  }
+  return Object.keys(result.data).length === 0 ? void 0 : result.data;
+}
+var init_change = __esm({
+  "src/statusline/change.ts"() {
+    "use strict";
+    init_cliError();
+    init_statusline();
+    init_keys();
+  }
+});
+
 // src/configProfilesStore.ts
 function profileJsonPath(paths, name) {
   return import_node_path12.default.join(paths.configProfilesDir, `${name}.json`);
@@ -31967,17 +32174,6 @@ function removeProfile(paths, name) {
   requireProfileExists(paths, name);
   import_node_fs5.default.rmSync(profileJsonPath(paths, name));
 }
-function withStatuslineChange(existing, change) {
-  const merged = new Map(Object.entries({ ...existing }));
-  for (const [key, value2] of Object.entries(change)) {
-    if (value2 === false) {
-      merged.delete(key);
-    } else {
-      merged.set(key, value2);
-    }
-  }
-  return merged.size === 0 ? void 0 : StatuslineSchema.parse(Object.fromEntries(merged));
-}
 function applyProfileChange(paths, name, change) {
   let touched = false;
   if (change.category !== void 0) {
@@ -32027,7 +32223,7 @@ function applyProfileChange(paths, name, change) {
     launchPatch.explain = change.launchExplain;
   }
   if (change.launchStatusline !== void 0) {
-    launchPatch.statusline = withStatuslineChange(readProfile(paths, name)?.launch?.statusline, change.launchStatusline);
+    launchPatch.statusline = applyStatuslineChange(readProfile(paths, name)?.launch?.statusline, change.launchStatusline);
   }
   if (Object.keys(launchPatch).length > 0) {
     setProfileLaunchFlags(paths, name, launchPatch);
@@ -32044,7 +32240,7 @@ var init_configProfilesStore = __esm({
     init_store();
     init_schema();
     init_cliError();
-    init_statusline();
+    init_change();
     init_load();
     ProfileNotFoundError = class extends CliError {
       constructor(profileName) {
@@ -32671,9 +32867,9 @@ function referencesFact(when, key) {
   if (when === void 0 || !("kind" in when)) {
     return false;
   }
-  const walk2 = (node2) => {
+  const walk3 = (node2) => {
     if (Array.isArray(node2)) {
-      return node2.some(walk2);
+      return node2.some(walk3);
     }
     if (typeof node2 !== "object" || node2 === null) {
       return false;
@@ -32681,9 +32877,9 @@ function referencesFact(when, key) {
     if ("kind" in node2 && node2.kind === "reference" && "key" in node2 && node2.key === key) {
       return true;
     }
-    return Object.values(node2).some(walk2);
+    return Object.values(node2).some(walk3);
   };
-  return walk2(when);
+  return walk3(when);
 }
 function isVacuousWhen(when) {
   return when !== void 0 && !("kind" in when) && Object.keys(when).length === 0;
@@ -33003,7 +33199,7 @@ function flattenLayers(layers, options) {
         launch.proxyBypass = layer.launch.proxyBypass;
       }
       if (layer.launch.statusline !== void 0) {
-        launch.statusline = { ...launch.statusline, ...layer.launch.statusline };
+        launch.statusline = StatuslineSchema.parse(mergeStatuslineSettings(launch.statusline, layer.launch.statusline));
       }
     }
     if (layer.models !== void 0) {
@@ -33184,6 +33380,7 @@ var init_flatten = __esm({
   "src/resolve/flatten.ts"() {
     "use strict";
     init_schema();
+    init_statusline();
     init_conditions();
     init_match();
   }
@@ -36010,7 +36207,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "claude-use",
-      version: "11.50.2",
+      version: "11.52.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>",
@@ -64959,7 +65156,7 @@ function isAnthropicUsageStale(member, nowMs) {
 function poolIdentityNames(pools, poolName) {
   const seenPools = /* @__PURE__ */ new Set();
   const identities = /* @__PURE__ */ new Set();
-  const walk2 = (name) => {
+  const walk3 = (name) => {
     const pool = pools[name];
     if (pool === void 0 || seenPools.has(name)) {
       return;
@@ -64971,11 +65168,11 @@ function poolIdentityNames(pools, poolName) {
       if (nested === void 0) {
         identities.add(member);
       } else {
-        walk2(nested);
+        walk3(nested);
       }
     }
   };
-  walk2(poolName);
+  walk3(poolName);
   return [...identities];
 }
 function describeError(error63) {
@@ -67168,14 +67365,14 @@ function memberKindOf(ref, models) {
 function expandMembers(name, models) {
   const virtual = models?.virtual ?? {};
   const expanded = [];
-  const walk2 = (current, chain) => {
+  const walk3 = (current, chain) => {
     const nested = virtual[current];
     if (nested !== void 0) {
       if (chain.includes(current)) {
         throw new Error(`virtual model cycle: ${[...chain, current].join(" -> ")}`);
       }
       for (const member of nested.members) {
-        walk2(member, [...chain, current]);
+        walk3(member, [...chain, current]);
       }
       return;
     }
@@ -67188,7 +67385,7 @@ function expandMembers(name, models) {
     throw new VirtualModelNotFoundError(name);
   }
   for (const member of top.members) {
-    walk2(member, [name]);
+    walk3(member, [name]);
   }
   return expanded;
 }
@@ -113936,7 +114133,7 @@ function writePools(paths, pools) {
   applyPatch(paths.globalConfigFile, GlobalConfigSchema, { pools }, { defaults: {} });
 }
 function poolCycleOf(pools, name) {
-  const walk2 = (current, path66) => {
+  const walk3 = (current, path66) => {
     for (const entry of pools[current]?.identities ?? []) {
       const nested = poolNameOf(poolMemberIdentity(entry));
       if (nested === void 0) {
@@ -113948,14 +114145,14 @@ function poolCycleOf(pools, name) {
       if (path66.includes(nested)) {
         continue;
       }
-      const found = walk2(nested, [...path66, nested]);
+      const found = walk3(nested, [...path66, nested]);
       if (found !== void 0) {
         return found;
       }
     }
     return void 0;
   };
-  return walk2(name, [name]);
+  return walk3(name, [name]);
 }
 function validateMembers(pools, name, members2) {
   for (const entry of members2) {
@@ -115117,7 +115314,7 @@ async function resolveFarmConflicts(params) {
 // src/configProfiles.ts
 init_commandDeps();
 init_cliError();
-init_statusline();
+init_change();
 init_proxyBypass2();
 init_configProfilesStore();
 async function ensureProfileExists(deps, name) {
@@ -115144,28 +115341,12 @@ async function ensureProfileExists(deps, name) {
 function toProfileView(name, profile, globalDefault) {
   return { name, globalDefault: name === globalDefault, ...profile, $schema: void 0 };
 }
-function segmentList(values) {
-  return values.length === 1 && values[0] === "none" ? [] : values;
-}
 function statuslineChangeOf(options) {
-  const raw = {
-    header: options.statuslineHeader === void 0 || options.statuslineHeader === false ? options.statuslineHeader : segmentList(options.statuslineHeader),
-    bars: options.statuslineBars === void 0 || options.statuslineBars === false ? options.statuslineBars : segmentList(options.statuslineBars),
-    warnAt: options.statuslineWarnAt === void 0 || options.statuslineWarnAt === false ? options.statuslineWarnAt : Number(options.statuslineWarnAt),
-    criticalAt: options.statuslineCriticalAt === void 0 || options.statuslineCriticalAt === false ? options.statuslineCriticalAt : Number(options.statuslineCriticalAt),
-    fiveHourLabel: options.statuslineFiveHourLabel,
-    sevenDayLabel: options.statuslineSevenDayLabel,
-    barWidth: options.statuslineBarWidth === void 0 || options.statuslineBarWidth === false ? options.statuslineBarWidth : Number(options.statuslineBarWidth)
-  };
-  const given = Object.entries(raw).filter(([, value2]) => value2 !== void 0);
-  if (given.length === 0) {
+  if (options.statusline === void 0 && options.unsetStatusline === void 0) {
     return void 0;
   }
-  const result = StatuslineSchema.safeParse(Object.fromEntries(given.filter(([, value2]) => value2 !== false)));
-  if (!result.success) {
-    throw new UsageError(`--statusline-*: ${result.error.issues.map((issue2) => `${issue2.path.join(".")}: ${issue2.message}`).join("; ")}.`);
-  }
-  return Object.fromEntries(given);
+  const assignments = (options.statusline ?? []).map(parseStatuslineAssignment);
+  return { set: Object.fromEntries(assignments.map(({ path: path66, value: value2 }) => [path66, value2])), unset: options.unsetStatusline ?? [] };
 }
 function registerProfileCommand(program2, deps) {
   const { paths } = deps;
@@ -115202,7 +115383,7 @@ function registerProfileCommand(program2, deps) {
   withExamples(
     profile.command("set <name>").description(
       "Update a configuration profile's categories, entries, extends list, description or launch settings. With no options on a terminal, walks through its categories."
-    ).option("--category <category=bool>", "Share (true) or hide (false) a whole category (repeatable).", collectBoolPair).option("--entry <path=bool>", "Share (true) or hide (false) one <category>/<path> entry (repeatable).", collectBoolPair).option("--extends <profile>", "Replace the extends list with these profiles (repeatable, in order).", collectRepeated).option("--no-extends", "Clear the extends list.").option("--description <text>", "Replace the description.").option("--no-description", "Clear the description.").option("--launch-skip-permissions", "Launches under this profile skip permission prompts.").option("--no-launch-skip-permissions", "Launches under this profile keep permission prompts.").option("--launch-remote-control", "Launches under this profile enable Remote Control.").option("--no-launch-remote-control", "Launches under this profile leave Remote Control off.").option("--launch-headroom", "Launches under this profile route through headroom.").option("--no-launch-headroom", "Launches under this profile route direct.").option("--launch-track-usage", "Launches under this profile route through the front door so their requests and quota are recorded, with no headroom needed.").option("--no-launch-track-usage", "Launches under this profile are not recorded unless a provider or headroom routes them anyway.").option("--launch-provider <provider>", "Launches under this profile route through this provider.").option("--no-launch-provider", "Clear this profile's provider selection.").option("--launch-claude-version <version>", "Launches under this profile run exactly this installed Claude Code version (such as 2.1.220); a version that is not installed fails the launch.").option("--no-launch-claude-version", "Clear this profile's Claude Code version pin.").option("--launch-delay <duration>", "Launches under this profile wait this long (such as 5s) after the launcher's own output before starting claude, so the output can be read.", parseDurationLiteral).option("--no-launch-delay", "Clear this profile's launch delay.").option("--launch-pause", "Launches under this profile wait for a key press after the launcher's own output before starting claude.").option("--no-launch-pause", "Launches under this profile start claude without waiting for a key press.").option("--launch-explain", "Launches under this profile that pick from a pool list every member the pick ranked and why, in the launcher's report.").option("--no-launch-explain", "Launches under this profile name only the member a pool pick chose.").option("--launch-proxy-bypass <host>", "Launches under this profile keep this host off the front door by adding it to NO_PROXY, so its traffic goes direct (repeatable; replaces the profile's list).", collectRepeated).option("--no-launch-proxy-bypass", "Clear this profile's list of hosts kept off the front door.").option("--statusline-header <segment>", `The statusline header segments to draw, in drawing order (repeatable; one of ${STATUSLINE_HEADER_SEGMENTS.join(", ")}, or "none" to hide the header).`, collectRepeated).option("--no-statusline-header", "Clear this profile's header segment list, restoring the default.").option("--statusline-bars <group>", `The statusline bar groups to draw, in drawing order (repeatable; one of ${STATUSLINE_BAR_GROUPS.join(", ")}, or "none" to hide the bars).`, collectRepeated).option("--no-statusline-bars", "Clear this profile's bar group list, restoring the default.").option("--statusline-warn-at <percent>", "The whole percentage of use at which a statusline bar turns yellow.").option("--no-statusline-warn-at", "Clear this profile's warning threshold.").option("--statusline-critical-at <percent>", "The whole percentage of use at which a statusline bar turns red.").option("--no-statusline-critical-at", "Clear this profile's critical threshold.").option("--statusline-five-hour-label <text>", "The statusline's name for the five-hour window.").option("--no-statusline-five-hour-label", "Clear this profile's five-hour window label.").option("--statusline-seven-day-label <text>", "The statusline's name for the weekly window.").option("--no-statusline-seven-day-label", "Clear this profile's weekly window label.").option("--statusline-bar-width <cells>", "The width of a statusline bar in cells, before the line's spare width is shared out among the bars.").option("--no-statusline-bar-width", "Clear this profile's bar width.").option("--json", "Print the result as JSON.").action(async (name, allOptions) => {
+    ).option("--category <category=bool>", "Share (true) or hide (false) a whole category (repeatable).", collectBoolPair).option("--entry <path=bool>", "Share (true) or hide (false) one <category>/<path> entry (repeatable).", collectBoolPair).option("--extends <profile>", "Replace the extends list with these profiles (repeatable, in order).", collectRepeated).option("--no-extends", "Clear the extends list.").option("--description <text>", "Replace the description.").option("--no-description", "Clear the description.").option("--launch-skip-permissions", "Launches under this profile skip permission prompts.").option("--no-launch-skip-permissions", "Launches under this profile keep permission prompts.").option("--launch-remote-control", "Launches under this profile enable Remote Control.").option("--no-launch-remote-control", "Launches under this profile leave Remote Control off.").option("--launch-headroom", "Launches under this profile route through headroom.").option("--no-launch-headroom", "Launches under this profile route direct.").option("--launch-track-usage", "Launches under this profile route through the front door so their requests and quota are recorded, with no headroom needed.").option("--no-launch-track-usage", "Launches under this profile are not recorded unless a provider or headroom routes them anyway.").option("--launch-provider <provider>", "Launches under this profile route through this provider.").option("--no-launch-provider", "Clear this profile's provider selection.").option("--launch-claude-version <version>", "Launches under this profile run exactly this installed Claude Code version (such as 2.1.220); a version that is not installed fails the launch.").option("--no-launch-claude-version", "Clear this profile's Claude Code version pin.").option("--launch-delay <duration>", "Launches under this profile wait this long (such as 5s) after the launcher's own output before starting claude, so the output can be read.", parseDurationLiteral).option("--no-launch-delay", "Clear this profile's launch delay.").option("--launch-pause", "Launches under this profile wait for a key press after the launcher's own output before starting claude.").option("--no-launch-pause", "Launches under this profile start claude without waiting for a key press.").option("--launch-explain", "Launches under this profile that pick from a pool list every member the pick ranked and why, in the launcher's report.").option("--no-launch-explain", "Launches under this profile name only the member a pool pick chose.").option("--launch-proxy-bypass <host>", "Launches under this profile keep this host off the front door by adding it to NO_PROXY, so its traffic goes direct (repeatable; replaces the profile's list).", collectRepeated).option("--no-launch-proxy-bypass", "Clear this profile's list of hosts kept off the front door.").option("--statusline <setting=value>", "Set one statusline setting for launches under this profile (repeatable; `agent-shim statusline keys` lists them; a list is comma-separated, and an empty value is the empty list).", collectRepeated).option("--unset-statusline <setting>", "Remove one statusline setting from this profile so the shallower layers or the default apply again (repeatable).", collectRepeated).option("--json", "Print the result as JSON.").action(async (name, allOptions) => {
       const { json: json2, ...options } = allOptions;
       requireProfileExists(paths, name);
       if (Object.entries(allOptions).every(([key, value2]) => key === "json" || value2 === void 0)) {
@@ -121899,7 +122080,7 @@ function findDeepMatches(check2, payload, segments = [], maps = [], values = [])
     payload.forEach((v, i10) => {
       findDeepMatches(check2, v, [...segments, i10], maps, values);
     });
-  } else if (isPlainObject2(payload)) {
+  } else if (isPlainObject3(payload)) {
     for (const key of Object.keys(payload)) {
       findDeepMatches(check2, payload[key], [...segments, key], maps, values);
     }
@@ -121924,7 +122105,7 @@ function* getConstructors(value2) {
     proto = Object.getPrototypeOf(proto);
   }
 }
-function isPlainObject2(value2) {
+function isPlainObject3(value2) {
   if (!value2 || typeof value2 !== "object") {
     return false;
   }
@@ -121957,7 +122138,7 @@ function setOwn(object3, key, value2) {
   }
 }
 function mergeTwoLevels(first, second) {
-  if (!isPlainObject2(first) || !isPlainObject2(second)) {
+  if (!isPlainObject3(first) || !isPlainObject3(second)) {
     return second;
   }
   const result = { ...first, ...second };
@@ -121967,7 +122148,7 @@ function mergeTwoLevels(first, second) {
     }
     const firstValue = first[key];
     const secondValue = second[key];
-    if (isPlainObject2(firstValue) && isPlainObject2(secondValue)) {
+    if (isPlainObject3(firstValue) && isPlainObject3(secondValue)) {
       result[key] = { ...firstValue, ...secondValue };
     }
   }
@@ -121996,7 +122177,7 @@ function cloneWithVisited(value2, visited) {
     }
     return result;
   }
-  if (isPlainObject2(value2)) {
+  if (isPlainObject3(value2)) {
     const existing = visited.get(value2);
     if (existing) {
       return existing;
@@ -122021,7 +122202,7 @@ function copyOnWrite(parent, key, original) {
   let copy;
   if (Array.isArray(value2)) {
     copy = value2.slice();
-  } else if (isPlainObject2(value2)) {
+  } else if (isPlainObject3(value2)) {
     copy = { ...value2 };
   } else {
     return value2;
@@ -122638,7 +122819,7 @@ function toORPCError(error63) {
   return error63 instanceof ORPCError ? error63 : new ORPCError("INTERNAL_SERVER_ERROR", { cause: error63 });
 }
 function isORPCErrorJson(json2) {
-  if (!isPlainObject2(json2)) {
+  if (!isPlainObject3(json2)) {
     return false;
   }
   const validKeys = ["defined", "code", "message", "data"];
@@ -122672,7 +122853,7 @@ function inferMalformedResponseMessage(response) {
   if (typeof response.body === "string" && isInferableMessage(response.body)) {
     return response.body;
   }
-  if (isPlainObject2(response.body) && typeof response.body.message === "string" && isInferableMessage(response.body.message)) {
+  if (isPlainObject3(response.body) && typeof response.body.message === "string" && isInferableMessage(response.body.message)) {
     return response.body.message;
   }
   const commonCode = Object.entries(COMMON_ERROR_STATUS_MAP).find(([, status]) => status === response.status)?.[0];
@@ -122963,7 +123144,7 @@ var RPCJsonSerializer = class {
       }
       return json2;
     }
-    if (isPlainObject2(data)) {
+    if (isPlainObject3(data)) {
       const json2 = new NullProtoObj();
       for (const k10 of Object.keys(data)) {
         const v = data[k10];
@@ -123209,7 +123390,7 @@ var BracketNotationSerializer = class {
       data.forEach((item, i10) => {
         this.internalSerialize(item, isRoot ? i10.toString() : `${path66}[${i10}]`, false, result);
       });
-    } else if (isPlainObject2(data)) {
+    } else if (isPlainObject3(data)) {
       for (const key of Object.keys(data)) {
         this.internalSerialize(data[key], isRoot ? key : `${path66}[${key}]`, false, result);
       }
@@ -123229,7 +123410,7 @@ var BracketNotationSerializer = class {
         const isLast = i10 === segments.length - 1;
         const existing = getOwn(currentRef, nextSegment);
         let child = existing;
-        if (!Array.isArray(child) && !isPlainObject2(child)) {
+        if (!Array.isArray(child) && !isPlainObject3(child)) {
           child = [];
         }
         if (Array.isArray(child)) {
@@ -123784,7 +123965,7 @@ var OpenAPIJsonSerializer = class {
       }
       return json2;
     }
-    if (isPlainObject2(data)) {
+    if (isPlainObject3(data)) {
       const json2 = new NullProtoObj();
       for (const k10 of Object.keys(data)) {
         const v = data[k10];
@@ -126618,7 +126799,7 @@ function toBodyContent(ctx, direction, schema) {
   if (rest.length > 0) {
     const restSchema = fileSchemasByMediaType.size ? combineJsonSchemasWithComposition("anyOf", rest) : schema;
     const hasNestedFiles = findDeepMatches(
-      (v) => isPlainObject2(v) && isJsonFileSchema(v),
+      (v) => isPlainObject3(v) && isJsonFileSchema(v),
       restSchema
     ).values.length > 0;
     const contentType = hasNestedFiles ? "multipart/form-data" : "application/json";
@@ -129117,7 +129298,7 @@ var OpenAPIHandlerCodecCore = class {
       if (!params || Object.keys(params).length < 1) {
         return data;
       }
-      if (!isPlainObject2(data)) {
+      if (!isPlainObject3(data)) {
         return params;
       }
       return {
@@ -129177,7 +129358,7 @@ var OpenAPIHandlerCodecCore = class {
     const [, search] = parseStandardUrl(url2);
     const searchParams = new URLSearchParams(search);
     const parsed = this.serializer.deserialize(searchParams);
-    if (!styles || !isPlainObject2(parsed)) {
+    if (!styles || !isPlainObject3(parsed)) {
       return parsed;
     }
     Object.entries(styles).forEach(([key, hint]) => {
@@ -129513,7 +129694,6 @@ init_providersStore();
 // src/frontdoor/configSchemas.ts
 init_zod();
 init_schema();
-init_statusline();
 var RemovalConfirmationSchema = external_exports.boolean();
 var CredentialWriteSchema = (targets) => external_exports.strictObject({
   sources: external_exports.array(RemoteCredentialSourceSchema).min(1).optional(),
@@ -129590,7 +129770,10 @@ var ConfigProfileSetInputSchema = external_exports.strictObject({
     pause: external_exports.boolean().optional(),
     explain: external_exports.boolean().optional(),
     proxyBypass: external_exports.union([external_exports.array(external_exports.string().min(1)), external_exports.literal(false)]).optional(),
-    statusline: StatuslineChangeSchema.optional()
+    statusline: external_exports.strictObject({
+      set: external_exports.record(external_exports.string(), external_exports.unknown()).optional(),
+      unset: external_exports.array(external_exports.string()).optional()
+    }).optional()
   }).optional()
 });
 var ConfigProfileSetOutputSchema = storedMutationOutput("profile", "updated", ProfileValueSchema);
@@ -130607,7 +130790,7 @@ function nextToken(body, from) {
   }
   return SCALAR;
 }
-function walk(body, hashing, parentAfter) {
+function walk2(body, hashing, parentAfter) {
   const thread = (0, import_node_crypto22.createHash)("sha256");
   const messages = (0, import_node_crypto22.createHash)("sha256");
   let parentDigest;
@@ -130724,12 +130907,12 @@ function lineageOf(body) {
   if (body.length > LINEAGE_BODY_BYTES_LIMIT) {
     return void 0;
   }
-  const counted = walk(body, false, void 0);
+  const counted = walk2(body, false, void 0);
   if (counted.abandoned || !counted.sawMessages) {
     return void 0;
   }
   const parentAfter = counted.elements > MESSAGES_PER_TURN ? counted.elements - MESSAGES_PER_TURN : void 0;
-  const hashed = walk(body, true, parentAfter);
+  const hashed = walk2(body, true, parentAfter);
   const combine = (messagesDigest) => (0, import_node_crypto22.createHash)("sha256").update(hashed.threadDigest).update(messagesDigest).digest("hex");
   return { ownKey: combine(hashed.messagesDigest), parentKey: hashed.parentDigest === void 0 ? void 0 : combine(hashed.parentDigest) };
 }
@@ -136872,6 +137055,9 @@ function providerScopedState(snapshot, providerName, providerDisplayName) {
 // src/statusline/commands.ts
 init_read();
 
+// src/statusline/render.ts
+init_statusline();
+
 // src/statusline/ansi.ts
 var ESCAPE_CHAR_CODE = 27;
 var ESCAPE = String.fromCharCode(ESCAPE_CHAR_CODE);
@@ -136880,9 +137066,6 @@ function visibleLength(text2) {
   return text2.replace(ANSI_REGEX, "").length;
 }
 
-// src/statusline/render.ts
-init_statusline();
-
 // src/statusline/barGrid.ts
 var BRACKET_COLUMNS = 2;
 function chunk(items, size) {
@@ -136953,7 +137136,122 @@ function layoutBarGrid(groups, maxWidth, separator, baseBarCells) {
   return renderGrid(layoutFor(1), maxWidth, separator, baseBarCells);
 }
 
-// src/statusline/render.ts
+// src/statusline/elements/header/account.ts
+function tierSuffixOf(tier) {
+  const match = /_(\d+x)$/i.exec(tier ?? "");
+  return match === null ? void 0 : match[1];
+}
+function accountPlanLabel(summary) {
+  switch (summary.loginOrganizationType) {
+    case void 0:
+      return planLabelOf(summary.loginRateLimitTier);
+    case "claude_max": {
+      const tier = tierSuffixOf(summary.loginRateLimitTier);
+      return tier === void 0 ? "Max" : `Max ${tier}`;
+    }
+    case "claude_pro":
+      return "Pro";
+    case "claude_team":
+      if (summary.loginSeatTier === "team_standard") {
+        return "Team Standard";
+      }
+      if (summary.loginSeatTier === "team_tier_1") {
+        return "Team Premium";
+      }
+      return "Team";
+    case "claude_enterprise":
+      return "Enterprise";
+    default:
+      return summary.loginOrganizationType;
+  }
+}
+function planLabelOf(tier) {
+  if (tier === void 0 || tier === "") {
+    return void 0;
+  }
+  const cleaned = tier.startsWith("default_") ? tier.slice("default_".length) : tier;
+  if (cleaned === "free") {
+    return "Free";
+  }
+  const maxWithMultiplier = /^claude_max_(\d+)x$/.exec(cleaned);
+  if (maxWithMultiplier !== null) {
+    return `Max ${maxWithMultiplier[1] ?? ""}x`;
+  }
+  if (cleaned === "claude_max") {
+    return "Max";
+  }
+  if (cleaned === "claude_pro") {
+    return "Pro";
+  }
+  return cleaned;
+}
+function accountSegment({ summary }) {
+  const loginPlan = summary.provider === void 0 ? summary.loginPlan ?? accountPlanLabel(summary) : void 0;
+  const loginOrgName = summary.loginOrganizationType === "claude_team" || summary.loginOrganizationType === "claude_enterprise" ? summary.loginOrganizationName : void 0;
+  const loginParts = [summary.loginAccountEmail, loginOrgName, loginPlan].filter((part) => part !== void 0);
+  if (summary.loginAccountEmail !== void 0 && summary.loginAccountEmail !== summary.providerAccountEmail) {
+    return loginParts.join(" \xB7 ");
+  }
+  return summary.provider === void 0 && loginParts.length > 0 ? loginParts.join(" \xB7 ") : void 0;
+}
+
+// src/statusline/palette.ts
+init_statusline();
+var RESET = `${ESCAPE}[0m`;
+var SGR_BY_NAME = {
+  default: "",
+  dim: "2",
+  black: "30",
+  red: "31",
+  green: "32",
+  yellow: "33",
+  blue: "34",
+  magenta: "35",
+  cyan: "36",
+  white: "37",
+  brightBlack: "90",
+  brightRed: "91",
+  brightGreen: "92",
+  brightYellow: "93",
+  brightBlue: "94",
+  brightMagenta: "95",
+  brightCyan: "96",
+  brightWhite: "97"
+};
+function isColourName(value2) {
+  return STATUSLINE_COLOUR_NAMES.some((name) => name === value2);
+}
+var CHANNELS = 3;
+var CHANNEL_DIGITS = 2;
+var HEX_RADIX2 = 16;
+function sgrOf(value2) {
+  if (typeof value2 === "number") {
+    return `38;5;${String(value2)}`;
+  }
+  if (value2.startsWith("#")) {
+    const channels = Array.from({ length: CHANNELS }, (_, index) => Number.parseInt(value2.slice(1 + index * CHANNEL_DIGITS, 1 + (index + 1) * CHANNEL_DIGITS), HEX_RADIX2));
+    return `38;2;${channels.join(";")}`;
+  }
+  return isColourName(value2) ? SGR_BY_NAME[value2] : "";
+}
+function colourEnabled(env) {
+  return env.NO_COLOR === void 0;
+}
+function createPalette(colours, enabled) {
+  const ansi = (role) => {
+    const sgr = enabled ? sgrOf(colours[role]) : "";
+    return sgr === "" ? "" : `${ESCAPE}[${sgr}m`;
+  };
+  return {
+    ansi,
+    paint: (role, text2) => {
+      const start = ansi(role);
+      return start === "" ? text2 : `${start}${text2}${RESET}`;
+    }
+  };
+}
+
+// src/statusline/style.ts
 var SECONDS_PER_MINUTE2 = 60;
 var MINUTES_PER_HOUR4 = 60;
 var SECONDS_PER_DAY = 86400;
@@ -136961,34 +137259,26 @@ var THOUSAND = 1e3;
 var MILLION = 1e6;
 var TEN = 10;
 var TWENTY = 20;
-var RESERVED_COLUMNS = 4;
-var SEPARATOR2 = " | ";
 var FULL_PERCENT3 = 100;
 var ONE_PERCENT = 1;
-var RESET = `${ESCAPE}[0m`;
-var DIM = `${ESCAPE}[90m`;
-var GREEN = `${ESCAPE}[32m`;
-var YELLOW = `${ESCAPE}[33m`;
-var RED = `${ESCAPE}[31m`;
-function colorize() {
-  return process.env.NO_COLOR === void 0;
-}
-function statusColor(fraction, isUsedMetric, bands) {
-  if (!colorize()) {
-    return "";
-  }
-  const yellowAt = bands.warnAt / FULL_PERCENT3;
-  const redAt = bands.criticalAt / FULL_PERCENT3;
+function withColor(color, text2) {
+  return color === "" ? text2 : `${color}${text2}${RESET}`;
+}
+function statusColor(fraction, isUsedMetric, style) {
+  const yellowAt = style.bands.warnAt / FULL_PERCENT3;
+  const redAt = style.bands.criticalAt / FULL_PERCENT3;
+  const warningRole = style.okRole === "usage" ? "usageWarning" : "warning";
+  const { ansi } = style.palette;
   if (isUsedMetric) {
     if (fraction >= redAt) {
-      return RED;
+      return ansi("critical");
     }
-    return fraction >= yellowAt ? YELLOW : GREEN;
+    return fraction >= yellowAt ? ansi(warningRole) : ansi(style.okRole);
   }
   if (fraction <= 1 - redAt) {
-    return RED;
+    return ansi("critical");
   }
-  return fraction <= 1 - yellowAt ? YELLOW : GREEN;
+  return fraction <= 1 - yellowAt ? ansi(warningRole) : ansi(style.okRole);
 }
 function formatTokens(num) {
   if (num >= MILLION) {
@@ -137016,6 +137306,29 @@ function formatDuration(seconds) {
   }
   return `${String(minutes)}m`;
 }
+function secondsUntil(resetAt, nowMs) {
+  if (resetAt === void 0) {
+    return void 0;
+  }
+  const resetMs = Date.parse(resetAt);
+  return Number.isNaN(resetMs) ? void 0 : Math.max(0, Math.round((resetMs - nowMs) / THOUSAND));
+}
+function drawBar(fraction, cells, style) {
+  const clamped = Math.max(0, Math.min(1, fraction));
+  const filled = Math.round(clamped * cells);
+  const color = statusColor(clamped, true, style);
+  const emptyColor = style.palette.ansi("empty");
+  const body = `${style.filled.repeat(filled)}${style.empty.repeat(cells - filled)}`;
+  if (color === "" && emptyColor === "") {
+    return `[${body}]`;
+  }
+  return `[${color}${style.filled.repeat(filled)}${emptyColor}${style.empty.repeat(cells - filled)}${RESET}]`;
+}
+function barCell(prefix, suffix, fraction, style) {
+  return { prefix, suffix, draw: (cells) => drawBar(fraction, cells, style) };
+}
+
+// src/statusline/elements/header/headroom.ts
 function headroomText(stats) {
   if (stats === void 0) {
     return void 0;
@@ -137028,85 +137341,123 @@ function headroomText(stats) {
   ].filter((part) => part !== void 0);
   return parts.length === 0 ? void 0 : `headroom ${parts.join(" \xB7 ")}`;
 }
-function cacheHitText(hitFraction, bands) {
+function headroomSegment({ summary }) {
+  return headroomText(summary.headroom);
+}
+
+// src/statusline/elements/header/identity.ts
+function identitySegment({ summary }) {
+  if (summary.identity !== void 0 && summary.provider !== void 0 && summary.identity !== summary.providerAccountEmail && summary.identity !== summary.loginAccountEmail) {
+    return summary.identity;
+  }
+  return void 0;
+}
+
+// src/statusline/elements/header/model.ts
+function choiceNamesProvider(summary) {
+  return summary.modelChoice !== void 0 && (summary.modelChoice.providers.length > 1 || summary.routedTarget !== void 0);
+}
+function modelSegment({ summary, view }) {
+  const namesProvider = choiceNamesProvider(summary);
+  const segment = summary.modelChoice !== void 0 && view.modelDisplayName !== void 0 && view.modelDisplayName !== "" ? `${view.modelDisplayName} -> ${namesProvider ? `${summary.modelChoice.provider}/${summary.modelChoice.served}` : summary.modelChoice.served}` : view.modelDisplayName;
+  return segment !== void 0 && segment !== "" ? segment : void 0;
+}
+
+// src/statusline/elements/header/provider.ts
+function providerSegment({ summary }) {
+  if (summary.provider === void 0) {
+    return void 0;
+  }
+  const account = [summary.providerAccountEmail, summary.providerPlan].filter((part) => part !== void 0);
+  return account.length > 0 ? `${summary.provider} \xB7 ${account.join(" \xB7 ")}` : summary.provider;
+}
+
+// src/statusline/elements/header/route.ts
+function routeSegment({ summary }) {
+  return summary.routedTarget !== void 0 && !choiceNamesProvider(summary) ? `via ${summary.routedTarget}` : void 0;
+}
+
+// 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 };
+}
+
+// src/statusline/elements/rows/context.ts
+function cacheHitText(hitFraction, style) {
   const clamped = Math.max(0, Math.min(1, hitFraction));
-  return ` (Cache: ${statusColor(clamped, false, bands)}${(clamped * FULL_PERCENT3).toFixed(0)}%${RESET})`;
+  return ` (Cache: ${withColor(statusColor(clamped, false, style), `${(clamped * FULL_PERCENT3).toFixed(0)}%`)})`;
 }
-function cacheShareText(view, bands) {
+function cacheShareText(view, style) {
   const hitRatio = view.cacheHitRatio;
   if (hitRatio !== void 0 && Number.isFinite(hitRatio)) {
-    return cacheHitText(hitRatio, bands);
+    return cacheHitText(hitRatio, style);
   }
   const promptTotal = (view.cacheReadTokens ?? 0) + (view.freshInputTokens ?? 0);
   if (promptTotal > 0 && (view.cacheReadTokens ?? 0) > 0) {
-    return cacheHitText((view.cacheReadTokens ?? 0) / promptTotal, bands);
+    return cacheHitText((view.cacheReadTokens ?? 0) / promptTotal, style);
   }
   return "";
 }
-function tierSuffixOf(tier) {
-  const match = /_(\d+x)$/i.exec(tier ?? "");
-  return match === null ? void 0 : match[1];
+function contextRow(context) {
+  const { view, palette } = context;
+  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));
+  }
+  return { kind: "bars", cells };
 }
-function accountPlanLabel(summary) {
-  switch (summary.loginOrganizationType) {
-    case void 0:
-      return planLabelOf(summary.loginRateLimitTier);
-    case "claude_max": {
-      const tier = tierSuffixOf(summary.loginRateLimitTier);
-      return tier === void 0 ? "Max" : `Max ${tier}`;
+
+// src/statusline/elements/rows/quota.ts
+function quotaRow(context) {
+  const { summary, nowMs, settings: settings2, palette } = context;
+  const style = barStyleOf(context, "usage");
+  const cells = [];
+  const drawWindow = (label, fraction, resetsAt) => {
+    const clamped = Math.max(0, Math.min(1, fraction));
+    const color = statusColor(clamped, true, style);
+    cells.push(barCell(palette.paint("label", `${label} `), ` ${withColor(color, `${(fraction * FULL_PERCENT3).toFixed(1)}%`)} (${formatDuration(secondsUntil(resetsAt, nowMs))})`, clamped, style));
+  };
+  if (summary.quotaFamilies.length > 0) {
+    for (const window of summary.quotaFamilies) {
+      drawWindow(window.measures, window.utilization, window.resetsAt);
     }
-    case "claude_pro":
-      return "Pro";
-    case "claude_team":
-      if (summary.loginSeatTier === "team_standard") {
-        return "Team Standard";
-      }
-      if (summary.loginSeatTier === "team_tier_1") {
-        return "Team Premium";
+  } else {
+    if (summary.fiveHourUsed !== void 0) {
+      drawWindow(settings2.labels.fiveHour, summary.fiveHourUsed / FULL_PERCENT3, summary.fiveHourResetAt);
+    }
+    if (summary.sevenDayUsed !== void 0) {
+      drawWindow(settings2.labels.sevenDay, summary.sevenDayUsed / FULL_PERCENT3, summary.sevenDayResetAt);
+    }
+    if (summary.fiveHourUsed === void 0 && summary.sevenDayUsed === void 0) {
+      for (const window of summary.providerQuotaWindows) {
+        drawWindow(window.measures, window.utilization, window.resetsAt);
       }
-      return "Team";
-    case "claude_enterprise":
-      return "Enterprise";
-    default:
-      return summary.loginOrganizationType;
-  }
-}
-function planLabelOf(tier) {
-  if (tier === void 0 || tier === "") {
-    return void 0;
-  }
-  const cleaned = tier.startsWith("default_") ? tier.slice("default_".length) : tier;
-  if (cleaned === "free") {
-    return "Free";
-  }
-  const maxWithMultiplier = /^claude_max_(\d+)x$/.exec(cleaned);
-  if (maxWithMultiplier !== null) {
-    return `Max ${maxWithMultiplier[1] ?? ""}x`;
-  }
-  if (cleaned === "claude_max") {
-    return "Max";
-  }
-  if (cleaned === "claude_pro") {
-    return "Pro";
-  }
-  return cleaned;
-}
-function secondsUntil(resetAt, nowMs) {
-  if (resetAt === void 0) {
-    return void 0;
+    }
   }
-  const resetMs = Date.parse(resetAt);
-  return Number.isNaN(resetMs) ? void 0 : Math.max(0, Math.round((resetMs - nowMs) / THOUSAND));
-}
-function drawBar(fraction, cells, bands) {
-  const clamped = Math.max(0, Math.min(1, fraction));
-  const filled = Math.round(clamped * cells);
-  const color = statusColor(clamped, true, bands);
-  return color === "" ? `[${"\u2588".repeat(filled)}${"\u2591".repeat(cells - filled)}]` : `[${color}${"\u2588".repeat(filled)}${DIM}${"\u2591".repeat(cells - filled)}${RESET}]`;
-}
-function barCell(prefix, suffix, fraction, bands) {
-  return { prefix, suffix, draw: (cells) => drawBar(fraction, cells, bands) };
+  return { kind: "bars", cells };
 }
+
+// src/statusline/elements/registry.ts
+var HEADER_ROLES = {
+  model: "model",
+  provider: "model",
+  route: "label",
+  account: "label",
+  identity: "label",
+  headroom: "label"
+};
+var ELEMENTS = {
+  header: { model: modelSegment, provider: providerSegment, route: routeSegment, account: accountSegment, identity: identitySegment, headroom: headroomSegment },
+  rows: { context: contextRow, quota: quotaRow }
+};
+
+// src/statusline/headerLayout.ts
 function justify(texts, maxWidth, separator) {
   if (texts.length < 2) {
     return texts.join(separator);
@@ -137156,80 +137507,41 @@ function layoutHeader(texts, maxWidth, separator) {
   }
   return lines.map((line) => justify(line, maxWidth, separator)).join("\n");
 }
-function renderStatuslineBlock(summary, view, terminalWidth, nowMs, settings2 = STATUSLINE_DEFAULTS) {
-  const segments = {};
-  const choiceNamesProvider = summary.modelChoice !== void 0 && (summary.modelChoice.providers.length > 1 || summary.routedTarget !== void 0);
-  const modelSegment = summary.modelChoice !== void 0 && view.modelDisplayName !== void 0 && view.modelDisplayName !== "" ? `${view.modelDisplayName} -> ${choiceNamesProvider ? `${summary.modelChoice.provider}/${summary.modelChoice.served}` : summary.modelChoice.served}` : view.modelDisplayName;
-  if (modelSegment !== void 0 && modelSegment !== "") {
-    segments.model = modelSegment;
-  }
-  if (summary.provider !== void 0) {
-    const account = [summary.providerAccountEmail, summary.providerPlan].filter((part) => part !== void 0);
-    segments.provider = account.length > 0 ? `${summary.provider} \xB7 ${account.join(" \xB7 ")}` : summary.provider;
-  }
-  if (summary.routedTarget !== void 0 && !choiceNamesProvider) {
-    segments.route = `via ${summary.routedTarget}`;
-  }
-  const loginPlan = summary.provider === void 0 ? summary.loginPlan ?? accountPlanLabel(summary) : void 0;
-  const loginOrgName = summary.loginOrganizationType === "claude_team" || summary.loginOrganizationType === "claude_enterprise" ? summary.loginOrganizationName : void 0;
-  const loginParts = [summary.loginAccountEmail, loginOrgName, loginPlan].filter((part) => part !== void 0);
-  if (summary.loginAccountEmail !== void 0 && summary.loginAccountEmail !== summary.providerAccountEmail) {
-    segments.account = loginParts.join(" \xB7 ");
-  } else if (summary.provider === void 0 && loginParts.length > 0) {
-    segments.account = loginParts.join(" \xB7 ");
-  }
-  if (summary.identity !== void 0 && summary.provider !== void 0 && summary.identity !== summary.providerAccountEmail && summary.identity !== summary.loginAccountEmail) {
-    segments.identity = summary.identity;
-  }
-  const savings = headroomText(summary.headroom);
-  if (savings !== void 0) {
-    segments.headroom = savings;
-  }
-  const header = settings2.header.flatMap((name) => segments[name] ?? []);
-  const bands = { warnAt: settings2.warnAt, criticalAt: settings2.criticalAt };
-  const contextGroup = [];
-  if (view.contextUsedPercentage !== void 0) {
-    const fraction = Math.max(0, Math.min(1, view.contextUsedPercentage / FULL_PERCENT3));
-    const color = statusColor(fraction, true, bands);
-    const percent2 = `${color}${view.contextUsedPercentage.toFixed(1)}%${RESET}`;
-    const tokens = view.contextTotalTokens !== void 0 && view.contextWindowTokens !== void 0 ? `${formatTokens(view.contextTotalTokens)}/${formatTokens(view.contextWindowTokens)} ` : "";
-    const cache = cacheShareText(view, bands);
-    contextGroup.push(barCell(`Ctx ${tokens}`, ` ${percent2}${cache}`, fraction, bands));
-  }
-  const quotaGroup = [];
-  const drawWindow = (label, fraction, resetsAt) => {
-    const clamped = Math.max(0, Math.min(1, fraction));
-    const color = statusColor(clamped, true, bands);
-    quotaGroup.push(barCell(`${label} `, ` ${color}${(fraction * FULL_PERCENT3).toFixed(1)}%${RESET} (${formatDuration(secondsUntil(resetsAt, nowMs))})`, clamped, bands));
-  };
-  if (summary.quotaFamilies.length > 0) {
-    for (const window of summary.quotaFamilies) {
-      drawWindow(window.measures, window.utilization, window.resetsAt);
-    }
-  } else {
-    if (summary.fiveHourUsed !== void 0) {
-      drawWindow(settings2.fiveHourLabel, summary.fiveHourUsed / FULL_PERCENT3, summary.fiveHourResetAt);
-    }
-    if (summary.sevenDayUsed !== void 0) {
-      drawWindow(settings2.sevenDayLabel, summary.sevenDayUsed / FULL_PERCENT3, summary.sevenDayResetAt);
-    }
-    if (summary.fiveHourUsed === void 0 && summary.sevenDayUsed === void 0) {
-      for (const window of summary.providerQuotaWindows) {
-        drawWindow(window.measures, window.utilization, window.resetsAt);
-      }
-    }
-  }
+
+// src/statusline/render.ts
+var RESERVED_COLUMNS = 4;
+var SEPARATOR2 = " | ";
+function renderStatuslineBlock(summary, view, terminalWidth, nowMs, settings2 = STATUSLINE_DEFAULTS, elements = ELEMENTS, env = process.env) {
+  const context = { summary, view, nowMs, settings: settings2, palette: createPalette(settings2.colours, colourEnabled(env)) };
+  const header = settings2.layout.header.flatMap((name) => {
+    const text2 = elements.header[name](context);
+    return text2 === void 0 ? [] : context.palette.paint(HEADER_ROLES[name], text2);
+  });
   const width = Math.max(TWENTY, terminalWidth - RESERVED_COLUMNS);
   const lines = [];
   if (header.length > 0) {
     lines.push(layoutHeader(header, width, SEPARATOR2));
   }
-  const groups = { context: contextGroup, quota: quotaGroup };
-  lines.push(...layoutBarGrid(settings2.bars.map((name) => groups[name]), width, SEPARATOR2, settings2.barWidth));
+  let barGroups = [];
+  const flushBars = () => {
+    lines.push(...layoutBarGrid(barGroups, width, SEPARATOR2, settings2.bar.width));
+    barGroups = [];
+  };
+  for (const name of settings2.layout.rows) {
+    const output2 = elements.rows[name](context);
+    if (output2.kind === "bars") {
+      barGroups.push(output2.cells);
+    } else {
+      flushBars();
+      lines.push(...output2.lines);
+    }
+  }
+  flushBars();
   return lines.join("\n");
 }
 
 // src/statusline/commands.ts
+init_keys();
 init_settings2();
 
 // src/statusline/width.ts
@@ -137281,8 +137593,9 @@ async function readAllStdin() {
 }
 var ROUTED_TARGET_LOOKBACK_MS = 36e5;
 function registerStatuslineCommand(program2, deps) {
+  const statusline = program2.command("statusline");
   withExamples(
-    program2.command("statusline").description("Serve as a statusline entrypoint: read the client's stdin payload, add the identity's live provider, account and usage windows under an agent_shim key, then run the renderer named in AGENT_SHIM_STATUSLINE_CMD or print the built-in line.").action(async () => {
+    statusline.description("Serve as a statusline entrypoint: read the client's stdin payload, add the identity's live provider, account and usage windows under an agent_shim key, then run the renderer named in AGENT_SHIM_STATUSLINE_CMD or print the built-in line.").action(async () => {
       const stdin2 = await readAllStdin();
       let payload;
       try {
@@ -137370,6 +137683,19 @@ function registerStatuslineCommand(program2, deps) {
     }),
     ["$ agent-shim statusline  # a client's statusline setting names this; it renders or delegates"]
   );
+  registerStatuslineKeys(statusline);
+}
+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."),
+    ["agent-shim statusline keys", "agent-shim statusline keys --json"]
+  ).action((options) => {
+    if (options.json === true) {
+      printJson(statuslineKeys());
+      return;
+    }
+    console.log(formatStatuslineKeys(statuslineKeys()));
+  });
 }
 
 // node_modules/.pnpm/@modelcontextprotocol+sdk@1.32.0_supports-color@7.2.0_zod@4.6.5/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
@@ -145437,7 +145763,7 @@ var Protocol = class {
     };
   }
 };
-function isPlainObject3(value2) {
+function isPlainObject4(value2) {
   return value2 !== null && typeof value2 === "object" && !Array.isArray(value2);
 }
 function mergeCapabilities(base, additional) {
@@ -145448,7 +145774,7 @@ function mergeCapabilities(base, additional) {
     if (addValue === void 0)
       continue;
     const baseValue = result[k10];
-    if (isPlainObject3(baseValue) && isPlainObject3(addValue)) {
+    if (isPlainObject4(baseValue) && isPlainObject4(addValue)) {
       result[k10] = { ...baseValue, ...addValue };
     } else {
       result[k10] = addValue;