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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: token-tracker
-Version: 0.4.4
+Version: 0.4.5
 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.4 → token_tracker-0.4.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "token-tracker"
-version = "0.4.4"
+version = "0.4.5"
 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.5}/src/token_tracker/hooks.py

@@ -702,13 +702,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"

{token_tracker-0.4.4 → token_tracker-0.4.5/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.5
 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.4 → token_tracker-0.4.5}/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 解析错误