usage-cli 0.34.16__tar.gz → 0.34.17__tar.gz

{usage_cli-0.34.16/usage_cli.egg-info → usage_cli-0.34.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usage-cli
-Version: 0.34.16
+Version: 0.34.17
 Summary: usage — 在 macOS menu bar 與 Windows 系統匣顯示 Claude Code、Codex、Antigravity 用量的小工具（也提供終端機 TUI）
 License-Expression: AGPL-3.0-only
 Requires-Python: >=3.13
@@ -123,7 +123,7 @@ Once set up, the bottom of the Claude Code window will show a status line like t
 | **Token Saver** | Asks Claude Code and Codex for shorter, plainer replies while keeping code and error messages byte-exact. In an A/B test on real sessions, late replies stayed **~40% shorter** instead of drifting 84% longer. | Off · no extra model calls |
 | **Side pane** | Quotas, other conversations, and background jobs next to your work. [See the side pane](#claude-code-side-pane). | Off · no extra model calls |
 | **Beginner Mode** | Explains up to three technical terms from each answer in one plain line, then brings them back for review. | Off · a little Claude quota |
-| **Quota-Aware Mode** | When a quota runs low, Claude tells you before a big task that would use it, and lets you do a smaller part or wait for the reset. | Off · no extra model calls |
+| **Quota-Aware Mode** | When a quota runs low, Claude tells you before a big task that would use it, and lets you do a smaller part or wait for the reset. Claude also gets a short quota overview at the start of each conversation. | Off · no extra model calls |
 | **Auto-start 5-hour session** | Right after a 5-hour quota resets, sends each tool one tiny message so the next window starts counting right away. | Off · negligible quota |
 | **Token-waste health check** | A daily scan of your logs for repeated file reads and noisy output. Say "show me" and the AI walks you through fixes. | Comes with Progress Concierge · no extra model calls |
 
@@ -146,7 +146,7 @@ Once set up, the bottom of the Claude Code window will show a status line like t
 - **Linux:** CI verifies `usage setup` on Ubuntu.
 - **Progress Concierge:** When you `/resume` a conversation that sat long enough for its cache to expire, it warns how many tokens the next message will re-send and suggests `/compact` first.
 - **Beginner Mode (macOS and Windows):** Terms appear above the prompt in your UI language. Press 9 to mark them understood; skipped terms come back after 1, 3, then 7 days. Understood terms return as a one-question multiple-choice quiz 7, 21, then 60 days later, at most one a day, and a wrong answer puts the term back in the hints. `/terms` opens your term history. Picking terms asks Claude Haiku through your Claude Code, and pauses while your 5-hour quota is at 90% or more.
-- **Quota-Aware Mode (macOS and Windows):** Claude Code gets one line with what is left and when it resets when a 5-hour quota passes 80%, 90%, or 95%, or a weekly quota passes 95%. It covers Claude Code, Codex, Antigravity, and Muse, says each level once per conversation, and treats each quota and model group separately, so a used-up one only matters for work that runs on it.
+- **Quota-Aware Mode (macOS and Windows):** Claude Code gets one line with what is left and when it resets when a 5-hour quota passes 80%, 90%, or 95%, or a weekly quota passes 95%. It covers Claude Code, Codex, Antigravity, and Muse, says each level once per conversation, tells Claude once when a quota it warned about resets, and treats each quota and model group separately, so a used-up one only matters for work that runs on it. Official Claude Code / Claude API or Codex API incidents and recovery also notify Claude, once per status change in each conversation. Claude also gets a short quota overview at the start of each conversation. After `/login` changes accounts, Claude hears once that earlier Claude Code quota notices no longer apply.
 - **Auto-start 5-hour session:** Claude gets Haiku, Antigravity gets Gemini 3.8 Flash Low, and Codex gets its cheapest model. The quota used is negligible. The Claude and Codex pings skip your own hooks and stay out of `claude --resume` and `codex resume`.
 - **Panel:** It stays put when another app takes focus; a second click on the menu bar icon, or Escape, closes it. Card order is shared across every theme with quota cards (all except World Cup 2026) and survives restarts.
 - **HTML reports:** A "What you worked on" section lists the names Claude Code gave your recent conversations, and masking covers those titles too.

{usage_cli-0.34.16 → usage_cli-0.34.17}/README.md

@@ -101,7 +101,7 @@ Once set up, the bottom of the Claude Code window will show a status line like t
 | **Token Saver** | Asks Claude Code and Codex for shorter, plainer replies while keeping code and error messages byte-exact. In an A/B test on real sessions, late replies stayed **~40% shorter** instead of drifting 84% longer. | Off · no extra model calls |
 | **Side pane** | Quotas, other conversations, and background jobs next to your work. [See the side pane](#claude-code-side-pane). | Off · no extra model calls |
 | **Beginner Mode** | Explains up to three technical terms from each answer in one plain line, then brings them back for review. | Off · a little Claude quota |
-| **Quota-Aware Mode** | When a quota runs low, Claude tells you before a big task that would use it, and lets you do a smaller part or wait for the reset. | Off · no extra model calls |
+| **Quota-Aware Mode** | When a quota runs low, Claude tells you before a big task that would use it, and lets you do a smaller part or wait for the reset. Claude also gets a short quota overview at the start of each conversation. | Off · no extra model calls |
 | **Auto-start 5-hour session** | Right after a 5-hour quota resets, sends each tool one tiny message so the next window starts counting right away. | Off · negligible quota |
 | **Token-waste health check** | A daily scan of your logs for repeated file reads and noisy output. Say "show me" and the AI walks you through fixes. | Comes with Progress Concierge · no extra model calls |
 
@@ -124,7 +124,7 @@ Once set up, the bottom of the Claude Code window will show a status line like t
 - **Linux:** CI verifies `usage setup` on Ubuntu.
 - **Progress Concierge:** When you `/resume` a conversation that sat long enough for its cache to expire, it warns how many tokens the next message will re-send and suggests `/compact` first.
 - **Beginner Mode (macOS and Windows):** Terms appear above the prompt in your UI language. Press 9 to mark them understood; skipped terms come back after 1, 3, then 7 days. Understood terms return as a one-question multiple-choice quiz 7, 21, then 60 days later, at most one a day, and a wrong answer puts the term back in the hints. `/terms` opens your term history. Picking terms asks Claude Haiku through your Claude Code, and pauses while your 5-hour quota is at 90% or more.
-- **Quota-Aware Mode (macOS and Windows):** Claude Code gets one line with what is left and when it resets when a 5-hour quota passes 80%, 90%, or 95%, or a weekly quota passes 95%. It covers Claude Code, Codex, Antigravity, and Muse, says each level once per conversation, and treats each quota and model group separately, so a used-up one only matters for work that runs on it.
+- **Quota-Aware Mode (macOS and Windows):** Claude Code gets one line with what is left and when it resets when a 5-hour quota passes 80%, 90%, or 95%, or a weekly quota passes 95%. It covers Claude Code, Codex, Antigravity, and Muse, says each level once per conversation, tells Claude once when a quota it warned about resets, and treats each quota and model group separately, so a used-up one only matters for work that runs on it. Official Claude Code / Claude API or Codex API incidents and recovery also notify Claude, once per status change in each conversation. Claude also gets a short quota overview at the start of each conversation. After `/login` changes accounts, Claude hears once that earlier Claude Code quota notices no longer apply.
 - **Auto-start 5-hour session:** Claude gets Haiku, Antigravity gets Gemini 3.8 Flash Low, and Codex gets its cheapest model. The quota used is negligible. The Claude and Codex pings skip your own hooks and stay out of `claude --resume` and `codex resume`.
 - **Panel:** It stays put when another app takes focus; a second click on the menu bar icon, or Escape, closes it. Card order is shared across every theme with quota cards (all except World Cup 2026) and survives restarts.
 - **HTML reports:** A "What you worked on" section lists the names Claude Code gave your recent conversations, and masking covers those titles too.

{usage_cli-0.34.16 → usage_cli-0.34.17}/i18n.json

@@ -556,7 +556,7 @@
     "claude_beginner_disabled_msg": "已關閉新手模式。重開 Claude Code 後生效。",
     "claude_beginner_action_failed": "無法切換新手模式",
     "quota_aware_menu": "額度感知模式",
-    "quota_aware_tooltip": "額度快用完時，Claude 開大任務前會先告訴你剩多少、幾點重置，讓你選先做小的還是等重置。",
+    "quota_aware_tooltip": "額度快用完時，Claude 開大任務前會先告訴你剩多少、幾點重置，讓你選先做小的還是等重置。Claude Code 或 Codex 官方服務出狀況時，也會告訴 Claude。每個對話開始時，也會給 Claude 一份各家額度的簡短總覽。",
     "quota_aware_enabled_msg": "已開啟額度感知模式。請重啟 Claude Code 套用。",
     "quota_aware_disabled_msg": "已關閉額度感知模式。請重啟 Claude Code 套用。",
     "quota_aware_action_failed": "無法切換額度感知模式。",
@@ -1136,7 +1136,7 @@
     "claude_beginner_disabled_msg": "Beginner Mode disabled. Restart Claude Code to apply.",
     "claude_beginner_action_failed": "Could not change Beginner Mode",
     "quota_aware_menu": "Quota-Aware Mode",
-    "quota_aware_tooltip": "When quota is running low, Claude tells you how much remains and when it resets before starting a large task, so you can choose a smaller part now or wait for the reset.",
+    "quota_aware_tooltip": "When quota is running low, Claude tells you how much remains and when it resets before starting a large task, so you can choose a smaller part now or wait for the reset. Claude is also notified of official Claude Code or Codex service incidents. Claude also gets a short quota overview at the start of each conversation.",
     "quota_aware_enabled_msg": "Quota-Aware Mode enabled. Restart Claude Code to apply.",
     "quota_aware_disabled_msg": "Quota-Aware Mode disabled. Restart Claude Code to apply.",
     "quota_aware_action_failed": "Could not change Quota-Aware Mode.",
@@ -1716,7 +1716,7 @@
     "claude_beginner_disabled_msg": "已关闭新手模式。重启 Claude Code 后生效。",
     "claude_beginner_action_failed": "无法切换新手模式",
     "quota_aware_menu": "额度感知模式",
-    "quota_aware_tooltip": "额度快用完时，Claude 开大任务前会先告诉你还剩多少、几点重置，让你选先做小的还是等重置。",
+    "quota_aware_tooltip": "额度快用完时，Claude 开大任务前会先告诉你还剩多少、几点重置，让你选先做小的还是等重置。Claude Code 或 Codex 官方服务出状况时，也会告诉 Claude。每个对话开始时，也会给 Claude 一份各家额度的简短总览。",
     "quota_aware_enabled_msg": "已开启额度感知模式。请重启 Claude Code 应用。",
     "quota_aware_disabled_msg": "已关闭额度感知模式。请重启 Claude Code 应用。",
     "quota_aware_action_failed": "无法切换额度感知模式。",
@@ -2296,7 +2296,7 @@
     "claude_beginner_disabled_msg": "初心者モードを無効にしました。Claude Code を再起動してください。",
     "claude_beginner_action_failed": "初心者モードを切り替えられません",
     "quota_aware_menu": "クォータ認識モード",
-    "quota_aware_tooltip": "クォータが少なくなると、大きなタスクを始める前に Claude が残量とリセット時刻を伝えます。小さな部分を先に進めるか、リセットを待つか選べます。",
+    "quota_aware_tooltip": "クォータが少なくなると、大きなタスクを始める前に Claude が残量とリセット時刻を伝えます。小さな部分を先に進めるか、リセットを待つか選べます。Claude Code または Codex の公式サービスに障害が起きたときも Claude に伝えます。会話の開始時にも、各ツールのクォータの短い概要を Claude に伝えます。",
     "quota_aware_enabled_msg": "クォータ認識モードを有効にしました。Claude Code を再起動してください。",
     "quota_aware_disabled_msg": "クォータ認識モードを無効にしました。Claude Code を再起動してください。",
     "quota_aware_action_failed": "クォータ認識モードを切り替えられませんでした。",
@@ -2876,7 +2876,7 @@
     "claude_beginner_disabled_msg": "초보자 모드를 껐습니다. Claude Code를 다시 시작하세요.",
     "claude_beginner_action_failed": "초보자 모드를 전환할 수 없습니다",
     "quota_aware_menu": "할당량 인식 모드",
-    "quota_aware_tooltip": "할당량이 부족해지면 Claude가 큰 작업을 시작하기 전에 남은 양과 초기화 시간을 알려 줍니다. 작은 부분을 먼저 진행하거나 초기화를 기다릴 수 있습니다.",
+    "quota_aware_tooltip": "할당량이 부족해지면 Claude가 큰 작업을 시작하기 전에 남은 양과 초기화 시간을 알려 줍니다. 작은 부분을 먼저 진행하거나 초기화를 기다릴 수 있습니다. Claude Code 또는 Codex 공식 서비스에 장애가 생겨도 Claude에게 알려 줍니다. 대화가 시작될 때도 Claude에게 각 도구의 할당량을 간단히 요약해 줍니다.",
     "quota_aware_enabled_msg": "할당량 인식 모드를 켰습니다. Claude Code를 다시 시작해 주세요.",
     "quota_aware_disabled_msg": "할당량 인식 모드를 껐습니다. Claude Code를 다시 시작해 주세요.",
     "quota_aware_action_failed": "할당량 인식 모드를 변경할 수 없습니다.",

{usage_cli-0.34.16 → usage_cli-0.34.17}/installer/session_hooks.py

@@ -95,7 +95,7 @@ _TERSE_REMINDER_MARKER = "usage-terse-reminder"
 _TERSE_REMINDER_MARKERS = (_TERSE_REMINDER_MARKER, "usage_terse_reminder")
 # Independent, opt-in Claude Code UserPromptSubmit hook.
 QUOTA_AWARE_HOOK_TARGET = Path(os.path.expanduser("~/.claude/usage-quota-aware.py"))
-QUOTA_AWARE_HOOK_VERSION = "1.5"
+QUOTA_AWARE_HOOK_VERSION = "1.12"
 QUOTA_AWARE_MATCHER = ""
 _QUOTA_AWARE_MARKER = "usage-quota-aware"
 _QUOTA_AWARE_MARKERS = (_QUOTA_AWARE_MARKER, "usage_quota_aware")

{usage_cli-0.34.16 → usage_cli-0.34.17}/loaders/agy_quota_probe.py

@@ -15,12 +15,15 @@ the internal ``retrieveUserQuotaSummary`` endpoint for the quota summary.
 
 from __future__ import annotations
 
+import hashlib
 import json
+import math
 import os
 import platform
 import subprocess
 import sys
 import tempfile
+import threading
 import time
 import urllib.parse
 from base64 import b64decode
@@ -41,7 +44,9 @@ from usage_common.subprocess_utils import hidden_console_kwargs
 
 CACHE_PATH = Path(os.path.expanduser("~/.usage/agy_quota_cache.json"))
 AUTH_EXPIRED_PATH = CACHE_PATH.parent / "agy_auth_expired"
+CLI_SIGNED_OUT_PATH = CACHE_PATH.parent / "agy_cli_signed_out"
 _CLI_LOG_PATH = CACHE_PATH.parent / "agy_usage_cli.log"
+BACKGROUND_AGY_LOCK = threading.Lock()
 
 
 def auth_expired() -> bool:
@@ -54,6 +59,38 @@ def _mark_auth_expired() -> None:
         AUTH_EXPIRED_PATH.touch()
 
 
+def mark_cli_signed_out(before: str | None) -> None:
+    after = _credential_fingerprint()
+    if after != before:
+        return
+    with suppress(OSError):
+        CLI_SIGNED_OUT_PATH.parent.mkdir(parents=True, exist_ok=True)
+        CLI_SIGNED_OUT_PATH.write_text(
+            json.dumps({"fingerprint": after, "marked_at": time.time()}),
+            encoding="utf-8",
+        )
+
+
+def agy_cli_signed_in(timeout: float) -> bool:
+    """Open the gate for a readable credential; bypass cooldown only for a known change."""
+    global _cli_retry_after_monotonic
+    if not CLI_SIGNED_OUT_PATH.exists():
+        return True
+    try:
+        marker = json.loads(CLI_SIGNED_OUT_PATH.read_text(encoding="utf-8"))
+    except (OSError, ValueError, UnicodeError):
+        marker = {}
+    stored = marker.get("fingerprint") if isinstance(marker, dict) else None
+    current = _credential_fingerprint()
+    if current is None or current == stored:
+        return False
+    with suppress(OSError):
+        CLI_SIGNED_OUT_PATH.unlink(missing_ok=True)
+    if isinstance(stored, str):
+        _cli_retry_after_monotonic = 0.0
+    return True
+
+
 # Legacy OAuth token written by older Antigravity CLI versions. Read-only: we
 # never write back here (that is the CLI's home and could corrupt its login).
 _TOKEN_PATH = Path(os.path.expanduser("~/.gemini/antigravity-cli/antigravity-oauth-token"))
@@ -121,6 +158,8 @@ class AgyQuotaGroup:
     models: list[str]
     weekly: AgyQuotaWindow | None
     five_hour: AgyQuotaWindow | None
+    weekly_fetched_at: str | None = None
+    weekly_resets_at: str | None = None
 
 
 @dataclass(frozen=True, slots=True)
@@ -169,19 +208,40 @@ def _probe_via_cli(timeout: float) -> AgyQuotaResult | None:
     agy = find_agy()
     if agy is None:
         return None
-    if time.monotonic() < _cli_retry_after_monotonic:
-        return None
-    # Offline (e.g. just after a sleep wake) the CLI would open a browser sign-in page.
-    if not google_auth_reachable():
+    if not BACKGROUND_AGY_LOCK.acquire(blocking=False):
         return None
-    result = _run_usage_command(agy, timeout)
-    _cli_retry_after_monotonic = (
-        0.0 if result is not None else time.monotonic() + _CLI_FAILURE_COOLDOWN_SECONDS
-    )
-    return result
+    try:
+        if not agy_cli_signed_in(timeout) or time.monotonic() < _cli_retry_after_monotonic:
+            return None
+        # Offline, the CLI would open a browser sign-in page.
+        if not google_auth_reachable():
+            return None
+        before = _credential_fingerprint()
+        log_offset = 0
+        with suppress(OSError):
+            log_offset = _CLI_LOG_PATH.stat().st_size
+        result = _run_usage_command(agy, timeout, before)
+        if result is None:
+            with suppress(OSError):
+                with _CLI_LOG_PATH.open("rb") as log:
+                    size = log.seek(0, os.SEEK_END)
+                    start = log_offset if size >= log_offset else 0
+                    log.seek(max(start, size - 65536))
+                    tail = log.read()
+                if (
+                    b"Print mode: not authenticated" in tail
+                    or b"triggering interactive OAuth" in tail
+                ):
+                    mark_cli_signed_out(before)
+        _cli_retry_after_monotonic = (
+            0.0 if result is not None else time.monotonic() + _CLI_FAILURE_COOLDOWN_SECONDS
+        )
+        return result
+    finally:
+        BACKGROUND_AGY_LOCK.release()
 
 
-def _run_usage_command(agy: str, timeout: float) -> AgyQuotaResult | None:
+def _run_usage_command(agy: str, timeout: float, before: str | None) -> AgyQuotaResult | None:
     command = [agy, "-p", "/usage", "--output-format", "json", "--log-file", str(_CLI_LOG_PATH)]
     try:
         completed = subprocess.run(
@@ -193,8 +253,19 @@ def _run_usage_command(agy: str, timeout: float) -> AgyQuotaResult | None:
             env=cli_env(agy),
             **hidden_console_kwargs(),
         )
+    except subprocess.TimeoutExpired as exc:
+        if "Authentication required" in str(exc.stdout) or "Authentication required" in str(
+            exc.stderr
+        ):
+            mark_cli_signed_out(before)
+        return None
     except (OSError, subprocess.SubprocessError):
         return None
+    if "Authentication required" in str(completed.stdout) or "Authentication required" in str(
+        getattr(completed, "stderr", "")
+    ):
+        mark_cli_signed_out(before)
+        return None
     if completed.returncode != 0:
         return None
     try:
@@ -226,11 +297,57 @@ def load_quota(max_age_minutes: float = 5) -> AgyQuotaResult | None:
     probed = probe_quota()
     if probed is None:
         return cached
+    probed = _carry_missing_weekly(probed, cached)
     probed = _carry_missing_groups(probed, cached)
     _write_cache(probed)
     return probed
 
 
+def _carry_missing_weekly(probed: AgyQuotaResult, cached: AgyQuotaResult | None) -> AgyQuotaResult:
+    """Retain a missing weekly window until its cached reset, without refreshing its age."""
+    if cached is None:
+        return probed
+    cached_at = _parse_timestamp(cached.fetched_at)
+    probed_at = _parse_timestamp(probed.fetched_at)
+    if cached_at is None or probed_at is None:
+        return probed
+    previous = {group.name: group for group in cached.groups}
+    groups = []
+    for group in probed.groups:
+        old = previous.get(group.name)
+        window = old.weekly if old is not None else None
+        if (
+            group.weekly is None
+            and old is not None
+            and window is not None
+            and window.resets_in_minutes is not None
+        ):
+            resets_at = (
+                _parse_timestamp(old.weekly_resets_at)
+                if old.weekly_resets_at is not None
+                else cached_at + timedelta(minutes=window.resets_in_minutes)
+            )
+            if resets_at is not None and resets_at > probed_at:
+                minutes = max(0, math.ceil((resets_at - probed_at).total_seconds() / 60))
+                group = replace(
+                    group,
+                    weekly=replace(
+                        window, resets_in_minutes=minutes, resets_in=_format_resets_in(minutes)
+                    ),
+                    weekly_fetched_at=old.weekly_fetched_at or cached.fetched_at,
+                    weekly_resets_at=resets_at.isoformat(),
+                )
+        groups.append(group)
+    return replace(probed, groups=groups)
+
+
+def _age_window(window: AgyQuotaWindow | None, elapsed: int) -> AgyQuotaWindow | None:
+    if window is None or window.resets_in_minutes is None or elapsed == 0:
+        return window
+    minutes = max(0, window.resets_in_minutes - elapsed)
+    return replace(window, resets_in_minutes=minutes, resets_in=_format_resets_in(minutes))
+
+
 def _carry_missing_groups(probed: AgyQuotaResult, cached: AgyQuotaResult | None) -> AgyQuotaResult:
     """Keep a group the API skipped this once, so the group toggle has something to show.
 
@@ -261,14 +378,12 @@ def _carry_missing_groups(probed: AgyQuotaResult, cached: AgyQuotaResult | None)
         else 0
     )
 
-    def age_window(window: AgyQuotaWindow | None) -> AgyQuotaWindow | None:
-        if window is None or window.resets_in_minutes is None or elapsed == 0:
-            return window
-        minutes = max(0, window.resets_in_minutes - elapsed)
-        return replace(window, resets_in_minutes=minutes, resets_in=_format_resets_in(minutes))
-
     missing = [
-        replace(group, weekly=age_window(group.weekly), five_hour=age_window(group.five_hour))
+        replace(
+            group,
+            weekly=_age_window(group.weekly, elapsed),
+            five_hour=_age_window(group.five_hour, elapsed),
+        )
         for group in missing
     ]
     order = {group.name: index for index, group in enumerate(cached.groups)}
@@ -276,6 +391,21 @@ def _carry_missing_groups(probed: AgyQuotaResult, cached: AgyQuotaResult | None)
     return AgyQuotaResult(groups=groups, fetched_at=probed.fetched_at)
 
 
+def _credential_fingerprint() -> str | None:
+    """Hash only the stored credential, without resolving or refreshing a token."""
+    token_data: object = None
+    if sys.platform == "darwin":
+        token_data = _read_macos_credential()
+    if not _has_usable_token(token_data):
+        token_data = _read_token_file()
+    if not _has_usable_token(token_data) and sys.platform == "win32":
+        token_data = _read_windows_credential()
+    token = token_data.get("token") if isinstance(token_data, dict) else None
+    if not isinstance(token, dict):
+        return None
+    return hashlib.sha256(json.dumps(token, sort_keys=True).encode()).hexdigest()
+
+
 def _resolve_access_token(timeout: float) -> str | None:
     """Return a usable access token, refreshing when stale.
 
@@ -845,7 +975,31 @@ def _read_cache() -> AgyQuotaResult | None:
         return None
     except OSError:
         return None
-    return _result_from_payload(payload)
+    result = _result_from_payload(payload)
+    if result is None:
+        return None
+    fetched_at = _parse_timestamp(result.fetched_at)
+    assert fetched_at is not None
+    now = datetime.now(UTC)
+
+    def weekly_expired(group: AgyQuotaGroup) -> bool:
+        if group.weekly_resets_at is not None:
+            resets_at = _parse_timestamp(group.weekly_resets_at)
+            if resets_at is not None:
+                return resets_at <= now
+        return (
+            group.weekly is not None
+            and group.weekly.resets_in_minutes is not None
+            and fetched_at + timedelta(minutes=group.weekly.resets_in_minutes) <= now
+        )
+
+    groups = [
+        replace(group, weekly=None, weekly_fetched_at=None, weekly_resets_at=None)
+        if group.weekly_fetched_at is not None and weekly_expired(group)
+        else group
+        for group in result.groups
+    ]
+    return replace(result, groups=groups)
 
 
 def _write_cache(result: AgyQuotaResult) -> None:
@@ -874,6 +1028,12 @@ def _result_to_payload(result: AgyQuotaResult) -> dict[str, object]:
                 "models": group.models,
                 "weekly": _window_to_payload(group.weekly),
                 "five_hour": _window_to_payload(group.five_hour),
+                **(
+                    {"weekly_fetched_at": group.weekly_fetched_at}
+                    if group.weekly_fetched_at
+                    else {}
+                ),
+                **({"weekly_resets_at": group.weekly_resets_at} if group.weekly_resets_at else {}),
             }
             for group in result.groups
         ],
@@ -917,6 +1077,8 @@ def _group_from_payload(payload: object) -> AgyQuotaGroup | None:
     models = payload.get("models")
     weekly = _window_from_payload(payload.get("weekly"))
     five_hour = _window_from_payload(payload.get("five_hour"))
+    weekly_fetched_at = payload.get("weekly_fetched_at")
+    weekly_resets_at = payload.get("weekly_resets_at")
     if (
         not isinstance(name, str)
         or not name
@@ -926,9 +1088,29 @@ def _group_from_payload(payload: object) -> AgyQuotaGroup | None:
         or "five_hour" not in payload
         or (payload["weekly"] is not None and weekly is None)
         or (payload["five_hour"] is not None and five_hour is None)
+        or (
+            weekly_fetched_at is not None
+            and (
+                not isinstance(weekly_fetched_at, str)
+                or _parse_timestamp(weekly_fetched_at) is None
+            )
+        )
+        or (
+            weekly_resets_at is not None
+            and (
+                not isinstance(weekly_resets_at, str) or _parse_timestamp(weekly_resets_at) is None
+            )
+        )
     ):
         return None
-    return AgyQuotaGroup(name=name, models=models, weekly=weekly, five_hour=five_hour)
+    return AgyQuotaGroup(
+        name=name,
+        models=models,
+        weekly=weekly,
+        five_hour=five_hour,
+        weekly_fetched_at=weekly_fetched_at,
+        weekly_resets_at=weekly_resets_at,
+    )
 
 
 def _window_from_payload(payload: object) -> AgyQuotaWindow | None:

{usage_cli-0.34.16 → usage_cli-0.34.17}/menubar/agy.py

@@ -90,7 +90,12 @@ def project_quota(
     )
     current_time = time.time() if now is None else now
     age_minutes = _cache_age_minutes(quota.fetched_at, current_time)
-    stale = _stale_state(quota.fetched_at, current_time, language)
+    stale = _stale_state(
+        selected.weekly_fetched_at or quota.fetched_at,
+        current_time,
+        language,
+        force=selected.weekly_fetched_at is not None,
+    )
     session_forecast: float | None = None
     weekly_forecast: float | None = None
     if stale is None and burn_rate_trackers is not None:
@@ -363,7 +368,9 @@ def _window_row(
     )
 
 
-def _stale_state(fetched_at: str, now: float, language: str) -> AgyStaleState | None:
+def _stale_state(
+    fetched_at: str, now: float, language: str, *, force: bool = False
+) -> AgyStaleState | None:
     if auth_expired():
         return {
             "ageText": _t(language, "agy_signin_expired"),
@@ -373,7 +380,7 @@ def _stale_state(fetched_at: str, now: float, language: str) -> AgyStaleState |
         age_seconds = now - parse_iso8601_utc_or_raise(fetched_at).timestamp()
     except (TypeError, ValueError):
         return None
-    if age_seconds <= AGY_STALE_SECONDS:
+    if age_seconds <= AGY_STALE_SECONDS and not force:
         return None
     if age_seconds < 3600:
         return cast(

{usage_cli-0.34.16 → usage_cli-0.34.17}/menubar/refresh.py

@@ -36,6 +36,7 @@ from menubar.prefs import (
 from quota import quota_snapshot
 from quota.burn_rate import BurnRateTracker
 from quota.usage_rate import UsageRateTracker
+from usage_common import service_status
 from usage_common.service_status import CLAUDE_STATUS, CODEX_STATUS, get_service_status
 
 logger = logging.getLogger(__name__)
@@ -197,6 +198,8 @@ def build_result(app: _RefreshApp, sources: RefreshSources) -> dict[str, Any]:
             get_service_status(CLAUDE_STATUS),
             get_service_status(CODEX_STATUS),
         )
+        if not app.mock:
+            service_status.write_snapshot(service_statuses)
         group = int(app.tracker.group())
         state = menubar_state.build_popover_state(
             outcome=outcome,

{usage_cli-0.34.16 → usage_cli-0.34.17}/pyproject.toml

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

{usage_cli-0.34.16 → usage_cli-0.34.17}/quota/agy_window_keeper.py

@@ -15,6 +15,7 @@ import threading
 import time
 from pathlib import Path
 
+from loaders import agy_quota_probe
 from menubar.agy import AgyRefreshResult
 from menubar.prefs import _agy_window_keeper_enabled
 from quota import keeper_outcome
@@ -37,6 +38,10 @@ _lock = threading.Lock()
 _ping_in_flight = False
 
 
+class _PingSkipped(Exception):
+    """The background safety gate refused this launch."""
+
+
 def should_ping(
     now: float,
     enabled: bool,
@@ -83,18 +88,32 @@ def _release() -> None:
 
 
 def _run_agy_ping(agy_bin: str) -> subprocess.CompletedProcess[str]:
-    return subprocess.run(  # noqa: S603 - resolved local Antigravity CLI
-        [agy_bin, "-p", "ok", "--model", AGY_MODEL],
-        stdin=subprocess.DEVNULL,
-        capture_output=True,
-        encoding="utf-8",
-        errors="replace",
-        timeout=PING_TIMEOUT_SECONDS,
-        cwd=os.path.expanduser("~"),
-        check=False,
-        env=cli_env(agy_bin),
-        **hidden_console_kwargs(),
-    )
+    if not agy_quota_probe.BACKGROUND_AGY_LOCK.acquire(blocking=False):
+        raise _PingSkipped("background agy is busy")
+    try:
+        before = agy_quota_probe._credential_fingerprint()
+        if not agy_quota_probe.agy_cli_signed_in(PING_TIMEOUT_SECONDS):
+            raise _PingSkipped("CLI is signed out")
+        result = subprocess.run(  # noqa: S603 - resolved local Antigravity CLI
+            [agy_bin, "-p", "ok", "--model", AGY_MODEL],
+            stdin=subprocess.DEVNULL,
+            capture_output=True,
+            encoding="utf-8",
+            errors="replace",
+            timeout=PING_TIMEOUT_SECONDS,
+            cwd=os.path.expanduser("~"),
+            check=False,
+            env=cli_env(agy_bin),
+            **hidden_console_kwargs(),
+        )
+        output = f"{result.stdout or ''}\n{result.stderr or ''}".lower()
+        if result.returncode != 0 and (
+            "authentication required" in output or "authentication failed" in output
+        ):
+            agy_quota_probe.mark_cli_signed_out(before)
+        return result
+    finally:
+        agy_quota_probe.BACKGROUND_AGY_LOCK.release()
 
 
 def _ping_worker(started_at: float) -> None:
@@ -102,6 +121,20 @@ def _ping_worker(started_at: float) -> None:
         binary = _resolve_agy_bin()
         result = _run_agy_ping(binary) if binary is not None else FileNotFoundError()
         fields = keeper_outcome.classify(result)
+    except _PingSkipped as exc:
+        _debug_log(f"Antigravity ping skipped: {exc}")
+        # A probe may win the shared lock after dispatch. Allow the next refresh
+        # to retry, and preserve any previous outcome rather than recording failure.
+        try:
+            keeper_outcome.update_state(
+                AGY_WINDOW_KEEPER_STATE_PATH,
+                lambda state: (
+                    {"last_ping_at": None} if state.get("last_ping_at") == started_at else {}
+                ),
+            )
+        finally:
+            _release()
+        return
     except Exception as exc:
         fields = keeper_outcome.classify(exc)
     try:
@@ -142,6 +175,12 @@ def maybe_ping(result: AgyRefreshResult, mock: bool) -> None:
     # leave the state untouched so the next refresh tries again.
     if not google_auth_reachable():
         return
+    if agy_quota_probe.BACKGROUND_AGY_LOCK.locked():
+        _debug_log("Antigravity ping skipped: background agy is busy")
+        return
+    if not agy_quota_probe.agy_cli_signed_in(PING_TIMEOUT_SECONDS):
+        _debug_log("Antigravity ping skipped: CLI is signed out")
+        return
     if not _try_acquire():
         return
     keeper_outcome.update_state(

{usage_cli-0.34.16 → usage_cli-0.34.17}/quota/status_payload.py

@@ -128,13 +128,23 @@ def _status_antigravity(now: int) -> dict[str, Any]:
             ),
         }
 
+    def weekly_status(group: agy_quota_probe.AgyQuotaGroup) -> dict[str, Any]:
+        window = window_status(group.weekly)
+        if group.weekly_fetched_at is not None:
+            window["updated_at"] = group.weekly_fetched_at
+            window["age_seconds"] = _age_seconds(group.weekly_fetched_at, now)
+        resets_at = parse_optional_iso8601_utc(group.weekly_resets_at)
+        if resets_at is not None:
+            window["resets_in_seconds"] = int(max(0, resets_at.timestamp() - now))
+        return window
+
     return {
         "available": True,
         "groups": [
             {
                 "name": group.name,
                 "five_hour": window_status(group.five_hour),
-                "seven_day": window_status(group.weekly),
+                "seven_day": weekly_status(group),
             }
             for group in quota.groups
         ],