usage-cli 0.33.6__tar.gz → 0.33.8__tar.gz

{usage_cli-0.33.6/usage_cli.egg-info → usage_cli-0.33.8}/PKG-INFO

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

{usage_cli-0.33.6 → usage_cli-0.33.8}/analyzer/dispatch_ledger.py

@@ -290,11 +290,12 @@ def load_windows() -> dict[str, QuotaWindow]:
         fetched = _timestamp(agy.fetched_at)
         if fetched:
             for group in agy.groups:
-                minutes = group.weekly.resets_in_minutes
-                if minutes is None:
+                weekly = group.weekly
+                if weekly is None or weekly.resets_in_minutes is None:
                     continue
+                minutes = weekly.resets_in_minutes
                 window = QuotaWindow(
-                    100 - group.weekly.remaining_percent,
+                    100 - weekly.remaining_percent,
                     fetched + timedelta(minutes=minutes),
                     timedelta(days=7),
                 )

{usage_cli-0.33.6 → usage_cli-0.33.8}/i18n.json

@@ -99,6 +99,9 @@
     "agy_group_claude_gpt": "Claude / GPT ⇄",
     "agy_group_switch_tooltip": "切換 Antigravity 額度組",
     "agy_quota_full": "額度全滿",
+    "agy_window_not_reported": "Google 沒有回報這項額度",
+    "agy_session_paused": "暫停",
+    "agy_session_paused_detail": "本週額度用完，等週重置",
     "agy_stale_minutes": "約 {minutes} 分鐘前",
     "agy_stale_hours": "約 {hours} 小時前",
     "agy_stale_tooltip": "顯示的是快取舊值。額度直接向官方 API 取得，通常每幾分鐘自動更新；出現舊值代表最近取用失敗（多半是 agy 尚未登入，或網路問題），成功後會自動恢復。",
@@ -643,6 +646,9 @@
     "agy_group_claude_gpt": "Claude / GPT ⇄",
     "agy_group_switch_tooltip": "Switch Antigravity quota group",
     "agy_quota_full": "Quota full",
+    "agy_window_not_reported": "Not reported by Google",
+    "agy_session_paused": "Paused",
+    "agy_session_paused_detail": "Weekly quota used up; waits for weekly reset",
     "agy_stale_minutes": "about {minutes} minutes ago",
     "agy_stale_hours": "about {hours} hours ago",
     "agy_stale_tooltip": "Showing a cached value. Quota is fetched straight from the official API, usually updating every few minutes; an old value means the last fetch failed (often agy isn't signed in, or there's a network issue), and it recovers automatically once a fetch succeeds.",
@@ -1187,6 +1193,9 @@
     "agy_group_claude_gpt": "Claude / GPT ⇄",
     "agy_group_switch_tooltip": "切换 Antigravity 额度组",
     "agy_quota_full": "额度已满",
+    "agy_window_not_reported": "Google 没有回报这项额度",
+    "agy_session_paused": "暂停",
+    "agy_session_paused_detail": "本周额度用完，等周重置",
     "agy_stale_minutes": "约 {minutes} 分钟前",
     "agy_stale_hours": "约 {hours} 小时前",
     "agy_stale_tooltip": "显示的是缓存旧值。额度直接从官方 API 获取，通常每隔几分钟自动更新；出现旧值说明最近获取失败（多半是 agy 尚未登录，或网络问题），成功后会自动恢复。",
@@ -1731,6 +1740,9 @@
     "agy_group_claude_gpt": "Claude / GPT ⇄",
     "agy_group_switch_tooltip": "Antigravity の割り当てグループを切り替え",
     "agy_quota_full": "クォータは満タンです",
+    "agy_window_not_reported": "Google から報告されていません",
+    "agy_session_paused": "一時停止",
+    "agy_session_paused_detail": "今週の上限に達したため、週のリセット待ち",
     "agy_stale_minutes": "約 {minutes} 分前",
     "agy_stale_hours": "約 {hours} 時間前",
     "agy_stale_tooltip": "キャッシュされた値を表示しています。利用枠は公式 API から直接取得し、通常数分ごとに自動更新されます。古い値が表示されるのは直近の取得に失敗したためです（多くの場合 agy が未サインイン、またはネットワークの問題）。取得に成功すると自動的に復旧します。",
@@ -2275,6 +2287,9 @@
     "agy_group_claude_gpt": "Claude / GPT ⇄",
     "agy_group_switch_tooltip": "Antigravity 할당량 그룹 전환",
     "agy_quota_full": "할당량이 가득 찼습니다",
+    "agy_window_not_reported": "Google에서 보고하지 않음",
+    "agy_session_paused": "일시 중지",
+    "agy_session_paused_detail": "이번 주 할당량 소진, 주간 초기화 대기",
     "agy_stale_minutes": "약 {minutes}분 전",
     "agy_stale_hours": "약 {hours}시간 전",
     "agy_stale_tooltip": "캐시된 값을 표시하고 있습니다. 사용량은 공식 API에서 직접 가져오며 보통 몇 분마다 자동 업데이트됩니다. 예전 값이 보이는 건 최근 가져오기에 실패했기 때문입니다(대개 agy 미로그인 또는 네트워크 문제). 가져오기에 성공하면 자동으로 복구됩니다.",

{usage_cli-0.33.6 → usage_cli-0.33.8}/loaders/agy_quota_probe.py

@@ -59,7 +59,8 @@ _KEYRING_BASE64_PREFIX = "go-keyring-base64:"
 
 _TOKEN_URL = "https://oauth2.googleapis.com/token"
 _QUOTA_URL = "https://daily-cloudcode-pa.googleapis.com/v1internal:retrieveUserQuotaSummary"
-# Both endpoints return small JSON objects; cap the read so a broken endpoint
+_MODELS_URL = "https://daily-cloudcode-pa.googleapis.com/v1internal:fetchAvailableModels"
+# All endpoints return small JSON objects; cap the read so a broken endpoint
 # cannot make us buffer an unbounded response.
 _MAX_RESPONSE_BYTES = 4 * 1024 * 1024
 # Antigravity's installed-app public client constants (same values quotio ships).
@@ -108,8 +109,8 @@ class AgyQuotaGroup:
 
     name: str
     models: list[str]
-    weekly: AgyQuotaWindow
-    five_hour: AgyQuotaWindow
+    weekly: AgyQuotaWindow | None
+    five_hour: AgyQuotaWindow | None
 
 
 @dataclass(frozen=True, slots=True)
@@ -133,7 +134,10 @@ def probe_quota(timeout_seconds: float = 15) -> AgyQuotaResult | None:
     groups_raw = _extract_groups(raw)
     if not groups_raw:
         return None
-    result = _build_result(groups_raw)
+    models_raw = None
+    if not any(_group_id(group) == "gemini" for group in groups_raw):
+        models_raw = _post_json(_MODELS_URL, access_token, {}, timeout_seconds)
+    result = _build_result(groups_raw, models_raw)
     if result is not None:
         with suppress(OSError):
             AUTH_EXPIRED_PATH.unlink(missing_ok=True)
@@ -505,7 +509,9 @@ def _extract_groups(raw: object) -> list[dict[str, object]] | None:
     return None
 
 
-def _build_result(groups_raw: list[dict[str, object]]) -> AgyQuotaResult | None:
+def _build_result(
+    groups_raw: list[dict[str, object]], models_raw: object = None
+) -> AgyQuotaResult | None:
     """Classify buckets into the Gemini / Claude-GPT groups UI expects."""
     windows: dict[str, dict[str, AgyQuotaWindow]] = {}
     for group in groups_raw:
@@ -527,11 +533,47 @@ def _build_result(groups_raw: list[dict[str, object]]) -> AgyQuotaResult | None:
                 continue
             slot[period] = window
     result_groups = _assemble_groups(windows)
+    if not any(_group_id(group) == "gemini" for group in groups_raw):
+        gemini = _gemini_group_from_models(models_raw)
+        if gemini is not None:
+            result_groups.insert(0, gemini)
     if not result_groups:
         return None
     return AgyQuotaResult(groups=result_groups, fetched_at=datetime.now(UTC).isoformat())
 
 
+def _gemini_group_from_models(raw: object) -> AgyQuotaGroup | None:
+    """Use the lowest reported Gemini fraction and classify its reset window."""
+    models = raw.get("models") if isinstance(raw, dict) else None
+    if not isinstance(models, dict):
+        return None
+    candidates: list[tuple[float, dict[str, object]]] = []
+    for model_id, model in models.items():
+        if not isinstance(model_id, str) or not model_id.startswith("gemini-"):
+            continue
+        info = model.get("quotaInfo") if isinstance(model, dict) else None
+        if not isinstance(info, dict):
+            continue
+        fraction = _coerce_float(info.get("remainingFraction"))
+        reset = _bucket_reset_time(info)
+        if fraction is not None and reset is not None and _parse_timestamp(reset) is not None:
+            candidates.append((fraction, info))
+    if not candidates:
+        return None
+    _, bucket = min(candidates, key=lambda candidate: candidate[0])
+    window = _bucket_to_window(bucket)
+    reset = _bucket_reset_time(bucket)
+    assert reset is not None
+    session = _seconds_until(reset) <= 5 * 3600 + 5 * 60
+    template = _assemble_groups({"gemini": {}})[0]
+    return AgyQuotaGroup(
+        name=template.name,
+        models=template.models,
+        weekly=None if session else window,
+        five_hour=window if session else None,
+    )
+
+
 def _assemble_groups(
     windows: dict[str, dict[str, AgyQuotaWindow]],
 ) -> list[AgyQuotaGroup]:
@@ -744,7 +786,11 @@ def _result_to_payload(result: AgyQuotaResult) -> dict[str, object]:
     }
 
 
-def _window_to_payload(window: AgyQuotaWindow) -> dict[str, float | int | str | None]:
+def _window_to_payload(
+    window: AgyQuotaWindow | None,
+) -> dict[str, float | int | str | None] | None:
+    if window is None:
+        return None
     return {
         "remaining_percent": window.remaining_percent,
         "resets_in": window.resets_in,
@@ -782,8 +828,10 @@ def _group_from_payload(payload: object) -> AgyQuotaGroup | None:
         or not name
         or not isinstance(models, list)
         or not all(isinstance(model, str) and model for model in models)
-        or weekly is None
-        or five_hour is None
+        or "weekly" not in payload
+        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)
     ):
         return None
     return AgyQuotaGroup(name=name, models=models, weekly=weekly, five_hour=five_hour)

{usage_cli-0.33.6 → usage_cli-0.33.8}/menubar/agy.py

@@ -9,7 +9,7 @@
 from __future__ import annotations
 
 import time
-from dataclasses import dataclass
+from dataclasses import dataclass, replace
 from typing import cast
 
 import quota.burn_rate as burn_rate
@@ -98,9 +98,13 @@ def project_quota(
         else:
             session_tracker = burn_rate_trackers["agy_session"]
             weekly_tracker = burn_rate_trackers["agy_weekly"]
-            if session_tracker.last_timestamp is None or sample_ts > session_tracker.last_timestamp:
+            if selected.five_hour is not None and (
+                session_tracker.last_timestamp is None or sample_ts > session_tracker.last_timestamp
+            ):
                 session_tracker.record(sample_ts, 100.0 - _remaining_percent(selected.five_hour))
-            if weekly_tracker.last_timestamp is None or sample_ts > weekly_tracker.last_timestamp:
+            if selected.weekly is not None and (
+                weekly_tracker.last_timestamp is None or sample_ts > weekly_tracker.last_timestamp
+            ):
                 weekly_tracker.record(sample_ts, 100.0 - _remaining_percent(selected.weekly))
             # agy samples arrive every 5 minutes, so the default 10-minute window
             # cannot collect MIN_FORECAST_SAMPLES; this wider window reacts more slowly.
@@ -112,25 +116,39 @@ def project_quota(
                 window_seconds=burn_rate.ROLLING_WINDOW_SECONDS,
                 min_span_seconds=AGY_WEEKLY_FORECAST_MIN_SPAN_SECONDS,
             )
+    session = _window_row(
+        _t(language, "session_label"),
+        selected.five_hour,
+        language,
+        age_minutes,
+        forecast_seconds=session_forecast,
+    )
+    weekly = _window_row(
+        _t(language, "weekly_label"),
+        selected.weekly,
+        language,
+        age_minutes,
+        forecast_seconds=weekly_forecast,
+        warning_max_seconds=AGY_WEEKLY_WARNING_MAX_SECONDS,
+        window_seconds=WEEKLY_WINDOW_SECONDS,
+    )
+    # Google pauses the 5-hour bucket once the weekly one is spent; showing it
+    # as "full" reads as usable, so say it is paused instead.
+    if (
+        selected.weekly is not None
+        and _remaining_percent(selected.weekly) == 0.0
+        and not weekly.reset_done
+    ):
+        session = replace(
+            session,
+            percent_text=_t(language, "agy_session_paused"),
+            reset_text=_t(language, "agy_session_paused_detail"),
+        )
     return AgyQuotaProjection(
         group_name=selected.name,
         group_switchable=len(quota.groups) >= 2,
-        session=_window_row(
-            _t(language, "session_label"),
-            selected.five_hour,
-            language,
-            age_minutes,
-            forecast_seconds=session_forecast,
-        ),
-        weekly=_window_row(
-            _t(language, "weekly_label"),
-            selected.weekly,
-            language,
-            age_minutes,
-            forecast_seconds=weekly_forecast,
-            warning_max_seconds=AGY_WEEKLY_WARNING_MAX_SECONDS,
-            window_seconds=WEEKLY_WINDOW_SECONDS,
-        ),
+        session=session,
+        weekly=weekly,
         stale=stale,
         five_hour=selected.five_hour,
     )
@@ -208,8 +226,12 @@ def fallback_projection(language: str) -> AgyQuotaProjection:
 
 def _group_remaining_percent(group: AgyQuotaGroup) -> float:
     return min(
-        _remaining_percent(group.five_hour),
-        _remaining_percent(group.weekly),
+        (
+            _remaining_percent(window)
+            for window in (group.five_hour, group.weekly)
+            if window is not None
+        ),
+        default=100.0,
     )
 
 
@@ -228,7 +250,7 @@ def _cache_age_minutes(fetched_at: str, now: float) -> float:
 
 def _window_row(
     title: str,
-    window: AgyQuotaWindow,
+    window: AgyQuotaWindow | None,
     language: str,
     age_minutes: float = 0,
     forecast_seconds: float | None = None,
@@ -236,6 +258,15 @@ def _window_row(
     *,
     window_seconds: float | None = None,
 ) -> QuotaRowState:
+    if window is None:
+        return QuotaRowState(
+            title=title,
+            available=False,
+            percent=None,
+            percent_text="--",
+            reset_text=_t(language, "agy_window_not_reported"),
+            color=AGY_COLOR,
+        )
     remaining = _remaining_percent(window)
     used = 100.0 - remaining
     warning = False

{usage_cli-0.33.6 → usage_cli-0.33.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usage-cli"
-version = "0.33.6"
+version = "0.33.8"
 description = "usage — 在 macOS menu bar 與 Windows 系統匣顯示 Claude Code、Codex、Antigravity 用量的小工具（也提供終端機 TUI）"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -81,6 +81,7 @@ select = ["E", "F", "I", "UP", "B", "SIM"]
 # usage_hooks/usage_session_resume.py 同樣裝進 ~/.claude/ 給系統 python3 (3.9) 跑，同一條限制。
 "usage_hooks/usage_session_resume.py" = ["UP017"]
 "usage_hooks/usage_quota_aware.py" = ["UP017", "UP045"]
+"usage_hooks/usage_statusline_agy.py" = ["UP017"]
 # Imported analytics source is kept with minimal path fixes; keep formatting
 # stable for this integration commit.
 "adapters/**/*.py" = ["E501", "I001", "SIM108", "UP015", "UP017"]

{usage_cli-0.33.6 → usage_cli-0.33.8}/quota/status_payload.py

@@ -97,7 +97,9 @@ def _status_antigravity(now: int) -> dict[str, Any]:
 
     fetched_timestamp = fetched_at.timestamp()
 
-    def window_status(window: agy_quota_probe.AgyQuotaWindow) -> dict[str, Any]:
+    def window_status(window: agy_quota_probe.AgyQuotaWindow | None) -> dict[str, Any]:
+        if window is None:
+            return _status_window(None, None, now)
         return {
             "used_percent": round(100 - window.remaining_percent, 1),
             "resets_in_seconds": (

{usage_cli-0.33.6 → usage_cli-0.33.8}/tests/test_agy_quota_probe.py

@@ -160,7 +160,7 @@ def test_find_agy_returns_none_when_all_paths_miss(
 # --- token freshness + refresh --------------------------------------------
 
 
-def test_quota_url_matches_current_cli_backend() -> None:
+def test_quota_url_matches_cli_backend() -> None:
     assert _QUOTA_URL == (
         "https://daily-cloudcode-pa.googleapis.com/v1internal:retrieveUserQuotaSummary"
     )
@@ -497,9 +497,11 @@ def test_build_result_parses_group_and_windows() -> None:
     assert [group.name for group in result.groups] == ["GEMINI MODELS"]
     gemini = result.groups[0]
     assert gemini.models == ["Gemini Flash", "Gemini Pro"]
+    assert gemini.weekly is not None
     assert gemini.weekly.remaining_percent == pytest.approx(83.28)
     assert gemini.weekly.resets_in_minutes is not None and gemini.weekly.resets_in_minutes > 0
     assert gemini.weekly.resets_in is not None and "h" in gemini.weekly.resets_in
+    assert gemini.five_hour is not None
     assert gemini.five_hour.remaining_percent == pytest.approx(95.27)
     assert gemini.five_hour.resets_in is not None
 
@@ -513,6 +515,7 @@ def test_build_result_handles_remaining_fraction_three_shapes() -> None:
         groups_raw = [_gemini_group([_bucket(remaining=remaining, bucket_id="weekly")])]
         result = agy_quota_probe._build_result(groups_raw)
         assert result is not None
+        assert result.groups[0].weekly is not None
         assert result.groups[0].weekly.remaining_percent == pytest.approx(50.0)
 
 
@@ -532,6 +535,7 @@ def test_build_result_non_full_bucket_without_reset_time_has_no_countdown() -> N
 
     assert result is not None
     window = result.groups[0].weekly
+    assert window is not None
     assert window.remaining_percent == pytest.approx(40.0)
     assert window.resets_in is None
     assert window.resets_in_minutes is None
@@ -557,6 +561,7 @@ def test_build_result_skips_disabled_bucket_and_fills_missing_window_as_full() -
     gemini = result.groups[0]
     # Disabled weekly dropped; only the session bucket survived.
     assert gemini.weekly == AgyQuotaWindow(100.0, None, None)
+    assert gemini.five_hour is not None
     assert gemini.five_hour.remaining_percent == pytest.approx(70.0)
 
 
@@ -623,6 +628,7 @@ def test_probe_quota_refreshes_then_fetches_quota(
 
     assert result is not None
     assert result.groups[0].name == "GEMINI MODELS"
+    assert result.groups[0].weekly is not None
     assert result.groups[0].weekly.remaining_percent == pytest.approx(83.28)
     # Two calls: refresh then quota; the quota call carried the refreshed token.
     assert [url for url, _auth in visited] == [_TOKEN_URL, _QUOTA_URL]
@@ -745,7 +751,7 @@ def test_successful_probe_clears_expiration_marker(monkeypatch: pytest.MonkeyPat
     monkeypatch.setattr(agy_quota_probe, "_resolve_access_token", lambda timeout: "token")
     monkeypatch.setattr(agy_quota_probe, "_post_json", lambda *args: {})
     monkeypatch.setattr(agy_quota_probe, "_extract_groups", lambda raw: [{}])
-    monkeypatch.setattr(agy_quota_probe, "_build_result", lambda raw: result)
+    monkeypatch.setattr(agy_quota_probe, "_build_result", lambda raw, models=None: result)
     assert agy_quota_probe.probe_quota() == result
     assert not agy_quota_probe.auth_expired()
 
@@ -755,7 +761,7 @@ def test_unusable_probe_keeps_expiration_marker(monkeypatch: pytest.MonkeyPatch)
     monkeypatch.setattr(agy_quota_probe, "_resolve_access_token", lambda timeout: "token")
     monkeypatch.setattr(agy_quota_probe, "_post_json", lambda *args: {})
     monkeypatch.setattr(agy_quota_probe, "_extract_groups", lambda raw: [{}])
-    monkeypatch.setattr(agy_quota_probe, "_build_result", lambda raw: None)
+    monkeypatch.setattr(agy_quota_probe, "_build_result", lambda raw, models=None: None)
     assert agy_quota_probe.probe_quota() is None
     assert agy_quota_probe.auth_expired()
 
@@ -795,7 +801,7 @@ def test_marker_write_and_delete_errors_are_ignored(monkeypatch: pytest.MonkeyPa
     monkeypatch.setattr(agy_quota_probe, "_resolve_access_token", lambda timeout: "token")
     monkeypatch.setattr(agy_quota_probe, "_post_json", lambda *args: {})
     monkeypatch.setattr(agy_quota_probe, "_extract_groups", lambda raw: [{}])
-    monkeypatch.setattr(agy_quota_probe, "_build_result", lambda raw: result)
+    monkeypatch.setattr(agy_quota_probe, "_build_result", lambda raw, models=None: result)
     assert agy_quota_probe.probe_quota() == result
     assert agy_quota_probe.auth_expired()
 
@@ -822,6 +828,7 @@ def test_carry_keeps_group_the_api_skipped_once() -> None:
 
     assert [group.name for group in merged.groups] == ["GEMINI MODELS", "CLAUDE AND GPT MODELS"]
     assert merged.groups[0] == full.groups[0]
+    assert merged.groups[1].weekly is not None
     assert merged.groups[1].weekly.remaining_percent == 0.0
 
 
@@ -861,3 +868,85 @@ def test_load_quota_writes_carried_group_to_cache(
     cached = agy_quota_probe._read_cache()
     assert cached is not None
     assert [group.name for group in cached.groups] == ["GEMINI MODELS", "CLAUDE AND GPT MODELS"]
+
+
+@pytest.mark.parametrize("minutes, weekly", [(300, False), (305, False), (306, True)])
+def test_probe_models_fallback_selects_lowest_gemini(
+    monkeypatch: pytest.MonkeyPatch, minutes: int, weekly: bool
+) -> None:
+    reset = (datetime.now(UTC) + timedelta(minutes=minutes)).isoformat()
+    models = {
+        "gemini-pro": {"quotaInfo": {"remainingFraction": 0.8, "resetTime": _FUTURE_RESET}},
+        "gemini-flash": {"quotaInfo": {"remainingFraction": "0.5", "resetTime": reset}},
+        "claude-opus": {"quotaInfo": {"resetTime": reset}},
+        "claude-sonnet": {"quotaInfo": {"remainingFraction": 0.01, "resetTime": reset}},
+        "chat_test": {"quotaInfo": {"remainingFraction": 1}},
+        "tab_test": {"quotaInfo": {"remainingFraction": 1}},
+    }
+    summary = _groups_payload(
+        [
+            {
+                "displayName": "Claude and GPT models",
+                "buckets": [_bucket(remaining=0.7, bucket_id="weekly")],
+            }
+        ]
+    )
+    calls = []
+
+    def post(url: str, token: str, body: dict[str, object], timeout: float) -> object:
+        calls.append((url, token, body, timeout))
+        return summary if url == _QUOTA_URL else {"models": models}
+
+    monkeypatch.setattr(agy_quota_probe, "_resolve_access_token", lambda timeout: "same-token")
+    monkeypatch.setattr(agy_quota_probe, "_post_json", post)
+    result = agy_quota_probe.probe_quota(7)
+    assert result is not None and len(result.groups) == 2
+    gemini = result.groups[0]
+    assert gemini.name == "GEMINI MODELS"
+    assert gemini.models == ["Gemini Flash", "Gemini Pro"]
+    window = gemini.weekly if weekly else gemini.five_hour
+    assert window is not None and window.remaining_percent == 50
+    assert (gemini.five_hour if weekly else gemini.weekly) is None
+    assert calls == [
+        (_QUOTA_URL, "same-token", {}, 7),
+        (agy_quota_probe._MODELS_URL, "same-token", {}, 7),
+    ]
+
+
+@pytest.mark.parametrize(
+    "models",
+    [None, {"models": {}}, {"models": {"claude": {"quotaInfo": {"resetTime": _FUTURE_RESET}}}}],
+)
+def test_probe_models_unavailable_keeps_summary(
+    monkeypatch: pytest.MonkeyPatch, models: object
+) -> None:
+    summary = _groups_payload([{"displayName": "Claude and GPT models", "buckets": []}])
+    monkeypatch.setattr(agy_quota_probe, "_resolve_access_token", lambda timeout: "token")
+    monkeypatch.setattr(
+        agy_quota_probe, "_post_json", lambda url, *args: summary if url == _QUOTA_URL else models
+    )
+    result = agy_quota_probe.probe_quota()
+    assert result is not None
+    assert [group.name for group in result.groups] == ["CLAUDE AND GPT MODELS"]
+
+
+def test_probe_summary_gemini_does_not_fetch_models(monkeypatch: pytest.MonkeyPatch) -> None:
+    summary = _groups_payload([_gemini_group([])])
+    urlopen, visited = _build_urlopen({_QUOTA_URL: summary})
+    monkeypatch.setattr(agy_quota_probe, "_resolve_access_token", lambda timeout: "token")
+    monkeypatch.setattr(agy_quota_probe, "urlopen", urlopen)
+    assert agy_quota_probe.probe_quota() is not None
+    assert visited == [(_QUOTA_URL, "Bearer token")]
+
+
+@pytest.mark.parametrize("weekly", [True, False])
+def test_cache_roundtrips_unreported_window(weekly: bool) -> None:
+    window = AgyQuotaWindow(50, "1h 0m", 60)
+    group = AgyQuotaGroup(
+        "GEMINI MODELS", ["Gemini Flash"], window if weekly else None, None if weekly else window
+    )
+    result = AgyQuotaResult([group], datetime.now(UTC).isoformat())
+    agy_quota_probe._write_cache(result)
+    payload = json.loads(agy_quota_probe.CACHE_PATH.read_text())
+    assert payload["groups"][0]["five_hour" if weekly else "weekly"] is None
+    assert agy_quota_probe._read_cache() == result

{usage_cli-0.33.6 → usage_cli-0.33.8}/tests/test_check_upstream.py

@@ -335,7 +335,14 @@ def test_sqlite_opens_readonly(monkeypatch: pytest.MonkeyPatch) -> None:
 def quota() -> dict[str, Any]:
     return {
         "fetched_at": now(),
-        "groups": [{"weekly": {"remaining_percent": 40}, "five_hour": {"remaining_percent": 80}}],
+        "groups": [
+            {
+                "name": "GEMINI MODELS",
+                "models": ["Gemini Flash"],
+                "weekly": {"remaining_percent": 40},
+                "five_hour": {"remaining_percent": 80},
+            }
+        ],
     }
 
 
@@ -344,6 +351,12 @@ def test_agy_quota_ok(quota: dict[str, Any]) -> None:
     assert check.check_agy_quota_cache()[0] == "OK"
 
 
+def test_agy_quota_accepts_unreported_window(quota: dict[str, Any]) -> None:
+    quota["groups"][0]["weekly"] = None
+    write_json(check.agy_quota_probe.CACHE_PATH, quota)
+    assert check.check_agy_quota_cache()[0] == "OK"
+
+
 @pytest.mark.parametrize("missing", ["groups", "weekly", "five_hour"])
 def test_agy_quota_missing(quota: dict[str, Any], missing: str) -> None:
     if missing == "groups":

{usage_cli-0.33.6 → usage_cli-0.33.8}/tests/test_dispatch_ledger.py

@@ -222,6 +222,18 @@ def test_agy_quota_uses_cache_only(
     assert result["antigravity:GEMINI MODELS"].resets_at == NOW + timedelta(hours=2)
 
 
+def test_agy_quota_skips_group_without_reported_weekly(
+    paths: tuple[Path, Path, Path], monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.setattr(rate_limits, "load_rate_limits", lambda: None)
+    monkeypatch.setattr(codex_loader, "load_rate_limits", lambda: None)
+    five_hour = agy_quota_probe.AgyQuotaWindow(99.5, None, 100)
+    group = agy_quota_probe.AgyQuotaGroup("GEMINI MODELS", ["Gemini Flash"], None, five_hour)
+    cached = agy_quota_probe.AgyQuotaResult([group], NOW.isoformat())
+    monkeypatch.setattr(agy_quota_probe, "_read_cache", lambda: cached)
+    assert "antigravity:GEMINI MODELS" not in ledger.load_windows()
+
+
 def test_render_ledger_formats_values_and_escapes_title() -> None:
     row: ledger.LedgerRow = {
         "date": "2026-09-26",

{usage_cli-0.33.6 → usage_cli-0.33.8}/tests/test_menubar_agy.py

@@ -227,6 +227,27 @@ def test_project_quota_marks_full_session_with_sliding_countdown_as_full() -> No
     assert projection.session.reset_text != "Resets in 4h 59m"
 
 
+def test_project_quota_shows_session_paused_when_weekly_is_spent() -> None:
+    quota = AgyQuotaResult(
+        groups=[
+            AgyQuotaGroup(
+                name="CLAUDE AND GPT MODELS",
+                models=["model"],
+                five_hour=AgyQuotaWindow(100.0, None, None),
+                weekly=AgyQuotaWindow(0.0, "57h", 3420),
+            )
+        ],
+        fetched_at="2026-01-01T00:00:00+00:00",
+    )
+
+    projection = menubar_agy.project_quota(quota, "en", now=1_767_225_600.0)
+
+    assert projection is not None
+    assert projection.session.percent_text == "Paused"
+    assert projection.session.reset_text == "Weekly quota used up; waits for weekly reset"
+    assert projection.weekly.percent == 100.0
+
+
 def test_project_quota_marks_cached_result_stale_after_twenty_minutes() -> None:
     now = datetime(2026, 1, 1, 1, 0, tzinfo=UTC)
     quota = AgyQuotaResult(
@@ -513,3 +534,27 @@ def test_fresh_cache_with_expired_login_is_stale() -> None:
     assert state is not None
     assert state["ageText"] == "登入過期"
     assert "agy" in state["tooltip"]
+
+
+@pytest.mark.parametrize("weekly", [True, False])
+def test_unreported_window_is_unavailable_and_not_recorded(weekly: bool) -> None:
+    now = datetime.now(UTC)
+    window = AgyQuotaWindow(50, "1h 0m", 60)
+    group = AgyQuotaGroup(
+        "GEMINI MODELS", [], window if weekly else None, None if weekly else window
+    )
+    trackers = _burn_rate_trackers()
+    projection = menubar_agy.project_quota(
+        AgyQuotaResult([group], now.isoformat()),
+        "en",
+        now=now.timestamp(),
+        burn_rate_trackers=trackers,
+    )
+    assert projection is not None
+    row = projection.session if weekly else projection.weekly
+    assert row.available is False
+    assert row.percent is None
+    assert row.percent_text == "--"
+    assert row.reset_text == "Not reported by Google"
+    assert trackers["agy_session" if weekly else "agy_weekly"].last_timestamp is None
+    assert (projection.weekly if weekly else projection.session).percent_text == "50% used"

{usage_cli-0.33.6 → usage_cli-0.33.8}/tests/test_panel_footer_layout.py

@@ -44,11 +44,9 @@ def test_footer_layout(tmp_path: Path, script: str) -> None:
     assert result.returncode == 0, result.stdout + result.stderr
 
 
-@pytest.mark.parametrize("panel", sorted((ROOT / "docs" / "panels").glob("*.html")))
-def test_agy_group_button_visibility(panel: Path) -> None:
-    source = panel.read_text(encoding="utf-8")
-    if 'data-action="set_agy_quota_group"' not in source:
-        pytest.skip("panel has no Antigravity group button")
+def test_agy_group_button_visibility() -> None:
+    # The app loads assets/panels/panel_core.js; docs/panels are generated demo copies.
+    source = (ROOT / "assets" / "panels" / "panel_core.js").read_text(encoding="utf-8")
     node = shutil.which("node")
     if node is None:
         pytest.skip("Node is required to execute panel JavaScript")