usage-cli 0.32.2__py3-none-any.whl → 0.32.3__py3-none-any.whl

menubar/agy.py

@@ -213,20 +213,20 @@ def _remaining_percent(window: AgyQuotaWindow) -> float:
     return max(0.0, min(100.0, float(window.remaining_percent)))
 
 
-def _cache_age_minutes(fetched_at: str, now: float) -> int:
-    """Whole minutes since the cached snapshot was taken (never negative)."""
+def _cache_age_minutes(fetched_at: str, now: float) -> float:
+    """Minutes since the cached snapshot was taken (never negative)."""
     try:
         age_seconds = now - parse_iso8601_utc_or_raise(fetched_at).timestamp()
     except (TypeError, ValueError):
         return 0
-    return max(0, int(age_seconds // 60))
+    return max(0.0, age_seconds / 60)
 
 
 def _window_row(
     title: str,
     window: AgyQuotaWindow,
     language: str,
-    age_minutes: int = 0,
+    age_minutes: float = 0,
     forecast_seconds: float | None = None,
     warning_max_seconds: float | None = None,
     *,
@@ -236,12 +236,20 @@ def _window_row(
     used = 100.0 - remaining
     warning = False
     warning_seconds: float | None = None
-    if remaining == 100.0:
+    reset_done = window.resets_in_minutes is not None and window.resets_in_minutes <= max(
+        0, age_minutes
+    )
+    if reset_done:
+        used = 0.0
+        reset_text = _t(language, "reset_done")
+    elif remaining == 100.0:
         reset_text = _t(language, "agy_quota_full")
     elif window.resets_in_minutes is None:
         reset_text = _t(language, "reset_placeholder")
+    elif window.resets_in_minutes - max(0, age_minutes) < 1:
+        reset_text = _t(language, "reset_imminent")
     else:
-        minutes_left = max(1, window.resets_in_minutes - max(0, age_minutes))
+        minutes_left = window.resets_in_minutes - int(max(0, age_minutes))
         time_to_reset = minutes_left * 60
         if window_seconds is None:
             if (
@@ -275,12 +283,13 @@ def _window_row(
             )
     return QuotaRowState(
         title=title,
-        percent=used,
+        percent=100.0 - remaining,
         percent_text=_t(language, "percent_used", value=_format_percent(used)),
         reset_text=reset_text,
         color=_bar_color(used, AGY_COLOR),
         warning=warning,
         available=True,
+        reset_done=reset_done,
     )
 
 

menubar/app.py

@@ -70,6 +70,7 @@ from loaders.history_loader import (
     flush_caches_on_terminate as flush_history_cache,
 )
 from menubar import actions as menubar_actions
+from menubar import manual_refresh
 from menubar import menu as menubar_menu
 from menubar import notify as menubar_notify
 from menubar import refresh as menubar_refresh
@@ -419,7 +420,7 @@ class AppDelegate(NSObject):
             self._panel_window_did_hide()
 
     def refreshNow_(self, sender: Any) -> None:
-        self._refresh(queue_if_busy=True)
+        manual_refresh.start_mac(self)
 
     def installHook_(self, sender: Any) -> None:
         thread = threading.Thread(target=self._install_hook_in_background, daemon=True)
@@ -822,7 +823,7 @@ class AppDelegate(NSObject):
             codex_model = result.get("codex_model", "unknown")
             self.codex_5h_pct = codex_5h_pct
             self.codex_model = codex_model
-            self.latest_state = state
+            self.latest_state = manual_refresh.finish_mac(self, state)
             self._process_quota_notifications(state)
             if self._panel_window_is_visible():
                 self.popover_controller.setState_(self.latest_state)
@@ -831,8 +832,7 @@ class AppDelegate(NSObject):
             menubar_title._set_button_title(self, state)
         finally:
             should_refresh_again = bool(self._refresh_queued)
-            self._refresh_queued = False
-            self._refresh_in_flight = False
+            self._refresh_queued = self._refresh_in_flight = False
         if should_refresh_again:
             self._refresh()
         if started_at:
@@ -842,7 +842,7 @@ class AppDelegate(NSObject):
             )
 
     def _clearRefreshInFlight_(self, _sender: Any) -> None:
-        self._refresh_in_flight = False
+        manual_refresh.fail_mac(self)
 
     def _load_codex_refresh_result(self) -> dict[str, Any]:
         history_scan = None if self.mock else self._history_source_scan()

menubar/grok.py

@@ -18,9 +18,7 @@ from menubar.state import (
     GROK_COLOR,
     GrokStaleState,
     QuotaRowState,
-    _bar_color,
-    _format_percent,
-    format_human_time,
+    _quota_row,
 )
 from usage_common.time_utils import parse_iso8601_utc_or_raise
 
@@ -56,22 +54,15 @@ def project_quota(
         period_end = parse_iso8601_utc_or_raise(quota.period_end).timestamp()
     except (TypeError, ValueError):
         return None
-    if period_end < current_time:
-        return None
     stale = _stale_state(quota.fetched_at, current_time, language)
-    used = max(0.0, min(100.0, quota.used_percent))
     return GrokQuotaProjection(
-        weekly=QuotaRowState(
-            title=_t(language, "weekly_label"),
-            percent=used,
-            percent_text=_t(language, "percent_used", value=_format_percent(used)),
-            reset_text=_t(
-                language,
-                "reset_in",
-                time=format_human_time(max(0.0, period_end - current_time), language),
-            ),
-            color=_bar_color(used, GROK_COLOR),
-            available=True,
+        weekly=_quota_row(
+            _t(language, "weekly_label"),
+            quota.used_percent,
+            period_end,
+            current_time,
+            GROK_COLOR,
+            language,
         ),
         stale=stale,
     )

menubar/manual_refresh.py

@@ -0,0 +1,51 @@
+"""Status-chip feedback for user-requested refreshes."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from i18n import _t
+from menubar.state import PopoverState
+
+
+def begin(state: PopoverState, *, queued: bool = False) -> None:
+    if state.refresh_status is None:
+        state.refresh_status = (state.status_text, state.status_long)
+    state.refresh_queued = state.refresh_queued or queued
+    state.status_text = _t(
+        state.language, "status_text", value=_t(state.language, "status_refreshing")
+    )
+    state.status_long = False
+
+
+def finish(
+    previous: PopoverState | None, state: PopoverState, *, queued: bool = False
+) -> PopoverState:
+    if previous is not None and previous.refresh_status is not None:
+        keep = previous.refresh_queued and queued
+        previous.status_text, previous.status_long = previous.refresh_status
+        previous.refresh_status = None
+        previous.refresh_queued = False
+        if keep:
+            begin(state)
+    return state
+
+
+def finish_mac(app: Any, state: PopoverState) -> PopoverState:
+    return finish(app.latest_state, state, queued=bool(app._refresh_queued))
+
+
+def start_mac(app: Any) -> None:
+    begin(app.latest_state, queued=bool(app._refresh_in_flight))
+    app._refresh(queue_if_busy=True)
+    if app._panel_window_is_visible():
+        app.popover_controller.setState_(app.latest_state)
+
+
+def fail_mac(app: Any) -> None:
+    state = getattr(app, "latest_state", None)
+    if state is not None:
+        finish(state, state)
+    app._refresh_in_flight = False
+    if state is not None and app._panel_window_is_visible():
+        app.popover_controller.setState_(state)

menubar/state.py

@@ -99,6 +99,13 @@ class QuotaRowState:
     warning: bool = False
     available: bool = True
     reset_text_compact: str = ""
+    reset_done: bool = False
+
+    # Keep percent unchanged for quota notifications; renderers use display_percent.
+
+    @property
+    def display_percent(self) -> float | None:
+        return 0.0 if self.reset_done else self.percent
 
 
 class CodexStaleState(TypedDict):
@@ -156,6 +163,8 @@ class PopoverState:
     grok_stale: GrokStaleState | None = None
     card_order: tuple[str, ...] = ("claude", "codex", "agy", "grok")
     history_error: HistoryLoadErrorState | None = None
+    refresh_status: tuple[str, bool] | None = None
+    refresh_queued: bool = False
 
 
 @dataclass(frozen=True, slots=True)
@@ -970,7 +979,10 @@ def _quota_row(
     pct = max(0.0, min(100.0, float(pct)))
     time_to_reset = resets_at - now
     warning_seconds: float | None = None
-    if time_to_reset < 60:
+    if time_to_reset <= 0:
+        reset_text = _t(language, "reset_done")
+        warning = False
+    elif time_to_reset < 60:
         reset_text = _t(language, "reset_imminent")
         warning = False
     else:
@@ -1007,11 +1019,14 @@ def _quota_row(
     row = QuotaRowState(
         title=title,
         percent=pct,
-        percent_text=_t(language, "percent_used", value=_format_percent(pct)),
+        percent_text=_t(
+            language, "percent_used", value=_format_percent(0.0 if time_to_reset <= 0 else pct)
+        ),
         reset_text=reset_text,
-        color=_bar_color(pct, color),
+        color=_bar_color(0.0 if time_to_reset <= 0 else pct, color),
         warning=warning,
         available=True,
+        reset_done=time_to_reset <= 0,
     )
     if warning_seconds is not None:
         row.reset_text_compact = _t(

menubar/title.py

@@ -66,20 +66,22 @@ def _menubar_attributed_title(app: _TitleApp, state: PopoverState) -> Any:
     if not state.hide_claude:
         claude_percent = (
             "--"
-            if state.claude_session.percent is None
-            else f"{_format_percent(state.claude_session.percent)}%"
+            if state.claude_session.display_percent is None
+            else f"{_format_percent(state.claude_session.display_percent)}%"
         )
         title.appendAttributedString_(_menubar_icon_attachment_string(_claude_menubar_icon()))
         title.appendAttributedString_(_menubar_text_string(app, f" {claude_percent}"))
     if not state.hide_codex and (app.codex_5h_pct is not None or state.hide_claude):
-        codex_percent = (
-            "--" if app.codex_5h_pct is None else f"{_format_percent(float(app.codex_5h_pct))}%"
+        codex_row = (
+            state.codex_session if state.codex_session.percent is not None else state.codex_weekly
         )
+        codex_used = 0.0 if codex_row.reset_done else app.codex_5h_pct
+        codex_percent = "--" if codex_used is None else f"{_format_percent(float(codex_used))}%"
         if not state.hide_claude:
             title.appendAttributedString_(_menubar_text_string(app, "  "))
         title.appendAttributedString_(_menubar_icon_attachment_string(_codex_menubar_icon()))
         title.appendAttributedString_(_menubar_text_string(app, f" {codex_percent}"))
-    agy_session_percent = state.agy_session.percent
+    agy_session_percent = state.agy_session.display_percent
     agy_visible = not state.hide_agy and agy_session_percent is not None
     if agy_visible:
         assert agy_session_percent is not None
@@ -88,7 +90,7 @@ def _menubar_attributed_title(app: _TitleApp, state: PopoverState) -> Any:
             title.appendAttributedString_(_menubar_text_string(app, "  "))
         title.appendAttributedString_(_menubar_icon_attachment_string(_agy_menubar_icon()))
         title.appendAttributedString_(_menubar_text_string(app, f" {agy_percent}"))
-    grok_weekly_percent = state.grok_weekly.percent
+    grok_weekly_percent = state.grok_weekly.display_percent
     grok_visible = not state.hide_grok and grok_weekly_percent is not None
     if grok_visible:
         assert grok_weekly_percent is not None
@@ -123,18 +125,22 @@ def _compose_title(app: _TitleApp, state: PopoverState) -> str:
     if not state.hide_claude:
         claude = (
             "--"
-            if state.claude_session.percent is None
-            else f"{_format_percent(state.claude_session.percent)}%"
+            if state.claude_session.display_percent is None
+            else f"{_format_percent(state.claude_session.display_percent)}%"
         )
         parts.append(claude)
     if not state.hide_codex and (app.codex_5h_pct is not None or state.hide_claude):
-        codex = "--" if app.codex_5h_pct is None else f"{_format_percent(float(app.codex_5h_pct))}%"
+        codex_row = (
+            state.codex_session if state.codex_session.percent is not None else state.codex_weekly
+        )
+        codex_used = 0.0 if codex_row.reset_done else app.codex_5h_pct
+        codex = "--" if codex_used is None else f"{_format_percent(float(codex_used))}%"
         parts.append(codex)
-    if not state.hide_agy and state.agy_session.percent is not None:
-        agy = f"{_format_percent(state.agy_session.percent)}%"
+    if not state.hide_agy and state.agy_session.display_percent is not None:
+        agy = f"{_format_percent(state.agy_session.display_percent)}%"
         parts.append(agy)
-    if not state.hide_grok and state.grok_weekly.percent is not None:
-        grok = f"{_format_percent(state.grok_weekly.percent)}%"
+    if not state.hide_grok and state.grok_weekly.display_percent is not None:
+        grok = f"{_format_percent(state.grok_weekly.display_percent)}%"
         parts.append(grok)
     # Both providers hidden: keep a recognizable, clickable status item.
     return " · ".join(parts) if parts else "usage"

panels/payload.py

@@ -91,7 +91,7 @@ def _data_uri(asset_name: str) -> str:
 
 def _row_payload(row: QuotaRowState) -> dict[str, object]:
     return {
-        "percent": row.percent,
+        "percent": row.display_percent,
         "percentText": row.percent_text,
         "resetText": row.reset_text,
         "resetTextCompact": row.reset_text_compact or row.reset_text,

{usage_cli-0.32.2.data → usage_cli-0.32.3.data}/data/share/usage/i18n.json

@@ -56,6 +56,7 @@
     "data_stale_hint": "資料來自備援來源，建議檢查設定",
     "status_loading": "載入中",
     "status_synced": "✓ 已同步",
+    "status_refreshing": "↻ 更新中…",
     "status_no_data": "無資料",
     "awaiting_rate_limits": "請對 Claude Code 發送一句訊息以同步配額",
     "hook_broken_not_installed": "⚠ 狀態列沒在更新，請按「設定狀態列」重新安裝",
@@ -75,6 +76,7 @@
     "percent_used": "{value}% 已用",
     "reset_in": "重置 {time}",
     "reset_imminent": "即將重置",
+    "reset_done": "已重置",
     "burn_warning": "⚠ 照目前速度 {empty}後用完 · 重置 {reset}",
     "burn_warning_compact": "⚠ {empty}後用完",
     "reset_placeholder": "重置 --",
@@ -490,6 +492,7 @@
     "claude_pane_invalid_sidecar": "usage-pane.json 格式錯誤",
     "claude_pane_elapsed": "{minutes}分{seconds}秒",
     "claude_pane_remaining": "剩",
+    "claude_pane_reset_done": "已重置",
     "claude_pane_hours_ago": "{count}時前"
   },
   "en": {
@@ -549,6 +552,7 @@
     "data_stale_hint": "Data is from a fallback source. Check settings.",
     "status_loading": "Loading",
     "status_synced": "✓ Synced",
+    "status_refreshing": "↻ Refreshing…",
     "status_no_data": "No data",
     "awaiting_rate_limits": "Send a message in Claude Code to sync your quota",
     "hook_broken_not_installed": "⚠ Status line is not updating. Click \"Set Up Status Line\" to reinstall it.",
@@ -568,6 +572,7 @@
     "percent_used": "{value}% used",
     "reset_in": "Resets in {time}",
     "reset_imminent": "Reset imminent",
+    "reset_done": "Reset",
     "burn_warning": "⚠ At this pace, empty in {empty} · resets in {reset}",
     "burn_warning_compact": "⚠ Empty in {empty}",
     "reset_placeholder": "Resets in --",
@@ -983,6 +988,7 @@
     "claude_pane_invalid_sidecar": "Invalid usage-pane.json",
     "claude_pane_elapsed": "{minutes}m{seconds}s",
     "claude_pane_remaining": "left",
+    "claude_pane_reset_done": "Reset",
     "claude_pane_hours_ago": "{count}h ago"
   },
   "zh-CN": {
@@ -1042,6 +1048,7 @@
     "data_stale_hint": "数据来自备用来源，建议检查设置",
     "status_loading": "加载中",
     "status_synced": "✓ 已同步",
+    "status_refreshing": "↻ 更新中…",
     "status_no_data": "无数据",
     "awaiting_rate_limits": "请对 Claude Code 发送一句消息以同步配额",
     "hook_broken_not_installed": "⚠ 状态栏没有更新，请点「设置状态栏」重新安装",
@@ -1061,6 +1068,7 @@
     "percent_used": "{value}% 已用",
     "reset_in": "重置 {time}",
     "reset_imminent": "即将重置",
+    "reset_done": "已重置",
     "burn_warning": "⚠ 按当前速度 {empty}后用完 · 重置 {reset}",
     "burn_warning_compact": "⚠ {empty}后用完",
     "reset_placeholder": "重置 --",
@@ -1476,6 +1484,7 @@
     "claude_pane_invalid_sidecar": "usage-pane.json 格式错误",
     "claude_pane_elapsed": "{minutes}分{seconds}秒",
     "claude_pane_remaining": "剩",
+    "claude_pane_reset_done": "已重置",
     "claude_pane_hours_ago": "{count}时前"
   },
   "ja": {
@@ -1535,6 +1544,7 @@
     "data_stale_hint": "データはフォールバック元から取得しています。設定を確認してください。",
     "status_loading": "読み込み中",
     "status_synced": "✓ 同期済み",
+    "status_refreshing": "↻ 更新中…",
     "status_no_data": "データなし",
     "awaiting_rate_limits": "Claude Code にメッセージを送信してクォータを同期してください",
     "hook_broken_not_installed": "⚠ ステータスラインが更新されていません。「ステータスラインを設定」を押して再インストールしてください。",
@@ -1554,6 +1564,7 @@
     "percent_used": "{value}% 使用済み",
     "reset_in": "{time}後にリセット",
     "reset_imminent": "まもなくリセット",
+    "reset_done": "リセット済み",
     "burn_warning": "⚠ このペースで{empty}で使い切り·リセット{reset}",
     "burn_warning_compact": "⚠ {empty}で使い切り",
     "reset_placeholder": "リセット --",
@@ -1969,6 +1980,7 @@
     "claude_pane_invalid_sidecar": "usage-pane.json の形式が不正です",
     "claude_pane_elapsed": "{minutes}分{seconds}秒",
     "claude_pane_remaining": "残り",
+    "claude_pane_reset_done": "リセット済み",
     "claude_pane_hours_ago": "{count}時間前"
   },
   "ko": {
@@ -2028,6 +2040,7 @@
     "data_stale_hint": "데이터가 대체 소스에서 왔습니다. 설정을 확인하세요.",
     "status_loading": "불러오는 중",
     "status_synced": "✓ 동기화됨",
+    "status_refreshing": "↻ 새로 고치는 중…",
     "status_no_data": "데이터 없음",
     "awaiting_rate_limits": "Claude Code에 메시지를 보내 할당량을 동기화하세요",
     "hook_broken_not_installed": "⚠ 상태 표시줄이 업데이트되지 않습니다. \"상태 표시줄 설정\"을 눌러 다시 설치하세요.",
@@ -2047,6 +2060,7 @@
     "percent_used": "{value}% 사용됨",
     "reset_in": "{time} 후 초기화",
     "reset_imminent": "곧 초기화",
+    "reset_done": "리셋됨",
     "burn_warning": "⚠ 현재 속도면 {empty} 후 소진 · 초기화까지 {reset}",
     "burn_warning_compact": "⚠ {empty} 후 소진",
     "reset_placeholder": "초기화까지 --",
@@ -2462,6 +2476,7 @@
     "claude_pane_invalid_sidecar": "usage-pane.json 형식이 잘못되었습니다",
     "claude_pane_elapsed": "{minutes}분{seconds}초",
     "claude_pane_remaining": "남음",
+    "claude_pane_reset_done": "리셋됨",
     "claude_pane_hours_ago": "{count}시간 전"
   }
 }

{usage_cli-0.32.2.dist-info → usage_cli-0.32.3.dist-info}/METADATA

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

{usage_cli-0.32.2.dist-info → usage_cli-0.32.3.dist-info}/RECORD

@@ -65,18 +65,19 @@ loaders/jsonl_utils.py,sha256=fWMDCP2skgNvdERLevxaQtcEB7nFzgSG_vxjPJpB0ug,1118
 loaders/muse_loader.py,sha256=906pUoUVH7tNdddRpfZYzHOhCsxXmiPMU1HRMLFD4Z8,6438
 menubar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 menubar/actions.py,sha256=EZIgfpQiphJ5Zy5LzkZ9d1ngT9pb_uWrxz7BWdg7RZw,8408
-menubar/agy.py,sha256=LEbdRn_wBYkASZ8vlMSOI5l7RRMWnw8_YO1PaQAo4a4,10355
-menubar/app.py,sha256=tPVEwlIgKkcQ9RAg3NSDAXQcNi0CYGqFkO0uSY_DLEg,41964
+menubar/agy.py,sha256=AV_Dn7GctMrnyrMTbA2RuWXlLEK7jBv7qsX1TJKsJts,10711
+menubar/app.py,sha256=0imKzQ3VSQi4eQlFjKpoGJE2ANFsRz6sYeJWUnncNIk,42009
 menubar/chrome.py,sha256=So9CEw7cGKpVtaY3lEQR3xLJvotdipZcs7e3r1bRq3w,5119
-menubar/grok.py,sha256=c7pzFtAJ-Cs3JUQqxFd0KmGePw29YakNbmGUGczjw08,3945
+menubar/grok.py,sha256=9-ElLqhsLgnvgE3t7zK6KXUSu3uQYQOaLj0aVAgl82c,3545
+menubar/manual_refresh.py,sha256=gWh03HAfj1gxEZkl8_YmFKDLQlT8nl-VySBVAgSFTOw,1662
 menubar/menu.py,sha256=ezuqbNTzaE-Bau5DCgtBgCY1297LQt46DKhypWyUzPk,6424
 menubar/new_badge.py,sha256=I7A4AAoDO4hMWGSLXfNxVFC6zLTZYrLJckF0ZEFbH3k,3277
 menubar/notify.py,sha256=ozWCNtSye_kZZILHnejgpFMjcArU8yGOfbX8N1r4dVY,3476
 menubar/popover.py,sha256=qYU02aQ359nq6g13BjqK4W0izI2fGgQXAG6U_UIcIdQ,11594
 menubar/prefs.py,sha256=uk5F_B7Ul7i0h6NQDt7oj89cL1RaW2qsFss6lCVkMEQ,5166
 menubar/refresh.py,sha256=R8aYRa-1PBU5nQ9i5Bgr4VQK5GEqnCdmWI-LmbnYU9w,11217
-menubar/state.py,sha256=p1MacjdQO7melcSyh3KSXnuXmAju2x3hZLvTtVQ7Y78,43200
-menubar/title.py,sha256=2_7AMHNkfeVDMG5_dPc1GzWyItIwe5dWmpgym2SxmwA,5516
+menubar/state.py,sha256=XZb8kDJaxaYTpek3MFDuajpHKDjQOgiiatJmaCDKuUk,43741
+menubar/title.py,sha256=nt5aGzKjfk3UtpDZj5TYyNk7T9SEFubMWJgxjuVeh2o,5952
 menubar/update.py,sha256=U1F9HiLy4qLYKKs_jvIbdPOdH2FQPHmlGgM1ec6wMlg,3826
 panels/__init__.py,sha256=ryL7R_PT9ureS00w4Wr_fl2vMHoRvsLJ5MyrES5_B_Y,7649
 panels/base.py,sha256=XJUZLN0wP_kXzUaaeReCxu6bS0QGbhh3xP55K0yRxr8,2777
@@ -84,7 +85,7 @@ panels/dynamic_height.py,sha256=Qio6Thnqih7QOriI79ta94PIK6Wozp7fjLy9cyFeE7M,9716
 panels/panel_scale.py,sha256=z-8THYvI4usWDVWPz-k2LGuDz6jjDEViFl91-vikpEM,1779
 panels/panel_window.py,sha256=cHitXmmBd-P1XjG_lyGJJTtqARM7aAAQV7BxB84ccNQ,2507
 panels/panel_window_state.py,sha256=E83mqXRPoWSUk4qT3uMlSXARuobmdArD1UrsfHRwB8o,5059
-panels/payload.py,sha256=njpu7t_TFvgmmmQK5nFq3eNvEHp36f32CnBztoM45gY,5838
+panels/payload.py,sha256=JUB-H5wM2NDA5n2qOhBprUR5oOPg01qjIYPVDWmVaUc,5846
 panels/web_panel.py,sha256=kOhgSBkWLfGC_-bO9SauPRlo0aaXVkH1w4Ya0-5x8pY,18250
 panels/window_drag.py,sha256=a86iAOMEDK6AIuJr1TeGQDjP7MsN3Y0Qd5A6RKI6I5A,1776
 quota/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -109,8 +110,8 @@ updates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 updates/checker.py,sha256=tgAwczfX9gj2kaI7OgCKDutsa3AFGxS7b-On64Aerz4,4972
 updates/gate.py,sha256=1Tgnw8WOpUAYXboYscNGEZLhg1qJR336mg9VILw2Q6s,2229
 updates/release_notes.py,sha256=3M03Zxn4ZQvrpIpz2fbCoavcmuxiYu96epCGwwdbqHI,1734
-usage_cli-0.32.2.data/data/share/usage/i18n.json,sha256=a7BqOe0dd5vvtmhb-JEwpnzORBZf_7YYUBTfKo6Js1c,186185
-usage_cli-0.32.2.dist-info/licenses/LICENSE,sha256=GbPiL4Am4oP7rnqY-G84xpiYOGUGqVZiqnKFBDDWRFo,34586
+usage_cli-0.32.3.data/data/share/usage/i18n.json,sha256=EOsEqbfYZJ6nGAWtbgLV2lLW9p1mwTlI5fozDTRN2FY,186802
+usage_cli-0.32.3.dist-info/licenses/LICENSE,sha256=GbPiL4Am4oP7rnqY-G84xpiYOGUGqVZiqnKFBDDWRFo,34586
 usage_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 usage_common/subprocess_utils.py,sha256=LczNW2o-n70BH_-ZVzpW5TfZphK5RvjZLZj47qqb59I,621
 usage_common/time_utils.py,sha256=aGRJioBHdThvvuFn1f21DuVtKR9KBTi3DYAL7JT1W8M,666
@@ -118,12 +119,12 @@ usage_common/usage_dir_sweeper.py,sha256=5TjfFH-1MNb5GKCGjjtslsaXCG-2UbdHTmGXz4E
 usage_common/usage_lang.py,sha256=EDV_dYxeqdUL_HQfOSf8lZqyX5xb8yPQIEN6ZuTgAJ4,2602
 usage_common/usage_logging.py,sha256=uHIf5aJsRrKZUPCxKI45i3ju0v7_mwstqabVqzOZYN8,2636
 wintray/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wintray/app.py,sha256=Ictp5O93cukG7hM-VLEL_uxt7abQmBKbtbBM03wWMug,95341
+wintray/app.py,sha256=HG2xRlDL9PshIbgNIfKddJZkH30MOGnCYn6ZdLYxGYg,96442
 wintray/login_item.py,sha256=550-crK2F27RuLetGbGDOcRY_Bo_Hz1W8PKjyVDM-Bk,1474
 wintray/menu.py,sha256=Xovi2MIOLsmf3baeom0X8D1PlLfOHDngSwk_0vSQy9I,4725
 wintray/watch.py,sha256=u-V4hQwBpXSVi4zbcS50pgweGJ1C7bINq9M73AM8MWc,15881
-usage_cli-0.32.2.dist-info/METADATA,sha256=zplgF-URxLW69FZbiwNbQd-lwi9CuxpWffFcHBgYyok,21284
-usage_cli-0.32.2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-usage_cli-0.32.2.dist-info/entry_points.txt,sha256=9lSkmKBSXLL30xY7A393j4oqspnoTUNTSHpakty9uDE,68
-usage_cli-0.32.2.dist-info/top_level.txt,sha256=AOBfBDtNFuvQ1PZm6x84KNlyXIpI2SQ6pKMXJuBsTUI,395
-usage_cli-0.32.2.dist-info/RECORD,,
+usage_cli-0.32.3.dist-info/METADATA,sha256=NTEhMio4mlLbJi4adxtAoZNuPepWSjh205h1lK-wyr0,21284
+usage_cli-0.32.3.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+usage_cli-0.32.3.dist-info/entry_points.txt,sha256=9lSkmKBSXLL30xY7A393j4oqspnoTUNTSHpakty9uDE,68
+usage_cli-0.32.3.dist-info/top_level.txt,sha256=AOBfBDtNFuvQ1PZm6x84KNlyXIpI2SQ6pKMXJuBsTUI,395
+usage_cli-0.32.3.dist-info/RECORD,,

wintray/app.py

@@ -35,6 +35,7 @@ from loaders import codex_loader, grok_loader
 from loaders.history_loader import UsageEntry, load_entries
 from menubar import agy as menubar_agy
 from menubar import grok as menubar_grok
+from menubar import manual_refresh
 from menubar import state as menubar_state
 from menubar.prefs import (
     _auto_update_check_enabled,
@@ -566,7 +567,11 @@ def _set_taskbar_progress(
 
 def build_tooltip(state: menubar_state.PopoverState) -> str:
     def line(name: str, row: menubar_state.QuotaRowState) -> str:
-        used = "--" if row.percent is None else str(min(100, max(0, round(row.percent))))
+        used = (
+            "--"
+            if row.display_percent is None
+            else str(min(100, max(0, round(row.display_percent))))
+        )
         return f"{name} {row.title}: {used}%"
 
     lines = [
@@ -888,7 +893,7 @@ class _WindowsTrayController:
             self.inject_state(force=True)
             # A panel reload can recreate its taskbar button. Reapply the
             # latest value once the visible native window has loaded.
-            self._update_taskbar_progress(self.latest_state.claude_session.percent)
+            self._update_taskbar_progress(self.latest_state.claude_session.display_percent)
 
     @staticmethod
     def _screen_rectangle(value: object) -> tuple[int, int, int, int] | None:
@@ -1458,6 +1463,17 @@ class _WindowsTrayController:
             self._last_file_event_refresh_started_at = time.monotonic()
         self.refresh()
 
+    def refresh_manual(self) -> None:
+        with self.refresh_lock:
+            if self.stopping.is_set():
+                return
+            manual_refresh.begin(self.latest_state, queued=self._refresh_in_flight)
+        try:
+            if self.visible:
+                self.inject_state()
+        finally:
+            self.refresh()
+
     def refresh(self) -> None:
         with self.refresh_lock:
             if self.stopping.is_set():
@@ -1484,10 +1500,14 @@ class _WindowsTrayController:
 
         while True:
             try:
-                self.latest_state = self._build_state(
+                state = self._build_state(
                     measure=measure,
                     debug_timing=debug_timing,
                 )
+                with self.refresh_lock:
+                    self.latest_state = manual_refresh.finish(
+                        self.latest_state, state, queued=self._refresh_queued
+                    )
                 self._process_quota_notifications(self.latest_state)
                 started_at = time.monotonic() if debug_timing else 0.0
                 self._update_tray()
@@ -1497,6 +1517,15 @@ class _WindowsTrayController:
                     self.inject_state()
                     measure("inject_state", started_at)
             except Exception:
+                with self.refresh_lock:
+                    manual_refresh.finish(
+                        self.latest_state, self.latest_state, queued=self._refresh_queued
+                    )
+                if self.visible:
+                    try:
+                        self.inject_state()
+                    except Exception:
+                        logger.warning("Windows tray refresh status update failed", exc_info=True)
                 if os.environ.get("USAGE_DEBUG") == "1":
                     logger.warning("Windows tray refresh failed", exc_info=True)
 
@@ -1669,7 +1698,7 @@ class _WindowsTrayController:
         return await self.usage_client.fetch_once()
 
     def _update_tray(self) -> None:
-        percent = self.latest_state.claude_session.percent
+        percent = self.latest_state.claude_session.display_percent
         self._update_taskbar_progress(percent)
         if self.icon is None:
             return
@@ -1729,7 +1758,7 @@ class _WindowsTrayController:
         self.visible = True
         self._place_window()
         self._dispatch_window_mutation(self._show_panel_on_ui_thread)
-        self._update_taskbar_progress(self.latest_state.claude_session.percent)
+        self._update_taskbar_progress(self.latest_state.claude_session.display_percent)
         self.inject_state(force=True)
         self.refresh()
 
@@ -2158,7 +2187,7 @@ class _WindowsTrayController:
             elif action == "reset_panel_position":
                 self.reset_panel_position()
             elif action == "refresh":
-                self.refresh()
+                self.refresh_manual()
             elif action == "toggle_login":
                 self.toggle_login()
             elif action == "toggle_quota_notifications":
@@ -2178,7 +2207,7 @@ class _WindowsTrayController:
             return None
         action = str(payload)
         if action == "refresh":
-            self.refresh()
+            self.refresh_manual()
         elif action == "quit":
             self.quit()
         elif action == "switch":