cc-usage-bar 0.4.0 → 0.4.2

package/AGENTS.md

@@ -1,6 +1,6 @@
 # AGENTS.md — cc-usage-bar 全功能说明
 
-> 这份文件是面向 AI 助手（Claude Code、Cursor、Codex 等）的安装/配置说明。如果用户对你说「装 cc-usage-bar」「帮我配 statusline 用量条」「装下 cc-usage-bar 帮我配好」之类的话，请按本文档完成全部步骤。**默认无需向用户追加确认**，除以下情况：用户的现有 `statusLine.command` 看上去包含定制脚本而你不确定如何保留时；或者用户没登录过 Claude Code（凭证查不到）。
+> 这份文件是面向 AI 助手（Claude Code、Cursor、Codex 等）的安装/配置说明。如果用户对你说「装 cc-usage-bar」「帮我配 statusline 用量条」「装下 cc-usage-bar 帮我配好」之类的话，请按本文档完成全部步骤。**默认无需向用户追加确认**；只有用户没登录过 Claude Code（凭证查不到）时才停下来让用户先登录。
 
 ## 1. 这个包是什么
 
@@ -18,6 +18,8 @@
 
 > **用户只描述偏好，你把 `statusLine.command` 配成 `cc-usage-bar-wrap`，并保留用户原有前缀。**
 
+如果已有 `statusLine.command`、`statusline-command.sh`、自定义 shell 脚本、git/path/model 展示等前缀内容，**一律视为要保留的前缀**：按 3.4 抽出它，并用 `cc-usage-bar-wrap --prefix=...` 串起来。不要询问是否覆盖、追加或暂不修改；追加保留是本项目默认行为。
+
 ## 3. 安装流程（必走）
 
 按顺序执行，每一步执行前简要告知用户：
@@ -39,7 +41,7 @@ which cc-usage-bar-wrap && which cc-usage-fetch
 where.exe cc-usage-bar-wrap
 ```
 
-要求：`cc-usage-bar` ≥ **0.4.0**（自适应换行 + 周限额上色 + countdown 预设 + 颜色 ramp 自定义）。已装旧版的话用 `npm i -g cc-usage-bar@latest` 升级。
+要求：`cc-usage-bar` ≥ **0.4.1**（自适应换行 + 周限额上色 + countdown 预设 + 颜色 ramp 自定义 + tint reverse 样式）。已装旧版的话用 `npm i -g cc-usage-bar@latest` 升级。
 
 ### 3.3 读取现有 statusLine.command
 
@@ -169,8 +171,11 @@ CC_USAGE_COLORS_BALANCE='0:cyan,60:yellow,90:red'
 # 自定义填充/空槽字符（cells）
 --bar-spec='{"mode":"cells","filled":"▰","empty":"▱","width":12}'
 
-# 单色渐变（tint）—— 完成部分上色，剩余部分变暗
---bar-spec='{"mode":"tint","text":"████████","emptyStyle":"dim"}'
+# 单色渐变（tint）—— 默认 reverse：完成部分反色底块，剩余部分变暗
+--bar-spec='{"mode":"tint","text":"Ciallo~(∠・ω< )⌒★"}'
+
+# 想要旧的"只染前景"效果，显式加 style:"fg"
+--bar-spec='{"mode":"tint","text":"████████","style":"fg","emptyStyle":"dim"}'
 
 # 动画帧（frames）—— 按百分比从帧序列里挑一帧
 --bar-spec='{"mode":"frames","frames":["⠋","⠙","⠹","⠸","⠼","⠴","⠦","⠧","⠇","⠏"]}'

package/README.md

@@ -20,6 +20,36 @@ Or, with `--format=bar-time`:
 [█████░░░░░] 47% until 18:00 / [██████░░░░] 59% until 5/9 09:00
 ```
 
+## Quick usage
+
+### Method 1: Command line
+
+```bash
+npm install -g cc-usage-bar@latest
+cc-usage-bar install --format=bar-countdown
+```
+
+If you already have a Claude Code statusline command, the installer keeps it as the prefix and appends the usage bar. Run diagnostics any time with:
+
+```bash
+cc-usage-bar status
+```
+
+### Method 2: Ask an AI assistant
+
+In Claude Code, Cursor, Codex, or another coding assistant, say:
+
+```text
+Install cc-usage-bar for my Claude Code statusline.
+Keep my existing statusline prefix and use the bar-countdown format.
+```
+
+If the assistant needs exact instructions, give it the AI-readable guide:
+
+```bash
+npx cc-usage-bar@latest agents
+```
+
 ## Install
 
 ```bash
@@ -111,12 +141,18 @@ cc-usage-bar install --format=bar-time \
   --bar-spec='{"mode":"tint","text":"Ciallo～(∠・ω< )⌒★"}'
 ```
 
-`tint` keeps the whole text visible and colors the completed prefix while dimming the rest:
+`tint` keeps the whole text visible. By default the completed prefix is rendered as a reversed-color block (high contrast), and the rest is dimmed:
 
 ```json
 {"mode":"tint","text":"Ciallo～(∠・ω< )⌒★"}
 ```
 
+If you prefer the older "color the foreground only" look, set `style:"fg"`:
+
+```json
+{"mode":"tint","text":"Ciallo～(∠・ω< )⌒★","style":"fg"}
+```
+
 `cells` replaces the default block characters:
 
 ```json

package/README.zh-CN.md

@@ -22,6 +22,36 @@
 [█████░░░░░] 47% until 18:00 / [██████░░░░] 59% until 5/9 09:00
 ```
 
+## 快速使用
+
+### 方法一：正常命令行
+
+```bash
+npm install -g cc-usage-bar@latest
+cc-usage-bar install --format=bar-countdown
+```
+
+如果你已经有自己的 Claude Code statusline 命令，安装器会把它保留为前缀，再追加用量条。需要诊断时运行：
+
+```bash
+cc-usage-bar status
+```
+
+### 方法二：直接和大模型交流
+
+在 Claude Code、Cursor、Codex 或其他编程助手里直接说：
+
+```text
+请安装 cc-usage-bar 并帮我配置 Claude Code statusline。
+保留我原来的 statusline 前缀，使用 bar-countdown 格式。
+```
+
+如果大模型需要更精确的操作说明，把下面命令输出的 AI 可读安装指南发给它：
+
+```bash
+npx cc-usage-bar@latest agents
+```
+
 ## 安装
 
 ```bash
@@ -111,7 +141,7 @@ cc-usage-bar install --format <preset> --bar-width <n>
 
 #### tint：整段文字始终可见
 
-推荐给颜文字、短句、logo 风格文本。已完成部分会染色，未完成部分会变暗，但整段文字一直可见：
+推荐给颜文字、短句、logo 风格文本。整段文字一直可见，**默认**已完成部分会用反色底块（reverse）增强对比，未完成部分变暗：
 
 ```bash
 cc-usage-bar install --format=bar-time \
@@ -122,6 +152,12 @@ cc-usage-bar install --format=bar-time \
 {"mode":"tint","text":"Ciallo～(∠・ω< )⌒★"}
 ```
 
+如果更喜欢"只给完成部分上前景色、不反色"的旧风格，显式加 `style:"fg"`：
+
+```json
+{"mode":"tint","text":"Ciallo～(∠・ω< )⌒★","style":"fg"}
+```
+
 #### cells：替换默认块字符
 
 ```json

package/dist/src/format.js

@@ -23,6 +23,7 @@ exports.FORMAT_PRESETS = [
     'bar-countdown',
 ];
 const ANSI_RESET = '\x1b[0m';
+const ANSI_REVERSE = '\x1b[7m';
 exports.COLOR_MAP = {
     none: '',
     dim: '\x1b[2m',
@@ -146,6 +147,7 @@ function parseBarSpec(raw) {
         const out = { mode: 'tint', text: obj.text };
         if (obj.emptyStyle === 'plain' || obj.emptyStyle === 'dim')
             out.emptyStyle = obj.emptyStyle;
+        out.style = obj.style === 'fg' ? 'fg' : 'reverse';
         return out;
     }
     if (obj.mode === 'frames') {
@@ -240,7 +242,8 @@ function formatBar(pct, width = 10, spec, activeColor = null, useColor = false)
         const inactive = chars.slice(filled).join('');
         if (!useColor)
             return active + inactive;
-        const activePart = activeColor && active ? paint(active, activeColor, true) : active;
+        const activeStyle = activeColor && spec.style === 'reverse' ? `${activeColor}${ANSI_REVERSE}` : activeColor;
+        const activePart = activeStyle && active ? paint(active, activeStyle, true) : active;
         const inactivePart = inactive && spec.emptyStyle !== 'plain' ? paint(inactive, exports.COLOR_MAP.dim, true) : inactive;
         return activePart + inactivePart;
     }
@@ -257,10 +260,22 @@ function paint(text, color, useColor) {
     return `${color}${text}${ANSI_RESET}`;
 }
 function applyTierPaint(text, color, opts, tpl) {
-    if (opts.barSpec?.mode === 'tint' && opts.color && tpl.includes('{bar}'))
-        return text;
     return paint(text, color, opts.color);
 }
+function applyTintTemplate(tpl, vars, color, opts) {
+    if (!opts.color || !color)
+        return applyTemplate(tpl, vars);
+    return tpl
+        .split(/(\{bar\})/g)
+        .map((part) => (part === '{bar}' ? vars.bar ?? '{bar}' : paint(applyTemplate(part, vars), color, true)))
+        .join('');
+}
+function renderTemplate(tpl, vars, color, opts) {
+    if (opts.barSpec?.mode === 'tint' && tpl.includes('{bar}')) {
+        return applyTintTemplate(tpl, vars, color, opts);
+    }
+    return applyTierPaint(applyTemplate(tpl, vars), color, opts, tpl);
+}
 function prependProvider(text, planName, opts) {
     return opts.showProviderName && planName ? `${planName} ${text}` : text;
 }
@@ -272,15 +287,15 @@ function renderTier(ctx, opts) {
     const tpl = opts.template ?? SUB_PRESET_TPL[opts.format];
     const ramp = ctx.label === '5h' ? opts.colorRamp5h ?? exports.DEFAULT_RAMP : opts.colorRampWk ?? exports.DEFAULT_RAMP;
     const color = colorFromRamp(pct, ramp);
-    const text = applyTemplate(tpl, {
+    const vars = {
         label: ctx.label,
         percent: String(pct),
         bar: formatBar(pct, opts.barWidth, opts.barSpec, color, opts.color),
         expiry: formatExpiry(ctx.tier.resets_at, opts.now),
         countdown: formatCountdown(ctx.tier.resets_at, opts.now),
         provider: ctx.provider,
-    });
-    return applyTierPaint(text, color, opts, tpl);
+    };
+    return renderTemplate(tpl, vars, color, opts);
 }
 function currencySymbol(unit) {
     switch (unit.toUpperCase()) {
@@ -315,18 +330,18 @@ function renderBalance(d, opts) {
     }
     if (typeof d.total !== 'number') {
         const tpl = opts.template ?? BAL_PRESET_TPL.compact;
-        const text = applyTemplate(tpl, {
+        const vars = {
             label: '', percent: '0', bar: '', expiry: '', countdown: '',
             provider: d.planName ?? '',
             amount: fmtMoney(d.remaining, d.unit),
-        });
-        return prependProvider(applyTierPaint(text, null, opts, tpl), d.planName, opts);
+        };
+        return prependProvider(renderTemplate(tpl, vars, null, opts), d.planName, opts);
     }
     const total = d.total;
     const usedPct = total > 0 ? ((total - d.remaining) / total) * 100 : 0;
     const tpl = opts.template ?? BAL_PRESET_TPL[opts.format];
     const color = colorFromRamp(usedPct, opts.colorRampBalance ?? exports.DEFAULT_RAMP);
-    const text = applyTemplate(tpl, {
+    const vars = {
         label: '',
         percent: String(Math.round(usedPct)),
         bar: formatBar(usedPct, opts.barWidth, opts.barSpec, color, opts.color),
@@ -334,8 +349,8 @@ function renderBalance(d, opts) {
         countdown: '',
         provider: d.planName ?? '',
         amount: `${fmtMoney(d.remaining, d.unit)}/${fmtMoney(total, d.unit)}`,
-    });
-    return prependProvider(applyTierPaint(text, color, opts, tpl), d.planName, opts);
+    };
+    return prependProvider(renderTemplate(tpl, vars, color, opts), d.planName, opts);
 }
 function renderUsage(data, opts) {
     if (!data)

package/dist/src/providers/minimax.js

@@ -3,13 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.minimaxAdapter = void 0;
 exports.parseMinimax = parseMinimax;
 const http_1 = require("./http");
-function tier(total, used, endMs) {
-    if (typeof total !== 'number' || typeof used !== 'number' || total <= 0)
-        return undefined;
-    return {
-        utilization: ((total - (total - used)) / total) * 100,
-        resets_at: typeof endMs === 'number' ? new Date(endMs).toISOString() : undefined,
-    };
+function isoFromMs(ms) {
+    return typeof ms === 'number' ? new Date(ms).toISOString() : undefined;
 }
 function parseMinimax(body) {
     if (!body || typeof body !== 'object')
@@ -19,16 +14,22 @@ function parseMinimax(body) {
     if (typeof code === 'number' && code !== 0) {
         return { error: r.base_resp?.status_msg ?? `MiniMax error ${code}` };
     }
-    const remains = r.model_remains?.[0];
-    if (!remains)
+    if (!Array.isArray(r.model_remains))
+        return null;
+    const item = r.model_remains.find((m) => m && m.model_name === 'general');
+    if (!item)
         return null;
     const out = { kind: 'subscription', planName: 'MiniMax' };
-    const fh = tier(remains.current_interval_total_count, remains.current_interval_usage_count, remains.end_time);
-    if (fh)
-        out.five_hour = fh;
-    const wk = tier(remains.current_weekly_total_count, remains.current_weekly_usage_count, remains.weekly_end_time);
-    if (wk)
-        out.seven_day = wk;
+    const fhRemain = item.current_interval_remaining_percent;
+    if (typeof fhRemain === 'number') {
+        out.five_hour = { utilization: 100 - fhRemain, resets_at: isoFromMs(item.end_time) };
+    }
+    if (item.current_weekly_status === 1) {
+        const wkRemain = item.current_weekly_remaining_percent;
+        if (typeof wkRemain === 'number') {
+            out.seven_day = { utilization: 100 - wkRemain, resets_at: isoFromMs(item.weekly_end_time) };
+        }
+    }
     if (!out.five_hour && !out.seven_day)
         return null;
     return out;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-usage-bar",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Show your Claude Code subscription usage (5h / 7d, or balance) in the statusline. Supports Anthropic, Kimi, GLM, MiniMax, DeepSeek, StepFun, SiliconFlow, OpenRouter, Novita.",
   "keywords": [
     "claude",