token-tracker 0.4.1__tar.gz → 0.4.2__tar.gz

{token_tracker-0.4.1/src/token_tracker.egg-info → token_tracker-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: token-tracker
-Version: 0.4.1
+Version: 0.4.2
 Summary: Track token usage across local AI agents (Claude Code, Codex)
 Author-email: stormzhang <stormzhang.dev@gmail.com>
 License: MIT License

{token_tracker-0.4.1 → token_tracker-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "token-tracker"
-version = "0.4.1"
+version = "0.4.2"
 description = "Track token usage across local AI agents (Claude Code, Codex)"
 readme = "README.md"
 requires-python = ">=3.11"

{token_tracker-0.4.1 → token_tracker-0.4.2}/src/token_tracker/analyzer/cost.py

@@ -28,6 +28,21 @@ _FAMILY_FALLBACK = (
     ("claude-haiku", "claude-haiku-4-5-20251001"),
     ("claude-fable", "claude-fable-5"),
     ("codex-", "gpt-5.5"),
+    # 国产模型系列兜底：出新版本（如 GLM-4.8、Kimi K3）litellm 未收录时退回该系列最新已知价
+    ("kimi", "kimi-k2.6"),
+    ("moonshot-v", "moonshot-v1-128k"),
+    ("glm-4", "glm-4.6"),
+    ("qwen3-coder", "qwen3-coder-plus"),
+    ("qwen3-max", "qwen-max"),
+    ("doubao-seed", "doubao-seed-1-6"),
+    ("doubao-1-5-pro", "doubao-1-5-pro-256k"),
+    ("deepseek", "deepseek-v4-flash"),
+    ("minimax", "MiniMax-M2"),
+    ("mimo", "mimo-v2.5"),
+    # Grok：退役 slug 按官方路由兜底（grok-code-* → build-0.1；grok-4-fast/4.1-fast/grok-3 等 → grok-4.3）
+    ("grok-code", "grok-build-0.1"),
+    ("grok-4", "grok-4.3"),
+    ("grok", "grok-4.3"),
 )
 
 # 解析不到定价的模型只提示一次，避免聚合时每条 entry 刷屏
@@ -195,6 +210,31 @@ _FABLE_PRICING = {
     "cache_read_input_token_cost": 1.0e-6,
 }
 
+# 国产模型多以人民币计价，统一折 USD 入表，与 CC/Codex 同口径（2026-06 近似汇率）
+_CNY_PER_USD = 7.1
+
+
+def _cny(input_m: float, output_m: float, cache_read_m: float | None = None) -> dict:
+    """人民币「元 / 百万 tokens」→ USD per token（÷汇率 ÷1e6）。国产模型按中国站人民币价折算。"""
+    info = {
+        "input_cost_per_token": input_m / _CNY_PER_USD * 1e-6,
+        "output_cost_per_token": output_m / _CNY_PER_USD * 1e-6,
+    }
+    if cache_read_m is not None:
+        info["cache_read_input_token_cost"] = cache_read_m / _CNY_PER_USD * 1e-6
+    return info
+
+
+def _usd(input_m: float, output_m: float, cache_read_m: float | None = None) -> dict:
+    """美元「$ / 百万 tokens」→ USD per token（÷1e6）。用于只有官方国际站 USD 价的模型。"""
+    info = {
+        "input_cost_per_token": input_m * 1e-6,
+        "output_cost_per_token": output_m * 1e-6,
+    }
+    if cache_read_m is not None:
+        info["cache_read_input_token_cost"] = cache_read_m * 1e-6
+    return info
+
 
 def _fallback_pricing() -> dict:
     return {
@@ -249,4 +289,47 @@ def _fallback_pricing() -> dict:
             "output_cost_per_token": 6e-6,
             "cache_read_input_token_cost": 0.375e-6,
         },
+        # ---- 国产模型（2026-06 官方核实）。除 GLM 用 z.ai 国际站 USD 外，其余按各家中国站
+        # 人民币价 ÷7.1 折算；阶梯定价模型（Qwen3-Coder / Doubao）统一取 0-32K 基础档。----
+        # Kimi / Moonshot（platform.kimi.com 官方人民币价；老 kimi-k2-instruct 已 EOL，靠系列兜底）
+        "kimi-k2.7-code": _cny(6.5, 27, 1.3),
+        "kimi-k2.6": _cny(6.5, 27, 1.1),
+        "kimi-k2.5": _cny(4, 21, 0.7),
+        "moonshot-v1-8k": _cny(2, 10),
+        "moonshot-v1-32k": _cny(5, 20),
+        "moonshot-v1-128k": _cny(10, 30),
+        # 智谱 GLM（z.ai 国际站官方 USD；中国站按量完整价含缓存无法从官方 SPA 取得，国内口径可能偏高）
+        "glm-4.6": _usd(0.6, 2.2, 0.11),
+        "glm-4.5": _usd(0.6, 2.2, 0.11),
+        "glm-4.5-air": _usd(0.2, 1.1, 0.03),
+        "glm-4.7": _usd(0.6, 2.2, 0.11),
+        "glm-5": _usd(1.0, 3.2, 0.2),
+        # 阿里 Qwen（中国站百炼人民币价，0-32K 基础档）
+        "qwen3-coder-plus": _cny(4, 16, 0.4),
+        "qwen-max": _cny(2.5, 10),
+        "qwen-plus": _cny(0.8, 2),
+        # 火山方舟 Doubao（中国站人民币价，0-32K 基础档）
+        "doubao-seed-1-6": _cny(0.8, 8),
+        "doubao-seed-code": _cny(1.2, 8),
+        "doubao-1-5-pro-32k": _cny(0.8, 2, 0.16),
+        "doubao-1-5-pro-256k": _cny(5, 9),
+        # DeepSeek（官方中国站人民币价；chat/reasoner 现映射 V4-Flash，2026-07-24 弃用旧名）
+        "deepseek-v4-flash": _cny(1, 2, 0.02),
+        "deepseek-v4-pro": _cny(3, 6, 0.025),
+        "deepseek-chat": _cny(1, 2, 0.02),
+        "deepseek-reasoner": _cny(1, 2, 0.02),
+        # MiniMax（官方 USD，与中国站÷7 自洽；M2/M2.1/M2.5 同价 legacy）
+        "MiniMax-M2": _usd(0.3, 1.2, 0.03),
+        "MiniMax-M2.1": _usd(0.3, 1.2, 0.03),
+        "MiniMax-M2.5": _usd(0.3, 1.2, 0.03),
+        "MiniMax-M2.7": _usd(0.3, 1.2, 0.06),
+        "MiniMax-M3": _usd(0.3, 1.2, 0.06),
+        # 小米 MiMo（mimo.mi.com 官方中国站人民币价；与 DeepSeek 同价，V2.5-Pro 主攻 agentic 编程）
+        "mimo-v2.5-pro": _cny(3, 6, 0.025),
+        "mimo-v2.5": _cny(1, 2, 0.02),
+        # xAI Grok（docs.x.ai 官方 USD）。2026-05-15 退役潮：grok-4-fast/4.1-fast/grok-3 路由到 grok-4.3，
+        # grok-code-fast-1 退役为 grok-build-0.1 别名（退役 slug 靠 _FAMILY_FALLBACK 接住）。grok-4.3 取 ≤200K 默认档。
+        "grok-4.3": _usd(1.25, 2.5, 0.2),
+        "grok-build-0.1": _usd(1.0, 2.0, 0.2),
+        "grok-code-fast-1": _usd(1.0, 2.0, 0.2),
     }

{token_tracker-0.4.1 → token_tracker-0.4.2}/src/token_tracker/cli.py

@@ -386,18 +386,15 @@ def main():
         update_hook()
 
     # 升级感知：新版若新增了值得重配的选项（SETUP_VERSION bump），老用户跑任意命令时
-    # 真终端直接弹一次 wizard；非 tty / 会话内只打印一行提示、不打断。
-    # wizard 内部最终会调 setup() → save_setup_version()，下次启动不再触发。
+    # 自动走一遍 setup——_run_setup_flow 内部分流：真终端弹 wizard、会话内 / 非 tty 静默
+    # _auto_setup 用默认值全装（语言跟随系统 / mocha / 组件全开）。两者最终都 save_setup_version()，
+    # 下次启动 setup_version 已是最新、不再触发。
     if (
         command not in ("setup", "unsetup")
         and is_setup()
         and config.setup_version() < config.SETUP_VERSION
     ):
-        if _should_run_wizard():
-            from .wizard import run_wizard
-            run_wizard()
-        else:
-            get_console().print(f"[dim]{t('setup_outdated_hint')}[/dim]")
+        _run_setup_flow()
 
     if command == "setup":
         _run_setup_flow()

{token_tracker-0.4.1 → token_tracker-0.4.2}/src/token_tracker/config.py

@@ -18,10 +18,11 @@ CONFIG_DIR = os.path.expanduser("~/.config/token-tracker")
 CONFIG_PATH = os.path.join(CONFIG_DIR, "config.json")
 SCHEMA_VERSION = 1
 
-# 引导版本：每次新增"值得让老用户重新走一遍 wizard"的配置项时手动 +1。
-# 老用户 config 里没这字段 → 读出 0 → 触发重新引导（真终端弹 wizard、非 tty 仅提示）。
+# 引导版本：每次新增"值得让老用户重新走一遍 setup"的配置项时手动 +1（只能整数、一次 +1）。
+# 老用户 config 里没这字段 / 旧版本号 < 当前 → 触发重新引导（真终端弹 wizard、非 tty 静默 _auto_setup）。
 # 跟 SCHEMA_VERSION 解耦：那是数据格式版本，这是用户引导版本，bump 节奏完全不同。
-SETUP_VERSION = 1
+# 2（0.4.2）：强制所有现存用户（0.3.8/0.4.0=无字段=0、0.4.1=1，全 < 2）升级后重走一遍 setup。
+SETUP_VERSION = 2
 
 # 旧位置（独立 theme.json / lang.json），老用户首次读 config.json 不存在时自动合并迁移
 _LEGACY_THEME_PATH = os.path.join(CONFIG_DIR, "theme.json")

{token_tracker-0.4.1 → token_tracker-0.4.2}/src/token_tracker/i18n.py

@@ -102,7 +102,6 @@ _STRINGS = {
         "no_agent_install": "未检测到 Claude Code 或 Codex，请先安装其中之一",
         "auto_setup_hint": "非交互环境，已按默认（语言跟随系统 / 主题 mocha / 组件全开）配置；如需自定义请在终端运行 tt setup",
         "first_setup": "首次使用，正在配置状态栏...",
-        "setup_outdated_hint": "检测到新版本新增了配置项；请在终端运行 tt setup 体验",
         "cc_not_found": "未检测到 Claude Code，跳过",
         "codex_not_found": "未检测到 Codex，跳过",
         "sl_backup_replace": "检测到已有 statusLine，备份后替换",
@@ -220,7 +219,6 @@ _STRINGS = {
         "no_agent_install": "Claude Code or Codex not detected, please install one first",
         "auto_setup_hint": "Non-interactive env — configured with defaults (language follows system / theme mocha / all components on); run tt setup in a terminal to customize",
         "first_setup": "First run, configuring status bar...",
-        "setup_outdated_hint": "New configuration options added in this release — run tt setup in a terminal to try them",
         "cc_not_found": "Claude Code not detected, skipping",
         "codex_not_found": "Codex not detected, skipping",
         "sl_backup_replace": "Existing statusLine detected, backing up and replacing",

{token_tracker-0.4.1 → token_tracker-0.4.2}/src/token_tracker/ui/format.py

@@ -21,6 +21,49 @@ MODEL_SHORT = {
     "claude-sonnet": "Sonnet",
     "claude-haiku-4-5-20251001": "Haiku 4.5",
     "claude-haiku": "Haiku",
+    # 国产模型短名（与 cost.py 内置定价 key 一一对应）
+    "kimi-k2.7-code": "Kimi K2.7",
+    "kimi-k2.6": "Kimi K2.6",
+    "kimi-k2.5": "Kimi K2.5",
+    "moonshot-v1-8k": "Moonshot 8k",
+    "moonshot-v1-32k": "Moonshot 32k",
+    "moonshot-v1-128k": "Moonshot 128k",
+    "glm-4.6": "GLM-4.6",
+    "glm-4.5": "GLM-4.5",
+    "glm-4.5-air": "GLM-4.5 Air",
+    "glm-4.7": "GLM-4.7",
+    "glm-5": "GLM-5",
+    "qwen3-coder-plus": "Qwen3 Coder",
+    "qwen-max": "Qwen Max",
+    "qwen-plus": "Qwen Plus",
+    "doubao-seed-1-6": "Doubao 1.6",
+    "doubao-seed-code": "Doubao Code",
+    "doubao-1-5-pro-32k": "Doubao Pro 32k",
+    "doubao-1-5-pro-256k": "Doubao Pro 256k",
+    "deepseek-v4-flash": "DeepSeek V4F",
+    "deepseek-v4-pro": "DeepSeek V4P",
+    "deepseek-chat": "DeepSeek Chat",
+    "deepseek-reasoner": "DeepSeek Rsnr",
+    "MiniMax-M2": "MiniMax M2",
+    "MiniMax-M2.1": "MiniMax M2.1",
+    "MiniMax-M2.5": "MiniMax M2.5",
+    "MiniMax-M2.7": "MiniMax M2.7",
+    "MiniMax-M3": "MiniMax M3",
+    "mimo-v2.5-pro": "MiMo V2.5P",
+    "mimo-v2.5": "MiMo V2.5",
+    # Gemini（litellm 在线表已有正确定价，这里只补短名让报表显示品牌名、不入 cost.py 兜底）
+    "gemini-2.5-pro": "Gemini 2.5 Pro",
+    "gemini-2.5-flash": "Gemini 2.5 Flash",
+    "gemini-3-pro-preview": "Gemini 3 Pro",
+    "gemini-3-pro": "Gemini 3 Pro",
+    "gemini-3-flash-preview": "Gemini 3 Flash",
+    "gemini-3.1-pro-preview": "Gemini 3.1 Pro",
+    "gemini-3.5-flash": "Gemini 3.5 Flash",
+    "gemini-2.0-flash": "Gemini 2.0 Flash",
+    # xAI Grok
+    "grok-4.3": "Grok 4.3",
+    "grok-build-0.1": "Grok Build",
+    "grok-code-fast-1": "Grok Code",
 }
 
 

{token_tracker-0.4.1 → token_tracker-0.4.2}/src/token_tracker/ui/heatmap.py

@@ -101,19 +101,8 @@ def _render_summary(stats: list[DailyStats], agents: list[str] | None,
         cur_m_avg = cur_m.cost_usd / max(1, elapsed_m)
         prev_m_avg = prev_m.cost_usd / max(1, _month_span(prev_m.month)[0]) if prev_m else None
         active_m = len({s.date for s in stats if s.date.startswith(cur_m.month)})
-        body_m = Text()
-        body_m.append("This Month", style=f"bold {_S.good}")
-        body_m.append(f"  {cur_m.month}", style=f"dim {_S.good}")
-        body_m.append("\n")
-        append_metric(body_m, "Tokens", _fmt_tokens(cur_m.total_tokens), _S.peach,
-                      cur_m.total_tokens, prev_m.total_tokens if prev_m else None)
-        body_m.append("   ")
-        append_metric(body_m, "Cost", _fmt_cost(cur_m.cost_usd), _S.peach,
-                      cur_m.cost_usd, prev_m.cost_usd if prev_m else None)
-        body_m.append("   ")
-        append_metric(body_m, "Avg/Cost", _fmt_cost(cur_m_avg), _S.peach, cur_m_avg, prev_m_avg)
-        body_m.append("   ")
-        append_metric(body_m, t("active_days"), f"{active_m}/{days_in_m}", _S.peach, active_m, None)
+        body_m = _period_section("This Month", cur_m.month, cur_m, prev_m,
+                                 cur_m_avg, prev_m_avg, f"{active_m}/{days_in_m}")
         parts.extend([Rule(style=_S.dim), body_m])
 
     # --- Section 3：This Week（Tokens / Cost / Avg/Cost 带环比 + 活跃天数 X/7） ---
@@ -126,19 +115,8 @@ def _render_summary(stats: list[DailyStats], agents: list[str] | None,
         cur_w_avg = cur_w.cost_usd / days_w
         prev_w_avg = prev_w.cost_usd / 7 if prev_w else None
         active_w = len({s.date for s in stats if s.date >= cur_w.week})
-        body_w = Text()
-        body_w.append("This Week", style=f"bold {_S.good}")
-        body_w.append(f"  {cur_w.week_start} ~ {cur_w.week_end}", style=f"dim {_S.good}")
-        body_w.append("\n")
-        append_metric(body_w, "Tokens", _fmt_tokens(cur_w.total_tokens), _S.peach,
-                      cur_w.total_tokens, prev_w.total_tokens if prev_w else None)
-        body_w.append("   ")
-        append_metric(body_w, "Cost", _fmt_cost(cur_w.cost_usd), _S.peach,
-                      cur_w.cost_usd, prev_w.cost_usd if prev_w else None)
-        body_w.append("   ")
-        append_metric(body_w, "Avg/Cost", _fmt_cost(cur_w_avg), _S.peach, cur_w_avg, prev_w_avg)
-        body_w.append("   ")
-        append_metric(body_w, t("active_days"), f"{active_w}/7", _S.peach, active_w, None)
+        body_w = _period_section("This Week", f"{cur_w.week_start} ~ {cur_w.week_end}",
+                                 cur_w, prev_w, cur_w_avg, prev_w_avg, f"{active_w}/7")
         parts.extend([Rule(style=_S.dim), body_w])
 
     get_console().print(Padding(Panel(Group(*parts),
@@ -147,6 +125,27 @@ def _render_summary(stats: list[DailyStats], agents: list[str] | None,
     get_console().print()
 
 
+def _period_section(title: str, subtitle: str,
+                    cur: WeeklyStats | MonthlyStats, prev: WeeklyStats | MonthlyStats | None,
+                    cur_avg: float, prev_avg: float | None, active_str: str) -> Text:
+    """This Month / This Week 段：标题 + 区间，单行橙色 Tokens/Cost/Avg/Cost（带环比）+ 活跃天数（不带环比）。
+    cur/prev 鸭子类型——Monthly/WeeklyStats 都有 total_tokens / cost_usd。"""
+    body = Text()
+    body.append(title, style=f"bold {_S.good}")
+    body.append(f"  {subtitle}", style=f"dim {_S.good}")
+    body.append("\n")
+    append_metric(body, "Tokens", _fmt_tokens(cur.total_tokens), _S.peach,
+                  cur.total_tokens, prev.total_tokens if prev else None)
+    body.append("   ")
+    append_metric(body, "Cost", _fmt_cost(cur.cost_usd), _S.peach,
+                  cur.cost_usd, prev.cost_usd if prev else None)
+    body.append("   ")
+    append_metric(body, "Avg/Cost", _fmt_cost(cur_avg), _S.peach, cur_avg, prev_avg)
+    body.append("   ")
+    append_metric(body, t("active_days"), active_str, _S.peach)
+    return body
+
+
 def _display_weeks() -> int:
     """要显示的周数，右对齐只保留最近若干周。宽度交给 Rich console 判定（它依次读 tty
     尺寸、`COLUMNS`，都拿不到才回落 80）；装不下整年时砍掉最左（最老）的周、不折行。

{token_tracker-0.4.1 → token_tracker-0.4.2/src/token_tracker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: token-tracker
-Version: 0.4.1
+Version: 0.4.2
 Summary: Track token usage across local AI agents (Claude Code, Codex)
 Author-email: stormzhang <stormzhang.dev@gmail.com>
 License: MIT License

{token_tracker-0.4.1 → token_tracker-0.4.2}/tests/test_cost.py

@@ -222,3 +222,121 @@ def test_stale_cache_survives_middownload_errors(tmp_path, monkeypatch, exc):
 
     monkeypatch.setattr(cost, "_fetch_and_cache", boom)
     assert cost._load_pricing() == {"gpt-5": {"input_cost_per_token": 7e-6}}
+
+
+# ---- 国产模型定价（2026-06 官方核实，详见 cost.py 注释）----
+
+
+def test_fallback_pricing_includes_chinese_models():
+    # 六家国产主力 model id 都要有内置价，不能因 litellm 未收录 bare key 而归零
+    pricing = cost._fallback_pricing()
+    for k in (
+        "kimi-k2.7-code", "kimi-k2.6", "kimi-k2.5", "moonshot-v1-128k",
+        "glm-4.6", "glm-4.5-air", "glm-5",
+        "qwen3-coder-plus", "qwen-max", "qwen-plus",
+        "doubao-seed-1-6", "doubao-seed-code", "doubao-1-5-pro-32k", "doubao-1-5-pro-256k",
+        "deepseek-v4-flash", "deepseek-v4-pro", "deepseek-chat", "deepseek-reasoner",
+        "MiniMax-M2", "MiniMax-M2.7", "MiniMax-M3",
+        "mimo-v2.5-pro", "mimo-v2.5",
+    ):
+        assert k in pricing, f"fallback pricing missing {k}"
+        assert pricing[k].get("input_cost_per_token", 0) > 0
+
+
+def test_glm_uses_intl_usd_pricing(monkeypatch):
+    # GLM 口径例外：用 z.ai 国际站官方 USD（$0.6/$2.2/$0.11），不折汇率
+    monkeypatch.setattr(cost, "_pricing", cost._fallback_pricing())
+    entry = make_entry(
+        model="glm-4.6", input_tokens=1_000_000, output_tokens=1_000_000, cache_read_tokens=1_000_000
+    )
+    assert cost.calculate_cost(entry) == pytest.approx(0.6 + 2.2 + 0.11)
+
+
+def test_kimi_cny_converted_to_usd(monkeypatch):
+    # Kimi K2.7 Code 中国站 ¥6.5/¥27/¥1.3 按 7.1 折 USD
+    monkeypatch.setattr(cost, "_pricing", cost._fallback_pricing())
+    entry = make_entry(
+        model="kimi-k2.7-code", input_tokens=1_000_000, output_tokens=1_000_000, cache_read_tokens=1_000_000
+    )
+    assert cost.calculate_cost(entry) == pytest.approx((6.5 + 27 + 1.3) / 7.1)
+
+
+def test_deepseek_and_qwen_cny_base_tier(monkeypatch):
+    # DeepSeek V4-Flash ¥1/¥2；Qwen3-Coder 取 0-32K 档 ¥4/¥16，均 ÷7.1
+    monkeypatch.setattr(cost, "_pricing", cost._fallback_pricing())
+    ds = make_entry(model="deepseek-v4-flash", input_tokens=1_000_000, output_tokens=1_000_000)
+    assert cost.calculate_cost(ds) == pytest.approx((1 + 2) / 7.1)
+    qw = make_entry(model="qwen3-coder-plus", input_tokens=1_000_000, output_tokens=1_000_000)
+    assert cost.calculate_cost(qw) == pytest.approx((4 + 16) / 7.1)
+
+
+def test_minimax_m2_usd_pricing(monkeypatch):
+    # MiniMax M2 官方 USD $0.3/$1.2（与中国站÷7 自洽）
+    monkeypatch.setattr(cost, "_pricing", cost._fallback_pricing())
+    entry = make_entry(model="MiniMax-M2", input_tokens=1_000_000, output_tokens=1_000_000)
+    assert cost.calculate_cost(entry) == pytest.approx(0.3 + 1.2)
+
+
+def test_mimo_cny_pricing(monkeypatch):
+    # 小米 MiMo 官方中国站人民币价（mimo.mi.com）：Pro ¥3/¥6、标准 ¥1/¥2，÷7.1；未来版本系列兜底
+    monkeypatch.setattr(cost, "_pricing", cost._fallback_pricing())
+    pro = make_entry(model="mimo-v2.5-pro", input_tokens=1_000_000, output_tokens=1_000_000)
+    assert cost.calculate_cost(pro) == pytest.approx((3 + 6) / 7.1)
+    std = make_entry(model="mimo-v2.5", input_tokens=1_000_000, output_tokens=1_000_000)
+    assert cost.calculate_cost(std) == pytest.approx((1 + 2) / 7.1)
+    # 未来 mimo-v3 → mimo-v2.5 系列兜底（¥1 input ÷7.1）
+    assert cost.calculate_cost(make_entry(model="mimo-v3", input_tokens=1_000_000)) == pytest.approx(1 / 7.1)
+
+
+def test_chinese_model_family_fallback(monkeypatch):
+    # 未知新版本 / 已下线旧 id 按系列兜底，不归零
+    monkeypatch.setattr(cost, "_pricing", cost._fallback_pricing())
+    # 未来 kimi-k3 → kimi-k2.6（¥6.5 input ÷7.1）
+    assert cost.calculate_cost(make_entry(model="kimi-k3-preview", input_tokens=1_000_000)) == pytest.approx(6.5 / 7.1)
+    # 已 EOL 的 kimi-k2-instruct → kimi 系列兜底，不归零
+    assert cost.calculate_cost(make_entry(model="kimi-k2-instruct", input_tokens=1_000_000)) == pytest.approx(6.5 / 7.1)
+    # 未来 glm-4.8 → glm-4.6（$0.6 input，不折汇率）
+    assert cost.calculate_cost(make_entry(model="glm-4.8", input_tokens=1_000_000)) == pytest.approx(0.6)
+    # 未来 minimax-m4 → MiniMax-M2（$0.3 input）
+    assert cost.calculate_cost(make_entry(model="minimax-m4", input_tokens=1_000_000)) == pytest.approx(0.3)
+
+
+def test_chinese_models_have_short_names():
+    # cost.py 内置的国产 key 都应在 MODEL_SHORT 有短名（报表 / 状态栏可读）
+    from token_tracker.ui.format import MODEL_SHORT
+    for k in (
+        "kimi-k2.7-code", "kimi-k2.6", "kimi-k2.5",
+        "moonshot-v1-8k", "moonshot-v1-32k", "moonshot-v1-128k",
+        "glm-4.6", "glm-4.5", "glm-4.5-air", "glm-4.7", "glm-5",
+        "qwen3-coder-plus", "qwen-max", "qwen-plus",
+        "doubao-seed-1-6", "doubao-seed-code", "doubao-1-5-pro-32k", "doubao-1-5-pro-256k",
+        "deepseek-v4-flash", "deepseek-v4-pro", "deepseek-chat", "deepseek-reasoner",
+        "MiniMax-M2", "MiniMax-M2.1", "MiniMax-M2.5", "MiniMax-M2.7", "MiniMax-M3",
+        "mimo-v2.5-pro", "mimo-v2.5",
+    ):
+        assert k in MODEL_SHORT, f"MODEL_SHORT missing {k}"
+
+
+def test_grok_pricing_and_retirement_routing(monkeypatch):
+    # xAI Grok 官方 USD（docs.x.ai）；2026-05-15 退役 slug 按官方路由到 grok-4.3 / grok-build-0.1
+    monkeypatch.setattr(cost, "_pricing", cost._fallback_pricing())
+    flagship = make_entry(model="grok-4.3", input_tokens=1_000_000, output_tokens=1_000_000)
+    assert cost.calculate_cost(flagship) == pytest.approx(1.25 + 2.5)
+    coding = make_entry(model="grok-build-0.1", input_tokens=1_000_000, output_tokens=1_000_000)
+    assert cost.calculate_cost(coding) == pytest.approx(1.0 + 2.0)
+    # 退役别名 grok-code-fast-1 → build-0.1 价（¥ 无关，纯 USD）
+    alias = make_entry(model="grok-code-fast-1", input_tokens=1_000_000, output_tokens=1_000_000)
+    assert cost.calculate_cost(alias) == pytest.approx(3.0)
+    # 退役 slug grok-4-fast / grok-3 → grok-4.3 价（官方就这么路由）
+    assert cost.calculate_cost(make_entry(model="grok-4-fast", input_tokens=1_000_000)) == pytest.approx(1.25)
+    assert cost.calculate_cost(make_entry(model="grok-3", input_tokens=1_000_000)) == pytest.approx(1.25)
+
+
+def test_gemini_and_grok_short_names():
+    # Gemini 不入 cost.py（litellm 价已对），只验短名在 MODEL_SHORT；Grok 短名同验
+    from token_tracker.ui.format import MODEL_SHORT
+    for k in (
+        "gemini-2.5-pro", "gemini-3-pro-preview", "gemini-3.5-flash",
+        "grok-4.3", "grok-build-0.1", "grok-code-fast-1",
+    ):
+        assert k in MODEL_SHORT, f"MODEL_SHORT missing {k}"

{token_tracker-0.4.1 → token_tracker-0.4.2}/tests/test_hooks.py

@@ -410,63 +410,38 @@ def test_setup_writes_setup_version(tmp_path, monkeypatch):
     assert config.setup_version() == config.SETUP_VERSION  # setup 完成后被打上当前版本
 
 
-def test_cli_outdated_setup_triggers_wizard_in_tty(monkeypatch, tmp_path):
-    # 老用户 is_setup=True 且 setup_version < SETUP_VERSION 且双 tty 非会话内 → 直接弹 wizard。
-    from token_tracker import cli, config, wizard
+def test_cli_outdated_setup_triggers_setup_flow(monkeypatch, tmp_path):
+    # 老用户 is_setup=True 且 setup_version < SETUP_VERSION → 自动走 _run_setup_flow
+    # （内部分流真终端 wizard / 会话内 _auto_setup，这里只验触发、不管分流）。
+    from token_tracker import cli, config
     _isolate_config(monkeypatch, tmp_path)
     calls: dict = {}
 
-    def fake_wizard():
-        calls["wizard"] = True
+    def fake_flow():
+        calls["flow"] = True
         raise SystemExit(0)  # 短路 cli.main 后续数据命令逻辑
 
-    monkeypatch.setattr(wizard, "run_wizard", fake_wizard)
+    monkeypatch.setattr(cli, "_run_setup_flow", fake_flow)
     monkeypatch.setattr(cli, "is_setup", lambda: True)
     monkeypatch.setattr(cli, "needs_update", lambda: False)
-    monkeypatch.setattr(cli, "_should_run_wizard", lambda: True)
     # setup_version 字段缺失 → 读出 0 < SETUP_VERSION
-    monkeypatch.setattr(config, "SETUP_VERSION", 1)
+    monkeypatch.setattr(config, "SETUP_VERSION", 2)
     monkeypatch.setattr("sys.argv", ["tt", "status"])
 
     with pytest.raises(SystemExit):
         cli.main()
-    assert calls == {"wizard": True}
+    assert calls == {"flow": True}
 
 
-def test_cli_outdated_setup_non_tty_prints_hint_only(monkeypatch, tmp_path, capsys):
-    # 老用户但非 tty / 会话内 → 不进 wizard，只打印一行 setup_outdated_hint 提示。
-    from token_tracker import cli, config, wizard
+def test_cli_setup_up_to_date_skips_flow(monkeypatch, tmp_path):
+    # setup_version 已是当前 → 不触发 _run_setup_flow，正常往下跑。
+    from token_tracker import cli, config
     _isolate_config(monkeypatch, tmp_path)
     calls: dict = {}
 
-    monkeypatch.setattr(wizard, "run_wizard", lambda: calls.__setitem__("wizard", True))
+    monkeypatch.setattr(cli, "_run_setup_flow", lambda: calls.__setitem__("flow", True))
     monkeypatch.setattr(cli, "is_setup", lambda: True)
     monkeypatch.setattr(cli, "needs_update", lambda: False)
-    monkeypatch.setattr(cli, "_should_run_wizard", lambda: False)
-    monkeypatch.setattr(cli, "_build_status_data", lambda _agents: {})  # 走 "no data" 早返回
-    from types import SimpleNamespace
-    monkeypatch.setattr(cli, "detect_agents",
-                        lambda: [SimpleNamespace(name="Claude Code", id="claude-code")])
-    monkeypatch.setattr(config, "SETUP_VERSION", 1)
-    monkeypatch.setattr("sys.argv", ["tt", "status"])
-
-    cli.main()
-    assert calls == {}  # wizard 没被调
-    out = capsys.readouterr().out
-    # 中英任一命中即可（取决于运行环境系统语言）
-    assert "tt setup" in out
-
-
-def test_cli_setup_up_to_date_skips_wizard(monkeypatch, tmp_path):
-    # setup_version 已是当前 → 不触发 wizard 也不打印提示，正常往下跑。
-    from token_tracker import cli, config, wizard
-    _isolate_config(monkeypatch, tmp_path)
-    calls: dict = {}
-
-    monkeypatch.setattr(wizard, "run_wizard", lambda: calls.__setitem__("wizard", True))
-    monkeypatch.setattr(cli, "is_setup", lambda: True)
-    monkeypatch.setattr(cli, "needs_update", lambda: False)
-    monkeypatch.setattr(cli, "_should_run_wizard", lambda: True)
     monkeypatch.setattr(cli, "_build_status_data", lambda _agents: {})
     from types import SimpleNamespace
     monkeypatch.setattr(cli, "detect_agents",