@cxmyu/ccglance 1.3.0 → 1.4.0

package/README.md

@@ -29,6 +29,17 @@ the Hour, Week, and account Limit usage windows.
 Older Claude Code versions keep working through optional fields and the legacy
 cache calculation.
 
+Updated for Claude Code 2.1.309: model window badges use the actual context
+capacity even without an `[1m]` suffix, thinking-only transcript entries stay
+in the thinking state, and gateway limits optionally include dollar amounts:
+
+```text
+🤖 Opus 5.5 1M | 🧠 high | 💭
+📊 Limit 🌔 63% $314.00/$500.00 monthly
+```
+
+The platform images above remain the Claude Code 2.1.258 emoji reference samples.
+
 **Docs:** [Overview](./docs/overview.md) · [Segments & icons](./docs/segments.md) · [Development](./docs/development.md)
 
 ## Terminal Font
@@ -103,15 +114,17 @@ Add a `statusLine` block to `~/.claude/settings.json`:
   "statusLine": {
     "type": "command",
     "command": "ccglance",
-    "padding": 0
+    "padding": 0,
+    "refreshInterval": 5
   }
 }
 ```
 
-On Claude Code >= 2.1.97, you can optionally add `"refreshInterval": 30`
-inside `statusLine` to keep elapsed time, quota resets, version hints, and other
-time-based fields moving while the main session is idle. Keep the base block
-above when compatibility with older Claude Code versions matters.
+`refreshInterval` is in seconds and requires Claude Code >= 2.1.97. This optional
+5-second refresh keeps transcript-derived status, elapsed time and countdowns
+moving while the main session is idle. Remove it for event-only refreshes or
+older Claude Code versions. It does not make API usage update before the next
+response, and submitting a prompt does not guarantee an immediate redraw.
 
 If you didn't install globally, point Node at the compiled file directly:
 
@@ -124,7 +137,8 @@ If you didn't install globally, point Node at the compiled file directly:
 }
 ```
 
-On Windows use a full path, e.g. `node D:\\path\\to\\ccglance\\dist\\cli.js`.
+On Windows use forward slashes and quote paths with spaces, e.g.
+`"command": "node \"D:/path with spaces/ccglance/dist/cli.js\""`.
 
 > **Cross-platform paths:** Claude Code v2.1.47+ expands a leading `~` in the
 > command on every platform, so `node ~/path/to/dist/cli.js` works too. Prefer
@@ -133,7 +147,7 @@ On Windows use a full path, e.g. `node D:\\path\\to\\ccglance\\dist\\cli.js`.
 > indent so the row starts at the left edge.
 
 > **Windows tip:** if status-line startup latency matters, point `command`
-> directly at the compiled file (`node D:\\absolute\\path\\to\\ccglance\\dist\\cli.js`)
+> directly at the compiled file (`node D:/absolute/path/to/ccglance/dist/cli.js`)
 > instead of the global `ccglance` command — it usually starts a bit faster.
 
 ## Contributing

package/README.zh-CN.md

@@ -27,6 +27,16 @@
 token 流量、缓存冷热状态，以及 Hour、Week 和账户 Limit 三类用量窗口。旧版 Claude Code 缺少这些可选字段时，
 仍会自动沿用原有缓存计算逻辑。
 
+本次按 Claude Code 2.1.309 更新：模型窗口标记优先读取实际容量，不再依赖 `[1m]` 后缀；
+纯 thinking 记录保持思考状态；企业网关 Limit 可选追加金额与周期：
+
+```text
+🤖 Opus 5.5 1M | 🧠 high | 💭
+📊 Limit 🌔 63% $314.00/$500.00 monthly
+```
+
+上方平台图片保留为 Claude Code 2.1.258 的 emoji 差异参考示例。
+
 **文档:** [概览](./docs/overview.zh-CN.md) · [字段与图标](./docs/segments.zh-CN.md) · [开发](./docs/development.zh-CN.md)
 
 ## 终端字体
@@ -95,14 +105,16 @@ node dist/cli.js preview
   "statusLine": {
     "type": "command",
     "command": "ccglance",
-    "padding": 0
+    "padding": 0,
+    "refreshInterval": 5
   }
 }
 ```
 
-Claude Code >= 2.1.97 可在 `statusLine` 内可选增加 `"refreshInterval": 30`，
-让会话时长、配额重置、版本提示等时间相关字段在主会话空闲时也能更新。
-若需兼容更旧的 Claude Code，保持上面的基础配置即可。
+`refreshInterval` 的单位为秒，要求 Claude Code >= 2.1.97。示例每 5 秒额外刷新一次，
+让 transcript 推断状态、会话时长和倒计时在主会话空闲时也能更新。删除该字段即可恢复
+仅按事件刷新，或兼容更旧的 Claude Code。它不会让 API 用量提前更新；发送用户消息也
+不保证立即触发重绘。
 
 若未全局安装,直接用 Node 指向编译后的文件:
 
@@ -115,7 +127,8 @@ Claude Code >= 2.1.97 可在 `statusLine` 内可选增加 `"refreshInterval": 30
 }
 ```
 
-Windows 用完整路径,例如 `node D:\\path\\to\\ccglance\\dist\\cli.js`。
+Windows 建议用正斜杠；路径含空格时加引号，例如
+`"command": "node \"D:/path with spaces/ccglance/dist/cli.js\""`。
 
 > **跨平台路径**:Claude Code v2.1.47+ 会在所有平台展开命令开头的 `~`,所以
 > `node ~/path/to/dist/cli.js` 也能用。优先用 `~` 而非 `%USERPROFILE%`(近版本不可靠);
@@ -123,7 +136,7 @@ Windows 用完整路径,例如 `node D:\\path\\to\\ccglance\\dist\\cli.js`。
 > 让状态栏从最左开始。
 
 > **Windows 提速小贴士**:若在意状态栏启动延时,可把 `command` 直接指向编译产物
-> `node D:\\绝对路径\\ccglance\\dist\\cli.js`,通常比走全局 `ccglance` 命令更快一些。
+> `node D:/absolute/path/to/ccglance/dist/cli.js`,通常比走全局 `ccglance` 命令更快一些。
 
 ## 贡献
 

package/dist/cli.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const readers_1 = require("./readers");
 // preview 子命令用的内置样例（覆盖默认状态栏会展示的常规字段）
 const PREVIEW_SAMPLE = {
-    model: { display_name: 'Opus 5', id: 'claude-opus-5[1m]' },
+    model: { display_name: 'Opus 5.5', id: 'claude-opus-5-5' },
     effort: { level: 'high' },
     thinking: { enabled: true },
     fast_mode: true,
@@ -24,13 +24,16 @@ const PREVIEW_SAMPLE = {
     rate_limits: {
         five_hour: { used_percentage: 23.5, resets_at: Math.floor(Date.now() / 1000) + 2 * 3600 },
         seven_day: { used_percentage: 41.2, resets_at: Math.floor(Date.now() / 1000) + 3 * 86400 },
-        spend_limit: { used_percentage: 62.8, resets_at: Math.floor(Date.now() / 1000) + 30 * 86400 },
+        spend_limit: {
+            used_percentage: 62.8, resets_at: Math.floor(Date.now() / 1000) + 30 * 86400,
+            used_usd: 314, limit_usd: 500, period: 'monthly',
+        },
     },
     workspace: { current_dir: process.cwd() },
     worktree: { name: 'main', branch: 'main' },
     session_name: 'ccglance',
     cost: { total_cost_usd: 0.1234, total_duration_ms: 192000, total_lines_added: 156, total_lines_removed: 23 },
-    version: '2.1.258',
+    version: '2.1.309',
 };
 const argv = process.argv.slice(2);
 // 用法 + 「安装后要做什么」指引。终端直接运行或 --help 时打印；此路径绝不读 stdin。
@@ -45,17 +48,21 @@ function printHelp() {
   ccglance --help, -h     显示本帮助 (show this help)
   ccglance --version, -v  显示版本号 (print version)
 
-安装后配置 Setup — 装完必须做这一步 (required after \`npm install -g ccglance\`):
+安装后配置 Setup — 装完必须做这一步 (required after \`npm install -g @cxmyu/ccglance\`):
   把下面这段加进 ~/.claude/settings.json，然后重启 Claude Code。
   Add this to ~/.claude/settings.json, then restart Claude Code:
 
     {
       "statusLine": {
         "type": "command",
-        "command": "ccglance"
+        "command": "ccglance",
+        "refreshInterval": 5
       }
     }
 
+  Claude Code >= 2.1.97: refreshInterval 的单位为秒；删除此字段则仅按事件刷新。
+  Refresh runs locally; API usage still updates only when Claude Code receives it.
+
   未全局安装？让 Node 直接指向编译产物 (not installed globally? point Node at the built file):
     "command": "node /absolute/path/to/dist/cli.js"
 

package/dist/readers/transcript.js

@@ -13,6 +13,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const paths_1 = require("../utils/paths");
 const TAIL_BYTES = 64 * 1024; // 尾部读取上限：足够覆盖最近若干条消息
+const STATUS_CACHE_VERSION = 2;
 function cacheFileFor(p) {
     const h = hashString(path_1.default.resolve(p));
     return path_1.default.join((0, paths_1.cacheDir)('transcript'), `${h}.usage.json`);
@@ -154,15 +155,20 @@ function extractRecentStatus(lines) {
         const msg = e.message;
         if (isInterruptedEntry(e))
             return { state: 'paused' };
+        if (e.isMeta || !msg)
+            continue;
         if (e.type === 'assistant') {
+            if (msg.stop_reason === 'end_turn' || msg.stop_reason === 'stop_sequence')
+                return { state: 'idle' };
             const content = blocks(msg && msg.content);
             const toolUse = content.find((b) => b && b.type === 'tool_use');
             if (toolUse)
                 return { state: 'tool', tool: toolUse.name };
-            // 已产出文本/思考内容 = 回合结束 → idle。
+            // 旧版完整文本回复可能没有 stop_reason；保留文本 → idle 的近似回退。
             // 注意：Claude Code transcript 常把完成的文本回复记为 stop_reason:null（而非 end_turn），
             // 所以判 idle 看「有内容」而非 stop_reason，否则正常回复会被误判成 thinking。
-            const hasText = content.some((b) => b && (b.type === 'text' || b.type === 'thinking'))
+            // 只有 thinking / redacted_thinking 时仍是思考中，不能据此判定完成。
+            const hasText = content.some((b) => b && b.type === 'text' && Boolean(b.text))
                 || (typeof (msg && msg.content) === 'string' && String(msg && msg.content).length > 0);
             return { state: hasText ? 'idle' : 'thinking' };
         }
@@ -187,7 +193,7 @@ function getRecentStatus(transcriptPath) {
     const cf = statusCacheFileFor(transcriptPath);
     try {
         const c = JSON.parse(fs_1.default.readFileSync(cf, 'utf8'));
-        if (c.mtimeMs === st.mtimeMs && c.size === st.size)
+        if (c.version === STATUS_CACHE_VERSION && c.mtimeMs === st.mtimeMs && c.size === st.size)
             return c.status;
     }
     catch {
@@ -196,7 +202,7 @@ function getRecentStatus(transcriptPath) {
     const status = extractRecentStatus(readTailLines(transcriptPath));
     try {
         fs_1.default.mkdirSync(path_1.default.dirname(cf), { recursive: true });
-        const payload = { mtimeMs: st.mtimeMs, size: st.size, status };
+        const payload = { version: STATUS_CACHE_VERSION, mtimeMs: st.mtimeMs, size: st.size, status };
         fs_1.default.writeFileSync(cf, JSON.stringify(payload));
     }
     catch {

package/dist/segments/index.js

@@ -65,7 +65,7 @@ const status = (ctx) => {
     return null;
 };
 const model = (ctx) => ctx.data.model && (ctx.data.model.display_name || ctx.data.model.id)
-    ? iconSeg(ctx, 'model', colors_1.C.model, 'model', (0, format_1.modelName)(ctx.data.model)) : null;
+    ? iconSeg(ctx, 'model', colors_1.C.model, 'model', (0, format_1.modelName)(ctx.data.model, ctx.data.context_window?.context_window_size)) : null;
 const agent = (ctx) => ctx.data.agent?.name ? iconSeg(ctx, 'agent', colors_1.C.agent, 'agent', ctx.data.agent.name) : null;
 // 旧版只有 effort.level；新版额外提供 thinking.enabled。字段缺失时保持旧输出。
 const effort = ({ data }) => {
@@ -160,7 +160,7 @@ const rateLimits = (ctx) => {
                     : pct >= 10 ? '🌒' : '🌑';
         return (0, colors_1.paint)(color, glyph, bold);
     };
-    const pushWindow = (label, win, allowOver100 = false) => {
+    const pushWindow = (label, win, allowOver100 = false, amounts) => {
         const pct = nonNegative(win?.used_percentage);
         if (pct == null)
             return;
@@ -173,6 +173,8 @@ const rateLimits = (ctx) => {
             meter(pct, winColor),
             (0, colors_1.paint)(winColor, fmtRatePct(pct, allowOver100), bold),
         ];
+        if (amounts)
+            detail.push((0, colors_1.paint)(normal, amounts, bold));
         if (reset)
             detail.push((0, colors_1.paint)(colors_1.C.rateReset, '⏳', bold), (0, colors_1.paint)(colors_1.C.rateReset, reset, bold));
         parts.push(detail.join(' '));
@@ -185,7 +187,16 @@ const rateLimits = (ctx) => {
         pushWindow(labels.seven_day, rl.seven_day);
     }
     if (wants(['all', 'spend_limit'])) {
-        pushWindow(labels.spend_limit, rl.spend_limit, true);
+        const spend = rl.spend_limit;
+        const usedUsd = nonNegative(spend?.used_usd);
+        const limitUsd = positive(spend?.limit_usd);
+        const period = typeof spend?.period === 'string' ? spend.period.trim() : '';
+        // Dollar amounts are fetched separately and may lag the percentage. Never
+        // derive a replacement percentage from them or fabricate a missing amount.
+        const amounts = usedUsd != null && limitUsd != null
+            ? `${(0, format_1.fmtCost)(usedUsd)}/${(0, format_1.fmtCost)(limitUsd)}${period ? ` ${period}` : ''}`
+            : undefined;
+        pushWindow(labels.spend_limit, spend, true, amounts);
     }
     if (!parts.length)
         return null;

package/dist/utils/format.js

@@ -21,12 +21,20 @@ const TOKEN_CASE = {
     llm: 'LLM',
     vl: 'VL',
 };
-function contextSuffix(id) {
+function contextSuffix(id, size) {
+    // New default-1M models may no longer carry [1m]. A valid live size also
+    // overrides a stale display-name/id hint when the session uses a smaller window.
+    if (typeof size === 'number' && Number.isFinite(size) && size > 0) {
+        return size >= 1000000 ? `${Number((size / 1000000).toFixed(2))}M` : '';
+    }
     return /\[1m\]/i.test(id) ? '1M' : '';
 }
-function appendContextSuffix(name, id) {
-    const suffix = contextSuffix(id);
-    return suffix && !new RegExp(`\\b${suffix}\\b`, 'i').test(name) ? `${name} ${suffix}` : name;
+function appendContextSuffix(name, id, size) {
+    if (typeof size === 'number' && Number.isFinite(size) && size > 0) {
+        name = name.replace(/\s+\d+(?:\.\d+)?\s*[km]$/i, '').trim();
+    }
+    const suffix = contextSuffix(id, size);
+    return suffix && !new RegExp(`\\b${suffix.replace(/\./g, '\\.')}\\b`, 'i').test(name) ? `${name} ${suffix}` : name;
 }
 function matchClaudeFamily(raw) {
     const source = raw.toLowerCase();
@@ -45,7 +53,7 @@ function matchClaudeFamily(raw) {
 function normalizeDisplayName(displayName) {
     return displayName
         .replace(/^Claude\s+/i, '')
-        .replace(/\s*\((\d+)\s*([km])(?:\s+context)?\)/i, ' $1$2')
+        .replace(/\s*\((\d+(?:\.\d+)?)\s*([km])(?:\s+context)?\)/i, ' $1$2')
         .replace(/\s+/g, ' ')
         .trim();
 }
@@ -85,12 +93,12 @@ function readableModelId(id) {
     return tokens.map(titleToken).join(' ').trim();
 }
 // 模型名以 Claude Code stdin 的 display_name 为准；id 只在 display_name 缺失时兜底。
-function modelName(model) {
+function modelName(model, contextWindowSize) {
     const id = (model.id || '').trim();
     const displayName = (model.display_name || '').trim();
     const normalizedDisplay = normalizeDisplayName(displayName);
     const baseName = normalizedDisplay || matchClaudeFamily(id) || readableModelId(id);
-    return appendContextSuffix(baseName, id);
+    return appendContextSuffix(baseName, id, contextWindowSize);
 }
 // 12345 → 12.3k
 const fmtTokens = (n) => n == null ? '0' : n < 1000 ? String(n)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cxmyu/ccglance",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "A fast, zero-dependency Claude Code status line for model, effort, context, prompt cache, usage limits, git and session.",
   "bin": {
     "ccglance": "dist/cli.js"