claude-token-saver 2.7.3 → 2.8.1

package/README.en.md

@@ -53,12 +53,12 @@ Risk chips lead when something's wrong: `🚨 5H 94%`, `⚠ 1M ON`, `⚠ Cache m
   "statusLine": {
     "type": "command",
     "command": "claude-token-saver --statusline --icon",
-    "refreshInterval": 1
+    "refreshInterval": 5
   }
 }
 ```
 
-`refreshInterval: 1` keeps the TTL countdown ticking while idle (Claude Code's statusline is otherwise event-driven). For Windows PowerShell, see `examples/statusline-command.ps1`.
+`refreshInterval: 5` keeps the TTL countdown ticking while idle (Claude Code's statusline is otherwise event-driven). 1s also works, but 5s is the recommended default to avoid constant I/O. For Windows PowerShell, see `examples/statusline-command.ps1`.
 
 ## Commands
 

package/README.md

@@ -53,12 +53,12 @@ TTL Breakdown / Cost Impact / Daily Trend ...
   "statusLine": {
     "type": "command",
     "command": "claude-token-saver --statusline --icon",
-    "refreshInterval": 1
+    "refreshInterval": 5
   }
 }
 ```
 
-`refreshInterval: 1`은 TTL 카운트다운이 idle 상태에서도 1초마다 갱신되게 합니다. Windows(PowerShell)는 `examples/statusline-command.ps1` 참고.
+`refreshInterval: 5`는 TTL 카운트다운이 idle 상태에서도 5초마다 갱신되게 합니다 (1초도 가능하지만 상시 I/O 부담을 피하려고 5초를 기본값으로 권장). Windows(PowerShell)는 `examples/statusline-command.ps1` 참고.
 
 ## 주요 명령
 

package/bin/cli.js

@@ -77,10 +77,31 @@ function extractCaps(stdinJson) {
  * `model.display_name` is the contract; fall back to `model.id` when it's
  * absent. Returns null when nothing usable is in the JSON.
  */
+// Bedrock/litellm proxies pass model IDs like
+//   global.anthropic.claude-opus-4-7-20251001-v1:0
+//   anthropic.claude-sonnet-4-6-20250930-v1:0
+//   bedrock/anthropic.claude-haiku-4-5
+// while Claude Code's `display_name` collapses these to a generic family
+// label ("Opus 4", "Sonnet 4") that hides the actual minor version. Pull the
+// version out of the id when we can spot it so the statusline shows the real
+// model in use (Opus 4.7 vs 4.6 matters a lot for token budgeting).
+function bedrockDisplayFromId(id) {
+  if (typeof id !== 'string') return null;
+  const m = id.match(/claude[-_](opus|sonnet|haiku)[-_](\d+)[-_](\d+)/i);
+  if (!m) return null;
+  const family = m[1].charAt(0).toUpperCase() + m[1].slice(1).toLowerCase();
+  return `${family} ${m[2]}.${m[3]}`;
+}
+
 function extractModel(stdinJson) {
   if (!stdinJson || !stdinJson.model) return null;
   const m = stdinJson.model;
-  if (typeof m === 'string') return m;
+  if (typeof m === 'string') return bedrockDisplayFromId(m) || m;
+  // Prefer the id when it carries a precise version (e.g. Bedrock IDs); fall
+  // back to display_name for the standard Claude Code path where display_name
+  // already says "Claude Opus 4.7".
+  const idDerived = bedrockDisplayFromId(m.id);
+  if (idDerived) return idDerived;
   if (typeof m.display_name === 'string' && m.display_name) return m.display_name;
   if (typeof m.id === 'string' && m.id) return m.id;
   return null;
@@ -344,6 +365,14 @@ async function main() {
     };
     const r = installAll({ force });
     print('skill', r.skill);
+    {
+      const s = r.statusline;
+      const verb = s.action === 'exists' ? 'already configured (refreshInterval=5)'
+        : s.action === 'skipped' ? `skipped — ${s.reason}`
+        : s.reason ? `${s.action} — ${s.reason}`
+        : s.action;
+      console.log(`  statusline: ${s.path} (${verb})`);
+    }
     if (r.legacy.action === 'removed') {
       print('legacy /token-monitor', r.legacy);
       console.log('  (consolidated into the skill — same workflow, triggered by intent)');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-token-saver",
-  "version": "2.7.3",
+  "version": "2.8.1",
   "description": "Save tokens on Claude Code — spike diagnosis, 1M-context detection, TTL countdown, statusline. (formerly claude-cache-monitor)",
   "type": "module",
   "bin": {

package/src/formatters/statusline.js

@@ -100,11 +100,18 @@ function gaugeBar(pct) {
  * Format a remaining-seconds countdown as MM:SS (or H:MM when ≥ 1h).
  */
 function formatTimer(remainingSec) {
-  if (remainingSec <= 0) return 'EXPIRED';
-  const totalSec = Math.floor(remainingSec);
+  // Defensive: non-finite/NaN inputs (e.g. clock skew, stringified Date) used
+  // to slip through and render as "NaN:NaN" or stretched seconds. Treat any
+  // weird input as expired rather than rendering garbage in the statusline.
+  if (!Number.isFinite(remainingSec) || remainingSec <= 0) return 'EXPIRED';
+  const totalSec = Math.max(0, Math.floor(remainingSec));
   const h = Math.floor(totalSec / 3600);
-  const m = Math.floor((totalSec % 3600) / 60);
-  const s = totalSec % 60;
+  const mRaw = Math.floor((totalSec % 3600) / 60);
+  const sRaw = totalSec % 60;
+  // Clamp explicitly so a future regression in the math (or padStart no-op
+  // truncation) can never produce m:sss like "4:547".
+  const m = Math.min(59, Math.max(0, mRaw));
+  const s = Math.min(59, Math.max(0, sRaw));
   if (h > 0) return `${h}:${String(m).padStart(2, '0')}`;
   return `${m}:${String(s).padStart(2, '0')}`;
 }
@@ -195,8 +202,18 @@ export function formatReport(data, { color = true, verbose = false, timer = true
   //   icon verbose:   "⏳ Expires 1h 59:58"
   let ttlSeg;
   if (timer && lastActivity) {
-    const elapsed = (Date.now() - lastActivity) / 1000;
-    const remaining = ttlSeconds - elapsed;
+    // Coerce to a numeric ms timestamp. Some upstream paths handed in a Date,
+    // a stringified ISO timestamp, or epoch-seconds — any of which silently
+    // produces NaN/huge values when subtracted from Date.now(), which then
+    // bypasses formatTimer's normal MM:SS shape.
+    const laMs =
+      typeof lastActivity === 'number'
+        ? (lastActivity < 1e12 ? lastActivity * 1000 : lastActivity) // seconds → ms
+        : (lastActivity instanceof Date ? lastActivity.getTime() : Date.parse(lastActivity));
+    const elapsed = Number.isFinite(laMs) ? (Date.now() - laMs) / 1000 : Infinity;
+    // Clamp remaining into the bucket so a clock-skew or stale-state edge case
+    // can't display a value larger than the bucket itself.
+    const remaining = Math.min(ttlSeconds, ttlSeconds - elapsed);
     const text = formatTimer(remaining);
     const pct = remaining / ttlSeconds;
     const timerColor =

package/src/installer.js

@@ -13,10 +13,13 @@
  * exist on every platform.
  */
 
-import { writeFileSync, mkdirSync, existsSync, unlinkSync } from 'node:fs';
+import { writeFileSync, mkdirSync, existsSync, unlinkSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { claudeUserDir } from './paths.js';
 
+const STATUSLINE_COMMAND = 'claude-token-saver --statusline --icon';
+const STATUSLINE_REFRESH_INTERVAL = 5;
+
 const SKILL_BODY = `---
 name: claude-token-saver
 description: Use when the user mentions Claude Code token usage, prompt cache hit rate, TTL/expiry, the 1M context window, cache misses, output spikes, rate-limit caps (5h/7d), or anything in the statusline produced by claude-token-saver (chips like "🚨 5H 94%", "🚨 7D 92%", "⚠ 1M ON", "⚠ Input spike", "⚠ Cache miss", "⚠ 5m TTL", "⚠ Rebuild churn", "⚠ Output heavy", "⚠ Call surge", "⏳ Cache expires", "💰 Cache saved", "🧠 Cache hit"). Also use when they ask to view token-usage history, want to understand a warning they just saw, or want to back up work before a session cap with \`claude-token-saver handoff\`.
@@ -127,9 +130,63 @@ export function removeLegacyCommand() {
   return { path: file, action: 'removed' };
 }
 
+// Registers/repairs the Claude Code statusLine entry in ~/.claude/settings.json.
+// - No statusLine yet: insert ours with refreshInterval:1.
+// - statusLine already points at claude-token-saver: ensure refreshInterval:1
+//   (this is the bit that makes the TTL countdown tick every second while idle).
+// - statusLine points at a different command: leave it alone unless --force.
+export function installStatusline({ force = false } = {}) {
+  const dir = claudeUserDir();
+  const file = join(dir, 'settings.json');
+  mkdirSync(dir, { recursive: true });
+
+  let settings = {};
+  if (existsSync(file)) {
+    try {
+      settings = JSON.parse(readFileSync(file, 'utf8'));
+    } catch (e) {
+      return { path: file, action: 'skipped', reason: `unreadable JSON (${e.message})` };
+    }
+  }
+
+  const cur = settings.statusLine;
+  const targetsUs = cur && typeof cur.command === 'string' && cur.command.includes('claude-token-saver');
+
+  if (!cur) {
+    settings.statusLine = {
+      type: 'command',
+      command: STATUSLINE_COMMAND,
+      refreshInterval: STATUSLINE_REFRESH_INTERVAL,
+    };
+    writeFileSync(file, JSON.stringify(settings, null, 2) + '\n');
+    return { path: file, action: 'created' };
+  }
+
+  if (targetsUs) {
+    if (cur.refreshInterval === STATUSLINE_REFRESH_INTERVAL) {
+      return { path: file, action: 'exists' };
+    }
+    cur.refreshInterval = STATUSLINE_REFRESH_INTERVAL;
+    writeFileSync(file, JSON.stringify(settings, null, 2) + '\n');
+    return { path: file, action: 'updated', reason: 'set refreshInterval=1' };
+  }
+
+  if (!force) {
+    return { path: file, action: 'skipped', reason: `existing statusLine command (${cur.command}) — re-run with --force to overwrite` };
+  }
+  settings.statusLine = {
+    type: 'command',
+    command: STATUSLINE_COMMAND,
+    refreshInterval: STATUSLINE_REFRESH_INTERVAL,
+  };
+  writeFileSync(file, JSON.stringify(settings, null, 2) + '\n');
+  return { path: file, action: 'updated', reason: 'replaced previous statusLine' };
+}
+
 export function installAll({ force = false } = {}) {
   return {
     skill: installSkill({ force }),
+    statusline: installStatusline({ force }),
     legacy: removeLegacyCommand(),
   };
 }