token-tracker 0.2.4__tar.gz → 0.3.1__tar.gz

{token_tracker-0.2.4 → token_tracker-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: token-tracker
-Version: 0.2.4
+Version: 0.3.1
 Summary: Track token usage across local AI agents (Claude Code, Codex)
 Requires-Python: >=3.11
 Requires-Dist: rich>=13.7

{token_tracker-0.2.4 → token_tracker-0.3.1}/README.md

@@ -38,6 +38,7 @@
 - **成本分析** — 按会话、日、周、月维度的等效成本统计，多 Agent 按来源分组展示
 - **会话洞察** — 项目、模型、时长、消息数一览
 - **零配置** — 自动检测已安装的 Agent，直接读取本地数据
+- **隐私安全** — 数据纯本地存储，不采集、不上传任何用户信息，极轻量无后顾之忧
 
 ## 安装
 
@@ -48,7 +49,7 @@ curl -sSL https://raw.githubusercontent.com/stormzhang/token-tracker/master/inst
 或者通过 pip：
 
 ```bash
-pip install token-tracker
+pip install --force-reinstall token-tracker
 tt setup
 ```
 

{token_tracker-0.2.4 → token_tracker-0.3.1}/pyproject.toml

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

{token_tracker-0.2.4 → token_tracker-0.3.1}/src/analyzer/cost.py

@@ -73,9 +73,18 @@ def _load_pricing() -> dict:
 
 
 def _fetch_and_cache() -> dict:
-    req = urllib.request.Request(LITELLM_URL, headers={"User-Agent": "token-tracker/0.1"})
-    with urllib.request.urlopen(req, timeout=10) as resp:
-        data = json.loads(resp.read().decode())
+    import ssl
+    ctx = ssl.create_default_context()
+    try:
+        req = urllib.request.Request(LITELLM_URL, headers={"User-Agent": "token-tracker/0.1"})
+        with urllib.request.urlopen(req, timeout=10, context=ctx) as resp:
+            data = json.loads(resp.read().decode())
+    except ssl.SSLCertVerificationError:
+        ctx.check_hostname = False
+        ctx.verify_mode = ssl.CERT_NONE
+        req = urllib.request.Request(LITELLM_URL, headers={"User-Agent": "token-tracker/0.1"})
+        with urllib.request.urlopen(req, timeout=10, context=ctx) as resp:
+            data = json.loads(resp.read().decode())
 
     try:
         with open(CACHE_PATH, "w") as f:

{token_tracker-0.2.4 → token_tracker-0.3.1}/src/hooks.py

@@ -10,7 +10,7 @@ CLAUDE_SETTINGS = os.path.expanduser("~/.claude/settings.json")
 HOOK_SCRIPT_PATH = os.path.expanduser("~/.claude/tt-statusline.py")
 CODEX_CONFIG = os.path.expanduser("~/.codex/config.toml")
 CODEX_BACKUP = os.path.expanduser("~/.codex/tt-backup.json")
-HOOK_VERSION = "1.1"
+HOOK_VERSION = "1.2"
 _BACKUP_KEY = "tokenTracker"
 _PREV_SL_KEY = "previousStatusLine"
 _SL_REGEX = re.compile(r'status_line\s*=\s*\[.*?\]', re.DOTALL)
@@ -25,8 +25,8 @@ CODEX_STATUS_LINE = [
 
 HOOK_SCRIPT = r'''#!/usr/bin/env python3
 """Claude Code statusLine — 状态栏显示 + 数据持久化到 tt-status.json"""
-__version__ = "1.1"
-import json, os, sys, tempfile
+__version__ = "1.2"
+import json, os, subprocess, sys, tempfile
 from datetime import datetime, timezone
 
 STATUS_FILE = os.path.expanduser("~/.claude/tt-status.json")
@@ -57,60 +57,129 @@ def progress_bar(value):
     return f"{color_by_pct(pct)}{filled_char * filled}{C['reset']}{empty_char * (width - filled)} {pct:.0f}%"
 
 
-def save_data(data):
-    data["_received_at"] = datetime.now(timezone.utc).isoformat()
+def fmt_duration(seconds):
+    if seconds >= 86400:
+        d, rem = int(seconds // 86400), int(seconds % 86400)
+        return f"{d}d{rem // 3600}h"
+    if seconds >= 3600:
+        h, m = int(seconds // 3600), int((seconds % 3600) // 60)
+        return f"{h}h{m}m"
+    if seconds >= 60:
+        return f"{int(seconds // 60)}min"
+    return f"{int(seconds)}s"
+
+
+def git_branch(cwd):
+    try:
+        branch = subprocess.check_output(
+            ["git", "branch", "--show-current"], cwd=cwd,
+            stderr=subprocess.DEVNULL, text=True, timeout=2,
+        ).strip()
+    except Exception:
+        return ""
+    if not branch:
+        return ""
+    try:
+        dirty = subprocess.check_output(
+            ["git", "status", "--porcelain", "--untracked-files=no"], cwd=cwd,
+            stderr=subprocess.DEVNULL, text=True, timeout=2,
+        ).strip()
+        if dirty:
+            branch += "*"
+    except Exception:
+        pass
+    return branch
+
+
+def save_data(data, now):
+    data["_received_at"] = now.isoformat()
+    tmp = None
     try:
         fd, tmp = tempfile.mkstemp(dir=os.path.dirname(STATUS_FILE), suffix=".tmp")
         with os.fdopen(fd, "w") as f:
             json.dump(data, f)
         os.replace(tmp, STATUS_FILE)
     except OSError:
-        pass
+        if tmp:
+            try:
+                os.unlink(tmp)
+            except OSError:
+                pass
 
 
-def render(data):
-    parts = []
+def render(data, now):
+    ctx = data.get("context_window") or {}
 
-    project = data.get("workspace", {}).get("project_dir", "")
-    if project:
-        parts.append(f"{C['cyan']}{os.path.basename(project)}{C['reset']}")
+    # --- Line 1: Project | 5h | 7d | CTX ---
+    line1 = []
 
-    rl = data.get("rate_limits", {})
-    has_rl = False
+    project = (data.get("workspace") or {}).get("project_dir", "")
+    if project:
+        name = os.path.basename(project)
+        branch = git_branch(project)
+        if branch:
+            line1.append(f"{C['green']}{name}{C['reset']}({C['magenta']}{branch}{C['reset']})")
+        else:
+            line1.append(f"{C['green']}{name}{C['reset']}")
+
+    rl = data.get("rate_limits") or {}
     for key, label in [("five_hour", "5h"), ("seven_day", "7d")]:
-        pct = rl.get(key, {}).get("used_percentage")
+        entry = rl.get(key) or {}
+        pct = entry.get("used_percentage")
         if pct is not None:
-            has_rl = True
-            parts.append(f"{C['blue']}{label}:{C['reset']}{progress_bar(pct)}")
-
-    if not has_rl:
-        cost = data.get("cost", {})
-        usd = cost.get("total_cost_usd")
-        if usd is not None:
-            parts.append(f"{C['blue']}Cost:{C['reset']}{C['peach']}${usd:.2f}{C['reset']}")
+            reset_str = ""
+            resets_at = entry.get("resets_at")
+            if resets_at:
+                remain = int(resets_at) - int(now.timestamp())
+                if remain > 0:
+                    reset_str = f" {C['dim']}({fmt_duration(remain)}){C['reset']}"
+            line1.append(f"{C['blue']}{label}:{C['reset']}{progress_bar(pct)}{reset_str}")
 
-    ctx = data.get("context_window", {})
     if ctx.get("used_percentage") is not None:
         size = ctx.get("context_window_size", 0)
-        pct = ctx["used_percentage"]
-        cc = C["green"] if pct < 40 else C["yellow"] if pct < 60 else C["red"]
-        parts.append(f"{cc}{fmt_tokens(size)} CTX: {pct:.0f}%{C['reset']}")
+        line1.append(f"{C['blue']}{fmt_tokens(size)} Context:{C['reset']}{progress_bar(ctx['used_percentage'])}")
+
+    # --- Line 2: Tokens + Cache + Cost ---
+    line2 = []
 
     total_in = ctx.get("total_input_tokens", 0)
     total_out = ctx.get("total_output_tokens", 0)
-    cache = ctx.get("current_usage", {}).get("cache_read_input_tokens", 0)
+    curr_usage = (ctx.get("current_usage") or {})
+    turn_in_total = curr_usage.get("input_tokens", 0) + curr_usage.get("cache_creation_input_tokens", 0)
+    turn_out = curr_usage.get("output_tokens", 0)
     if total_in or total_out:
-        parts.append(f"{C['peach']}Tokens: {fmt_tokens(total_in)}↑ {fmt_tokens(total_out)}↓ cached:{fmt_tokens(cache)}{C['reset']}")
-
-    model_name = data.get("model", {}).get("display_name", "")
+        tok = f"{C['peach']}Tokens: in {fmt_tokens(total_in)}, out {fmt_tokens(total_out)}"
+        tok += f" {C['dim']}(本轮: in {fmt_tokens(turn_in_total)}, out {fmt_tokens(turn_out)})"
+        tok += C['reset']
+        line2.append(tok)
+    cache_read = curr_usage.get("cache_read_input_tokens", 0)
+    if cache_read > 0:
+        line2.append(f"{C['cyan']}Cached: {fmt_tokens(cache_read)}{C['reset']}")
+
+    cost = data.get("cost") or {}
+    usd = cost.get("total_cost_usd")
+    if usd is not None:
+        line2.append(f"{C['magenta']}Cost: ${usd:.2f}{C['reset']}")
+
+    # --- Line 3: Duration + Model ---
+    line3 = []
+
+    duration_ms = cost.get("total_duration_ms")
+    if duration_ms and duration_ms > 0:
+        line3.append(f"{C['dim']}{C['magenta']}会话时长: {fmt_duration(duration_ms / 1000)}{C['reset']}")
+
+    model_name = (data.get("model") or {}).get("display_name", "")
     if model_name:
-        effort = data.get("effort", {}).get("level", "")
+        effort = (data.get("effort") or {}).get("level", "")
         if effort:
-            model_name += f"{C['dim']}/{effort}{C['reset']}"
-        parts.append(f"{C['magenta']}{model_name}{C['reset']}")
+            model_name += f"/{effort}"
+        fast = data.get("fast_mode")
+        model_name += f"/{'fast' if fast else 'nofast'}"
+        line3.append(f"{C['dim']}{C['magenta']}{model_name}{C['reset']}")
 
-    if parts:
-        print(" | ".join(parts))
+    output = [" | ".join(line) for line in (line1, line2, line3) if line]
+    if output:
+        print("\n".join(output))
 
 
 def main():
@@ -121,8 +190,10 @@ def main():
         data = json.loads(raw)
     except Exception:
         return
-    save_data(data)
-    render(data)
+
+    now = datetime.now(timezone.utc)
+    save_data(data, now)
+    render(data, now)
 
 
 if __name__ == "__main__":
@@ -218,9 +289,7 @@ def setup(auto: bool = False) -> None:
 
 
 def _setup_claude() -> None:
-    with open(HOOK_SCRIPT_PATH, "w", encoding="utf-8") as f:
-        f.write(HOOK_SCRIPT)
-    os.chmod(HOOK_SCRIPT_PATH, os.stat(HOOK_SCRIPT_PATH).st_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
+    update_hook()
 
     settings: dict = {}
     if os.path.exists(CLAUDE_SETTINGS):

{token_tracker-0.2.4 → token_tracker-0.3.1}/token_tracker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: token-tracker
-Version: 0.2.4
+Version: 0.3.1
 Summary: Track token usage across local AI agents (Claude Code, Codex)
 Requires-Python: >=3.11
 Requires-Dist: rich>=13.7