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

{usage_cli-0.34.11/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.11
+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.11 → 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.11 → 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

{usage_cli-0.34.11 → 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.11 → 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.11 → 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.11 → usage_cli-0.34.12}/installer/setup_hook.py

@@ -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.11 → 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.11 → 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.11 → 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.11 → 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,
     )
 
 

{usage_cli-0.34.11 → usage_cli-0.34.12}/loaders/muse_quota_probe.py

@@ -11,7 +11,6 @@ import logging
 import math
 import os
 import re
-import shutil
 import subprocess
 import tempfile
 import threading
@@ -22,6 +21,7 @@ from pathlib import Path
 from typing import TypedDict, TypeGuard
 
 from loaders import muse_loader
+from usage_common.cli_lookup import cli_env, resolve_cli
 from usage_common.subprocess_utils import hidden_console_kwargs
 
 logger = logging.getLogger(__name__)
@@ -54,14 +54,9 @@ class MuseQuotaResult(TypedDict):
 
 def find_muse() -> str | None:
     """Find Muse even when the app inherits a limited GUI PATH."""
-    executable = shutil.which("muse")
-    if executable is not None:
-        return executable
-    for candidate in ("~/.local/bin/muse", "/opt/homebrew/bin/muse", "/usr/local/bin/muse"):
-        expanded = os.path.expanduser(candidate)
-        if os.path.isfile(expanded) and os.access(expanded, os.X_OK):
-            return expanded
-    return None
+    return resolve_cli(
+        "muse", ("~/.local/bin/muse", "/opt/homebrew/bin/muse", "/usr/local/bin/muse")
+    )
 
 
 def _number(value: object) -> TypeGuard[int | float]:
@@ -239,6 +234,7 @@ def _probe_worker(executable: str) -> None:
                 stderr=subprocess.PIPE,
                 encoding="utf-8",
                 cwd=PROBE_DIR,
+                env=cli_env(executable),
                 **hidden_console_kwargs(),
             )
             _probe_process = process

{usage_cli-0.34.11 → usage_cli-0.34.12}/main.py

@@ -231,11 +231,19 @@ def main() -> None:
             session_hooks._migrate_bundled_python_commands_if_needed()
         raise SystemExit(exit_code)
     if args.unsetup:
-        from installer.session_hooks import disable_session_resume, disable_terse_mode
+        from installer.claude_pane import disable_claude_beginner, disable_claude_pane
+        from installer.session_hooks import (
+            disable_quota_aware,
+            disable_session_resume,
+            disable_terse_mode,
+        )
         from installer.setup_hook import unsetup
 
         disable_session_resume()
         disable_terse_mode()
+        disable_quota_aware()
+        disable_claude_pane()
+        disable_claude_beginner()
         raise SystemExit(unsetup())
     preferences_snapshot = _load_preferences()
     _self_heal()

{usage_cli-0.34.11 → usage_cli-0.34.12}/menubar/actions.py

@@ -177,7 +177,7 @@ def show_forwarder_mode_prompt_if_needed(language: str | None = None) -> None:
         )
         if dismissed or setup_hook._detect_current_state(settings) != "external":
             return
-    except Exception:
+    except (Exception, SystemExit):
         if os.environ.get("USAGE_DEBUG") == "1":
             logger.warning("forwarder prompt check failed", exc_info=True)
         return
@@ -194,13 +194,13 @@ def show_forwarder_mode_prompt_if_needed(language: str | None = None) -> None:
         if result == 1000:
             setup_hook.setup(force_forwarder=True)
             session_hooks._migrate_bundled_python_commands_if_needed()
-    except Exception:
+    except (Exception, SystemExit):
         if os.environ.get("USAGE_DEBUG") == "1":
             logger.warning("forwarder setup failed", exc_info=True)
     finally:
         try:
             _set_forwarder_mode_prompt_dismissed()
-        except Exception:
+        except (Exception, SystemExit):
             if os.environ.get("USAGE_DEBUG") == "1":
                 logger.warning("forwarder prompt dismissal failed", exc_info=True)
 

{usage_cli-0.34.11 → usage_cli-0.34.12}/menubar/fsevents_watch.py

@@ -15,6 +15,7 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Any
 
+from loaders.claude_paths import claude_config_dirs
 from loaders.codex_paths import codex_home
 
 logger = logging.getLogger(__name__)
@@ -115,14 +116,15 @@ def classify_file_events(paths: Iterable[str], flags: Iterable[int]) -> FileEven
 
 def usage_watch_paths() -> list[Path]:
     """Return existing agent directories that contain usage history records."""
-    home = Path.home()
     codex_dir = codex_home()
     return [
         path
-        for path in (
-            home / ".claude" / "projects",
-            codex_dir / "sessions",
-            codex_dir / "archived_sessions",
+        for path in dict.fromkeys(
+            (
+                *(directory / "projects" for directory in claude_config_dirs()),
+                codex_dir / "sessions",
+                codex_dir / "archived_sessions",
+            )
         )
         if path.exists()
     ]

{usage_cli-0.34.11 → usage_cli-0.34.12}/menubar/state.py

@@ -571,14 +571,12 @@ def project_rows_for_windows(
     current_time = datetime.now(UTC) if now is None else now
     local_now = current_time.astimezone()
     local_today = local_now.date()
-    local_tz = local_now.tzinfo
-    assert local_tz is not None
-    today_start = datetime.combine(local_today, datetime_time.min, tzinfo=local_tz).astimezone(UTC)
+    today_start = datetime.combine(local_today, datetime_time.min).astimezone(UTC)
     tomorrow_start = datetime.combine(
-        local_today + timedelta(days=1), datetime_time.min, tzinfo=local_tz
+        local_today + timedelta(days=1), datetime_time.min
     ).astimezone(UTC)
     yesterday_start = datetime.combine(
-        local_today - timedelta(days=1), datetime_time.min, tzinfo=local_tz
+        local_today - timedelta(days=1), datetime_time.min
     ).astimezone(UTC)
     cutoff_7d = current_time - timedelta(hours=168)
     cutoff_30d = current_time - timedelta(hours=720)

{usage_cli-0.34.11 → usage_cli-0.34.12}/menubar/title.py

@@ -35,7 +35,7 @@ from menubar.state import PopoverState, QuotaRowState, _format_percent
 class _TitleApp(Protocol):
     _menubar_text_cache: dict[str, Any]
     codex_5h_pct: float | None
-    _last_button_title_key: tuple[str] | None
+    _last_button_title_key: tuple[Any, ...] | None
     _last_plain_title_key: tuple[str] | None
     status_item: Any
     interval: float
@@ -166,7 +166,7 @@ def _menubar_attributed_title(app: _TitleApp, state: PopoverState) -> Any:
 def _set_button_title(app: _TitleApp, state: PopoverState) -> None:
     app._reschedule_poll_timer(menubar_poll_interval(app, state))
     title = _compose_title(app, state)
-    title_key = (title,)
+    title_key = (title, tuple(icon for icon, _text in _menubar_items(app, state)))
     if app._last_button_title_key == title_key:
         return
 

{usage_cli-0.34.11 → usage_cli-0.34.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usage-cli"
-version = "0.34.11"
+version = "0.34.12"
 description = "usage — 在 macOS menu bar 與 Windows 系統匣顯示 Claude Code、Codex、Antigravity 用量的小工具（也提供終端機 TUI）"
 readme = "README.md"
 requires-python = ">=3.13"

{usage_cli-0.34.11 → usage_cli-0.34.12}/quota/agy_window_keeper.py

@@ -10,7 +10,6 @@ from __future__ import annotations
 
 import logging
 import os
-import shutil
 import subprocess
 import threading
 import time
@@ -19,6 +18,7 @@ from pathlib import Path
 from menubar.agy import AgyRefreshResult
 from menubar.prefs import _agy_window_keeper_enabled
 from quota import keeper_outcome
+from usage_common.cli_lookup import cli_env, resolve_cli
 from usage_common.subprocess_utils import hidden_console_kwargs
 
 logger = logging.getLogger(__name__)
@@ -63,14 +63,7 @@ def _load_last_ping(path: Path | None = None) -> float | None:
 
 
 def _resolve_agy_bin() -> str | None:
-    found = shutil.which("agy")
-    if found:
-        return found
-    for candidate in _AGY_BIN_FALLBACKS:
-        resolved = os.path.expanduser(candidate)
-        if os.path.isfile(resolved) and os.access(resolved, os.X_OK):
-            return resolved
-    return None
+    return resolve_cli("agy", _AGY_BIN_FALLBACKS)
 
 
 def _try_acquire() -> bool:
@@ -98,6 +91,7 @@ def _run_agy_ping(agy_bin: str) -> subprocess.CompletedProcess[str]:
         timeout=PING_TIMEOUT_SECONDS,
         cwd=os.path.expanduser("~"),
         check=False,
+        env=cli_env(agy_bin),
         **hidden_console_kwargs(),
     )