claude-use 11.60.2 → 11.62.0

package/dist/index.cjs

@@ -250,6 +250,15 @@ var init_graphemes = __esm({
   }
 });
 
+// src/statusline/messages/languages.ts
+var STATUSLINE_LANGUAGES;
+var init_languages = __esm({
+  "src/statusline/messages/languages.ts"() {
+    "use strict";
+    STATUSLINE_LANGUAGES = ["en", "zh-Hans", "zh-Hant"];
+  }
+});
+
 // src/config/statusline.ts
 function distinctList(member) {
   return import_zod2.z.array(member).refine((items) => new Set(items).size === items.length, "must not repeat an entry");
@@ -260,10 +269,13 @@ function isSingleVisibleGrapheme(text) {
 function unsettable(setting) {
   return setting.unwrap().nullable().optional().describe(`${setting.description ?? ""} ${UNSET_NOTE}`);
 }
+function canonicalLanguage(tag) {
+  return tag === "zh" || tag === "zh-TW" ? LANGUAGE_ALIASES[tag] : tag;
+}
 function isPlainObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function mergeStatuslineSettings(base, over) {
+function mergeKeys(base, over) {
   if (!isPlainObject(over)) {
     return over === void 0 ? base : over;
   }
@@ -272,7 +284,7 @@ function mergeStatuslineSettings(base, over) {
     if (value === null) {
       Reflect.deleteProperty(merged, key);
     } else {
-      merged[key] = mergeStatuslineSettings(merged[key], value);
+      merged[key] = mergeKeys(merged[key], value);
     }
   }
   return merged;
@@ -280,6 +292,13 @@ function mergeStatuslineSettings(base, over) {
 function contextBands({ bands, context }) {
   return { warnAt: context.warnAt ?? bands.warnAt, criticalAt: context.criticalAt ?? bands.criticalAt };
 }
+function isPresetName(value) {
+  return STATUSLINE_PRESETS.some((name) => name === value);
+}
+function mergeStatuslineSettings(base, over) {
+  const preset = isPlainObject(over) ? over.preset : void 0;
+  return mergeKeys(isPresetName(preset) ? mergeKeys(base, PRESET_BUNDLES[preset]) : base, over);
+}
 function resolveStatusline(settings) {
   const resolved = ResolvedStatuslineSchema.parse(mergeStatuslineSettings(STATUSLINE_DEFAULTS, settings));
   if (resolved.bands.warnAt >= resolved.bands.criticalAt) {
@@ -289,9 +308,17 @@ function resolveStatusline(settings) {
   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`);
   }
+  const merged = new Set(resolved.layout.merge.flat());
+  const unmerged = resolved.layout.rightAlign.filter((row) => !merged.has(row));
+  if (unmerged.length > 0) {
+    throw new RangeError(`statusline layout.rightAlign names ${unmerged.join(", ")}, which no group in layout.merge contains`);
+  }
+  if (resolved.layout.forceMaxWidth && resolved.layout.maxWidth === 0) {
+    throw new RangeError("statusline layout.forceMaxWidth needs layout.maxWidth to be set");
+  }
   return resolved;
 }
-var import_string_width2, import_zod2, 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 import_string_width2, import_zod2, STATUSLINE_HEADER_SEGMENTS, STATUSLINE_ROWS, STATUSLINE_SESSION_TIME_PARTS, PROMPT_CACHE_TTL_SECONDS, STATUSLINE_COLOUR_NAMES, DEFAULT_HEADER_SEGMENTS, DEFAULT_ROWS, STATUSLINE_PRESETS, GIT_WITH_DIRTY_MARKER, JJ_OFF, PRESET_BUNDLES, STATUSLINE_PATH_LEVELS, STATUSLINE_USAGE_VALUES, STATUSLINE_TIME_FORMATS, STATUSLINE_HOUR_CYCLES, MAX_PERCENT, MAX_STATUSLINE_PALETTE_INDEX, MAX_STATUSLINE_LABEL_COLUMNS, MIN_STATUSLINE_COLUMNS, MAX_STATUSLINE_COLUMNS, MAX_BAR_CELLS, MAX_ACCOUNT_USER_CHARS, MAX_DISPLAY_TEXT_CHARS, LABEL_RE2, OPTIONAL_LABEL_RE, mergeGroups, colourValue, barCharacter, STATUSLINE_CONTEXT_VALUES, STATUSLINE_CONTEXT_ESTIMATES, AUTOCOMPACT_RESERVE_FRACTION, AUTOCOMPACT_RESERVE_RAMP_START, AUTOCOMPACT_RESERVE_RAMP_END, labelWithinColumns, labelWithinColumnsMessage, labelShowsSomething, labelShowsSomethingMessage, labelIsPlainText, labelIsPlainTextMessage, windowLabel, overrideText, wholePercent, thresholdPercent, SHAPES, UNSET_NOTE, LANGUAGE_DESCRIPTION, LANGUAGE_TAGS, LANGUAGE_ALIASES, TOP_LEVEL, StatuslineSchema, ResolvedStatuslineSchema, STATUSLINE_DEFAULTS, STATUSLINE_ENV;
 var init_statusline = __esm({
   "src/config/statusline.ts"() {
     "use strict";
@@ -299,6 +326,7 @@ var init_statusline = __esm({
     import_zod2 = require("zod");
     init_blank();
     init_graphemes();
+    init_languages();
     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", "tokens"];
     STATUSLINE_SESSION_TIME_PARTS = ["started", "lastReply"];
@@ -325,6 +353,21 @@ var init_statusline = __esm({
     ];
     DEFAULT_HEADER_SEGMENTS = ["model", "provider", "route", "account", "identity", "headroom"];
     DEFAULT_ROWS = ["context", "quota"];
+    STATUSLINE_PRESETS = ["standard", "full", "essential", "minimal"];
+    GIT_WITH_DIRTY_MARKER = { enabled: true, showDirty: true, showAheadBehind: false, showLineDiff: false };
+    JJ_OFF = { enabled: false, showDirty: true, showConflicts: true };
+    PRESET_BUNDLES = {
+      standard: { layout: { header: DEFAULT_HEADER_SEGMENTS, rows: DEFAULT_ROWS }, git: GIT_WITH_DIRTY_MARKER, jj: JJ_OFF, usage: { resetLabel: false }, context: { breakdown: "never" } },
+      full: {
+        layout: { header: ["model", "project", "vcs", "effort", "advisor", "version", "outputStyle", "cost", "sessionName", "duration"], rows: ["context", "quota", "addedDirs", "memory", "environment", "promptCache", "compactions", "tokens"] },
+        git: GIT_WITH_DIRTY_MARKER,
+        jj: { enabled: true, showDirty: true, showConflicts: true },
+        usage: { resetLabel: true },
+        context: { breakdown: "critical" }
+      },
+      essential: { layout: { header: ["model", "project", "vcs", "duration"], rows: ["context", "addedDirs"] }, git: GIT_WITH_DIRTY_MARKER, jj: JJ_OFF, usage: { resetLabel: true }, context: { breakdown: "never" } },
+      minimal: { layout: { header: ["model", "project", "vcs"], rows: ["context", "addedDirs"] }, git: GIT_WITH_DIRTY_MARKER, jj: JJ_OFF, usage: { resetLabel: true }, context: { breakdown: "never" } }
+    };
     STATUSLINE_PATH_LEVELS = ["1", "2", "3", "full"];
     STATUSLINE_USAGE_VALUES = ["used", "remaining"];
     STATUSLINE_TIME_FORMATS = ["relative", "absolute", "both", "elapsed", "elapsedAndAbsolute"];
@@ -332,11 +375,17 @@ var init_statusline = __esm({
     MAX_PERCENT = 100;
     MAX_STATUSLINE_PALETTE_INDEX = 255;
     MAX_STATUSLINE_LABEL_COLUMNS = 12;
+    MIN_STATUSLINE_COLUMNS = 20;
+    MAX_STATUSLINE_COLUMNS = 1e3;
     MAX_BAR_CELLS = 40;
     MAX_ACCOUNT_USER_CHARS = 254;
     MAX_DISPLAY_TEXT_CHARS = 80;
     LABEL_RE2 = /^[^\p{C}\p{Z}]+(?: [^\p{C}\p{Z}]+)*$/u;
     OPTIONAL_LABEL_RE = /^(?:[^\p{C}\p{Z}]+(?: [^\p{C}\p{Z}]+)*)?$/u;
+    mergeGroups = import_zod2.z.array(distinctList(import_zod2.z.enum(STATUSLINE_ROWS)).min(2)).refine((groups) => {
+      const rows = groups.flat();
+      return new Set(rows).size === rows.length;
+    }, "must not name a row in more than one group");
     colourValue = import_zod2.z.union([import_zod2.z.enum(STATUSLINE_COLOUR_NAMES), import_zod2.z.number().int().min(0).max(MAX_STATUSLINE_PALETTE_INDEX), import_zod2.z.string().regex(/^#[0-9a-fA-F]{6}$/, "must be a colour name, a palette index from 0 to 255 or #rrggbb")]);
     barCharacter = import_zod2.z.string().refine(isSingleVisibleGrapheme, "must be a single visible character that takes one terminal column");
     STATUSLINE_CONTEXT_VALUES = ["both", "percent", "tokens", "remaining"];
@@ -344,14 +393,27 @@ var init_statusline = __esm({
     AUTOCOMPACT_RESERVE_FRACTION = 0.165;
     AUTOCOMPACT_RESERVE_RAMP_START = 0.05;
     AUTOCOMPACT_RESERVE_RAMP_END = 0.5;
-    labelText = import_zod2.z.string().refine((text) => (0, import_string_width2.default)(text) <= MAX_STATUSLINE_LABEL_COLUMNS, `must take no more than ${String(MAX_STATUSLINE_LABEL_COLUMNS)} terminal columns`).refine((text) => !drawsNothing(text), "must show something: a label of only combining marks or blank characters draws nothing").regex(LABEL_RE2, "must be visible text without control characters");
+    labelWithinColumns = (text) => (0, import_string_width2.default)(text) <= MAX_STATUSLINE_LABEL_COLUMNS;
+    labelWithinColumnsMessage = `must take no more than ${String(MAX_STATUSLINE_LABEL_COLUMNS)} terminal columns`;
+    labelShowsSomething = (text) => !drawsNothing(text);
+    labelShowsSomethingMessage = "must show something: a label of only combining marks or blank characters draws nothing";
+    labelIsPlainText = (text) => LABEL_RE2.test(text);
+    labelIsPlainTextMessage = "must be visible text without control characters";
+    windowLabel = import_zod2.z.string().refine((text) => text === "" || labelWithinColumns(text), labelWithinColumnsMessage).refine((text) => text === "" || labelShowsSomething(text), labelShowsSomethingMessage).refine((text) => text === "" || labelIsPlainText(text), labelIsPlainTextMessage);
     overrideText = import_zod2.z.string().max(MAX_DISPLAY_TEXT_CHARS).regex(OPTIONAL_LABEL_RE, "must be visible text without control characters");
     wholePercent = import_zod2.z.number().int().min(1).max(MAX_PERCENT);
     thresholdPercent = import_zod2.z.number().int().min(0).max(MAX_PERCENT);
     SHAPES = {
       layout: {
         header: distinctList(import_zod2.z.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(import_zod2.z.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.")
+        rows: distinctList(import_zod2.z.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."),
+        mode: import_zod2.z.enum(["expanded", "compact"]).describe("How the statusline is laid out: expanded draws the header and then the rows, each on lines of its own as layout.merge allows, and compact draws the header segments and every row's content on one line, starting a new line only where the line would be wider than the width. layout.mergeBars, layout.merge, layout.rightAlign and layout.rule have no effect in compact."),
+        rule: import_zod2.z.enum(["none", "belowHeader"]).describe(`Whether a rule is drawn across the line between the header and the rows beneath it, as wide as the header's widest line (at least ${String(MIN_STATUSLINE_COLUMNS)} columns, at most the width); it is drawn only when both the header and the rows have something to show, and not in the compact layout.`),
+        mergeBars: import_zod2.z.boolean().describe("Whether bar rows that sit next to each other in layout.rows share a line, and one grid, when they fit (the context and quota bars do by default); when false each bar row is on a line of its own, its bars still aligned to its neighbours'. A row of text is never joined by this setting, whichever form the quota row takes: layout.merge does that."),
+        merge: mergeGroups.describe("Groups of rows that share a line when they sit next to each other in layout.rows and fit on one line together, and are drawn on lines of their own when they do not; each group names at least two rows, and no row belongs to two groups. A group may mix bar rows and rows of text, which are joined with the separator when every member is a single line. Bar rows outside a group follow layout.mergeBars. A group in which no row has anything to show draws nothing: one with a row of text in it still ends a run of bars sharing a line, as an empty row of text does, and one of bar rows alone is left out, so the bars either side of it share as if it were not there."),
+        rightAlign: distinctList(import_zod2.z.enum(STATUSLINE_ROWS)).describe("Rows that start the right-aligned part of a merged line: the first of them to appear on a line, and the rows after it, are pushed to the right edge, with the gap padded by spaces. A row named here must belong to a group in layout.merge, and it has no effect when it is the first row of its line."),
+        maxWidth: import_zod2.z.number().int().min(0).max(MAX_STATUSLINE_COLUMNS).refine((columns) => columns === 0 || columns >= MIN_STATUSLINE_COLUMNS, `must be 0, or at least ${String(MIN_STATUSLINE_COLUMNS)} columns`).describe(`The exact width in columns lines are drawn to when the client reports none and the COLUMNS environment variable names none, in place of the default width it would assume for the terminal; unlike a terminal's width, it is not reduced by the columns Claude Code keeps back for itself. It is 0, to leave it unset, or from ${String(MIN_STATUSLINE_COLUMNS)} to ${String(MAX_STATUSLINE_COLUMNS)}; a value outside that is refused, not clamped.`),
+        forceMaxWidth: import_zod2.z.boolean().describe("Whether maxWidth is the exact width lines are drawn to for whatever the client reports, even when the terminal is narrower or wider; it needs maxWidth to be set.")
       },
       model: {
         format: import_zod2.z.enum(["full", "compact", "short"]).describe("How the model's name is written: full is the name as the client gives it, compact drops a context-window suffix such as (1M context), and short also drops a leading Claude."),
@@ -385,8 +447,8 @@ var init_statusline = __esm({
         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.")
+        fiveHour: windowLabel.describe("The name of the five-hour subscription window; empty uses the language's own name for it."),
+        sevenDay: windowLabel.describe("The name of the weekly subscription window; empty uses the language's own name for it.")
       },
       bar: {
         width: import_zod2.z.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."),
@@ -452,7 +514,16 @@ var init_statusline = __esm({
       }
     };
     UNSET_NOTE = "A layer may write null to return it to unset when a shallower layer sets it.";
+    LANGUAGE_DESCRIPTION = "The language of the words the statusline writes (labels, units of waiting such as `ago`, the names of effort levels): en, zh-Hans for Chinese in simplified characters, and zh-Hant for traditional; zh and zh-TW are read as zh-Hans and zh-Hant, and any other tag is refused. Durations, token counts, the dollar sign and clock times are written the same in every language, and a clock time follows the system locale and the clock settings.";
+    LANGUAGE_TAGS = [...STATUSLINE_LANGUAGES, "zh", "zh-TW"];
+    LANGUAGE_ALIASES = { zh: "zh-Hans", "zh-TW": "zh-Hant" };
+    TOP_LEVEL = {
+      language: import_zod2.z.enum(STATUSLINE_LANGUAGES).describe(LANGUAGE_DESCRIPTION),
+      preset: import_zod2.z.enum(STATUSLINE_PRESETS).describe("A named bundle of settings (layout.header, layout.rows, git.enabled, git.showDirty, git.showAheadBehind, git.showLineDiff, jj.enabled, jj.showDirty, jj.showConflicts, usage.resetLabel and context.breakdown) that this layer sets beneath the keys it names itself and above everything the shallower layers set: standard is the statusline's own; full, essential and minimal are claude-hud's presets. Each draws the model, project and version control segments and the context row; full adds the effort, advisor, version, output style, cost, session name and duration segments and the quota, added directories, memory, environment, prompt cache, compactions and session tokens rows, with the token breakdown at high use, essential adds the duration and the added directories row, and minimal adds the added directories row alone.")
+    };
     StatuslineSchema = import_zod2.z.strictObject({
+      language: import_zod2.z.enum(LANGUAGE_TAGS).transform(canonicalLanguage).describe(LANGUAGE_DESCRIPTION).optional(),
+      preset: TOP_LEVEL.preset.optional(),
       layout: import_zod2.z.strictObject(SHAPES.layout).partial().optional(),
       model: import_zod2.z.strictObject(SHAPES.model).partial().optional(),
       provider: import_zod2.z.strictObject(SHAPES.provider).partial().optional(),
@@ -475,6 +546,8 @@ var init_statusline = __esm({
       jj: import_zod2.z.strictObject(SHAPES.jj).partial().optional()
     });
     ResolvedStatuslineSchema = import_zod2.z.strictObject({
+      language: TOP_LEVEL.language,
+      preset: TOP_LEVEL.preset,
       layout: import_zod2.z.strictObject(SHAPES.layout),
       model: import_zod2.z.strictObject(SHAPES.model),
       provider: import_zod2.z.strictObject(SHAPES.provider),
@@ -497,7 +570,9 @@ var init_statusline = __esm({
       jj: import_zod2.z.strictObject(SHAPES.jj)
     });
     STATUSLINE_DEFAULTS = {
-      layout: { header: [...DEFAULT_HEADER_SEGMENTS], rows: [...DEFAULT_ROWS] },
+      language: "en",
+      preset: "standard",
+      layout: { header: [...DEFAULT_HEADER_SEGMENTS], rows: [...DEFAULT_ROWS], mode: "expanded", rule: "none", mergeBars: true, merge: [], rightAlign: [], maxWidth: 0, forceMaxWidth: false },
       model: { format: "full", override: "", source: "client" },
       provider: { name: "" },
       account: { parts: ["user", "organisation", "plan"], userLength: 0 },
@@ -505,7 +580,7 @@ var init_statusline = __esm({
       advisor: { override: "" },
       context: { bar: "shown", value: "both", estimate: "never", breakdown: "never" },
       bands: { warnAt: 70, criticalAt: 90 },
-      labels: { fiveHour: "5h", sevenDay: "Wk" },
+      labels: { fiveHour: "", sevenDay: "" },
       bar: { width: 10, filled: "\u2588", empty: "\u2591" },
       usage: { value: "used", bar: true, compact: false, resetLabel: false, modelScoped: false, timeFormat: "relative", threshold: 0, sevenDayThreshold: 0 },
       clock: { hourCycle: "auto", seconds: false },
@@ -4577,7 +4652,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "claude-use",
-      version: "11.60.2",
+      version: "11.62.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>",
@@ -7815,6 +7890,9 @@ function keyOf(path41, declared) {
   if (leaf instanceof import_zod16.z.ZodArray && leaf.element instanceof import_zod16.z.ZodEnum) {
     return { ...common, kind: "list", choices: Object.values(leaf.element.enum).map(String) };
   }
+  if (leaf instanceof import_zod16.z.ZodArray && leaf.element instanceof import_zod16.z.ZodArray && leaf.element.element instanceof import_zod16.z.ZodEnum) {
+    return { ...common, kind: "groups", choices: Object.values(leaf.element.element.enum).map(String) };
+  }
   throw new TypeError(`statusline setting ${path41.join(".")} has a kind the key listing does not describe`);
 }
 function walk(shape, prefix) {

package/dist/index.mjs

@@ -228,6 +228,15 @@ var init_graphemes = __esm({
   }
 });
 
+// src/statusline/messages/languages.ts
+var STATUSLINE_LANGUAGES;
+var init_languages = __esm({
+  "src/statusline/messages/languages.ts"() {
+    "use strict";
+    STATUSLINE_LANGUAGES = ["en", "zh-Hans", "zh-Hant"];
+  }
+});
+
 // src/config/statusline.ts
 import stringWidth2 from "string-width";
 import { z as z2 } from "zod";
@@ -240,10 +249,13 @@ function isSingleVisibleGrapheme(text) {
 function unsettable(setting) {
   return setting.unwrap().nullable().optional().describe(`${setting.description ?? ""} ${UNSET_NOTE}`);
 }
+function canonicalLanguage(tag) {
+  return tag === "zh" || tag === "zh-TW" ? LANGUAGE_ALIASES[tag] : tag;
+}
 function isPlainObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function mergeStatuslineSettings(base, over) {
+function mergeKeys(base, over) {
   if (!isPlainObject(over)) {
     return over === void 0 ? base : over;
   }
@@ -252,7 +264,7 @@ function mergeStatuslineSettings(base, over) {
     if (value === null) {
       Reflect.deleteProperty(merged, key);
     } else {
-      merged[key] = mergeStatuslineSettings(merged[key], value);
+      merged[key] = mergeKeys(merged[key], value);
     }
   }
   return merged;
@@ -260,6 +272,13 @@ function mergeStatuslineSettings(base, over) {
 function contextBands({ bands, context }) {
   return { warnAt: context.warnAt ?? bands.warnAt, criticalAt: context.criticalAt ?? bands.criticalAt };
 }
+function isPresetName(value) {
+  return STATUSLINE_PRESETS.some((name) => name === value);
+}
+function mergeStatuslineSettings(base, over) {
+  const preset = isPlainObject(over) ? over.preset : void 0;
+  return mergeKeys(isPresetName(preset) ? mergeKeys(base, PRESET_BUNDLES[preset]) : base, over);
+}
 function resolveStatusline(settings) {
   const resolved = ResolvedStatuslineSchema.parse(mergeStatuslineSettings(STATUSLINE_DEFAULTS, settings));
   if (resolved.bands.warnAt >= resolved.bands.criticalAt) {
@@ -269,14 +288,23 @@ function resolveStatusline(settings) {
   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`);
   }
+  const merged = new Set(resolved.layout.merge.flat());
+  const unmerged = resolved.layout.rightAlign.filter((row) => !merged.has(row));
+  if (unmerged.length > 0) {
+    throw new RangeError(`statusline layout.rightAlign names ${unmerged.join(", ")}, which no group in layout.merge contains`);
+  }
+  if (resolved.layout.forceMaxWidth && resolved.layout.maxWidth === 0) {
+    throw new RangeError("statusline layout.forceMaxWidth needs layout.maxWidth to be set");
+  }
   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, 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 STATUSLINE_HEADER_SEGMENTS, STATUSLINE_ROWS, STATUSLINE_SESSION_TIME_PARTS, PROMPT_CACHE_TTL_SECONDS, STATUSLINE_COLOUR_NAMES, DEFAULT_HEADER_SEGMENTS, DEFAULT_ROWS, STATUSLINE_PRESETS, GIT_WITH_DIRTY_MARKER, JJ_OFF, PRESET_BUNDLES, STATUSLINE_PATH_LEVELS, STATUSLINE_USAGE_VALUES, STATUSLINE_TIME_FORMATS, STATUSLINE_HOUR_CYCLES, MAX_PERCENT, MAX_STATUSLINE_PALETTE_INDEX, MAX_STATUSLINE_LABEL_COLUMNS, MIN_STATUSLINE_COLUMNS, MAX_STATUSLINE_COLUMNS, MAX_BAR_CELLS, MAX_ACCOUNT_USER_CHARS, MAX_DISPLAY_TEXT_CHARS, LABEL_RE2, OPTIONAL_LABEL_RE, mergeGroups, colourValue, barCharacter, STATUSLINE_CONTEXT_VALUES, STATUSLINE_CONTEXT_ESTIMATES, AUTOCOMPACT_RESERVE_FRACTION, AUTOCOMPACT_RESERVE_RAMP_START, AUTOCOMPACT_RESERVE_RAMP_END, labelWithinColumns, labelWithinColumnsMessage, labelShowsSomething, labelShowsSomethingMessage, labelIsPlainText, labelIsPlainTextMessage, windowLabel, overrideText, wholePercent, thresholdPercent, SHAPES, UNSET_NOTE, LANGUAGE_DESCRIPTION, LANGUAGE_TAGS, LANGUAGE_ALIASES, TOP_LEVEL, StatuslineSchema, ResolvedStatuslineSchema, STATUSLINE_DEFAULTS, STATUSLINE_ENV;
 var init_statusline = __esm({
   "src/config/statusline.ts"() {
     "use strict";
     init_blank();
     init_graphemes();
+    init_languages();
     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", "tokens"];
     STATUSLINE_SESSION_TIME_PARTS = ["started", "lastReply"];
@@ -303,6 +331,21 @@ var init_statusline = __esm({
     ];
     DEFAULT_HEADER_SEGMENTS = ["model", "provider", "route", "account", "identity", "headroom"];
     DEFAULT_ROWS = ["context", "quota"];
+    STATUSLINE_PRESETS = ["standard", "full", "essential", "minimal"];
+    GIT_WITH_DIRTY_MARKER = { enabled: true, showDirty: true, showAheadBehind: false, showLineDiff: false };
+    JJ_OFF = { enabled: false, showDirty: true, showConflicts: true };
+    PRESET_BUNDLES = {
+      standard: { layout: { header: DEFAULT_HEADER_SEGMENTS, rows: DEFAULT_ROWS }, git: GIT_WITH_DIRTY_MARKER, jj: JJ_OFF, usage: { resetLabel: false }, context: { breakdown: "never" } },
+      full: {
+        layout: { header: ["model", "project", "vcs", "effort", "advisor", "version", "outputStyle", "cost", "sessionName", "duration"], rows: ["context", "quota", "addedDirs", "memory", "environment", "promptCache", "compactions", "tokens"] },
+        git: GIT_WITH_DIRTY_MARKER,
+        jj: { enabled: true, showDirty: true, showConflicts: true },
+        usage: { resetLabel: true },
+        context: { breakdown: "critical" }
+      },
+      essential: { layout: { header: ["model", "project", "vcs", "duration"], rows: ["context", "addedDirs"] }, git: GIT_WITH_DIRTY_MARKER, jj: JJ_OFF, usage: { resetLabel: true }, context: { breakdown: "never" } },
+      minimal: { layout: { header: ["model", "project", "vcs"], rows: ["context", "addedDirs"] }, git: GIT_WITH_DIRTY_MARKER, jj: JJ_OFF, usage: { resetLabel: true }, context: { breakdown: "never" } }
+    };
     STATUSLINE_PATH_LEVELS = ["1", "2", "3", "full"];
     STATUSLINE_USAGE_VALUES = ["used", "remaining"];
     STATUSLINE_TIME_FORMATS = ["relative", "absolute", "both", "elapsed", "elapsedAndAbsolute"];
@@ -310,11 +353,17 @@ var init_statusline = __esm({
     MAX_PERCENT = 100;
     MAX_STATUSLINE_PALETTE_INDEX = 255;
     MAX_STATUSLINE_LABEL_COLUMNS = 12;
+    MIN_STATUSLINE_COLUMNS = 20;
+    MAX_STATUSLINE_COLUMNS = 1e3;
     MAX_BAR_CELLS = 40;
     MAX_ACCOUNT_USER_CHARS = 254;
     MAX_DISPLAY_TEXT_CHARS = 80;
     LABEL_RE2 = /^[^\p{C}\p{Z}]+(?: [^\p{C}\p{Z}]+)*$/u;
     OPTIONAL_LABEL_RE = /^(?:[^\p{C}\p{Z}]+(?: [^\p{C}\p{Z}]+)*)?$/u;
+    mergeGroups = z2.array(distinctList(z2.enum(STATUSLINE_ROWS)).min(2)).refine((groups) => {
+      const rows = groups.flat();
+      return new Set(rows).size === rows.length;
+    }, "must not name a row in more than one group");
     colourValue = z2.union([z2.enum(STATUSLINE_COLOUR_NAMES), z2.number().int().min(0).max(MAX_STATUSLINE_PALETTE_INDEX), z2.string().regex(/^#[0-9a-fA-F]{6}$/, "must be a colour name, a palette index from 0 to 255 or #rrggbb")]);
     barCharacter = z2.string().refine(isSingleVisibleGrapheme, "must be a single visible character that takes one terminal column");
     STATUSLINE_CONTEXT_VALUES = ["both", "percent", "tokens", "remaining"];
@@ -322,14 +371,27 @@ var init_statusline = __esm({
     AUTOCOMPACT_RESERVE_FRACTION = 0.165;
     AUTOCOMPACT_RESERVE_RAMP_START = 0.05;
     AUTOCOMPACT_RESERVE_RAMP_END = 0.5;
-    labelText = z2.string().refine((text) => stringWidth2(text) <= MAX_STATUSLINE_LABEL_COLUMNS, `must take no more than ${String(MAX_STATUSLINE_LABEL_COLUMNS)} terminal columns`).refine((text) => !drawsNothing(text), "must show something: a label of only combining marks or blank characters draws nothing").regex(LABEL_RE2, "must be visible text without control characters");
+    labelWithinColumns = (text) => stringWidth2(text) <= MAX_STATUSLINE_LABEL_COLUMNS;
+    labelWithinColumnsMessage = `must take no more than ${String(MAX_STATUSLINE_LABEL_COLUMNS)} terminal columns`;
+    labelShowsSomething = (text) => !drawsNothing(text);
+    labelShowsSomethingMessage = "must show something: a label of only combining marks or blank characters draws nothing";
+    labelIsPlainText = (text) => LABEL_RE2.test(text);
+    labelIsPlainTextMessage = "must be visible text without control characters";
+    windowLabel = z2.string().refine((text) => text === "" || labelWithinColumns(text), labelWithinColumnsMessage).refine((text) => text === "" || labelShowsSomething(text), labelShowsSomethingMessage).refine((text) => text === "" || labelIsPlainText(text), labelIsPlainTextMessage);
     overrideText = z2.string().max(MAX_DISPLAY_TEXT_CHARS).regex(OPTIONAL_LABEL_RE, "must be visible text without control characters");
     wholePercent = z2.number().int().min(1).max(MAX_PERCENT);
     thresholdPercent = z2.number().int().min(0).max(MAX_PERCENT);
     SHAPES = {
       layout: {
         header: distinctList(z2.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(z2.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.")
+        rows: distinctList(z2.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."),
+        mode: z2.enum(["expanded", "compact"]).describe("How the statusline is laid out: expanded draws the header and then the rows, each on lines of its own as layout.merge allows, and compact draws the header segments and every row's content on one line, starting a new line only where the line would be wider than the width. layout.mergeBars, layout.merge, layout.rightAlign and layout.rule have no effect in compact."),
+        rule: z2.enum(["none", "belowHeader"]).describe(`Whether a rule is drawn across the line between the header and the rows beneath it, as wide as the header's widest line (at least ${String(MIN_STATUSLINE_COLUMNS)} columns, at most the width); it is drawn only when both the header and the rows have something to show, and not in the compact layout.`),
+        mergeBars: z2.boolean().describe("Whether bar rows that sit next to each other in layout.rows share a line, and one grid, when they fit (the context and quota bars do by default); when false each bar row is on a line of its own, its bars still aligned to its neighbours'. A row of text is never joined by this setting, whichever form the quota row takes: layout.merge does that."),
+        merge: mergeGroups.describe("Groups of rows that share a line when they sit next to each other in layout.rows and fit on one line together, and are drawn on lines of their own when they do not; each group names at least two rows, and no row belongs to two groups. A group may mix bar rows and rows of text, which are joined with the separator when every member is a single line. Bar rows outside a group follow layout.mergeBars. A group in which no row has anything to show draws nothing: one with a row of text in it still ends a run of bars sharing a line, as an empty row of text does, and one of bar rows alone is left out, so the bars either side of it share as if it were not there."),
+        rightAlign: distinctList(z2.enum(STATUSLINE_ROWS)).describe("Rows that start the right-aligned part of a merged line: the first of them to appear on a line, and the rows after it, are pushed to the right edge, with the gap padded by spaces. A row named here must belong to a group in layout.merge, and it has no effect when it is the first row of its line."),
+        maxWidth: z2.number().int().min(0).max(MAX_STATUSLINE_COLUMNS).refine((columns) => columns === 0 || columns >= MIN_STATUSLINE_COLUMNS, `must be 0, or at least ${String(MIN_STATUSLINE_COLUMNS)} columns`).describe(`The exact width in columns lines are drawn to when the client reports none and the COLUMNS environment variable names none, in place of the default width it would assume for the terminal; unlike a terminal's width, it is not reduced by the columns Claude Code keeps back for itself. It is 0, to leave it unset, or from ${String(MIN_STATUSLINE_COLUMNS)} to ${String(MAX_STATUSLINE_COLUMNS)}; a value outside that is refused, not clamped.`),
+        forceMaxWidth: z2.boolean().describe("Whether maxWidth is the exact width lines are drawn to for whatever the client reports, even when the terminal is narrower or wider; it needs maxWidth to be set.")
       },
       model: {
         format: z2.enum(["full", "compact", "short"]).describe("How the model's name is written: full is the name as the client gives it, compact drops a context-window suffix such as (1M context), and short also drops a leading Claude."),
@@ -363,8 +425,8 @@ var init_statusline = __esm({
         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.")
+        fiveHour: windowLabel.describe("The name of the five-hour subscription window; empty uses the language's own name for it."),
+        sevenDay: windowLabel.describe("The name of the weekly subscription window; empty uses the language's own name for it.")
       },
       bar: {
         width: z2.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."),
@@ -430,7 +492,16 @@ var init_statusline = __esm({
       }
     };
     UNSET_NOTE = "A layer may write null to return it to unset when a shallower layer sets it.";
+    LANGUAGE_DESCRIPTION = "The language of the words the statusline writes (labels, units of waiting such as `ago`, the names of effort levels): en, zh-Hans for Chinese in simplified characters, and zh-Hant for traditional; zh and zh-TW are read as zh-Hans and zh-Hant, and any other tag is refused. Durations, token counts, the dollar sign and clock times are written the same in every language, and a clock time follows the system locale and the clock settings.";
+    LANGUAGE_TAGS = [...STATUSLINE_LANGUAGES, "zh", "zh-TW"];
+    LANGUAGE_ALIASES = { zh: "zh-Hans", "zh-TW": "zh-Hant" };
+    TOP_LEVEL = {
+      language: z2.enum(STATUSLINE_LANGUAGES).describe(LANGUAGE_DESCRIPTION),
+      preset: z2.enum(STATUSLINE_PRESETS).describe("A named bundle of settings (layout.header, layout.rows, git.enabled, git.showDirty, git.showAheadBehind, git.showLineDiff, jj.enabled, jj.showDirty, jj.showConflicts, usage.resetLabel and context.breakdown) that this layer sets beneath the keys it names itself and above everything the shallower layers set: standard is the statusline's own; full, essential and minimal are claude-hud's presets. Each draws the model, project and version control segments and the context row; full adds the effort, advisor, version, output style, cost, session name and duration segments and the quota, added directories, memory, environment, prompt cache, compactions and session tokens rows, with the token breakdown at high use, essential adds the duration and the added directories row, and minimal adds the added directories row alone.")
+    };
     StatuslineSchema = z2.strictObject({
+      language: z2.enum(LANGUAGE_TAGS).transform(canonicalLanguage).describe(LANGUAGE_DESCRIPTION).optional(),
+      preset: TOP_LEVEL.preset.optional(),
       layout: z2.strictObject(SHAPES.layout).partial().optional(),
       model: z2.strictObject(SHAPES.model).partial().optional(),
       provider: z2.strictObject(SHAPES.provider).partial().optional(),
@@ -453,6 +524,8 @@ var init_statusline = __esm({
       jj: z2.strictObject(SHAPES.jj).partial().optional()
     });
     ResolvedStatuslineSchema = z2.strictObject({
+      language: TOP_LEVEL.language,
+      preset: TOP_LEVEL.preset,
       layout: z2.strictObject(SHAPES.layout),
       model: z2.strictObject(SHAPES.model),
       provider: z2.strictObject(SHAPES.provider),
@@ -475,7 +548,9 @@ var init_statusline = __esm({
       jj: z2.strictObject(SHAPES.jj)
     });
     STATUSLINE_DEFAULTS = {
-      layout: { header: [...DEFAULT_HEADER_SEGMENTS], rows: [...DEFAULT_ROWS] },
+      language: "en",
+      preset: "standard",
+      layout: { header: [...DEFAULT_HEADER_SEGMENTS], rows: [...DEFAULT_ROWS], mode: "expanded", rule: "none", mergeBars: true, merge: [], rightAlign: [], maxWidth: 0, forceMaxWidth: false },
       model: { format: "full", override: "", source: "client" },
       provider: { name: "" },
       account: { parts: ["user", "organisation", "plan"], userLength: 0 },
@@ -483,7 +558,7 @@ var init_statusline = __esm({
       advisor: { override: "" },
       context: { bar: "shown", value: "both", estimate: "never", breakdown: "never" },
       bands: { warnAt: 70, criticalAt: 90 },
-      labels: { fiveHour: "5h", sevenDay: "Wk" },
+      labels: { fiveHour: "", sevenDay: "" },
       bar: { width: 10, filled: "\u2588", empty: "\u2591" },
       usage: { value: "used", bar: true, compact: false, resetLabel: false, modelScoped: false, timeFormat: "relative", threshold: 0, sevenDayThreshold: 0 },
       clock: { hourCycle: "auto", seconds: false },
@@ -4553,7 +4628,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "claude-use",
-      version: "11.60.2",
+      version: "11.62.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>",
@@ -7792,6 +7867,9 @@ function keyOf(path41, declared) {
   if (leaf instanceof z16.ZodArray && leaf.element instanceof z16.ZodEnum) {
     return { ...common, kind: "list", choices: Object.values(leaf.element.enum).map(String) };
   }
+  if (leaf instanceof z16.ZodArray && leaf.element instanceof z16.ZodArray && leaf.element.element instanceof z16.ZodEnum) {
+    return { ...common, kind: "groups", choices: Object.values(leaf.element.element.enum).map(String) };
+  }
   throw new TypeError(`statusline setting ${path41.join(".")} has a kind the key listing does not describe`);
 }
 function walk(shape, prefix) {