nomnomtokens 0.5.0 → 0.6.0

package/README.md

@@ -61,15 +61,18 @@ live updates.
 The hook doubles as a real status line:
 
 ```
-(＾ｕ＾)  $4.20  ctx 37%  7d 81% ·4d3h  5h 73% ·1h47m  138 lines
+Limits: 7d  81%  4d3h  |  5h  73%  1h47m  |  ctx. 37%  |  Opus 4.6
 ```
 
-The countdown after each window is the time left until it resets: the
-percentage tells you whether to slow down, the countdown tells you what slowing
-down would cost. It is omitted when Claude Code sends no `resets_at`. The
-weekly window is shown first when it is the tighter of the two. If Claude's
-week is nearly full and a recent Codex snapshot in the store still has
-headroom, a `codex 7d N%` suffix is appended.
+The labels `7d`, `5h`, and `ctx`, and the session model name, are cyan; the
+figures stay the default colour. The model is Claude's `display_name` for
+whatever is selected in this session. The countdown after each percentage is
+the time left until that
+window resets. It is omitted when there is no `resets_at`. If this render's
+payload has no `rate_limits` yet — typical before the first request of a
+session — the last stored snapshot is shown instead, as long as that window
+has not reset. If Claude's week is nearly full and a recent Codex snapshot
+in the store still has headroom, a `codex: N%` segment is appended.
 
 ## Commands
 

package/dist/index.js

@@ -5303,13 +5303,6 @@ function forecastLimit(snapshots, now = Date.now()) {
     samples: current.length
   };
 }
-function moodFor(usedPct) {
-  if (usedPct < 5) return "hungry";
-  if (usedPct < 50) return "content";
-  if (usedPct < 80) return "full";
-  if (usedPct < 100) return "stuffed";
-  return "overstuffed";
-}
 
 // packages/core/src/export-format.ts
 var CSV_HEADERS = [
@@ -8443,45 +8436,43 @@ async function serve(opts = {}) {
 }
 
 // packages/cli/src/statusline-render.ts
-var MOOD_FACE = {
-  hungry: "(\u30FB_\u30FB)",
-  content: "(^_^)",
-  full: "(\uFF3E\uFF55\uFF3E)",
-  stuffed: "(>_<)",
-  overstuffed: "(x_x)"
-};
 var CLAUDE_WEEKLY_HINT = 80;
 var CODEX_HEADROOM = 50;
+var ESC2 = "\x1B";
+function paintLabel(label) {
+  if (process.env.NO_COLOR !== void 0) return label;
+  return `${ESC2}[36m${label}${ESC2}[0m`;
+}
 function limitSegment(label, usedPct, resetsAtSeconds, now) {
   const resetsAt = typeof resetsAtSeconds === "number" && Number.isFinite(resetsAtSeconds) ? resetsAtSeconds * 1e3 : null;
   const left = untilReset(resetsAt, now);
-  return `${label} ${Math.round(usedPct)}%${left ? ` \xB7${left}` : ""}`;
+  const head = `${paintLabel(label)}  ${Math.round(usedPct)}%`;
+  return left ? `${head}  ${left}` : head;
+}
+function resolveWindow(livePct, liveResetsAtSeconds, cached, now) {
+  if (livePct !== null) {
+    return { pct: livePct, resetsAtSeconds: liveResetsAtSeconds };
+  }
+  if (cached && cached.resetsAt !== null && cached.resetsAt > now) {
+    return { pct: cached.usedPct, resetsAtSeconds: cached.resetsAt / 1e3 };
+  }
+  return { pct: null };
 }
 function buildStatuslineParts(view) {
   const now = view.now;
   const five = view.fiveHour;
   const seven = view.sevenDay;
-  const moodPct = Math.max(five ?? 0, seven ?? 0);
-  const parts = [];
-  parts.push(MOOD_FACE[moodFor(moodPct)] ?? "(^_^)");
-  if (view.cost !== null) parts.push(usd(view.cost));
-  if (view.ctx !== null) parts.push(`ctx ${Math.round(view.ctx)}%`);
-  const fiveSeg = five !== null ? limitSegment("5h", five, view.fiveHourResetsAt, now) : null;
-  const sevenSeg = seven !== null ? limitSegment("7d", seven, view.sevenDayResetsAt, now) : null;
-  const weeklyFirst = seven !== null && (five === null || seven >= five);
-  if (weeklyFirst) {
-    if (sevenSeg) parts.push(sevenSeg);
-    if (fiveSeg) parts.push(fiveSeg);
-  } else {
-    if (fiveSeg) parts.push(fiveSeg);
-    if (sevenSeg) parts.push(sevenSeg);
-  }
-  if (view.lines > 0) parts.push(`${compactNumber(view.lines)} lines`);
+  const segments = [];
+  if (seven !== null) segments.push(limitSegment("7d", seven, view.sevenDayResetsAt, now));
+  if (five !== null) segments.push(limitSegment("5h", five, view.fiveHourResetsAt, now));
+  if (view.ctx !== null) segments.push(`${paintLabel("ctx")}. ${Math.round(view.ctx)}%`);
+  const model = view.model?.trim();
+  if (model) segments.push(paintLabel(model));
   const codex = view.codexSevenDay;
   if (seven !== null && seven >= CLAUDE_WEEKLY_HINT && typeof codex === "number" && Number.isFinite(codex) && codex <= CODEX_HEADROOM) {
-    parts.push(`codex 7d ${Math.round(codex)}%`);
+    segments.push(`${paintLabel("codex")}: ${Math.round(codex)}%`);
   }
-  return parts;
+  return segments.length === 0 ? "Limits:" : `Limits: ${segments.join("  |  ")}`;
 }
 
 // packages/cli/src/commands/statusline.ts
@@ -8491,18 +8482,24 @@ async function readStdin() {
   for await (const chunk of process.stdin) chunks.push(chunk);
   return Buffer.concat(chunks).toString("utf8");
 }
-function readCodexWeekly(db) {
+function readStoredLimits(db, now = Date.now()) {
+  const empty = { codexSevenDay: null, claudeFive: null, claudeSeven: null };
   try {
     const { sqlite } = openDb(db);
-    const q = new Queries(sqlite);
-    const latest = q.latestLimits();
+    const latest = new Queries(sqlite).latestLimits();
     sqlite.close();
-    const row = latest.find((l) => l.provider === "codex" && l.window === "7d");
-    if (!row) return null;
-    if (Date.now() - row.ts > CODEX_FRESH_MS) return null;
-    return row.usedPct;
+    const claude = (window) => {
+      const row = latest.find((l) => l.provider === "claude-code" && l.window === window);
+      return row ? { usedPct: row.usedPct, resetsAt: row.resetsAt } : null;
+    };
+    const codex = latest.find((l) => l.provider === "codex" && l.window === "7d");
+    return {
+      codexSevenDay: codex && now - codex.ts <= CODEX_FRESH_MS ? codex.usedPct : null,
+      claudeFive: claude("5h"),
+      claudeSeven: claude("7d")
+    };
   } catch {
-    return null;
+    return empty;
   }
 }
 async function statusline(opts = {}) {
@@ -8514,23 +8511,33 @@ async function statusline(opts = {}) {
     return;
   }
   const limits2 = payload.rate_limits;
-  const fiveHour = limits2?.five_hour?.used_percentage ?? null;
-  const sevenDay = limits2?.seven_day?.used_percentage ?? null;
-  const cost = payload.cost?.total_cost_usd ?? null;
+  const now = Date.now();
+  const stored = readStoredLimits(opts.db, now);
+  const five = resolveWindow(
+    limits2?.five_hour?.used_percentage ?? null,
+    limits2?.five_hour?.resets_at,
+    stored.claudeFive,
+    now
+  );
+  const seven = resolveWindow(
+    limits2?.seven_day?.used_percentage ?? null,
+    limits2?.seven_day?.resets_at,
+    stored.claudeSeven,
+    now
+  );
   const ctx = payload.context_window?.used_percentage ?? null;
-  const lines = (payload.cost?.total_lines_added ?? 0) + (payload.cost?.total_lines_removed ?? 0);
-  const codexSevenDay = readCodexWeekly(opts.db);
-  const parts = buildStatuslineParts({
-    fiveHour,
-    sevenDay,
-    fiveHourResetsAt: limits2?.five_hour?.resets_at,
-    sevenDayResetsAt: limits2?.seven_day?.resets_at,
-    cost,
+  const model = payload.model?.display_name?.trim() || payload.model?.id?.trim() || null;
+  const line = buildStatuslineParts({
+    fiveHour: five.pct,
+    sevenDay: seven.pct,
+    fiveHourResetsAt: five.resetsAtSeconds,
+    sevenDayResetsAt: seven.resetsAtSeconds,
     ctx,
-    lines,
-    codexSevenDay
+    model,
+    codexSevenDay: stored.codexSevenDay,
+    now
   });
-  process.stdout.write(`${parts.join("  ")}
+  process.stdout.write(`${line}
 `);
   if (opts.dryRun) return;
   try {