token-tracker 0.4.4__tar.gz → 0.4.6__tar.gz

{token_tracker-0.4.4/src/token_tracker.egg-info → token_tracker-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: token-tracker
-Version: 0.4.4
+Version: 0.4.6
 Summary: Track token usage across local AI agents (Claude Code, Codex)
 Author-email: stormzhang <stormzhang.dev@gmail.com>
 License: MIT License
@@ -149,6 +149,13 @@ curl -sSL https://raw.githubusercontent.com/stormzhang/token-tracker/main/instal
 > **升级**：重跑上面的命令即可（脚本幂等、自动升到最新）。
 > **卸载**：`tt unsetup`
 
+**升级后 `tt --version` 还是旧版？** 多半是旧版装在别的 Python 环境里遮蔽了新版（常见于 Windows、或早期用 `pip install` 装过）。卸载旧版后重装一次即可：
+
+```bash
+pip uninstall token-tracker
+curl -sSL https://raw.githubusercontent.com/stormzhang/token-tracker/main/install.sh | bash
+```
+
 ## 使用
 
 ```bash

{token_tracker-0.4.4 → token_tracker-0.4.6}/README.md

@@ -96,6 +96,13 @@ curl -sSL https://raw.githubusercontent.com/stormzhang/token-tracker/main/instal
 > **升级**：重跑上面的命令即可（脚本幂等、自动升到最新）。
 > **卸载**：`tt unsetup`
 
+**升级后 `tt --version` 还是旧版？** 多半是旧版装在别的 Python 环境里遮蔽了新版（常见于 Windows、或早期用 `pip install` 装过）。卸载旧版后重装一次即可：
+
+```bash
+pip uninstall token-tracker
+curl -sSL https://raw.githubusercontent.com/stormzhang/token-tracker/main/install.sh | bash
+```
+
 ## 使用
 
 ```bash

{token_tracker-0.4.4 → token_tracker-0.4.6}/pyproject.toml

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

{token_tracker-0.4.4 → token_tracker-0.4.6}/src/token_tracker/hooks.py

@@ -36,8 +36,8 @@ CODEX_DIR = _CODEX
 CODEX_CONFIG = os.path.join(CODEX_DIR, "config.toml")     # 改 Codex 配置，留 agent 目录
 CODEX_STATUSLINE_HOOK_PATH = os.path.join(_TT, "codex-statusline.py")
 STATUS_FILE = os.path.join(_TT, "tt-status.json")         # CC statusline 缓存（脚本写、tt status 读）
-HOOK_VERSION = "1.7"
-STATUSLINE_HOOK_VERSION = "1.0"
+HOOK_VERSION = "1.8"
+STATUSLINE_HOOK_VERSION = "1.1"
 
 CC_BACKUP_PATH = os.path.join(_TT, "cc-backup.json")
 CODEX_BACKUP_LEGACY = os.path.join(_TT, "codex-backup.json")  # 老用户残留，unsetup 时还能恢复
@@ -150,25 +150,35 @@ def git_branch(cwd):
 
 
 def git_diff_stat(cwd):
-    """相对 HEAD 的未提交增删行数（暂存+未暂存，不含未跟踪文件）。失败/无 commit 返回 (0, 0)。"""
+    """相对 HEAD 的未提交增删行数 + 未跟踪文件数（已跟踪改动按行、未跟踪按文件计数）。
+    失败/无 commit 返回 (0, 0, 0)。"""
+    added = deleted = 0
     try:
         out = subprocess.check_output(
             ["git", "diff", "HEAD", "--numstat"], cwd=cwd,
             stderr=subprocess.DEVNULL, text=True, timeout=2,
         )
+        for line in out.splitlines():
+            parts = line.split("\t")
+            if len(parts) < 2:
+                continue
+            a, d = parts[0], parts[1]
+            if a.isdigit():
+                added += int(a)
+            if d.isdigit():
+                deleted += int(d)
     except Exception:
-        return 0, 0
-    added = deleted = 0
-    for line in out.splitlines():
-        parts = line.split("\t")
-        if len(parts) < 2:
-            continue
-        a, d = parts[0], parts[1]
-        if a.isdigit():
-            added += int(a)
-        if d.isdigit():
-            deleted += int(d)
-    return added, deleted
+        pass
+    untracked = 0
+    try:
+        out = subprocess.check_output(
+            ["git", "ls-files", "--others", "--exclude-standard"], cwd=cwd,
+            stderr=subprocess.DEVNULL, text=True, timeout=2,
+        )
+        untracked = sum(1 for ln in out.splitlines() if ln.strip())
+    except Exception:
+        pass
+    return added, deleted, untracked
 
 
 def save_data(data, now):
@@ -267,11 +277,13 @@ def render(data, now, tps=None):
         branch = git_branch(project)
         if branch:
             inner = f"{C['branch']}{branch}{C['reset']}"
-            added, deleted = git_diff_stat(project)
+            added, deleted, untracked = git_diff_stat(project)
             if added:
                 inner += f" {C['added']}+{added}{C['reset']}"
             if deleted:
                 inner += f" {C['deleted']}-{deleted}{C['reset']}"
+            if untracked:
+                inner += f" {C['untracked']}?{untracked}{C['reset']}"
             line1.append(f"\033[1m{C['project']}[{name}]{C['reset']}({inner})")
         else:
             line1.append(f"\033[1m{C['project']}[{name}]{C['reset']}")
@@ -528,9 +540,10 @@ def _ctx_pct(info):
 
 
 def _git_status(cwd):
-    """(branch, +A, -D)；失败/非 git/无 commit 返回 ("", 0, 0)。"""
+    """(branch, +A, -D, ?U)；已跟踪改动按行、未跟踪按文件计数。
+    失败/非 git/无 commit 返回 ("", 0, 0, 0)。"""
     if not cwd:
-        return "", 0, 0
+        return "", 0, 0, 0
 
     def run(args):
         return subprocess.check_output(
@@ -540,9 +553,9 @@ def _git_status(cwd):
     try:
         branch = run(["branch", "--show-current"])
     except Exception:
-        return "", 0, 0
+        return "", 0, 0, 0
     if not branch:
-        return "", 0, 0
+        return "", 0, 0, 0
     try:
         if run(["status", "--porcelain", "--untracked-files=no"]):
             branch += "*"
@@ -559,14 +572,19 @@ def _git_status(cwd):
                     d += int(parts[1])
     except Exception:
         pass
-    return branch, a, d
+    u = 0
+    try:
+        u = sum(1 for ln in run(["ls-files", "--others", "--exclude-standard"]).splitlines() if ln.strip())
+    except Exception:
+        pass
+    return branch, a, d, u
 
 
 def _render_project(cwd):
     if not cwd:
         return ""
     name = os.path.basename(cwd.rstrip("/"))
-    branch, a, d = _git_status(cwd)
+    branch, a, d, u = _git_status(cwd)
     if not branch:
         return f"{BOLD}{C['project']}[{name}]{RST}"
     inner = f"{C['branch']}{branch}{RST}"
@@ -574,6 +592,8 @@ def _render_project(cwd):
         inner += f" {C['added']}+{a}{RST}"
     if d:
         inner += f" {C['deleted']}-{d}{RST}"
+    if u:
+        inner += f" {C['untracked']}?{u}{RST}"
     return f"{BOLD}{C['project']}[{name}]{RST}({inner})"
 
 
@@ -614,7 +634,8 @@ def main():
         line1.append(f"{C['tokens']}Total: {fmt_tokens(total)}{RST}")  # 整体取 tokens 槽（mocha=peach/橙）
     model = model or payload.get("model") or ""  # session turn_context 的 model（gpt-5.5）优先
     if model:
-        label = f"{model} {effort}" if effort else model
+        # effort 缺失时显示 default（Codex 默认 reasoning level），与 TUI 的 Current reasoning level 对齐
+        label = f"{model} {effort or 'default'}"
         line1.append(f"{C['total']}Model: {label}{RST}")  # 整体取 total 槽（mocha=red/红）
 
     # L2: Limit: 5h | 7d | <window> Ctx（仿 CC statusline，带进度条 + reset）
@@ -702,13 +723,21 @@ def _has_tt_codex_statusline(content: str) -> bool:
 
 def _install_codex_statusline(content: str, python: str) -> str:
     """落盘 Codex statusline 脚本 + 在 config.toml 末尾追加 Stop hook 段。
-    新名（codex-statusline）已存在 → 幂等返回；只存在旧名（tt-statusline）→ 清掉后追加（迁移）。"""
+    - 新名 codex-statusline 段已存在 + python 路径一致 → 幂等返回；
+    - 已存在但 python 路径不一致（用户升级 Python / 切换 conda/venv / 卸载某环境后跑 tt setup）→ 删旧装新，
+      避免 command 指向已死 python（症状：脚本 import token_tracker 失败被 try/except 吞掉，状态栏只剩项目名）；
+    - 只存在旧名 tt-statusline → 清掉后追加新路径段（老用户迁移）。"""
     _write_codex_statusline_script()
-    if "codex-statusline" in content:
-        return content
-    if "tt-statusline" in content:  # 旧路径残留 → 清掉，下面追加新路径段
-        content = _CODEX_STATUSLINE_REGEX.sub("\n", content)
     cmd = f"{python} {CODEX_STATUSLINE_HOOK_PATH}"
+    if "codex-statusline" in content or "tt-statusline" in content:
+        # 从已有的 command 行提取 python 路径（兼容 basic / literal string 包裹）
+        m = re.search(
+            r"command = [\"']([^ ]+) [^\"']*(?:codex-statusline|tt-statusline)[^\"']*[\"']",
+            content,
+        )
+        if m and m.group(1) == python and "codex-statusline" in content:
+            return content  # python 一致 + 已是新名 → 幂等
+        content = _CODEX_STATUSLINE_REGEX.sub("\n", content)  # 路径不一致或老名残留 → 删旧段
     return content.rstrip() + (
         "\n\n[[hooks.Stop]]\n\n"
         "[[hooks.Stop.hooks]]\n"
@@ -791,6 +820,30 @@ def _is_tt_cc_command(cmd: str) -> bool:
     return "claude-statusline" in cmd or "tt-statusline" in cmd
 
 
+def _build_cc_command(python: str, script: str) -> str:
+    """拼 statusLine command 字符串。
+    Windows: 反斜杠转正斜杠（CC 在 Windows 走 Git Bash/sh 执行 command，反斜杠被吞致 exit 127）；
+    所有平台: 两段路径都加双引号包裹（防路径含空格断词）。
+    issue #13 / #14 根治：旧格式 `f"{python} {script}"` 在 Windows 静默失败、状态栏空白。"""
+    if os.name == "nt":
+        python = python.replace("\\", "/")
+        script = script.replace("\\", "/")
+    return f'"{python}" "{script}"'
+
+
+def _cc_command_outdated(cmd: str) -> bool:
+    """settings.json 里 tt 的 statusLine.command 是否还是旧格式（裸拼接 / 含反斜杠）。
+    新格式：两段路径都用 `"` 包裹 + Windows 上路径必须正斜杠。
+    仅对 tt 的 command 生效（_is_tt_cc_command 已先过滤），用户原 command 不动。"""
+    if not cmd:
+        return False
+    if not cmd.startswith('"'):
+        return True  # 没引号 = 旧裸拼接
+    if os.name == "nt" and "\\" in cmd:
+        return True  # Windows 上还含反斜杠 = 没转过来
+    return False
+
+
 def _write_cc_statusline_script() -> None:
     """渲染并落盘 CC statusline 脚本（mkdir + 执行权限）。"""
     os.makedirs(_TT, exist_ok=True)
@@ -811,12 +864,45 @@ def _migrate_legacy() -> None:
                 pass
 
 
+def _cc_command_needs_sync() -> bool:
+    """检测 settings.json 里 tt 的 statusLine.command 是否需要重写为新格式（issue #13/#14）。
+    用户原 command（非 tt）一律不动。"""
+    if not os.path.exists(CLAUDE_SETTINGS):
+        return False
+    try:
+        with open(CLAUDE_SETTINGS, encoding="utf-8") as f:
+            settings = json.load(f)
+    except (OSError, json.JSONDecodeError):
+        return False
+    cmd = (settings.get("statusLine") or {}).get("command") or ""
+    if not _is_tt_cc_command(cmd):
+        return False
+    return _cc_command_outdated(cmd)
+
+
+def _sync_cc_command() -> None:
+    """重写 settings.json 里 tt 的 statusLine.command 字段（保留其它字段不动）。"""
+    try:
+        with open(CLAUDE_SETTINGS, encoding="utf-8") as f:
+            settings = json.load(f)
+    except (OSError, json.JSONDecodeError):
+        return
+    if not _is_tt_cc_command((settings.get("statusLine") or {}).get("command") or ""):
+        return
+    python = sys.executable or "python3"
+    settings["statusLine"] = {"type": "command", "command": _build_cc_command(python, HOOK_SCRIPT_PATH)}
+    with open(CLAUDE_SETTINGS, "w", encoding="utf-8") as f:
+        json.dump(settings, f, indent=2, ensure_ascii=False)
+
+
 def needs_update() -> bool:
     # 只在已安装（新位置脚本文件存在）时纳入版本判断，未装不主动装
     if os.path.exists(HOOK_SCRIPT_PATH) and _installed_hook_version() != HOOK_VERSION:
         return True
     sv = _installed_codex_statusline_version()
-    return sv is not None and sv != STATUSLINE_HOOK_VERSION
+    if sv is not None and sv != STATUSLINE_HOOK_VERSION:
+        return True
+    return _cc_command_needs_sync()  # settings.json 里 command 格式过时也算待更新（issue #13/#14）
 
 
 def update_hook() -> None:
@@ -824,6 +910,8 @@ def update_hook() -> None:
         _write_cc_statusline_script()
     if _installed_codex_statusline_version() is not None:
         _write_codex_statusline_script()
+    if _cc_command_needs_sync():
+        _sync_cc_command()
 
 
 # --- setup ---
@@ -895,7 +983,7 @@ def _setup_claude(quiet: bool = False) -> None:
             json.dump({"statusLine": existing}, f, indent=2)
 
     python = sys.executable or "python3"
-    settings["statusLine"] = {"type": "command", "command": f"{python} {HOOK_SCRIPT_PATH}"}
+    settings["statusLine"] = {"type": "command", "command": _build_cc_command(python, HOOK_SCRIPT_PATH)}
 
     with open(CLAUDE_SETTINGS, "w", encoding="utf-8") as f:
         json.dump(settings, f, indent=2, ensure_ascii=False)

{token_tracker-0.4.4 → token_tracker-0.4.6}/src/token_tracker/ui/themes.py

@@ -2,7 +2,7 @@
 
 每个主题只定义 **9 个基色**（沿用 Catppuccin 的槽位命名）+ 是否浅色 + 5 档热力渐变；
 - 17 个 CLI 语义槽由 `derive_slots()` 统一派生（`token=sapphire`、`cost=yellow`…）；
-- statusline 的 12 个 key 由 `_STATUSLINE_SLOTS` 映射到这 9 槽的子集。
+- statusline 的 13 个 key 由 `_STATUSLINE_SLOTS` 映射到这 9 槽的子集。
 
 颜色取值：Catppuccin（mocha/latte/frappe/macchiato）用官方 hex；Nord / Dracula 按色相
 就近映射到这 9 槽。truecolor 终端用精确 hex，不支持 truecolor 的降级到 **256 色近似**
@@ -77,15 +77,17 @@ THEMES: dict[str, dict] = {
 # 展示顺序（tt theme list / 向导）。
 THEME_NAMES = tuple(THEMES)
 
-# statusline 12 个着色 key → 9 基色槽（reset 固定为 \033[0m，单列）。
+# statusline 13 个着色 key → 9 基色槽（reset 固定为 \033[0m，单列）。
 # 这套角色映射沿用旧 mocha 状态栏观感（分支红/玫红、标签粉、Tokens 桃、Model/Duration 蓝），
 # 与 CLI 报表的 _S 语义槽**不完全同源**（CLI token=sapphire 青）——按主人审美选择保留状态栏旧手感。
 # total=red 红：第 1 行消耗/产出指标（Total/Cost/Code 标签）用它。
+# untracked=mauve 紫：git 段未跟踪文件数 ?N，独占一色与 +A(绿)/-D(红) 区分。
 _STATUSLINE_SLOTS = {
     "project": "green",
     "branch": "red",
     "added": "green",
     "deleted": "red",
+    "untracked": "mauve",
     "label": "pink",
     "bar_ok": "green",
     "bar_warn": "yellow",

{token_tracker-0.4.4 → token_tracker-0.4.6/src/token_tracker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: token-tracker
-Version: 0.4.4
+Version: 0.4.6
 Summary: Track token usage across local AI agents (Claude Code, Codex)
 Author-email: stormzhang <stormzhang.dev@gmail.com>
 License: MIT License
@@ -149,6 +149,13 @@ curl -sSL https://raw.githubusercontent.com/stormzhang/token-tracker/main/instal
 > **升级**：重跑上面的命令即可（脚本幂等、自动升到最新）。
 > **卸载**：`tt unsetup`
 
+**升级后 `tt --version` 还是旧版？** 多半是旧版装在别的 Python 环境里遮蔽了新版（常见于 Windows、或早期用 `pip install` 装过）。卸载旧版后重装一次即可：
+
+```bash
+pip uninstall token-tracker
+curl -sSL https://raw.githubusercontent.com/stormzhang/token-tracker/main/install.sh | bash
+```
+
 ## 使用
 
 ```bash

{token_tracker-0.4.4 → token_tracker-0.4.6}/tests/test_hooks.py

@@ -80,12 +80,28 @@ def test_codex_statusline_install_uninstall_roundtrip(tmp_path, monkeypatch):
     assert "tt-statusline" not in removed and 'command = "mine"' in removed
 
 
+def test_codex_statusline_install_updates_stale_python(tmp_path, monkeypatch):
+    # 回归：用户升级 Python / 切换 conda/venv 后再跑 tt setup，
+    # 老的 codex-statusline 段被无脑幂等保留 → command 指向已死 python → 状态栏半残（issue 用户反馈）。
+    monkeypatch.setattr(hooks, "CODEX_STATUSLINE_HOOK_PATH", str(tmp_path / "codex-statusline.py"))
+    first = hooks._install_codex_statusline("", "/old/python")
+    assert "/old/python" in first
+    # 同 python 再装 → 幂等保持
+    assert hooks._install_codex_statusline(first, "/old/python") == first
+    # 换 python（用户升级了 Python / 切了环境）→ 必须重写、删旧段、装新段
+    second = hooks._install_codex_statusline(first, "/new/python")
+    assert "/new/python" in second
+    assert "/old/python" not in second  # 死路径清干净
+    assert second.count("[[hooks.Stop]]") == 1  # 没残留两段
+
+
 def test_codex_statusline_windows_path_toml_parses(tmp_path, monkeypatch):
     # 回归：Windows 路径含 \U \A \P 等被 TOML basic string 当 unicode 转义起始符（issue 用户反馈）
     # —— 写入的 command 必须用 literal string（单引号）包裹，写出来后能被 tomllib 原样解析回来。
     import tomllib
     monkeypatch.setattr(hooks, "CODEX_STATUSLINE_HOOK_PATH",
                         r"C:\Users\test\.config\token-tracker\codex-statusline.py")
+    monkeypatch.setattr(hooks, "_write_codex_statusline_script", lambda: None)  # 别在 macOS 上真写 Windows 路径
     py = r"C:\Users\test\AppData\Local\Programs\Python\Python313\python.exe"
     content = hooks._install_codex_statusline("", py)
     parsed = tomllib.loads(content)  # 旧 bug：basic string 下 \U 等触发 TOML 解析错误
@@ -128,8 +144,8 @@ def test_setup_components_off_skips_install(tmp_path, monkeypatch):
 
     hooks.setup(components=hooks.SetupComponents(codex_faux_statusline=False))
 
-    # CC statusline 仍装
-    assert json.loads(settings_path.read_text())["statusLine"]["command"].endswith("tt-statusline.py")
+    # CC statusline 仍装（command 现在带引号包裹，issue #13 修复）
+    assert json.loads(settings_path.read_text())["statusLine"]["command"].endswith('tt-statusline.py"')
     # Codex 端：不再动 [tui].status_line（保持用户原配置）；Stop hook（tt-statusline）也不在 config 里
     codex_content = codex_config.read_text()
     assert "status_line = []" in codex_content  # 用户原 status_line 没被动
@@ -213,6 +229,12 @@ def test_statusline_shows_git_diff_stat(tmp_path):
     line_dirty = _run_statusline(script_path, repo)
     assert "+2" in line_dirty and "-1" in line_dirty
 
+    # 再造 2 个未跟踪文件 → 应额外显示 ?2（按文件数计、不读行数）
+    (repo / "new1.txt").write_text("x\n")
+    (repo / "new2.txt").write_text("x\ny\n")
+    line_with_untracked = _run_statusline(script_path, repo)
+    assert "?2" in line_with_untracked
+
 
 def _run_statusline_home(script_path, payload, home):
     """隔离 HOME 下跑落盘 statusline 脚本，返回完整 stdout（不污染真实 ~/.claude）。"""
@@ -464,3 +486,77 @@ def test_cli_setup_up_to_date_skips_flow(monkeypatch, tmp_path):
 
     cli.main()
     assert calls == {}
+
+
+def test_build_cc_command_windows_quotes_and_slashes(monkeypatch):
+    # issue #13/#14：Windows 上 statusLine command 必须正斜杠 + 引号包裹，
+    # 否则 CC 走 Git Bash 执行时反斜杠被吞，状态栏静默空白。
+    monkeypatch.setattr(hooks.os, "name", "nt")
+    cmd = hooks._build_cc_command(
+        r"C:\Users\X\pipx\venvs\token-tracker\Scripts\python.exe",
+        r"C:\Users\X\.config\token-tracker\claude-statusline.py",
+    )
+    assert cmd == '"C:/Users/X/pipx/venvs/token-tracker/Scripts/python.exe" "C:/Users/X/.config/token-tracker/claude-statusline.py"'
+    assert "\\" not in cmd  # 反斜杠全转完
+    assert cmd.count('"') == 4  # 两段路径各包一对引号
+
+
+def test_build_cc_command_unix_always_quoted(monkeypatch):
+    # Unix 平台不转换路径分隔符，但始终加引号（防路径含空格断词）。
+    monkeypatch.setattr(hooks.os, "name", "posix")
+    cmd = hooks._build_cc_command(
+        "/Users/John Doe/.local/share/uv/tools/token-tracker/bin/python3",
+        "/Users/John Doe/.config/token-tracker/claude-statusline.py",
+    )
+    assert cmd.startswith('"') and cmd.count('"') == 4
+    assert "John Doe" in cmd  # 含空格路径被引号包住、能正确执行
+
+
+def test_cc_command_outdated_detects_legacy_format(monkeypatch):
+    # 旧格式（裸拼接、无引号）应被检测为过时；新格式不动。
+    monkeypatch.setattr(hooks.os, "name", "posix")
+    assert hooks._cc_command_outdated("/usr/bin/python3 /home/u/.config/token-tracker/claude-statusline.py")
+    assert not hooks._cc_command_outdated('"/usr/bin/python3" "/home/u/.config/token-tracker/claude-statusline.py"')
+    # Windows 上即便有引号，含反斜杠也算过时
+    monkeypatch.setattr(hooks.os, "name", "nt")
+    assert hooks._cc_command_outdated(r'"C:\Users\X\python.exe" "C:\Users\X\claude-statusline.py"')
+    assert not hooks._cc_command_outdated('"C:/Users/X/python.exe" "C:/Users/X/claude-statusline.py"')
+    # 空命令 / 非 tt 命令交给上层 _is_tt_cc_command 过滤；这里仅断言空串返回 False
+    assert not hooks._cc_command_outdated("")
+
+
+def test_update_hook_rewrites_outdated_cc_command(tmp_path, monkeypatch):
+    # 老用户场景：HOOK_SCRIPT_PATH 存在 + settings.json 里 command 是旧格式 →
+    # 跑任意 tt 命令触发 update_hook 自动重写为新格式（用户其它字段不动）。
+    settings_file = tmp_path / "settings.json"
+    script_file = tmp_path / "claude-statusline.py"
+    script_file.write_text(hooks._render_hook_script(), encoding="utf-8")
+    settings_file.write_text(json.dumps({
+        "statusLine": {"type": "command",
+                       "command": "/old/python3 /old/path/claude-statusline.py"},
+        "userField": "keep me",
+    }), encoding="utf-8")
+    monkeypatch.setattr(hooks, "CLAUDE_SETTINGS", str(settings_file))
+    monkeypatch.setattr(hooks, "HOOK_SCRIPT_PATH", str(script_file))
+    monkeypatch.setattr(hooks.sys, "executable", "/new/python3")
+    monkeypatch.setattr(hooks.os, "name", "posix")
+
+    assert hooks._cc_command_needs_sync()  # 检测到过时
+    hooks.update_hook()
+    new_settings = json.loads(settings_file.read_text(encoding="utf-8"))
+    assert new_settings["statusLine"]["command"].startswith('"/new/python3"')
+    assert new_settings["userField"] == "keep me"  # 用户其它字段保留
+    assert not hooks._cc_command_needs_sync()  # 重写后不再触发
+
+
+def test_cc_command_sync_skips_non_tt_command(tmp_path, monkeypatch):
+    # 用户自己的 statusLine（非 tt）即便没引号也不动——只管 tt 自己装的。
+    settings_file = tmp_path / "settings.json"
+    user_cmd = "/usr/bin/my-own-statusline --foo"
+    settings_file.write_text(json.dumps({
+        "statusLine": {"type": "command", "command": user_cmd},
+    }), encoding="utf-8")
+    monkeypatch.setattr(hooks, "CLAUDE_SETTINGS", str(settings_file))
+    assert not hooks._cc_command_needs_sync()
+    hooks._sync_cc_command()  # no-op
+    assert json.loads(settings_file.read_text(encoding="utf-8"))["statusLine"]["command"] == user_cmd