@cxmyu/ccglance 1.1.1 → 1.2.0

package/README.md

@@ -19,6 +19,18 @@ model · effort · context · cache · git · session — all at a glance
 
 **Docs:** [Overview](./docs/overview.md) · [Segments & icons](./docs/segments.md) · [Development](./docs/development.md)
 
+## Terminal Font
+
+Use a Nerd Font in your terminal so emoji, Nerd Font icons, arrows, and box-like
+symbols keep consistent width. [Maple Mono NF](https://github.com/subframe7536/maple-font)
+is a good default; use `Maple Mono NF CN` if you want better CJK coverage.
+
+ccglance intentionally outputs standard Unicode emoji. A Nerd Font improves text
+metrics and symbol coverage, but color emoji are still rendered by the operating
+system's emoji font (for example Segoe UI Emoji on Windows, Apple Color Emoji on
+macOS, and Noto Color Emoji on many Linux desktops), so their artwork can differ
+across platforms.
+
 ## Install
 
 ### Option A — npm (global, recommended)
@@ -83,6 +95,11 @@ Add a `statusLine` block to `~/.claude/settings.json`:
 }
 ```
 
+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.
+
 If you didn't install globally, point Node at the compiled file directly:
 
 ```json

package/README.zh-CN.md

@@ -19,6 +19,16 @@
 
 **文档:** [概览](./docs/overview.zh-CN.md) · [字段与图标](./docs/segments.zh-CN.md) · [开发](./docs/development.zh-CN.md)
 
+## 终端字体
+
+终端建议使用 Nerd Font,避免 emoji、Nerd Font 图标、箭头和类进度符号宽度不一致。
+首选可以用 [Maple Mono NF](https://github.com/subframe7536/maple-font);
+需要更好的中文显示时用 `Maple Mono NF CN`。
+
+ccglance 会固定输出标准 Unicode emoji。Nerd Font 可以改善文本宽度和符号覆盖,
+但彩色 emoji 仍由系统 emoji 字体渲染(例如 Windows 的 Segoe UI Emoji、
+macOS 的 Apple Color Emoji、很多 Linux 桌面的 Noto Color Emoji),所以不同平台的图案可能不同。
+
 ## 安装
 
 ### 方式 A —— npm 全局安装(推荐)
@@ -79,6 +89,10 @@ node dist/cli.js preview
 }
 ```
 
+Claude Code >= 2.1.97 可在 `statusLine` 内可选增加 `"refreshInterval": 30`，
+让会话时长、配额重置、版本提示等时间相关字段在主会话空闲时也能更新。
+若需兼容更旧的 Claude Code，保持上面的基础配置即可。
+
 若未全局安装,直接用 Node 指向编译后的文件:
 
 ```json

package/dist/cli.js

@@ -4,8 +4,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const readers_1 = require("./readers");
 // preview 子命令用的内置样例（覆盖默认状态栏会展示的常规字段）
 const PREVIEW_SAMPLE = {
-    model: { display_name: 'Opus 4.8', id: 'claude-opus-4-8[1m]' },
+    model: { display_name: 'Opus 5', id: 'claude-opus-5[1m]' },
     effort: { level: 'high' },
+    thinking: { enabled: true },
     fast_mode: true,
     context_window: {
         context_window_size: 1000000, total_input_tokens: 235000, total_output_tokens: 1200,
@@ -21,7 +22,7 @@ const PREVIEW_SAMPLE = {
     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.0.1',
+    version: '2.1.221',
 };
 const argv = process.argv.slice(2);
 // 用法 + 「安装后要做什么」指引。终端直接运行或 --help 时打印；此路径绝不读 stdin。

package/dist/defaults/index.js

@@ -6,9 +6,9 @@ exports.DEFAULT_SPEC = {
         mode: 'responsive',
         separator: ' | ',
         rows: [
-            ['model', 'effort', 'status', 'fast', 'context', 'cache', 'style'], // 运行时
+            ['model', 'agent', 'effort', 'status', 'fast', 'context', 'cache', 'style'], // 运行时
             ['rate_limits'], // 订阅(无订阅→整行消失)
-            ['dir', 'git', 'session_name', 'session', 'cost', 'version'], // 项目/会话
+            ['dir', 'git', 'pr', 'session_name', 'session', 'cost', 'version'], // 项目/会话
         ],
         minWidth: 80,
     },
@@ -19,6 +19,7 @@ exports.DEFAULT_SPEC = {
             statusIcons: { idle: '✅', paused: '⏸️', thinking: '💭', working: '⚙️', tool: '🔧' },
         },
         model: { enabled: true },
+        agent: { enabled: true },
         effort: { enabled: true },
         fast: { enabled: true },
         context: { enabled: true, percentOnly: false, warnPct: 75, dangerPct: 90 },
@@ -34,6 +35,7 @@ exports.DEFAULT_SPEC = {
         style: { enabled: true },
         dir: { enabled: true, fullPath: false },
         git: { enabled: true, ttlMs: 20 * 60 * 1000 },
+        pr: { enabled: true },
         session_name: { enabled: true },
         session: { enabled: true },
         cost: { enabled: true },

package/dist/render/colors.js

@@ -15,7 +15,7 @@ const paint = (code, s, bold = false) => `\x1b[${bold ? '1;' : ''}${code}m${(0,
 exports.paint = paint;
 exports.C = {
     // 第一行（运行时）
-    model: CYAN, effort: YELLOW, fast: GREEN,
+    model: CYAN, agent: MAGENTA, effort: YELLOW, fast: GREEN,
     ctx: MAGENTA, cache: GREEN, style: CYAN,
     rate: CYAN, // rate_limits 主图标/标签
     rateReset: YELLOW, // 配额重置时间
@@ -31,6 +31,7 @@ exports.C = {
     name: MAGENTA, dirIcon: YELLOW, dirText: GREEN, git: WHITE,
     gitClean: GREEN, gitDirty: BLUE, gitConflict: RED,
     gitAhead: GREEN, gitBehind: BLUE,
+    pr: CYAN, prApproved: GREEN, prPending: YELLOW, prChanges: RED, prDraft: WHITE,
     sess: CYAN, add: GREEN, del: RED,
     cost: YELLOW, // 美元成本
     wt: GREEN, // worktree

package/dist/render/icons.js

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.icon = icon;
 const ICONS = {
     model: '🤖',
+    agent: '👤',
     dir: '📁',
     git: '🌿',
+    pr: '🔀',
     context: '⚡️',
     cache: '💾',
     rate_limits: '📊',

package/dist/runtime/bg.js

@@ -101,30 +101,48 @@ function runVersionTask(cacheFile, done) {
         catch { /* ignore */ }
         done();
     };
-    try {
-        const https = require('https');
-        const req = https.get('https://registry.npmjs.org/@anthropic-ai/claude-code/latest', (r) => {
-            if (r.statusCode !== 200) {
-                r.resume();
-                return finish('');
-            }
-            let d = '';
-            r.on('data', (c) => { d += c; });
-            r.on('end', () => {
-                try {
-                    finish(JSON.parse(d).version || '');
-                }
-                catch {
-                    finish('');
+    const requestVersion = (url, parse, callback) => {
+        let settled = false;
+        const settle = (version) => {
+            if (settled)
+                return;
+            settled = true;
+            callback(version);
+        };
+        try {
+            const https = require('https');
+            const req = https.get(url, (r) => {
+                if (r.statusCode !== 200) {
+                    r.resume();
+                    return settle('');
                 }
+                let d = '';
+                r.on('data', (c) => { d += c; });
+                r.on('end', () => {
+                    try {
+                        settle(parse(d));
+                    }
+                    catch {
+                        settle('');
+                    }
+                });
             });
-        });
-        req.on('error', () => finish(''));
-        req.setTimeout(5000, () => { req.destroy(); finish(''); });
-    }
-    catch {
-        finish('');
-    }
+            req.on('error', () => settle(''));
+            req.setTimeout(5000, () => { req.destroy(); settle(''); });
+        }
+        catch {
+            settle('');
+        }
+    };
+    // Claude Code 新版优先跟随官方 rolling-latest 端点；旧版/npm 发布链仍作回退。
+    requestVersion('https://downloads.claude.ai/claude-code-releases/latest', (body) => {
+        const version = body.trim();
+        return /^\d+\.\d+\.\d+$/.test(version) ? version : '';
+    }, (official) => {
+        if (official)
+            return finish(official);
+        requestVersion('https://registry.npmjs.org/@anthropic-ai/claude-code/latest', (body) => JSON.parse(body).version || '', finish);
+    });
 }
 // 每次运行都做的轻清理：删除过期的孤儿瞬时产物（.refresh / .tmp），以及历史遗留的
 // tasks/ 目录内容。成本很低（这些目录文件很少），能让残留不再累积。

package/dist/runtime/version.js

@@ -9,7 +9,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const paths_1 = require("../utils/paths");
 const refresh_1 = require("./refresh");
-const CACHE_TTL_MS = 4 * 3600 * 1000;
+const CACHE_TTL_MS = 2 * 3600 * 1000;
 const REFRESH_THROTTLE_MS = 60 * 1000;
 const cacheFile = path_1.default.join((0, paths_1.cacheDir)('version'), 'claude-code.json');
 const refreshFile = path_1.default.join((0, paths_1.cacheDir)('version'), 'claude-code.refresh');

package/dist/segments/index.js

@@ -52,7 +52,18 @@ const status = (ctx) => {
 };
 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;
-const effort = ({ data }) => data.effort && data.effort.level ? (0, colors_1.seg)(colors_1.C.effort, '🧠', data.effort.level) : 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 }) => {
+    const level = data.effort?.level;
+    const thinking = data.thinking?.enabled;
+    if (!level && thinking == null)
+        return null;
+    const text = level
+        ? `${level}${thinking === false ? ' ⊘' : ''}`
+        : thinking ? '✓' : '⊘';
+    return (0, colors_1.seg)(colors_1.C.effort, '🧠', text);
+};
 const fast = (ctx) => ctx.data.fast_mode ? iconSeg(ctx, 'fast', colors_1.C.fast, 'fast', 'fast') : null;
 const context = (ctx) => {
     const cw = ctx.data.context_window;
@@ -76,6 +87,8 @@ const context = (ctx) => {
     const parts = [(0, format_1.fmtPct)(pct), `↓${(0, format_1.fmtTokens)(used)}`, `↑${(0, format_1.fmtTokens)(out)}`];
     if (remain != null)
         parts.push(`→${(0, format_1.fmtTokens)(remain)}`);
+    if (ctx.data.exceeds_200k_tokens)
+        parts.push('⚠200k+');
     return iconSeg(ctx, 'context', col, 'context', parts.join(colors_1.DOT));
 };
 const cache = (ctx) => {
@@ -162,7 +175,23 @@ const git = (ctx) => {
     if (!cwd)
         return null;
     const { gitSegment } = require('../runtime/git');
-    return gitSegment(cwd, optIcon(ctx, 'git', 'git'), opt(ctx, 'git'), ctx.data.worktree?.branch, ctx.data.worktree?.name);
+    const worktreeName = ctx.data.worktree?.name || ctx.data.workspace?.git_worktree;
+    return gitSegment(cwd, optIcon(ctx, 'git', 'git'), opt(ctx, 'git'), ctx.data.worktree?.branch, worktreeName);
+};
+const pr = (ctx) => {
+    const number = ctx.data.pr?.number;
+    if (typeof number !== 'number' || !Number.isFinite(number) || number <= 0)
+        return null;
+    const state = ctx.data.pr?.review_state;
+    const states = {
+        approved: { glyph: '✓', color: colors_1.C.prApproved },
+        pending: { glyph: '○', color: colors_1.C.prPending },
+        changes_requested: { glyph: '!', color: colors_1.C.prChanges },
+        draft: { glyph: '◌', color: colors_1.C.prDraft },
+    };
+    const review = state ? states[state] : undefined;
+    const text = `#${number}${review ? ` ${review.glyph}` : ''}`;
+    return iconSeg(ctx, 'pr', review?.color ?? colors_1.C.pr, 'pr', text);
 };
 const sessionName = ({ data }) => data.session_name ? (0, colors_1.seg)(colors_1.C.name, '🏷️', data.session_name) : null;
 const session = (ctx) => {
@@ -195,9 +224,9 @@ const version = (ctx) => {
 };
 exports.SEGMENTS = {
     // 运行时
-    status, model, effort, fast, context, cache, style,
+    status, model, agent, effort, fast, context, cache, style,
     // 订阅
     rate_limits: rateLimits,
     // 项目 / 会话
-    dir, git, session_name: sessionName, session, cost, version,
+    dir, git, pr, session_name: sessionName, session, cost, version,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cxmyu/ccglance",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "A fast, zero-dependency, multi-line status line for Claude Code — model, effort, context, cache, git and session, all at a glance.",
   "bin": {
     "ccglance": "dist/cli.js"