usage-cli 0.34.10__tar.gz → 0.34.12__tar.gz

{usage_cli-0.34.10/usage_cli.egg-info → usage_cli-0.34.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usage-cli
-Version: 0.34.10
+Version: 0.34.12
 Summary: usage — 在 macOS menu bar 與 Windows 系統匣顯示 Claude Code、Codex、Antigravity 用量的小工具（也提供終端機 TUI）
 License-Expression: AGPL-3.0-only
 Requires-Python: >=3.13

{usage_cli-0.34.10 → usage_cli-0.34.12}/adapters/claude.py

@@ -16,6 +16,7 @@ from typing import Any
 from loaders.claude_paths import claude_config_dirs
 from loaders.jsonl_utils import iter_jsonl_dicts
 from usage_common.project_resolver import resolve_project_name
+from usage_common.time_utils import parse_optional_iso8601_utc
 
 from .types import AgentInfo
 
@@ -190,10 +191,8 @@ def _parse_assistant_entry(data: dict[str, Any], project: str) -> list[UsageEntr
         else 0
     )
 
-    timestamp_str = data.get("timestamp", "")
-    try:
-        ts = datetime.fromisoformat(timestamp_str.replace("Z", "+00:00"))
-    except (ValueError, AttributeError):
+    ts = parse_optional_iso8601_utc(data.get("timestamp", ""))
+    if ts is None:
         return []
 
     message_id = message.get("id", "")

{usage_cli-0.34.10 → usage_cli-0.34.12}/adapters/rate_limits.py

@@ -36,7 +36,8 @@ def _read_status() -> dict[str, Any] | None:
         try:
             with open(path, "r", encoding="utf-8") as f:
                 data: dict[str, Any] = json.load(f)
-                return data
+                if isinstance(data, dict):
+                    return data
         except (json.JSONDecodeError, OSError, UnicodeDecodeError):
             continue
     return None
@@ -51,9 +52,9 @@ def load_rate_limits() -> RateLimits | None:
         if data is None:
             return None
 
-    rl = data.get("rate_limits") or {}
-    five = rl.get("five_hour") or {}
-    seven = rl.get("seven_day") or {}
+    rl = usage_client._as_dict(data.get("rate_limits"))
+    five = usage_client._as_dict(rl.get("five_hour"))
+    seven = usage_client._as_dict(rl.get("seven_day"))
 
     now_ts = datetime.now(timezone.utc).timestamp()
     five_pct = _as_finite_float(five.get("used_percentage"))

{usage_cli-0.34.10 → usage_cli-0.34.12}/analyzer/blocks.py

@@ -56,7 +56,10 @@ def analyze_blocks(entries: list[UsageEntry]) -> list[SessionBlock]:
             block.is_active = True
             elapsed = (now - block.start_time).total_seconds() / 60
             if elapsed > 0:
-                block.burn_rate = block.total_tokens / elapsed
+                active_tokens = (
+                    block.input_tokens + block.output_tokens + block.cache_creation_tokens
+                )
+                block.burn_rate = active_tokens / elapsed
 
     return blocks
 

{usage_cli-0.34.10 → usage_cli-0.34.12}/analyzer/persona_loader.py

@@ -22,7 +22,8 @@ from usage_common.time_utils import parse_optional_iso8601_utc
 
 logger = logging.getLogger(__name__)
 
-_CACHE_TTL_SECONDS = 300.0
+# Habits move slowly, while a rescan reads every session file (~20s on heavy users).
+_CACHE_TTL_SECONDS = 3600.0
 _cache: dict[int, tuple[float, PersonaProfile]] = {}
 
 

{usage_cli-0.34.10 → usage_cli-0.34.12}/analyzer/reporter.py

@@ -7,6 +7,7 @@
 from __future__ import annotations
 
 import contextlib
+from bisect import bisect_right
 from collections import defaultdict
 from concurrent.futures import ThreadPoolExecutor
 from dataclasses import dataclass
@@ -146,6 +147,7 @@ class CubeModelData(TypedDict):
 
 
 class CubeReportData(TypedDict):
+    today: NotRequired[str]
     dates: list[str]
     agents: list[CubeAgentData]
     models: list[CubeModelData]
@@ -1236,6 +1238,7 @@ def build_report_data(agents: list[AgentInfo], period: str = "month") -> ReportD
         )
     cube_rows.sort(key=lambda row: (row[0], row[1], row[2], row[3]))
     cube: CubeReportData = {
+        "today": today.isoformat(),
         "dates": cube_dates,
         "agents": cube_agents,
         "models": cube_models,
@@ -1293,7 +1296,7 @@ def build_report_data(agents: list[AgentInfo], period: str = "month") -> ReportD
         start_time = _session_start_text(session.start_time)
         session_rows.append(
             {
-                "date_idx": date_indices[start_time[:10]],
+                "date_idx": max(0, bisect_right(cube_dates, start_time[:10]) - 1),
                 "project_idx": project_indices[session.project or "unknown"],
                 "model_idx": model_indices[session.model or "unknown"],
                 "start_time": start_time,

{usage_cli-0.34.10 → usage_cli-0.34.12}/i18n.json

@@ -1,5 +1,19 @@
 {
   "zh-TW": {
+    "report_title_tools_top": "{tool} 用得最多，佔 {pct}%",
+    "report_title_tools_single": "全部用量來自 {tool}",
+    "report_sub_tools": "各工具 token 佔比 · 共 {total} tokens",
+    "report_title_projects_top3": "前 3 個專案佔了 {pct}% 的用量",
+    "report_sub_projects": "各專案 token 佔比",
+    "report_title_trend_peak_week": "{date} 那週用量最高",
+    "report_sub_trend": "每日與每週 token 用量",
+    "report_title_composition_top": "{pct}% 的 token 是{kind}",
+    "report_sub_composition": "各類 token 佔比",
+    "report_title_sessions_top": "最大的一段會話用了 {tokens} tokens",
+    "report_title_streak": "已經連續 {days} 天每天都有用",
+    "report_source_note": "資料來源：本機 {tools} 使用紀錄 · {from} – {to}",
+    "report_source_pricing": "API 等值依公開 API 價目換算",
+    "report_weekly_chart_title": "每週用量",
     "panel_default_name": "預設",
     "panel_load_error": "面板載入失敗，請回報這個問題：",
     "panel_matrix": "駭客任務",
@@ -545,6 +559,7 @@
     "report_project_others": "其他專案",
     "report_ledger_lead": "Claude 派給 Codex、Antigravity 的工作，各吃掉多少週額度。",
     "report_trend_partial_week": "僅 {days} 天",
+    "report_trend_incomplete_week": "不完整週",
     "report_history_scope": "分工具紀錄從 {date} 起；更早的每日總量只在下方熱力圖",
     "report_composition_missing": "另有 {tokens} tokens 沒有輸入／輸出拆解",
     "report_wrapped_cost_scope": "只含有價格紀錄的日子（{date} 起）",
@@ -558,6 +573,20 @@
     "report_ledger_all_reset": "最近 7 天的派工都在額度重置前，算在上週。"
   },
   "en": {
+    "report_title_tools_top": "{tool} leads with {pct}% of tokens",
+    "report_title_tools_single": "All usage came from {tool}",
+    "report_sub_tools": "Token share by tool · {total} tokens in total",
+    "report_title_projects_top3": "The top 3 projects account for {pct}% of tokens",
+    "report_sub_projects": "Token share by project",
+    "report_title_trend_peak_week": "The week of {date} was the busiest",
+    "report_sub_trend": "Daily and weekly token usage",
+    "report_title_composition_top": "{kind} makes up {pct}% of tokens",
+    "report_sub_composition": "Token share by type",
+    "report_title_sessions_top": "The largest session used {tokens} tokens",
+    "report_title_streak": "{days} days in a row with usage",
+    "report_source_note": "Source: local {tools} usage logs · {from} – {to}",
+    "report_source_pricing": "API-equivalent cost is based on public API prices",
+    "report_weekly_chart_title": "Weekly usage",
     "panel_default_name": "Default",
     "panel_load_error": "Panel failed to load. Please report this:",
     "panel_matrix": "Matrix",
@@ -1103,6 +1132,7 @@
     "report_project_others": "Other projects",
     "report_ledger_lead": "How much of each weekly quota went to work Claude handed to Codex and Antigravity.",
     "report_trend_partial_week": "only {days} days",
+    "report_trend_incomplete_week": "Incomplete week",
     "report_history_scope": "Per-tool records start on {date}; earlier daily totals appear only in the heatmap below.",
     "report_composition_missing": "Another {tokens} tokens have no input/output breakdown.",
     "report_wrapped_cost_scope": "Only days with price records (from {date})",
@@ -1116,6 +1146,20 @@
     "report_ledger_all_reset": "All dispatched work in the last 7 days came before the quota reset, so it counts toward last week."
   },
   "zh-CN": {
+    "report_title_tools_top": "{tool} 用得最多，占 {pct}%",
+    "report_title_tools_single": "全部用量来自 {tool}",
+    "report_sub_tools": "各工具 token 占比 · 共 {total} tokens",
+    "report_title_projects_top3": "前 3 个项目占了 {pct}% 的用量",
+    "report_sub_projects": "各项目 token 占比",
+    "report_title_trend_peak_week": "{date} 那周用量最高",
+    "report_sub_trend": "每日与每周 token 用量",
+    "report_title_composition_top": "{pct}% 的 token 是{kind}",
+    "report_sub_composition": "各类 token 占比",
+    "report_title_sessions_top": "最大的一段会话用了 {tokens} tokens",
+    "report_title_streak": "已经连续 {days} 天每天都有使用",
+    "report_source_note": "数据来源：本机 {tools} 使用记录 · {from} – {to}",
+    "report_source_pricing": "API 等值按公开 API 价格换算",
+    "report_weekly_chart_title": "每周用量",
     "panel_default_name": "默认",
     "panel_load_error": "面板加载失败，请反馈这个问题：",
     "panel_matrix": "黑客任务",
@@ -1661,6 +1705,7 @@
     "report_project_others": "其他项目",
     "report_ledger_lead": "Claude 派给 Codex、Antigravity 的工作，各吃掉多少周额度。",
     "report_trend_partial_week": "仅 {days} 天",
+    "report_trend_incomplete_week": "不完整周",
     "report_history_scope": "分工具记录从 {date} 起；更早的每日总量只在下方热力图",
     "report_composition_missing": "另有 {tokens} tokens 没有输入／输出拆解",
     "report_wrapped_cost_scope": "只含有价格记录的日子（{date} 起）",
@@ -1674,6 +1719,20 @@
     "report_ledger_all_reset": "最近 7 天的派工都在额度重置前，算在上周。"
   },
   "ja": {
+    "report_title_tools_top": "{tool} が最多で {pct}%",
+    "report_title_tools_single": "すべての使用量は {tool} から",
+    "report_sub_tools": "ツール別 token 比率 · 合計 {total} tokens",
+    "report_title_projects_top3": "上位 3 プロジェクトが使用量の {pct}%",
+    "report_sub_projects": "プロジェクト別 token 比率",
+    "report_title_trend_peak_week": "{date} の週が使用量最多",
+    "report_sub_trend": "日別・週別 token 使用量",
+    "report_title_composition_top": "token の {pct}% は{kind}",
+    "report_sub_composition": "種類別 token 比率",
+    "report_title_sessions_top": "最大のセッションは {tokens} tokens",
+    "report_title_streak": "{days} 日連続で毎日使用中",
+    "report_source_note": "データ元：ローカルの {tools} 使用記録 · {from} – {to}",
+    "report_source_pricing": "API 相当額は公開 API 料金で換算",
+    "report_weekly_chart_title": "週別使用量",
     "panel_default_name": "デフォルト",
     "panel_load_error": "パネルの読み込みに失敗しました。報告してください：",
     "panel_matrix": "マトリックス",
@@ -2219,6 +2278,7 @@
     "report_project_others": "その他のプロジェクト",
     "report_ledger_lead": "Claude が Codex・Antigravity に任せた作業が、それぞれの週間クォータをどれだけ使ったか。",
     "report_trend_partial_week": "{days} 日分のみ",
+    "report_trend_incomplete_week": "不完全な週",
     "report_history_scope": "ツール別記録は {date} から。それ以前の日別合計は下のヒートマップにのみ表示します。",
     "report_composition_missing": "ほかに {tokens} tokens は入力／出力の内訳がありません。",
     "report_wrapped_cost_scope": "価格記録のある日のみ（{date} 以降）",
@@ -2232,6 +2292,20 @@
     "report_ledger_all_reset": "直近 7 日間に委任した作業はすべてクォータのリセット前のため、先週分に含まれます。"
   },
   "ko": {
+    "report_title_tools_top": "{tool} 사용량이 {pct}%로 가장 많음",
+    "report_title_tools_single": "모든 사용량은 {tool}에서 발생",
+    "report_sub_tools": "도구별 token 비율 · 총 {total} tokens",
+    "report_title_projects_top3": "상위 3개 프로젝트가 사용량의 {pct}%",
+    "report_sub_projects": "프로젝트별 token 비율",
+    "report_title_trend_peak_week": "{date} 주의 사용량이 가장 많음",
+    "report_sub_trend": "일별 및 주별 token 사용량",
+    "report_title_composition_top": "token의 {pct}%는 {kind}",
+    "report_sub_composition": "유형별 token 비율",
+    "report_title_sessions_top": "가장 큰 세션에서 {tokens} tokens 사용",
+    "report_title_streak": "{days}일 연속 매일 사용 중",
+    "report_source_note": "데이터 출처: 로컬 {tools} 사용 기록 · {from} – {to}",
+    "report_source_pricing": "API 환산 비용은 공개 API 요금 기준",
+    "report_weekly_chart_title": "주별 사용량",
     "panel_default_name": "기본",
     "panel_load_error": "패널을 불러오지 못했습니다. 제보해 주세요:",
     "panel_matrix": "매트릭스",
@@ -2777,6 +2851,7 @@
     "report_project_others": "기타 프로젝트",
     "report_ledger_lead": "Claude가 Codex와 Antigravity에 맡긴 작업이 각 주간 한도를 얼마나 썼는지 보여 줍니다.",
     "report_trend_partial_week": "{days}일만 포함",
+    "report_trend_incomplete_week": "불완전한 주",
     "report_history_scope": "도구별 기록은 {date}부터입니다. 이전 일별 합계는 아래 히트맵에만 표시됩니다.",
     "report_composition_missing": "추가 {tokens} tokens에는 입력/출력 내역이 없습니다.",
     "report_wrapped_cost_scope": "가격 기록이 있는 날만 포함 ({date}부터)",

{usage_cli-0.34.10 → usage_cli-0.34.12}/installer/session_hooks.py

@@ -1158,7 +1158,11 @@ def self_heal() -> None:
             return
         _migrate_bundled_python_commands_if_needed(settings)
         setup_hook._migrate_windows_statusline_command_if_needed(settings)
-        if not is_setup() and "statusLine" not in settings:
+        usage_settings = settings.get(BACKUP_KEY)
+        statusline_disabled = (
+            isinstance(usage_settings, dict) and setup_hook.DISABLED_SL_KEY in usage_settings
+        )
+        if not is_setup() and "statusLine" not in settings and not statusline_disabled:
             exit_code = _run_quietly(setup)
             if exit_code == 0:
                 _append_self_heal_log("install_hook", "initial setup")

{usage_cli-0.34.10 → usage_cli-0.34.12}/installer/setup_hook.py

@@ -86,7 +86,7 @@ PREV_SL_KEY = "previousStatusLine"
 # Where the status-line switch parks the live statusLine while it is off, so it
 # never overwrites the pre-install backup under PREV_SL_KEY.
 DISABLED_SL_KEY = "disabledStatusLine"
-HOOK_VERSION = "1.16"
+HOOK_VERSION = "1.17"
 FORWARDER_VERSION = "1.1"
 # Antigravity's Go runner hands its status-line command to cmd.exe unquoted, so
 # every character cmd.exe treats specially has to be kept out of the path.
@@ -811,9 +811,7 @@ def _replace_grok_status_line(content: str, replacement: str) -> str | None:
     else:
         start, end = section
         candidate = content[:start] + replacement + content[end:]
-    try:
-        tomllib.loads(candidate)
-    except tomllib.TOMLDecodeError:
+    if _validated_table_edit(content, candidate, "ui", "status_line") != candidate:
         return None
     return candidate
 
@@ -887,8 +885,9 @@ def _unsetup_grok() -> bool:
         restored = content[:start] + content[end:]
         if start > 0 and restored[:start].endswith("\n"):
             restored = restored[: start - 1] + restored[start:]
+    if _validated_table_edit(content, restored, "ui", "status_line") != restored:
+        return False
     try:
-        tomllib.loads(restored)
         _atomic_write_text(GROK_SETTINGS, restored)
         GROK_PREVIOUS_STATUSLINE.unlink(missing_ok=True)
     except (OSError, tomllib.TOMLDecodeError):
@@ -969,13 +968,31 @@ def _find_top_level_dotted_line(
     return dotted_line.search(content, 0, top_level_end)
 
 
+def _validated_table_edit(content: str, candidate: str, name: str, key: str) -> str:
+    """Reject edits that change anything except the requested TOML key."""
+    try:
+        before, after = tomllib.loads(content), tomllib.loads(candidate)
+    except tomllib.TOMLDecodeError:
+        return content
+
+    def without_target(table: dict[str, Any], path: list[str]) -> None:
+        part = path[0]
+        if len(path) == 1:
+            table.pop(part, None)
+        elif isinstance(child := table.get(part), dict):
+            without_target(child, path[1:])
+            if not child:
+                table.pop(part)
+
+    path = [*name.split("."), key]
+    without_target(before, path)
+    without_target(after, path)
+    return candidate if before == after else content
+
+
 def _insert_table_line(content: str, name: str, line: str) -> str:
     def validated(candidate: str) -> str:
-        try:
-            tomllib.loads(candidate)
-        except tomllib.TOMLDecodeError:
-            return content
-        return candidate
+        return _validated_table_edit(content, candidate, name, next(iter(tomllib.loads(line))))
 
     table = _find_table(content, name)
     if table is None:
@@ -1017,11 +1034,9 @@ def _replace_table_line(
     content: str, name: str, line_regex: re.Pattern[str], replacement: str
 ) -> str:
     def validated(candidate: str) -> str:
-        try:
-            tomllib.loads(candidate)
-        except tomllib.TOMLDecodeError:
-            return content
-        return candidate
+        return _validated_table_edit(
+            content, candidate, name, next(iter(tomllib.loads(replacement)))
+        )
 
     table = _find_table(content, name)
     if table is None:
@@ -1042,13 +1057,9 @@ def _replace_table_line(
     return validated(candidate)
 
 
-def _remove_table_line(content: str, name: str, line_regex: re.Pattern[str]) -> str:
+def _remove_table_line(content: str, name: str, line_regex: re.Pattern[str], key: str) -> str:
     def validated(candidate: str) -> str:
-        try:
-            tomllib.loads(candidate)
-        except tomllib.TOMLDecodeError:
-            return content
-        return candidate
+        return _validated_table_edit(content, candidate, name, key)
 
     table = _find_table(content, name)
     if table is None:
@@ -1072,11 +1083,7 @@ def _ensure_table_line(content: str, name: str, line_regex: re.Pattern[str], lin
     itself is absent."""
 
     def validated(candidate: str) -> str:
-        try:
-            tomllib.loads(candidate)
-        except tomllib.TOMLDecodeError:
-            return content
-        return candidate
+        return _validated_table_edit(content, candidate, name, next(iter(tomllib.loads(line))))
 
     table = _find_table(content, name)
     if table is None:
@@ -1097,7 +1104,7 @@ def _replace_tui_status_line(content: str, replacement: str) -> str:
 
 
 def _remove_tui_status_line(content: str) -> str:
-    return _remove_table_line(content, "tui", _SL_REGEX)
+    return _remove_table_line(content, "tui", _SL_REGEX, "status_line")
 
 
 def _read_codex_config() -> tuple[str, dict[str, Any]] | None:
@@ -1150,6 +1157,10 @@ def _setup_codex() -> None:
         print(_t("setup_codex_config_unmodifiable"))
         return
     _atomic_write_text(CODEX_CONFIG, content)
+    written = _read_codex_config()
+    if written is None or _codex_status_line(written[1]) != CODEX_STATUS_LINE:
+        print(_t("setup_codex_config_unmodifiable"))
+        return
     print(_t("setup_codex_configured"))
     if old is not None and old not in LEGACY_CODEX_STATUS_LINES:
         print(_t("setup_codex_backup_written", path=CODEX_BACKUP))
@@ -1335,15 +1346,20 @@ def unsetup() -> int:
         settings = _load_settings()
         sl = settings.get("statusLine")
         backup = settings.get(BACKUP_KEY)
-        parked = backup.pop(DISABLED_SL_KEY, None) if isinstance(backup, dict) else None
-        if sl is None:
-            sl = parked
+        parked = backup.get(DISABLED_SL_KEY) if isinstance(backup, dict) else None
 
-        if _is_usage_hook(sl) or _is_legacy_tt_hook(sl):
+        if _is_usage_hook(sl) or _is_legacy_tt_hook(sl) or (sl is None and parked is not None):
             legacy_backup = settings.get(LEGACY_TT_BACKUP_KEY)
             prev = backup.get(PREV_SL_KEY) if isinstance(backup, dict) else None
             if not isinstance(prev, dict) and isinstance(legacy_backup, dict):
                 prev = legacy_backup.get(PREV_SL_KEY)
+            if (
+                not isinstance(prev, dict)
+                and isinstance(parked, dict)
+                and not _is_usage_hook(parked)
+                and not _is_legacy_tt_hook(parked)
+            ):
+                prev = parked
 
             if isinstance(prev, dict):
                 settings["statusLine"] = prev
@@ -1354,6 +1370,7 @@ def unsetup() -> int:
 
             if isinstance(backup, dict):
                 backup.pop(PREV_SL_KEY, None)
+                backup.pop(DISABLED_SL_KEY, None)
                 if not backup:
                     del settings[BACKUP_KEY]
             if isinstance(legacy_backup, dict):

{usage_cli-0.34.10 → usage_cli-0.34.12}/loaders/agy_disk_cache.py

@@ -91,11 +91,13 @@ def seed_caches(
                 continue
             if len(file_cache) >= maxsize:
                 file_cache.popitem(last=False)
+            wal = file_data.get("wal")
             file_cache[Path(path_str)] = _FileCacheEntry(
                 mtime=float(file_data["mtime"]),
                 size=int(file_data["size"]),
                 entries=[_deserialize_entry(entry) for entry in entries_data],
                 skipped_missing_dedup_key=int(file_data["skipped_missing_dedup_key"]),
+                wal=None if wal is None else (int(wal[0]), int(wal[1])),
             )
         except (KeyError, TypeError, ValueError):
             continue
@@ -118,6 +120,7 @@ def flush_caches(
                 str(path): {
                     "mtime": entry.mtime,
                     "size": entry.size,
+                    "wal": entry.wal,
                     "entries": [_serialize_entry(item) for item in entry.entries],
                     "skipped_missing_dedup_key": entry.skipped_missing_dedup_key,
                 }

{usage_cli-0.34.10 → usage_cli-0.34.12}/loaders/agy_loader.py

@@ -38,7 +38,7 @@ AGY_SESSIONS_DIR = Path(os.path.expanduser("~/.gemini/antigravity-cli/conversati
 # below that count evicts databases parsed during the prior refresh, causing a
 # permanent full SQLite/protobuf reparse on every load (LRU thrashing).
 _FILE_CACHE_MAXSIZE = 4096
-_AGY_DB_CACHE_SCHEMA = 3
+_AGY_DB_CACHE_SCHEMA = 4
 AGY_CACHE_PATH = Path(os.path.expanduser("~/.usage/agy_db_cache.json"))
 _disk_cache_seeded = False
 _DISK_CACHE_FLUSH_INTERVAL_S = 300.0
@@ -92,6 +92,7 @@ class _FileCacheEntry:
     size: int
     entries: list[AgyUsageEntry]
     skipped_missing_dedup_key: int
+    wal: tuple[int, int] | None = None
 
 
 _file_cache: OrderedDict[Path, _FileCacheEntry] = OrderedDict()
@@ -120,22 +121,24 @@ def load_entries_with_stats(hours_back: int = 0) -> AgyLoadResult:
     skipped_missing_dedup_key = 0
     cutoff_ts = cutoff.timestamp() if cutoff else None
     file_cache_snapshot = {
-        str(path): (entry.mtime, entry.size) for path, entry in _file_cache.items()
+        str(path): (entry.mtime, entry.size, entry.wal) for path, entry in _file_cache.items()
     }
     for path in AGY_SESSIONS_DIR.glob("*.db"):
         if cutoff_ts is not None:
             try:
-                if path.stat().st_mtime < cutoff_ts:
-                    continue
+                modified = path.stat().st_mtime
             except OSError as exc:
                 logger.warning("failed to stat Antigravity database %s: %s", path, exc)
                 continue
+            wal = _wal_fingerprint(path)
+            if max(modified, wal[0] / 1e9 if wal else 0.0) < cutoff_ts:
+                continue
         file_entries, skipped = _load_database(path, cutoff, seen_dedup_keys)
         entries.extend(file_entries)
         skipped_missing_dedup_key += skipped
 
     if {
-        str(path): (entry.mtime, entry.size) for path, entry in _file_cache.items()
+        str(path): (entry.mtime, entry.size, entry.wal) for path, entry in _file_cache.items()
     } != file_cache_snapshot:
         _disk_cache_dirty = True
         _flush_caches_to_disk()
@@ -176,6 +179,15 @@ def flush_caches_on_terminate() -> None:
     _flush_caches_on_terminate(lambda: _flush_caches_to_disk(force=True))
 
 
+def _wal_fingerprint(path: Path) -> tuple[int, int] | None:
+    """Return the ``-wal`` file's (mtime_ns, size); WAL commits leave the main file untouched."""
+    try:
+        stat = Path(f"{path}-wal").stat()
+    except OSError:
+        return None
+    return (stat.st_mtime_ns, stat.st_size)
+
+
 def _load_database(
     path: Path,
     cutoff: datetime | None,
@@ -187,8 +199,14 @@ def _load_database(
         logger.warning("failed to stat Antigravity database %s: %s", path, exc)
         return [], 0
 
+    wal = _wal_fingerprint(path)
     cached = _file_cache.get(path)
-    if cached is not None and cached.mtime == st.st_mtime and cached.size == st.st_size:
+    if (
+        cached is not None
+        and cached.mtime == st.st_mtime
+        and cached.size == st.st_size
+        and cached.wal == wal
+    ):
         _file_cache.move_to_end(path)
         return _filter_entries(
             cached.entries,
@@ -208,6 +226,7 @@ def _load_database(
         size=st.st_size,
         entries=parsed_entries,
         skipped_missing_dedup_key=skipped_missing_dedup_key,
+        wal=wal,
     )
     return _filter_entries(parsed_entries, skipped_missing_dedup_key, cutoff, seen_dedup_keys)
 

{usage_cli-0.34.10 → usage_cli-0.34.12}/loaders/agy_quota_probe.py

@@ -18,7 +18,6 @@ from __future__ import annotations
 import json
 import os
 import platform
-import shutil
 import subprocess
 import sys
 import tempfile
@@ -35,6 +34,7 @@ from typing import Any
 from urllib.error import HTTPError, URLError
 from urllib.request import Request, urlopen
 
+from usage_common.cli_lookup import cli_env, resolve_cli
 from usage_common.subprocess_utils import hidden_console_kwargs
 
 CACHE_PATH = Path(os.path.expanduser("~/.usage/agy_quota_cache.json"))
@@ -168,6 +168,7 @@ def _probe_via_cli(timeout: float) -> AgyQuotaResult | None:
             capture_output=True,
             timeout=timeout,
             stdin=subprocess.DEVNULL,
+            env=cli_env(agy),
             **hidden_console_kwargs(),
         )
     except (OSError, subprocess.SubprocessError):
@@ -189,14 +190,7 @@ def _probe_via_cli(timeout: float) -> AgyQuotaResult | None:
 
 def find_agy() -> str | None:
     """Find the Antigravity CLI in PATH or common user installation paths."""
-    path = shutil.which("agy")
-    if path is not None:
-        return path
-    for candidate in ("~/.local/bin/agy", "/opt/homebrew/bin/agy", "/usr/local/bin/agy"):
-        expanded = os.path.expanduser(candidate)
-        if os.access(expanded, os.X_OK):
-            return expanded
-    return None
+    return resolve_cli("agy", ("~/.local/bin/agy", "/opt/homebrew/bin/agy", "/usr/local/bin/agy"))
 
 
 def load_quota(max_age_minutes: float = 5) -> AgyQuotaResult | None:

{usage_cli-0.34.10 → usage_cli-0.34.12}/loaders/claude_usage.py

@@ -303,9 +303,10 @@ def _has_rate_limits(data: dict[str, Any]) -> bool:
     rl = data.get("rate_limits")
     if not isinstance(rl, dict):
         return False
-    windows = [w for w in (rl.get("five_hour"), rl.get("seven_day")) if isinstance(w, dict)]
+    windows = [w for w in (rl.get("five_hour"), rl.get("seven_day")) if w is not None]
     return bool(windows) and all(
-        _as_finite_float(w.get("used_percentage")) is not None for w in windows
+        isinstance(w, dict) and _as_finite_float(w.get("used_percentage")) is not None
+        for w in windows
     )
 
 
@@ -347,7 +348,10 @@ def _build_snapshot(data: dict[str, Any], *, data_source: str = "hook") -> Usage
 
     return UsageSnapshot(
         current_percent=five_pct,
-        current_reset_at=five_reset,
+        # Keep an unknown hook reset unknown so the keeper cannot remember a
+        # parse-time default as a real boundary. Display expiry logic above
+        # still uses the default to preserve the reported percentage.
+        current_reset_at=_as_finite_float(five.get("resets_at")),
         weekly_percent=seven_pct,
         weekly_reset_at=seven_reset,
         current_status=status,

{usage_cli-0.34.10 → usage_cli-0.34.12}/loaders/codex_loader.py

@@ -652,16 +652,23 @@ def _rate_limits_from_websocket_error(
     headers = _as_dict(event.get("headers"))
     primary_reset = _as_optional_float(headers.get("X-Codex-Primary-Reset-At"))
     secondary_reset = _as_optional_float(headers.get("X-Codex-Secondary-Reset-At"))
-    now_ts = datetime.now(UTC).timestamp()
+    recorded_at = _timestamp_from_log_ts(ts)
+    recorded_ts = recorded_at.timestamp() if recorded_at is not None else None
     if primary_reset is None:
         primary_reset_after = _as_optional_float(headers.get("X-Codex-Primary-Reset-After-Seconds"))
-        primary_reset = now_ts + primary_reset_after if primary_reset_after is not None else None
+        primary_reset = (
+            recorded_ts + primary_reset_after
+            if recorded_ts is not None and primary_reset_after is not None
+            else None
+        )
     if secondary_reset is None:
         secondary_reset_after = _as_optional_float(
             headers.get("X-Codex-Secondary-Reset-After-Seconds")
         )
         secondary_reset = (
-            now_ts + secondary_reset_after if secondary_reset_after is not None else None
+            recorded_ts + secondary_reset_after
+            if recorded_ts is not None and secondary_reset_after is not None
+            else None
         )
     return _build_rate_limits(
         primary_pct=_as_optional_float(headers.get("X-Codex-Primary-Used-Percent")),
@@ -669,7 +676,7 @@ def _rate_limits_from_websocket_error(
         secondary_pct=_as_optional_float(headers.get("X-Codex-Secondary-Used-Percent")),
         secondary_reset=secondary_reset,
         model=_event_value(body, "model") or "unknown",
-        updated_at=_timestamp_from_log_ts(ts),
+        updated_at=recorded_at,
     )