claude-limit-statusline 0.3.0 → 0.4.0

package/README.md

@@ -13,12 +13,11 @@ with a **live reset countdown**.
 🔗 [GitHub](https://github.com/ann0nip/claude-limit-statusline)
 
 ```
-🤖 Opus 4.8 (1M context) | 🧠 42k (4%) | ⏳ Session 17% · resets in 0h47m (23:12) | 📅 Week 10% · resets in 2d 21h (Jun 03 19:54)
+🤖 Opus 4.8 | 🧠 42k (4%) | 🕔 Session 17% · resets in 0h47m | 📅 Week 10%
 ```
 
-The line **auto-fits your terminal width** — on a narrow window it sheds detail
-gracefully (see [Narrow terminals](#narrow-terminals)) while always keeping the
-session/week percentages.
+That's the default (`medium`). Pick the [size](#sizes) that fits your terminal —
+from `full` (both reset countdowns) down to `bare` (just the two percentages).
 
 Unlike tools that estimate the 5‑hour block from local logs, this reads the
 **official `rate_limits` payload** that Claude Code provides on stdin — the same
@@ -48,10 +47,10 @@ for you (merging, never clobbering your other settings). Then open a **new**
 Claude Code session and send one message — `rate_limits` populates after the
 first API response.
 
-Want only the two limits? Pass your display options straight through:
+Want a different size? Pass your display options straight through:
 
 ```bash
-cc-limits --install --segments=session,week
+cc-limits --install --size=compact
 ```
 
 To remove it again:
@@ -65,6 +64,12 @@ cc-limits --uninstall
 > installed command isn't on the `PATH` of the non‑login shell Claude Code uses
 > for the status line.
 
+> **Upgrading from 0.3.x / 0.2.x?** The old adaptive‑width behavior is gone —
+> replaced by fixed [sizes](#sizes) (default `medium`). Re‑run `cc-limits
+> --install` (optionally with `--size=…`) to refresh the baked‑in command; any
+> leftover `--width` / `--no-adapt` flags are now ignored. The session icon also
+> changed from ⏳ to 🕔.
+
 <details>
 <summary>Manual setup (if you prefer)</summary>
 
@@ -91,45 +96,44 @@ If the bar stays blank (nvm/Volta `PATH` issue), use absolute paths instead —
 | --- | --- | --- |
 | `🤖 model` | Active model | local |
 | `🧠 42k (4%)` | Tokens in the current context window | local |
-| `⏳ Session 17% · resets in 0h47m (23:12)` | **Real** 5‑hour limit used + reset | server |
-| `📅 Week 10% · resets in 2d 21h (Jun 03 19:54)` | **Real** 7‑day limit used + reset | server |
-
-The reset countdowns appear when the terminal is wide enough; on narrower
-windows they drop out automatically (week first, then session). Use `--reset` to
-cap which ones may ever show.
+| `🕔 Session 17% · resets in 0h47m (23:12)` | **Real** 5‑hour limit used (+ reset) | server |
+| `📅 Week 10% · resets in 2d 21h (Jun 03 19:54)` | **Real** 7‑day limit used (+ reset) | server |
 
 The percentage **is** your "how close am I to the limit" gauge. Subscription
 limits are dynamic, so Anthropic does not expose a fixed token cap — only a
 percentage, which is exactly what this surfaces.
 
 Before the first API response (and right after `/compact`) the session segment
-shows `⏳ Session --` until fresh data arrives.
+shows `🕔 Session --` until fresh data arrives.
 
-### Narrow terminals
+## Sizes
 
-The line **auto-shrinks to fit your terminal width**, so it stays readable on a
-small window and expands again when you make the window bigger — no config
-needed. It sheds detail in steps, dropping the least important parts first and
-**always keeping the session/week percentages**:
+Claude Code shows the status line on a single line and truncates anything past
+the terminal width. So instead of guessing, you **pick the size that fits** —
+set it once with `--size` (or `CC_LIMITS_SIZE`). The default is `medium`.
 
 ```text
-full     🤖 Opus 4.8 (1M context) | 🧠 42k (4%) | ⏳ Session 17% · resets in 0h47m (23:12) | 📅 Week 10% · resets in 2d 21h (Jun 03 19:54)
-          ↓ week countdown drops
-medium   🤖 Opus 4.8 (1M context) | 🧠 42k (4%) | ⏳ Session 17% · resets in 0h47m (23:12) | 📅 Week 10%
-          ↓ session countdown drops
-plain    🤖 Opus 4.8 (1M context) | 🧠 42k (4%) | ⏳ Session 17% | 📅 Week 10%
-          ↓ labels shorten, model/context trim away
-narrow   🤖 Opus 4.8 | 🧠 42k | ⏳ S 17% | 📅 W 10%
-tiny     ⏳ S 17% | 📅 W 10%
+full     🤖 Opus 4.8 (1M context) | 🧠 42k (4%) | 🕔 Session 17% · resets in 0h47m (23:12) | 📅 Week 10% · resets in 2d 21h (Jun 03 19:54)
+medium   🤖 Opus 4.8 | 🧠 42k (4%) | 🕔 Session 17% · resets in 0h47m | 📅 Week 10%
+compact  🤖 Opus 4.8 | 🧠 42k (4%) | 🕔 Session 17% | 📅 Week 10%
+mini     🤖 Opus 4.8 | 🧠 42k | 🕔 S 17% | 📅 W 10%
+bare     🕔 S 17% | 📅 W 10%
 ```
 
-The width comes from the terminal itself (read via `/dev/tty`), so it follows
-live window resizes. Disable it with `--no-adapt` (or `CC_LIMITS_ADAPT=0`) to
-always print the full line, or pin a width with `--width=N` / `CC_LIMITS_WIDTH=N`.
+| Size | Shows |
+| --- | --- |
+| `full` | Model (with context length), tokens + %, both limits with reset countdown & clock |
+| `medium` | Model, tokens + %, session countdown, both percentages *(default)* |
+| `compact` | Model, tokens + %, both percentages — no countdowns |
+| `mini` | Model, tokens, short labels |
+| `bare` | Just the two limits |
+
+```bash
+cc-limits --install --size=compact
+```
 
-> **Upgrading from 0.2.0?** Adaptive width is new and on by default. If you
-> preferred the old always-full line (and let Claude Code truncate it), add
-> `--no-adapt`.
+You can still fine‑tune any size with [`--segments`](#flags) and
+[`--reset`](#flags) below.
 
 ## Configuration
 
@@ -144,24 +148,23 @@ Pick **which segments** to show (and their order). The four segments are
 "command": "cc-limits --no-context"
 ```
 
-Cap **which reset countdowns** may show (they still drop out on narrow
-terminals):
+Cap **which reset countdowns** a size may show (this can hide a countdown,
+never add one):
 
 ```jsonc
-"command": "cc-limits --reset=session"   // never show the week countdown
-"command": "cc-limits --no-reset"        // just percentages, no countdowns
+"command": "cc-limits --size=full --reset=session"  // full, but no week countdown
+"command": "cc-limits --no-reset"                   // just percentages, no countdowns
 ```
 
 ### Flags
 
 | Flag | Description |
 | --- | --- |
+| `--size=full\|medium\|compact\|mini\|bare` | How much detail to show (default `medium`) |
 | `--segments=a,b,c` | Allowlist + order. Subset of `model,context,session,week` |
 | `--no-<segment>` | Hide one segment (e.g. `--no-context`). Repeatable |
 | `--reset=both\|session\|week\|none` | Cap which reset countdowns may show (default `both`) |
 | `--no-reset` | Shorthand for `--reset=none` |
-| `--no-adapt` | Don't shrink to terminal width; always print the full line |
-| `--width=N` | Assume `N` columns instead of auto-detecting the terminal width |
 | `--no-color` | Disable ANSI colors |
 | `--demo` | Print a sample line (no stdin needed) |
 | `-h`, `--help` | Show help |
@@ -172,10 +175,9 @@ Equivalent to the flags, handy if you don't want to edit the command string:
 
 | Env var | Default | Description |
 | --- | --- | --- |
+| `CC_LIMITS_SIZE` | `medium` | `full` / `medium` / `compact` / `mini` / `bare` |
 | `CC_LIMITS_SEGMENTS` | `model,context,session,week` | Segments + order |
 | `CC_LIMITS_RESET` | `both` | `both` / `session` / `week` / `none` |
-| `CC_LIMITS_ADAPT` | `1` | Set to `0` to disable adaptive width (=`--no-adapt`) |
-| `CC_LIMITS_WIDTH` | — | Force a column width instead of auto-detecting |
 | `CC_LIMITS_WARN` | `70` | % at/above which a limit turns yellow |
 | `CC_LIMITS_CRIT` | `90` | % at/above which a limit turns red |
 | `CC_LIMITS_SEP` | `" \| "` | Separator between segments |
@@ -183,7 +185,7 @@ Equivalent to the flags, handy if you don't want to edit the command string:
 
 ```bash
 cc-limits --demo
-cc-limits --segments=session,week --reset=session --demo
+cc-limits --size=compact --demo
 ```
 
 ## How it works

package/bin/cli.js

@@ -18,7 +18,6 @@
 const fs = require("fs");
 const path = require("path");
 const os = require("os");
-const tty = require("tty");
 
 const argv = process.argv.slice(2);
 
@@ -58,9 +57,19 @@ if (segSel != null && segSel !== "") {
   SEGMENTS = ALL_SEGMENTS.filter((s) => !argv.includes(`--no-${s}`));
 }
 
-// Which reset countdowns are *allowed*: both | session | week | none. This is
-// a cap — the adaptive width logic shows them only while they fit, dropping the
-// week countdown before the session one. Default both (full line when wide).
+// Size preset: how much detail to show. The user picks the one that fits their
+// terminal — predictable, no width guessing. Default "medium".
+const SIZES = ["full", "medium", "compact", "mini", "bare"];
+let SIZE = (
+  getFlagValue("--size") ||
+  process.env.CC_LIMITS_SIZE ||
+  "medium"
+).toLowerCase();
+if (!SIZES.includes(SIZE)) SIZE = "medium";
+
+// Which reset countdowns are *allowed*: both | session | week | none. This only
+// caps what a preset would show (it can hide a countdown, never add one).
+// Default both (no extra cap on top of the chosen preset).
 let RESET_MODE = (
   getFlagValue("--reset") ||
   process.env.CC_LIMITS_RESET ||
@@ -78,86 +87,6 @@ const NO_COLOR =
   argv.includes("--no-color") ||
   (process.env.NO_COLOR != null && process.env.NO_COLOR !== "");
 
-// Adaptive width: progressively shrink the line so it fits the terminal,
-// keeping the session/week percentages last to die. On by default; disable
-// with --no-adapt or CC_LIMITS_ADAPT=0 to always render the full line.
-const ADAPT =
-  !argv.includes("--no-adapt") &&
-  process.env.CC_LIMITS_ADAPT !== "0" &&
-  process.env.CC_LIMITS_ADAPT !== "false";
-
-// Detect the usable terminal width. The status-line JSON payload does NOT
-// carry the width, and Claude Code captures our stdout (so stdout.columns is
-// undefined), so we ask the controlling terminal directly via /dev/tty — that
-// reflects the real width and updates when the user resizes. Falls back
-// through stdout/COLUMNS to "unknown" (null => render full line).
-function termWidth() {
-  const override = getFlagValue("--width") || process.env.CC_LIMITS_WIDTH;
-  if (override != null && override !== "") {
-    const n = Number(override);
-    if (Number.isFinite(n) && n > 0) return n;
-    return null; // explicit but invalid width => skip adaptation, full line
-  }
-  if (process.stdout && process.stdout.columns) return process.stdout.columns;
-  let fd;
-  try {
-    fd = fs.openSync("/dev/tty", "r");
-    if (tty.isatty(fd)) {
-      // tty.ReadStream takes ownership of fd; destroy() closes it (async).
-      // Do NOT also closeSync it below, or we double-close / reuse the fd.
-      const s = new tty.ReadStream(fd);
-      const c = s.columns;
-      s.destroy();
-      fd = undefined;
-      if (c) return c;
-    }
-  } catch (_) {
-    /* no controlling terminal — fall through */
-  } finally {
-    if (fd !== undefined) {
-      try {
-        fs.closeSync(fd);
-      } catch (_) {
-        /* ignore */
-      }
-    }
-  }
-  const env = Number(process.env.COLUMNS);
-  if (Number.isFinite(env) && env > 0) return env;
-  return null;
-}
-
-// Terminal display width of one Unicode code point: emoji / CJK render as 2
-// columns, everything else as 1. A small wcwidth-lite so we measure the line
-// the way the terminal draws it (e.g. ⏳ is one code unit but two columns).
-function isWide(cp) {
-  return (
-    cp >= 0x1100 &&
-    (cp <= 0x115f || // Hangul Jamo
-      cp === 0x2329 ||
-      cp === 0x232a ||
-      cp === 0x231a ||
-      cp === 0x231b ||
-      (cp >= 0x23e9 && cp <= 0x23f3) || // ⏳ and clock/hourglass emoji
-      (cp >= 0x2600 && cp <= 0x27bf) || // misc symbols & dingbats
-      (cp >= 0x2e80 && cp <= 0xa4cf && cp !== 0x303f) || // CJK
-      (cp >= 0xac00 && cp <= 0xd7a3) || // Hangul syllables
-      (cp >= 0xf900 && cp <= 0xfaff) || // CJK compat
-      (cp >= 0xfe30 && cp <= 0xfe4f) ||
-      (cp >= 0xff00 && cp <= 0xff60) ||
-      (cp >= 0xffe0 && cp <= 0xffe6) ||
-      (cp >= 0x1f000 && cp <= 0x1faff)) // emoji planes (🤖 🧠 📅 …)
-  );
-}
-
-// Visible display width of a string, ignoring ANSI color escapes.
-function visibleLen(s) {
-  const plain = s.replace(/\x1b\[[0-9;]*m/g, "");
-  let w = 0;
-  for (const ch of plain) w += isWide(ch.codePointAt(0)) ? 2 : 1;
-  return w;
-}
-
 // ---------- colors ----------
 const C = {
   reset: "\x1b[0m",
@@ -216,13 +145,15 @@ function fmtClock(epochSec, withDate) {
 }
 
 // ---------- segment renderers ----------
-// Each renderer takes a `v` (variant) describing how compact to be:
-//   v.reset   2 = "· resets in Xd Yh (clock)", 1 = "· resets in Xd Yh", 0 = none
-//   v.short   true => short labels (Session→S, Week→W), trimmed model, no ctx %
+// A `v` (variant) describes how compact to be:
+//   v.model  "full" = name as-is | "trim" = drop "(…)" suffix | "off" = hide
+//   v.ctx    "pct"  = "🧠 172k (17%)" | "tokens" = "🧠 172k" | "off" = hide
+//   v.short  true => short limit labels (Session→S, Week→W)
+//   v.rs/v.rw  reset detail for session/week: 2 = "…Xd Yh (clock)", 1 = "…Xd Yh", 0 = none
 function renderModel(data, v) {
   let model = clean(data?.model?.display_name || "Claude");
   // Drop trailing parenthetical (e.g. "Opus 4.8 (1M context)" → "Opus 4.8").
-  if (v.short) model = model.replace(/\s*\([^)]*\)\s*$/, "").trim();
+  if (v.model === "trim") model = model.replace(/\s*\([^)]*\)\s*$/, "").trim();
   return paint("🤖 " + model, C.cyan);
 }
 function renderContext(data, v) {
@@ -231,10 +162,11 @@ function renderContext(data, v) {
     (Number(cw.total_input_tokens) || 0) +
     (Number(cw.total_output_tokens) || 0);
   let s = "🧠 " + humanTokens(tokens);
-  if (!v.short && cw.used_percentage != null) s += ` (${round(cw.used_percentage)}%)`;
+  if (v.ctx === "pct" && cw.used_percentage != null) {
+    s += ` (${round(cw.used_percentage)}%)`;
+  }
   return paint(s, C.gray);
 }
-// `reset`: 2 = "· resets in Xd Yh (clock)", 1 = "· resets in Xd Yh", 0 = none.
 function renderLimit(limit, { icon, label, shortLabel, withDate }, { short, reset }) {
   const lbl = short ? shortLabel : label;
   if (!limit || limit.used_percentage == null) {
@@ -249,23 +181,22 @@ function renderLimit(limit, { icon, label, shortLabel, withDate }, { short, rese
   return s;
 }
 
-// Build one full status line at a given compactness variant. The variant gives
-// independent reset levels for session (`rs`) and week (`rw`); each is also
-// capped by the user's --reset choice.
+// Build one status line at a given variant. Reset levels (rs/rw) are also
+// capped by the user's --reset choice (it can hide a countdown, never add one).
 function buildLine(data, v) {
   const rl = data?.rate_limits || {};
   const cap = (which, level) => (resetAllowed(which) ? level : 0);
   const out = [];
   for (const seg of SEGMENTS) {
     if (seg === "model") {
-      if (!v.dropModel) out.push(renderModel(data, v));
+      if (v.model !== "off") out.push(renderModel(data, v));
     } else if (seg === "context") {
-      if (!v.dropContext) out.push(renderContext(data, v));
+      if (v.ctx !== "off") out.push(renderContext(data, v));
     } else if (seg === "session") {
       out.push(
         renderLimit(
           rl.five_hour,
-          { icon: "⏳", label: "Session", shortLabel: "S", withDate: false },
+          { icon: "🕔", label: "Session", shortLabel: "S", withDate: false },
           { short: v.short, reset: cap("session", v.rs) }
         )
       );
@@ -282,32 +213,17 @@ function buildLine(data, v) {
   return out.join(SEP);
 }
 
-// Compactness variants, richest → poorest. We pick the richest one that fits
-// the terminal. The week countdown is dropped before the session one, and the
-// session/week percentages survive every tier.
-const VARIANTS = [
-  { rs: 2, rw: 2, short: false },                               // full: both resets + clock
-  { rs: 2, rw: 1, short: false },                               // week loses its clock
-  { rs: 2, rw: 0, short: false },                               // medium: session reset only
-  { rs: 1, rw: 0, short: false },                               // session reset, no clock
-  { rs: 0, rw: 0, short: false },                               // plain %, full labels
-  { rs: 0, rw: 0, short: true },                                // short labels, trim model/ctx
-  { rs: 0, rw: 0, short: true, dropContext: true },             // drop context
-  { rs: 0, rw: 0, short: true, dropContext: true, dropModel: true }, // limits only
-];
+// Size presets, richest → smallest. The user picks one with --size / CC_LIMITS_SIZE.
+const PRESETS = {
+  full:    { model: "full", ctx: "pct",    short: false, rs: 2, rw: 2 },
+  medium:  { model: "trim", ctx: "pct",    short: false, rs: 1, rw: 0 },
+  compact: { model: "trim", ctx: "pct",    short: false, rs: 0, rw: 0 },
+  mini:    { model: "trim", ctx: "tokens", short: true,  rs: 0, rw: 0 },
+  bare:    { model: "off",  ctx: "off",     short: true,  rs: 0, rw: 0 },
+};
 
 function render(data) {
-  const full = buildLine(data, VARIANTS[0]);
-  if (!ADAPT) return full;
-  const w = termWidth();
-  if (w == null) return full; // width unknown — never truncate ourselves
-  const usable = w - 1; // small safety margin for emoji width rounding
-  if (visibleLen(full) <= usable) return full;
-  for (let i = 1; i < VARIANTS.length; i++) {
-    const line = buildLine(data, VARIANTS[i]);
-    if (visibleLen(line) <= usable) return line;
-  }
-  return buildLine(data, VARIANTS[VARIANTS.length - 1]);
+  return buildLine(data, PRESETS[SIZE] || PRESETS.medium);
 }
 
 // ---------- demo payload ----------
@@ -341,37 +257,35 @@ if (argv.includes("--help") || argv.includes("-h")) {
       "real Pro/Max rate limits (5h session + 7d week) with reset countdowns.",
       "",
       "Setup (writes ~/.claude/settings.json for you):",
-      "  cc-limits --install                      configure the status line",
-      "  cc-limits --install --segments=session,week   ...with display options",
-      "  cc-limits --uninstall                    remove it again",
+      "  cc-limits --install                  configure the status line",
+      "  cc-limits --install --size=compact   ...at a chosen size",
+      "  cc-limits --uninstall                remove it again",
       "",
       "Or set it manually in ~/.claude/settings.json:",
       '  "statusLine": { "type": "command", "command": "cc-limits" }',
       "",
+      "Size (pick the one that fits your terminal — default medium):",
+      "  --size=full      🤖 Opus 4.8 (1M context) | 🧠 172k (17%) | 🕔 Session 14% · resets in 2h55m (04:00) | 📅 Week 12% · resets…",
+      "  --size=medium    🤖 Opus 4.8 | 🧠 172k (17%) | 🕔 Session 14% · resets in 2h55m | 📅 Week 12%",
+      "  --size=compact   🤖 Opus 4.8 | 🧠 172k (17%) | 🕔 Session 14% | 📅 Week 12%",
+      "  --size=mini      🤖 Opus 4.8 | 🧠 172k | 🕔 S 14% | 📅 W 12%",
+      "  --size=bare      🕔 S 14% | 📅 W 12%",
+      "",
       "Segments (default: all, in this order): model, context, session, week",
       "  --segments=session,week   Show only these, in this order",
       "  --no-context              Hide a single segment (repeatable)",
       "  --no-model --no-week      ...",
       "",
-      "Reset countdowns:",
+      "Reset countdowns (a preset's countdowns can be hidden, never added):",
       "  --reset=both|session|week|none   Which resets MAY show (default both)",
       "  --no-reset                       Same as --reset=none",
       "",
-      "Narrow terminals (on by default):",
-      "  The line auto-shrinks to fit the terminal width: it drops the week",
-      "  countdown first, then the session countdown, then shortens labels —",
-      "  always keeping the session/week %. Width is read from the terminal",
-      "  (via /dev/tty) and follows live resizes.",
-      "  --no-adapt        Always print the full line (let CC truncate it)",
-      "  --width=N         Assume N columns instead of auto-detecting",
-      "",
       "Other flags: --demo, --no-color, -h/--help",
       "",
       "Env vars:",
+      "  CC_LIMITS_SIZE=full|medium|compact|mini|bare",
       "  CC_LIMITS_SEGMENTS=model,context,session,week",
       "  CC_LIMITS_RESET=both|session|week|none",
-      "  CC_LIMITS_ADAPT=0    disable adaptive width (=--no-adapt)",
-      "  CC_LIMITS_WIDTH=N    force a column width",
       "  CC_LIMITS_WARN=70    yellow threshold (% of a limit)",
       "  CC_LIMITS_CRIT=90    red threshold",
       "  CC_LIMITS_SEP=' | '  segment separator",
@@ -435,7 +349,10 @@ function doUninstall() {
 }
 
 if (argv.includes("--install")) {
-  const passthrough = argv.filter((a) => a !== "--install" && a !== "--uninstall");
+  // Bake only persistent display flags into the command — never the one-shot
+  // ones (--install/--demo/--help) or the status line would break.
+  const TRANSIENT = new Set(["--install", "--uninstall", "--demo", "--help", "-h"]);
+  const passthrough = argv.filter((a) => !TRANSIENT.has(a));
   doInstall(passthrough);
   process.exit(0);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-limit-statusline",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Claude Code status line that shows your REAL Pro/Max subscription limits — 5-hour session and 7-day weekly usage with a live reset countdown. Uses the official rate_limits payload, not a local estimate.",
   "type": "commonjs",
   "bin": {