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

{usage_cli-0.34.9/usage_cli.egg-info → usage_cli-0.34.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usage-cli
-Version: 0.34.9
+Version: 0.34.11
 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.9 → usage_cli-0.34.11}/adapters/rate_limits.py

@@ -44,16 +44,16 @@ def _read_status() -> dict[str, Any] | None:
 
 def load_rate_limits() -> RateLimits | None:
     data = _read_status()
-    if data is None or not usage_client._has_complete_rate_limits(data):
+    if data is None or not usage_client._has_rate_limits(data):
         snapshot = usage_client.read_quota_fallback()
         if snapshot is not None:
             return _snapshot_rate_limits(snapshot)
         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.9 → usage_cli-0.34.11}/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.9 → usage_cli-0.34.11}/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.9 → usage_cli-0.34.11}/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.14"
+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.

{usage_cli-0.34.9 → usage_cli-0.34.11}/loaders/claude_usage.py

@@ -293,17 +293,20 @@ def _hook_broken_message(now: float, polled_at: float) -> str | None:
     return HOOK_BROKEN_NOT_INSTALLED
 
 
-def _has_complete_rate_limits(data: dict[str, Any]) -> bool:
+def _has_rate_limits(data: dict[str, Any]) -> bool:
+    """True when every window the hook sent is valid and at least one was sent.
+
+    Plans without a 5-hour limit never send five_hour, so requiring both windows
+    would leave them on the cache or the loading state forever. A window that is
+    present but unreadable still falls back to the cache.
+    """
     rl = data.get("rate_limits")
     if not isinstance(rl, dict):
         return False
-    five = rl.get("five_hour")
-    seven = rl.get("seven_day")
-    if not isinstance(five, dict) or not isinstance(seven, dict):
-        return False
-    return (
-        _as_finite_float(five.get("used_percentage")) is not None
-        and _as_finite_float(seven.get("used_percentage")) is not None
+    windows = [w for w in (rl.get("five_hour"), rl.get("seven_day")) if w is not None]
+    return bool(windows) and all(
+        isinstance(w, dict) and _as_finite_float(w.get("used_percentage")) is not None
+        for w in windows
     )
 
 
@@ -345,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,
@@ -440,11 +446,11 @@ class ClaudeUsageClient:
 
         # ``.claude.json`` is Claude Code's cache, not a competing live source.
         # In particular its fetchedAtMs can be newer than the hook timestamp while
-        # still describing a different/expired session.  A complete statusLine
-        # payload must therefore always win; use the cache only when the hook has
-        # not provided both quota windows yet. Desktop history is also a fallback;
-        # it never replaces a complete hook payload or supplies invented resets.
-        if not _has_complete_rate_limits(data):
+        # still describing a different/expired session.  A statusLine payload
+        # with quota must therefore always win; use the cache only when the hook
+        # has not provided any quota window yet. Desktop history is also a fallback;
+        # it never replaces a hook payload or supplies invented resets.
+        if not _has_rate_limits(data):
             fallback_snapshot = read_quota_fallback(self._read_claude_json_snapshot_cached)
             if fallback_snapshot is not None:
                 return self._success_outcome(fallback_snapshot)

{usage_cli-0.34.9 → usage_cli-0.34.11}/menubar/agy.py

@@ -124,6 +124,7 @@ def project_quota(
         language,
         age_minutes,
         forecast_seconds=session_forecast,
+        now=current_time,
     )
     weekly = _window_row(
         _t(language, "weekly_label"),
@@ -133,6 +134,7 @@ def project_quota(
         forecast_seconds=weekly_forecast,
         warning_max_seconds=AGY_WEEKLY_WARNING_MAX_SECONDS,
         window_seconds=WEEKLY_WINDOW_SECONDS,
+        now=current_time,
     )
     # 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.
@@ -278,6 +280,7 @@ def _window_row(
     warning_max_seconds: float | None = None,
     *,
     window_seconds: float | None = None,
+    now: float | None = None,
 ) -> QuotaRowState:
     if window is None:
         return QuotaRowState(
@@ -346,6 +349,12 @@ def _window_row(
         warning=warning,
         available=True,
         reset_done=reset_done,
+        resets_at=(
+            (time.time() if now is None else now)
+            + (window.resets_in_minutes - max(0, age_minutes)) * 60
+            if window.resets_in_minutes is not None
+            else None
+        ),
     )
 
 

{usage_cli-0.34.9 → usage_cli-0.34.11}/menubar/app.py

@@ -189,7 +189,6 @@ __all__ = [
 ]
 
 UPDATE_ALERT_BODY_LIMIT = 2000
-SLOW_POLL_INTERVAL_S = 300.0
 
 logger = logging.getLogger(__name__)
 
@@ -317,7 +316,7 @@ class AppDelegate(NSObject):
 
         self._request_notification_authorization()
         self._refresh()
-        self._reschedule_poll_timer(max(self.interval, SLOW_POLL_INTERVAL_S))
+        self._reschedule_poll_timer(menubar_title.menubar_poll_interval(self, self.latest_state))
         self._fs_stream = setup_fsevents(self)
         self._history_source_tracker.set_incremental_enabled(self._fs_stream is not None)
         warm_up_pricing(self._refresh_after_pricing_warm_up)
@@ -378,7 +377,7 @@ class AppDelegate(NSObject):
 
     def _panel_window_did_hide(self) -> None:
         self.popover_controller.evictInactivePanelViews()
-        self._reschedule_poll_timer(max(self.interval, SLOW_POLL_INTERVAL_S))
+        self._reschedule_poll_timer(menubar_title.menubar_poll_interval(self, self.latest_state))
 
     def windowDidMove_(self, notification: Any) -> None:
         if notification.object() is self.popover and self._panel_window_is_visible():

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

@@ -106,6 +106,7 @@ class QuotaRowState:
     available: bool = True
     reset_text_compact: str = ""
     reset_done: bool = False
+    resets_at: float | None = None
 
     # Keep percent unchanged for quota notifications; renderers use display_percent.
 
@@ -902,7 +903,8 @@ def build_popover_state(
             CLAUDE_COLOR,
             language,
             forecast_seconds=burn_rate_trackers["claude_session"].forecast_seconds(),
-            allow_unknown_reset=snapshot.data_source == "claude-desktop",
+            # The hook reader leaves a missing five_hour resets_at unknown.
+            allow_unknown_reset=True,
         )
         claude_weekly = _quota_row(
             _t(language, "weekly_label"),
@@ -1083,6 +1085,7 @@ def _quota_row(
         warning=warning,
         available=True,
         reset_done=time_to_reset <= 0,
+        resets_at=resets_at,
     )
     if warning_seconds is not None:
         row.reset_text_compact = _t(

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

@@ -8,6 +8,8 @@
 
 from __future__ import annotations
 
+import math
+import time
 from collections.abc import Callable
 from typing import Any, Protocol
 
@@ -27,7 +29,7 @@ from menubar.chrome import (
     _menubar_icon_attachment_string,
     _muse_menubar_icon,
 )
-from menubar.state import PopoverState, _format_percent
+from menubar.state import PopoverState, QuotaRowState, _format_percent
 
 
 class _TitleApp(Protocol):
@@ -36,6 +38,11 @@ class _TitleApp(Protocol):
     _last_button_title_key: tuple[str] | None
     _last_plain_title_key: tuple[str] | None
     status_item: Any
+    interval: float
+
+    def _reschedule_poll_timer(self, interval: float) -> None: ...
+
+    def _panel_window_is_visible(self) -> bool: ...
 
 
 _MENUBAR_FONT: Any = None
@@ -65,10 +72,43 @@ def _menubar_text_string(app: _TitleApp, text: str) -> Any:
 
 # A wider strip slides behind the notch; the panel still lists every source.
 _MENUBAR_MAX_ITEMS = 3
+SLOW_POLL_INTERVAL_S = 300.0
+
+
+def _format_countdown(seconds: float) -> str:
+    minutes = math.ceil(seconds / 60)
+    if minutes >= 1440:
+        return f"{minutes // 1440}d{minutes % 1440 // 60}h"
+    if minutes >= 60:
+        return f"{minutes // 60}h{minutes % 60}m"
+    return f"{minutes}m"
+
+
+def _quota_countdown(rows: tuple[QuotaRowState, ...], now: float) -> str | None:
+    full = [row for row in rows if row.display_percent is not None and row.display_percent >= 100]
+    if not full:
+        return None
+    resets = []
+    for row in full:
+        if row.resets_at is None or row.resets_at <= now:
+            return None
+        resets.append(row.resets_at)
+    return _format_countdown(max(resets) - now)
+
+
+def menubar_poll_interval(app: _TitleApp, state: PopoverState) -> float:
+    if app._panel_window_is_visible() or any(
+        text != "--" and not text.endswith("%") for _icon, text in _menubar_items(app, state)
+    ):
+        return app.interval
+    return max(app.interval, SLOW_POLL_INTERVAL_S)
 
 
-def _menubar_items(app: _TitleApp, state: PopoverState) -> list[tuple[Callable[[], Any], str]]:
-    """Visible (icon loader, percent text) pairs, keeping the highest-usage sources in order."""
+def _menubar_items(
+    app: _TitleApp, state: PopoverState, now: float | None = None
+) -> list[tuple[Callable[[], Any], str]]:
+    """Visible icon/text pairs, keeping the highest-usage sources in order."""
+    now = time.time() if now is None else now
     items: list[tuple[Callable[[], Any], float | None]] = []
     if not state.hide_claude:
         items.append((_claude_menubar_icon, state.claude_session.display_percent))
@@ -85,15 +125,29 @@ def _menubar_items(app: _TitleApp, state: PopoverState) -> list[tuple[Callable[[
     ):
         if not hidden and percent is not None:
             items.append((icon, percent))
+    rows_by_icon = {
+        _claude_menubar_icon: (state.claude_session, state.claude_weekly),
+        _codex_menubar_icon: (state.codex_session, state.codex_weekly),
+        _agy_menubar_icon: (state.agy_session, state.agy_weekly),
+        _grok_menubar_icon: (state.grok_weekly,),
+        _muse_menubar_icon: (state.muse_session, state.muse_weekly),
+    }
+    countdowns = [_quota_countdown(rows_by_icon[icon], now) for icon, _percent in items]
     if len(items) > _MENUBAR_MAX_ITEMS:
         # Stable sort, so ties keep the fixed order; an unknown "--" ranks last.
-        ranks = [-1.0 if percent is None else percent for _icon, percent in items]
+        ranks = [
+            100.0 if countdowns[i] is not None else -1.0 if percent is None else percent
+            for i, (_icon, percent) in enumerate(items)
+        ]
         ranked = sorted(range(len(items)), key=ranks.__getitem__, reverse=True)
-        items = [items[i] for i in sorted(ranked[:_MENUBAR_MAX_ITEMS])]
-    return [
-        (icon, "--" if percent is None else f"{_format_percent(percent)}%")
-        for icon, percent in items
+        selected = sorted(ranked[:_MENUBAR_MAX_ITEMS])
+    else:
+        selected = list(range(len(items)))
+    rendered = [
+        (icon, countdown or ("--" if percent is None else f"{_format_percent(percent)}%"))
+        for (icon, percent), countdown in zip(items, countdowns, strict=True)
     ]
+    return [rendered[i] for i in selected]
 
 
 def _menubar_attributed_title(app: _TitleApp, state: PopoverState) -> Any:
@@ -110,6 +164,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,)
     if app._last_button_title_key == title_key:

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

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

{usage_cli-0.34.9 → usage_cli-0.34.11}/quota/window_keeper.py

@@ -33,6 +33,7 @@ dispatches a one-line call into :func:`maybe_ping`.
 from __future__ import annotations
 
 import logging
+import math
 import os
 import shutil
 import subprocess
@@ -60,10 +61,8 @@ PING_TIMEOUT_SECONDS = 180
 # window the previous ping opened.
 PING_COOLDOWN_SECONDS = 5 * 3600 + 300
 
-# loaders.claude_usage defaults a missing ``resets_at`` to parse-time "now", which one
-# refresh later reads as "expired seconds ago". Requiring the expiry to be at
-# least this old filters those synthetic timestamps without delaying a real
-# expired-while-away ping by more than two minutes.
+# Wait briefly after a real reset before opening the next window, allowing
+# quota observations around the reset boundary to settle.
 PING_EXPIRY_GRACE_SECONDS = 120
 
 # ``claude`` binary resolution order: PATH first, then the well-known install
@@ -203,6 +202,35 @@ def _ping_worker(started_at: float) -> None:
         _release()
 
 
+def _recall_expired_window(
+    state: dict[str, object],
+    current_reset_at: float | None,
+    current_percent: float | None,
+    data_source: str,
+) -> tuple[float | None, float | None]:
+    """Stand in the last reported five-hour reset once the payload drops the window.
+
+    Claude Code omits ``five_hour`` once its ``resets_at`` has passed, and the
+    statusLine hook drops the cached copy too (plans without a 5-hour limit never
+    send one), so an expired window reaches us as no window at all. The reader
+    then reports no percent and no reset, which is not worth keeping.
+    Remember every real reset the hook reports; a plan that never reported one
+    stays unarmed.
+    """
+    if data_source != "hook":
+        return current_reset_at, current_percent
+    remembered = keeper_outcome.numeric_value(state, "last_seen_reset_at")
+    if current_percent is None:
+        return (current_reset_at, None) if remembered is None else (remembered, 0.0)
+    if current_reset_at is None or not math.isfinite(current_reset_at):
+        return None, current_percent
+    if current_reset_at is not None and current_reset_at != remembered:
+        keeper_outcome.update_state(
+            WINDOW_KEEPER_STATE_PATH, {"last_seen_reset_at": current_reset_at}
+        )
+    return current_reset_at, current_percent
+
+
 def maybe_ping(
     current_reset_at: float | None,
     current_percent: float | None,
@@ -224,6 +252,9 @@ def maybe_ping(
     now = time.time()
     last_pinged_reset_at, last_ping_at = _load_ping_state()
     state = keeper_outcome.read_state(WINDOW_KEEPER_STATE_PATH)
+    current_reset_at, current_percent = _recall_expired_window(
+        state, current_reset_at, current_percent, data_source
+    )
     idle = should_ping(now, current_reset_at, enabled, None, None, current_percent, data_source)
     fresh = should_ping(
         now,

{usage_cli-0.34.9 → usage_cli-0.34.11}/tests/test_adapters_rate_limits.py

@@ -13,6 +13,7 @@ from pathlib import Path
 import pytest
 
 from adapters import rate_limits
+from loaders import claude_usage
 
 
 def _write_status(path: Path, body: dict[str, object]) -> None:
@@ -20,6 +21,46 @@ def _write_status(path: Path, body: dict[str, object]) -> None:
     path.write_text(json.dumps(body), encoding="utf-8")
 
 
+@pytest.mark.parametrize("window", [None, ["invalid"], {}, {"used_percentage": "nan"}])
+def test_malformed_window_uses_fallback(monkeypatch: pytest.MonkeyPatch, window: object) -> None:
+    data = {
+        "rate_limits": {
+            "five_hour": window,
+            "seven_day": {"used_percentage": 42, "resets_at": 9_999_999_999},
+        }
+    }
+    assert claude_usage._has_rate_limits(data) is (window is None)
+    monkeypatch.setattr(rate_limits, "_read_status", lambda: data)
+    calls = []
+    fallback = claude_usage.UsageSnapshot(10, None, 20, None, "", 1_800_000_000)
+
+    def read_fallback() -> claude_usage.UsageSnapshot:
+        calls.append(True)
+        return fallback
+
+    monkeypatch.setattr(claude_usage, "read_quota_fallback", read_fallback)
+    result = rate_limits.load_rate_limits()
+    assert result is not None
+    assert result.five_hour_pct == (None if window is None else 10)
+    assert calls == ([] if window is None else [True])
+    # Missing fallback must also tolerate malformed windows without .get errors.
+    monkeypatch.setattr(claude_usage, "read_quota_fallback", lambda: None)
+    result = rate_limits.load_rate_limits()
+    assert result is not None
+    assert result.five_hour_pct is None
+    assert result.seven_day_pct == 42
+
+
+def test_weekly_only_ultra_remains_valid(monkeypatch: pytest.MonkeyPatch) -> None:
+    data = {"rate_limits": {"seven_day": {"used_percentage": 42}}}
+    assert claude_usage._has_rate_limits(data) is True
+    monkeypatch.setattr(rate_limits, "_read_status", lambda: data)
+    result = rate_limits.load_rate_limits()
+    assert result is not None
+    assert result.five_hour_pct is None
+    assert result.seven_day_pct == 42
+
+
 def test_load_rate_limits_skips_bad_utf8_status_without_crashing(
     monkeypatch: pytest.MonkeyPatch,
     tmp_path: Path,