token-tracker 0.3.6__tar.gz → 0.3.8__tar.gz

token_tracker-0.3.8/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 stormzhang
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

token_tracker-0.3.8/PKG-INFO

@@ -0,0 +1,179 @@
+Metadata-Version: 2.4
+Name: token-tracker
+Version: 0.3.8
+Summary: Track token usage across local AI agents (Claude Code, Codex)
+Author-email: stormzhang <stormzhang.dev@gmail.com>
+License: MIT License
+        
+        Copyright (c) 2026 stormzhang
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+        
+Project-URL: Homepage, https://github.com/stormzhang/token-tracker
+Project-URL: Repository, https://github.com/stormzhang/token-tracker
+Project-URL: Issues, https://github.com/stormzhang/token-tracker/issues
+Keywords: claude-code,codex,token,usage,cost,ai-agent,statusline,cli
+Classifier: Development Status :: 4 - Beta
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Software Development
+Classifier: Topic :: Utilities
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: rich>=13.7
+Provides-Extra: test
+Requires-Dist: pytest>=8.0; extra == "test"
+Provides-Extra: dev
+Requires-Dist: pytest>=8.0; extra == "dev"
+Requires-Dist: ruff>=0.6; extra == "dev"
+Requires-Dist: mypy>=1.8; extra == "dev"
+Dynamic: license-file
+
+# Token Tracker (tt)
+
+本地 AI Agent Token 消耗追踪/分析工具，支持 **Claude Code** 和 **Codex** 。
+
+自定义 StatusLine 状态栏 + CLI Dashboard，实时查看 token 用量、等效成本、限额状态。
+
+![Python](https://img.shields.io/badge/python-3.11+-blue) ![License](https://img.shields.io/badge/license-MIT-green)
+
+[English](README_EN.md)
+
+## StatusLine 状态栏
+
+自动为 Claude Code 和 Codex 配置状态栏，`tt setup` 一键配置，脚本更新时自动升级。
+
+**Claude Code**：基于官方自定义 StatusLine 接口，数据完全来自本地 Claude，准确无任何推测
+
+![Claude Code StatusLine](assets/screenshot-statusline-cc.png)
+
+状态栏共三行，从左到右：
+
+| 行 | 字段 | 说明 |
+|----|------|------|
+| 1 | `项目名(分支)` | 当前项目目录 + Git 分支，未提交的修改会标 `*` |
+| 1 | `5h: ██░ 31% (1h19m)` | 5 小时滑动窗口配额用量，括号内为重置倒计时 |
+| 1 | `7d: ██░ 11% (5d8h)` | 7 天滑动窗口配额用量 |
+| 1 | `1.0M Context: ██░ 20%` | 上下文窗口总大小及已用占比 |
+| 2 | `Tokens: in 155k, out 128k` | 本次会话累计输入/输出 Token |
+| 2 | `(本轮: in 1, out 15)` | 当前对话轮次的 Token 用量 |
+| 2 | `Cached: 204k` | 当前轮次命中的 Prompt Cache Token 数 |
+| 2 | `Cost: $35.51` | 本次会话等效成本（按官方定价计算） |
+| 3 | `Model: Opus 4.6/high/nofast` | 模型名 / thinking 级别 / 是否 fast 模式 |
+| 3 | `Duration: 1h33m` | 当前会话已持续时间 |
+
+> 终端宽度不足时会自动降级：先隐藏重置倒计时，再将进度条简化为百分比数字。
+
+**Codex**：官方暂不支持自定义 StatusLine 渲染，沿用官方默认样式，`tt setup` 仅写入字段配置
+
+![Codex StatusLine](assets/screenshot-statusline-codex.png)
+
+| 字段 | 说明 |
+|------|------|
+| `project` | 当前项目目录名 |
+| `five-hour-limit` | 5 小时滑动窗口配额用量 |
+| `weekly-limit` | 7 天滑动窗口配额用量 |
+| `context-remaining` | 上下文窗口剩余占比 |
+| `model-with-reasoning` | 模型名 + 推理强度（如 `gpt-5-codex/high`） |
+
+## Dashboard 数据面板和 日/周/月 数据报表分析
+
+![Token Tracker Dashboard](assets/screenshot.png)
+
+![Token Tracker Daily](assets/screenshot-daily.png)
+
+![Token Tracker Weekly](assets/screenshot-weekly.png)
+
+![Token Tracker Monthly](assets/screenshot-monthly.png)
+
+## 功能
+
+- **多 Agent 追踪** — Claude Code + Codex 统一面板，左右键切换
+- **状态栏集成** — Claude Code statusLine + Codex status_line，首次运行自动配置，脚本更新自动升级
+- **限额监控** — 实时 5h / 7d 配额百分比 + 重置倒计时
+- **成本分析** — 按会话、日、周、月维度的等效成本统计，多 Agent 按来源分组展示
+- **会话洞察** — 项目、模型、时长、消息数一览
+- **零配置** — 自动检测已安装的 Agent，直接读取本地数据
+- **隐私安全** — 数据纯本地存储，不采集、不上传任何用户信息，极轻量无后顾之忧
+
+## 安装
+
+```bash
+curl -sSL https://raw.githubusercontent.com/stormzhang/token-tracker/main/install.sh | bash
+```
+
+或者通过 pip：
+
+```bash
+pip install --force-reinstall token-tracker && tt setup
+```
+
+## 使用
+
+```bash
+tt setup          # 初始化配置 Claude Code + Codex status_line
+tt                # 交互式 Dashboard（方向键切换 Agent）
+tt claude         # 仅展示 Claude Code
+tt codex          # 仅展示 Codex
+tt daily          # 按日汇总（按 token 消耗排序）
+tt weekly         # 按周汇总（多 Agent 分组展示）
+tt monthly        # 按月汇总（多 Agent 分组展示）
+tt sessions       # 最近 20 条会话明细数据
+tt unsetup        # 卸载并恢复安装前的配置
+```
+
+### 报告排序
+
+所有报告命令支持 `--sort` 和 `--asc/--desc` 参数：
+
+```bash
+tt daily --sort cost --desc     # 按成本降序
+tt sessions --sort tokens --asc # 按 token 升序
+```
+
+可选排序字段：`tokens` / `cost` / `messages` / `time` / `input` / `output`
+
+### Dashboard 快捷键
+
+| 按键 | 功能 |
+|------|------|
+| `←` `→` | 切换 Agent |
+| `↑` `↓` | 滚动内容 |
+| `s` | 切换排序字段（时间 → Token → 等效成本 → 消息数） |
+| `r` | 反转排序方向 |
+| `+` / `-` | 调整会话显示条数（±10，最少 10 条） |
+| `q` | 退出 |
+
+## 环境要求
+
+- Python 3.11+
+- [Rich](https://github.com/Textualize/rich)（自动安装）
+
+## TODO
+
+未来持续增加更多数据报表，多维度分析。
+
+## License
+
+Copyright (c) 2026 stormzhang. MIT License.

{token_tracker-0.3.6 → token_tracker-0.3.8}/README.md

@@ -33,10 +33,18 @@
 
 > 终端宽度不足时会自动降级：先隐藏重置倒计时，再将进度条简化为百分比数字。
 
-**Codex**：官方暂不支持自定义 StatusLine，使用官方默认样式，展示项目名、5h/7d 配额、上下文剩余、模型名
+**Codex**：官方暂不支持自定义 StatusLine 渲染，沿用官方默认样式，`tt setup` 仅写入字段配置
 
 ![Codex StatusLine](assets/screenshot-statusline-codex.png)
 
+| 字段 | 说明 |
+|------|------|
+| `project` | 当前项目目录名 |
+| `five-hour-limit` | 5 小时滑动窗口配额用量 |
+| `weekly-limit` | 7 天滑动窗口配额用量 |
+| `context-remaining` | 上下文窗口剩余占比 |
+| `model-with-reasoning` | 模型名 + 推理强度（如 `gpt-5-codex/high`） |
+
 ## Dashboard 数据面板和 日/周/月 数据报表分析
 
 ![Token Tracker Dashboard](assets/screenshot.png)
@@ -66,8 +74,7 @@ curl -sSL https://raw.githubusercontent.com/stormzhang/token-tracker/main/instal
 或者通过 pip：
 
 ```bash
-pip install --force-reinstall token-tracker
-tt setup
+pip install --force-reinstall token-tracker && tt setup
 ```
 
 ## 使用

token_tracker-0.3.8/pyproject.toml

@@ -0,0 +1,68 @@
+[build-system]
+requires = ["setuptools>=68.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "token-tracker"
+version = "0.3.8"
+description = "Track token usage across local AI agents (Claude Code, Codex)"
+readme = "README.md"
+requires-python = ">=3.11"
+license = { file = "LICENSE" }
+authors = [
+    { name = "stormzhang", email = "stormzhang.dev@gmail.com" },
+]
+keywords = ["claude-code", "codex", "token", "usage", "cost", "ai-agent", "statusline", "cli"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Environment :: Console",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Topic :: Software Development",
+    "Topic :: Utilities",
+]
+dependencies = [
+    "rich>=13.7",
+]
+
+[project.optional-dependencies]
+test = [
+    "pytest>=8.0",
+]
+dev = [
+    "pytest>=8.0",
+    "ruff>=0.6",
+    "mypy>=1.8",
+]
+
+[project.urls]
+Homepage = "https://github.com/stormzhang/token-tracker"
+Repository = "https://github.com/stormzhang/token-tracker"
+Issues = "https://github.com/stormzhang/token-tracker/issues"
+
+[project.scripts]
+tt = "src.cli:main"
+
+[tool.setuptools.packages.find]
+include = ["src*"]
+
+[tool.ruff]
+line-length = 120
+target-version = "py311"
+
+[tool.ruff.lint]
+# E501(行长)故意不开：状态栏 ANSI 色码串本就长，启用只产生噪音
+select = ["E4", "E7", "E9", "F", "W", "I", "UP", "B"]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+addopts = "-q"
+
+[tool.mypy]
+python_version = "3.11"
+ignore_missing_imports = true
+# 宽松起步，后续逐步收紧
+check_untyped_defs = true

{token_tracker-0.3.6 → token_tracker-0.3.8}/src/adapters/claude.py

@@ -1,9 +1,9 @@
-import json
 import os
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from pathlib import Path
 
 from .types import AgentInfo, UsageEntry
+from .util import iter_jsonl_dicts, project_from_cwd
 
 CLAUDE_DIRS = [
     os.path.expanduser("~/.claude/projects"),
@@ -14,12 +14,7 @@ CLAUDE_DIRS = [
 def detect() -> AgentInfo | None:
     for d in _get_claude_dirs():
         if Path(d).is_dir():
-            return AgentInfo(
-                id="claude-code",
-                name="Claude Code",
-                data_dir=d,
-                installed=True,
-            )
+            return AgentInfo(id="claude-code", name="Claude Code")
     return None
 
 
@@ -29,7 +24,7 @@ def load_entries(hours_back: int = 0) -> list[UsageEntry]:
     cutoff = None
     if hours_back > 0:
         from datetime import timedelta
-        cutoff = datetime.now(timezone.utc) - timedelta(hours=hours_back)
+        cutoff = datetime.now(UTC) - timedelta(hours=hours_back)
 
     for base_dir in _get_claude_dirs():
         base = Path(base_dir)
@@ -54,16 +49,6 @@ def _get_claude_dirs() -> list[str]:
     return dirs
 
 
-def _project_from_cwd(cwd: str) -> str:
-    home = os.path.expanduser("~")
-    if cwd.startswith(home):
-        rel = cwd[len(home):].strip(os.sep)
-    else:
-        rel = cwd.strip(os.sep)
-    parts = rel.split(os.sep)
-    return parts[-1] if parts and parts[-1] else rel or "unknown"
-
-
 def _extract_project_from_dir(jsonl_path: Path, base: Path) -> str:
     rel = jsonl_path.relative_to(base)
     project_dir = str(rel.parts[0]) if rel.parts else "unknown"
@@ -82,34 +67,22 @@ def _parse_jsonl(
     seen: set[str],
     cutoff: datetime | None,
 ) -> None:
-    try:
-        with open(path, "r", encoding="utf-8") as f:
-            for line in f:
-                line = line.strip()
-                if not line:
-                    continue
-                try:
-                    data = json.loads(line)
-                except json.JSONDecodeError:
-                    continue
-
-                if data.get("type") != "assistant":
-                    continue
+    for data in iter_jsonl_dicts(path):
+        if data.get("type") != "assistant":
+            continue
 
-                entry = _parse_assistant_entry(data, project)
-                if entry is None:
-                    continue
+        entry = _parse_assistant_entry(data, project)
+        if entry is None:
+            continue
 
-                if cutoff and entry.timestamp < cutoff:
-                    continue
+        if cutoff and entry.timestamp < cutoff:
+            continue
 
-                if entry.dedup_key in seen:
-                    continue
-                seen.add(entry.dedup_key)
+        if entry.dedup_key in seen:
+            continue
+        seen.add(entry.dedup_key)
 
-                entries.append(entry)
-    except (OSError, PermissionError):
-        pass
+        entries.append(entry)
 
 
 def _parse_assistant_entry(data: dict, project: str) -> UsageEntry | None:
@@ -143,7 +116,7 @@ def _parse_assistant_entry(data: dict, project: str) -> UsageEntry | None:
 
     cwd = data.get("cwd", "")
     if cwd:
-        project = _project_from_cwd(cwd)
+        project = project_from_cwd(cwd)
 
     return UsageEntry(
         timestamp=ts,

token_tracker-0.3.8/src/adapters/codex.py

@@ -0,0 +1,200 @@
+import os
+import sqlite3
+from datetime import UTC, datetime, timedelta
+from pathlib import Path
+
+from .types import AgentInfo, RateLimits, UsageEntry, normalize_pct
+from .util import iter_jsonl_dicts, project_from_cwd
+
+CODEX_DIR = os.path.expanduser("~/.codex")
+SESSIONS_DIR = os.path.join(CODEX_DIR, "sessions")
+STATE_DB = os.path.join(CODEX_DIR, "state_5.sqlite")
+_RATE_LIMIT_SCAN_FILES = 5  # 只扫最近改动的 N 个 session 文件找限额信息
+
+
+def detect() -> AgentInfo | None:
+    if Path(SESSIONS_DIR).is_dir():
+        return AgentInfo(id="codex", name="Codex")
+    return None
+
+
+def load_entries(hours_back: int = 0) -> list[UsageEntry]:
+    entries: list[UsageEntry] = []
+    seen: set[str] = set()
+    cutoff = None
+    if hours_back > 0:
+        cutoff = datetime.now(UTC) - timedelta(hours=hours_back)
+
+    models = _load_thread_models()
+
+    sessions_path = Path(SESSIONS_DIR)
+    if not sessions_path.is_dir():
+        return entries
+
+    for jsonl_path in sessions_path.rglob("*.jsonl"):
+        _parse_jsonl(jsonl_path, models, entries, seen, cutoff)
+
+    entries.sort(key=lambda e: e.timestamp)
+    return entries
+
+
+def _load_thread_models() -> dict[str, str]:
+    if not os.path.exists(STATE_DB):
+        return {}
+    try:
+        conn = sqlite3.connect(f"file:{STATE_DB}?mode=ro", uri=True)
+        rows = conn.execute("SELECT id, model FROM threads WHERE model IS NOT NULL").fetchall()
+        conn.close()
+        return {row[0]: row[1] for row in rows}
+    except (sqlite3.Error, OSError):
+        return {}
+
+
+def load_rate_limits() -> RateLimits | None:
+    sessions_path = Path(SESSIONS_DIR)
+    if not sessions_path.is_dir():
+        return None
+
+    # session 文件在轮转，rglob 与 stat 之间文件可能消失：mtime 取不到时退化为 0，避免整体崩溃
+    jsonl_files = sorted(sessions_path.rglob("*.jsonl"), key=_safe_mtime, reverse=True)
+    models = _load_thread_models()
+
+    for path in jsonl_files[:_RATE_LIMIT_SCAN_FILES]:
+        rl = _extract_rate_limits(path, models)
+        if rl:
+            return rl
+    return None
+
+
+def _safe_mtime(path: Path) -> float:
+    try:
+        return path.stat().st_mtime
+    except OSError:
+        return 0.0
+
+
+def _extract_rate_limits(path: Path, models: dict[str, str]) -> RateLimits | None:
+    session_id = ""
+    last_payload = None
+    for data in iter_jsonl_dicts(path):
+        if data.get("type") == "session_meta":
+            session_id = data.get("payload", {}).get("id", "")
+        if data.get("type") != "event_msg":
+            continue
+        payload = data.get("payload", {})
+        if payload.get("type") != "token_count":
+            continue
+        rl = payload.get("rate_limits")
+        if rl:
+            last_payload = (rl, payload.get("info") or {}, session_id)
+
+    if not last_payload:
+        return None
+
+    rl, info, sid = last_payload
+
+    now_ts = datetime.now(UTC).timestamp()
+    five_pct = five_reset = None
+    seven_pct = seven_reset = None
+
+    # 按 window_minutes 字段分配 5h / 7d 桶，
+    # 而不是固定 primary→5h、secondary→7d（free plan 实测 primary 为 7 天窗口）
+    for bucket in (rl.get("primary"), rl.get("secondary")):
+        if not bucket:
+            continue
+        resets = bucket.get("resets_at")
+        window = bucket.get("window_minutes") or 0
+        pct = normalize_pct(bucket.get("used_percent"), resets, now_ts)
+        if window < 1440:
+            five_pct, five_reset = pct, resets
+        else:
+            seven_pct, seven_reset = pct, resets
+
+    if five_pct is None and seven_pct is None:
+        return None
+
+    return RateLimits(
+        five_hour_pct=five_pct,
+        five_hour_resets_at=five_reset,
+        seven_day_pct=seven_pct,
+        seven_day_resets_at=seven_reset,
+        model=models.get(sid, ""),
+        plan_type=rl.get("plan_type") or "",
+        context_window=info.get("model_context_window"),
+    )
+
+
+def _parse_jsonl(
+    path: Path,
+    models: dict[str, str],
+    entries: list[UsageEntry],
+    seen: set[str],
+    cutoff: datetime | None,
+) -> None:
+    session_id = ""
+    session_ts = ""
+    project = "unknown"
+    model = "unknown"
+    last_usage = None
+    msg_count = 0
+
+    for data in iter_jsonl_dicts(path):
+        row_type = data.get("type")
+
+        if row_type == "session_meta":
+            payload = data.get("payload", {})
+            session_id = payload.get("id", "")
+            session_ts = payload.get("timestamp", "")
+            cwd = payload.get("cwd", "")
+            if cwd:
+                project = project_from_cwd(cwd)
+            model = models.get(session_id, "unknown")
+            continue
+
+        if row_type != "event_msg":
+            continue
+
+        payload = data.get("payload", {})
+        if payload.get("type") == "token_count":
+            info = payload.get("info")
+            if info and info.get("total_token_usage"):
+                last_usage = info["total_token_usage"]
+                msg_count += 1
+
+    if not last_usage or not session_id:
+        return
+
+    cached = last_usage.get("cached_input_tokens", 0)
+    input_tokens = last_usage.get("input_tokens", 0) - cached
+    output_tokens = last_usage.get("output_tokens", 0) + last_usage.get("reasoning_output_tokens", 0)
+
+    if input_tokens == 0 and output_tokens == 0:
+        return
+
+    try:
+        ts = datetime.fromisoformat(session_ts.replace("Z", "+00:00"))
+    except (ValueError, AttributeError):
+        return
+
+    if cutoff and ts < cutoff:
+        return
+
+    if session_id in seen:
+        return
+    seen.add(session_id)
+
+    entries.append(UsageEntry(
+        timestamp=ts,
+        session_id=session_id,
+        message_id=session_id,
+        request_id="",
+        model=model,
+        input_tokens=input_tokens,
+        output_tokens=output_tokens,
+        cache_creation_tokens=0,
+        cache_read_tokens=cached,
+        cost_usd=None,
+        project=project,
+        agent_id="codex",
+        message_count=msg_count,
+    ))

{token_tracker-0.3.6 → token_tracker-0.3.8}/src/adapters/rate_limits.py

@@ -1,8 +1,8 @@
 import json
 import os
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
-from .types import RateLimits
+from .types import RateLimits, normalize_pct
 
 STATUS_FILE = os.path.expanduser("~/.claude/tt-status.json")
 
@@ -12,7 +12,7 @@ def load_rate_limits() -> RateLimits | None:
         return None
 
     try:
-        with open(STATUS_FILE, "r", encoding="utf-8") as f:
+        with open(STATUS_FILE, encoding="utf-8") as f:
             data = json.load(f)
     except (json.JSONDecodeError, OSError):
         return None
@@ -21,16 +21,12 @@ def load_rate_limits() -> RateLimits | None:
     five = rl.get("five_hour") or {}
     seven = rl.get("seven_day") or {}
 
-    now_ts = datetime.now(timezone.utc).timestamp()
-    five_pct = five.get("used_percentage")
+    now_ts = datetime.now(UTC).timestamp()
     five_reset = five.get("resets_at")
-    if five_reset and five_reset < now_ts:
-        five_pct = 0.0
+    five_pct = normalize_pct(five.get("used_percentage"), five_reset, now_ts)
 
-    seven_pct = seven.get("used_percentage")
     seven_reset = seven.get("resets_at")
-    if seven_reset and seven_reset < now_ts:
-        seven_pct = 0.0
+    seven_pct = normalize_pct(seven.get("used_percentage"), seven_reset, now_ts)
 
     model_info = data.get("model") or {}
     model_name = model_info.get("display_name") or model_info.get("id") or ""
@@ -44,5 +40,4 @@ def load_rate_limits() -> RateLimits | None:
         seven_day_pct=seven_pct,
         seven_day_resets_at=seven_reset,
         model=model_name,
-        updated_at=data.get("_received_at", ""),
     )

{token_tracker-0.3.6 → token_tracker-0.3.8}/src/adapters/types.py

@@ -1,5 +1,17 @@
 from dataclasses import dataclass, field
-from datetime import datetime
+from datetime import UTC, datetime
+
+
+def normalize_pct(pct: float | None, resets_at: int | float | None, now_ts: float | None = None) -> float | None:
+    """配额百分比：若已过重置时间则归零（窗口已滚动，旧用量不再有效）。"""
+    if pct is None:
+        return None
+    if resets_at:
+        if now_ts is None:
+            now_ts = datetime.now(UTC).timestamp()
+        if resets_at < now_ts:
+            return 0.0
+    return pct
 
 
 @dataclass
@@ -31,8 +43,6 @@ class UsageEntry:
 class AgentInfo:
     id: str
     name: str
-    data_dir: str
-    installed: bool
 
 
 @dataclass
@@ -107,7 +117,8 @@ class RateLimits:
     seven_day_pct: float | None = None
     seven_day_resets_at: int | None = None
     model: str = ""
-    updated_at: str = ""
+    plan_type: str = ""
+    context_window: int | None = None
 
 
 @dataclass