usage-cli 0.32.2__tar.gz → 0.32.3__tar.gz

{usage_cli-0.32.2 → usage_cli-0.32.3}/PKG-INFO

@@ -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 → usage_cli-0.32.3}/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 → usage_cli-0.32.3}/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,
     )
 
 

{usage_cli-0.32.2 → usage_cli-0.32.3}/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()

{usage_cli-0.32.2 → usage_cli-0.32.3}/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,
     )

usage_cli-0.32.3/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)

{usage_cli-0.32.2 → usage_cli-0.32.3}/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(

{usage_cli-0.32.2 → usage_cli-0.32.3}/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"

{usage_cli-0.32.2 → usage_cli-0.32.3}/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 → usage_cli-0.32.3}/pyproject.toml

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

usage_cli-0.32.3/tests/test_manual_refresh.py

@@ -0,0 +1,62 @@
+from types import SimpleNamespace
+
+import pytest
+
+from i18n import _t
+from menubar import manual_refresh
+from menubar.state import _empty_state
+
+
+@pytest.mark.parametrize("normal", ["status_synced", "data_stale_hint", "status_no_data"])
+def test_manual_refresh_restores_new_status(normal: str) -> None:
+    previous = _empty_state()
+    manual_refresh.begin(previous)
+    assert previous.status_text == "Status: ↻ Refreshing…"
+    assert previous.status_long is False
+    state = _empty_state()
+    state.status_text = _t("en", "status_text", value=_t("en", normal))
+    state.status_long = True
+    assert manual_refresh.finish(previous, state) is state
+    assert state.status_text == _t("en", "status_text", value=_t("en", normal))
+    assert state.status_long is True
+    assert state.refresh_status is None
+
+
+def test_auto_refresh_never_changes_status() -> None:
+    previous, state = _empty_state(), _empty_state()
+    expected = state.status_text
+    manual_refresh.finish(previous, state, queued=True)
+    assert state.status_text == expected
+    assert state.refresh_status is None
+
+
+def test_manual_refresh_queued_behind_auto_waits_for_its_result() -> None:
+    previous = _empty_state()
+    manual_refresh.begin(previous, queued=True)
+    state = manual_refresh.finish(previous, _empty_state(), queued=True)
+    assert state.status_text == "Status: ↻ Refreshing…"
+    result = manual_refresh.finish(state, _empty_state())
+    assert result.status_text == _empty_state().status_text
+    assert result.refresh_status is None
+
+
+def test_mac_manual_refresh_pushes_status_and_failure_restores_it() -> None:
+    state = _empty_state()
+    expected = state.status_text
+    pushed: list[str] = []
+    calls: list[bool] = []
+    app = SimpleNamespace(
+        latest_state=state,
+        _refresh_in_flight=False,
+        _refresh=lambda *, queue_if_busy: calls.append(queue_if_busy),
+        _panel_window_is_visible=lambda: True,
+        popover_controller=SimpleNamespace(
+            setState_=lambda state: pushed.append(state.status_text)
+        ),
+    )
+    manual_refresh.start_mac(app)
+    assert calls == [True]
+    assert pushed == ["Status: ↻ Refreshing…"]
+    manual_refresh.fail_mac(app)
+    assert pushed == ["Status: ↻ Refreshing…", expected]
+    assert app._refresh_in_flight is False

{usage_cli-0.32.2 → usage_cli-0.32.3}/tests/test_menubar.py

@@ -19,6 +19,7 @@ import pytest
 import panels
 import quota.agy_window_keeper as agy_window_keeper
 import quota.window_keeper as window_keeper
+from i18n import _t
 from installer import statusline_settings
 from loaders import codex_loader, grok_loader, history_loader
 from menubar import actions as menubar_actions
@@ -334,19 +335,21 @@ def test_quota_row_shows_imminent_reset_with_30_seconds_remaining() -> None:
     assert row.warning is False
 
 
-def test_quota_row_shows_imminent_reset_at_zero_seconds() -> None:
+def test_quota_row_shows_done_reset_at_zero_seconds() -> None:
     row = menubar._quota_row(
         "Session", 50.0, 1_000.0, 1_000.0, menubar.CODEX_COLOR, language="zh-TW"
     )
 
-    assert row.reset_text == "即將重置"
+    assert row.reset_text == "已重置"
+    assert row.display_percent == 0.0
     assert row.warning is False
 
 
-def test_quota_row_shows_imminent_reset_after_reset_time() -> None:
+def test_quota_row_shows_done_reset_after_reset_time() -> None:
     row = menubar._quota_row("Session", 50.0, 970.0, 1_000.0, menubar.CODEX_COLOR, language="zh-TW")
 
-    assert row.reset_text == "即將重置"
+    assert row.reset_text == "已重置"
+    assert row.display_percent == 0.0
     assert row.warning is False
 
 
@@ -2690,9 +2693,13 @@ def test_refresh_now_queues_when_refresh_is_busy() -> None:
     delegate._refresh_in_flight = True
     delegate._refresh_queued = False
 
+    delegate.popover = SimpleNamespace(isVisible=lambda: False)
     delegate.refreshNow_(None)
 
     assert delegate._refresh_queued is True
+    assert delegate.latest_state.status_text == _t(
+        delegate.language, "status_text", value=_t(delegate.language, "status_refreshing")
+    )
 
 
 def test_apply_refresh_result_clears_busy_flag_when_ui_update_fails() -> None:
@@ -3128,3 +3135,30 @@ def test_state_from_outcome_shows_setup_button_for_codex_only(
     )
 
     assert state.show_install_button is True
+
+
+def test_reset_title_keeps_notification_values(monkeypatch: pytest.MonkeyPatch) -> None:
+    from types import SimpleNamespace
+
+    state = menubar._empty_state("en")
+    row = menubar._quota_row("Session", 100.0, 999.0, 1000.0, menubar.CLAUDE_COLOR)
+    state.claude_session = state.codex_session = state.agy_session = state.grok_weekly = row
+    state.hide_claude = state.hide_codex = state.hide_agy = state.hide_grok = False
+    app = SimpleNamespace(codex_5h_pct=100.0, _menubar_text_cache={})
+    assert menubar_title._compose_title(app, state) == "0% · 0% · 0% · 0%"
+    texts: list[str] = []
+    original_text_string = menubar_title._menubar_text_string
+
+    def record_text(app: Any, text: str) -> Any:
+        texts.append(text)
+        return original_text_string(app, text)
+
+    monkeypatch.setattr(menubar_title, "_menubar_text_string", record_text)
+    menubar_title._menubar_attributed_title(app, state)
+    assert texts.count(" 0%") == 4
+    state.claude_session = menubar._missing_row("Session", menubar.CLAUDE_COLOR)
+    state.codex_session = menubar._missing_row("", menubar.CODEX_COLOR)
+    state.codex_weekly = row
+    state.hide_claude = state.hide_agy = state.hide_grok = True
+    assert menubar_title._compose_title(app, state) == "0%"
+    assert row.percent == 100.0

{usage_cli-0.32.2 → usage_cli-0.32.3}/tests/test_menubar_agy.py

@@ -288,7 +288,7 @@ def test_project_quota_counts_down_by_cache_age() -> None:
     assert projection.session.reset_text == "Resets in 9m"
 
 
-def test_project_quota_countdown_clamps_to_one_minute_when_overdue() -> None:
+def test_project_quota_displays_zero_when_overdue() -> None:
     now_dt = datetime(2026, 1, 1, 0, 0, tzinfo=UTC)
     fetched = now_dt - timedelta(minutes=18)
     quota = AgyQuotaResult(
@@ -307,7 +307,10 @@ def test_project_quota_countdown_clamps_to_one_minute_when_overdue() -> None:
     projection = menubar_agy.project_quota(quota, "en", now=now_dt.timestamp())
 
     assert projection is not None
-    assert projection.session.reset_text == "Resets in 1m"
+    assert projection.session.reset_text == "Reset"
+    assert projection.session.display_percent == 0.0
+    assert projection.session.percent == 50.0
+    assert not projection.session.warning
 
 
 def test_project_quota_warns_when_session_will_empty_before_reset() -> None:
@@ -478,3 +481,17 @@ def test_project_quota_warns_for_weekly_window_after_thirty_minute_span() -> Non
 
     assert projection is not None
     assert projection.weekly.warning is True
+
+
+@pytest.mark.parametrize(
+    "age_minutes, text, used",
+    [(12.0, "Reset", 0.0), (11.5, "Reset imminent", 90.0), (11.0, "Resets in 1m", 90.0)],
+)
+def test_window_row_reset_boundary(age_minutes: float, text: str, used: float) -> None:
+    window = AgyQuotaWindow(10.0, None, 12)
+    row = menubar_agy._window_row("Session", window, "en", age_minutes, forecast_seconds=10.0)
+    assert row.display_percent == used
+    if age_minutes >= 11.5:
+        assert row.reset_text == text
+        assert not row.warning
+    assert window.remaining_percent == 10.0

{usage_cli-0.32.2 → usage_cli-0.32.3}/tests/test_menubar_grok.py

@@ -92,3 +92,17 @@ def test_build_popover_state_includes_grok_row_and_visibility() -> None:
     assert state.hide_grok is False
     assert state.grok_weekly.percent == 18.0
     assert state.card_order == ("claude", "codex", "agy", "grok")
+
+
+@pytest.mark.parametrize(
+    "offset, text, used", [(0, "Reset", 0.0), (1, "Reset", 0.0), (-30, "Reset imminent", 18.0)]
+)
+def test_project_quota_reset_boundary(offset: int, text: str, used: float) -> None:
+    quota = _quota()
+    now = datetime(2026, 9, 1, 15, 50, 8, tzinfo=UTC).timestamp() + offset
+    projection = menubar_grok.project_quota(quota, "en", now=now)
+    assert projection is not None
+    assert projection.weekly.display_percent == used
+    assert projection.weekly.reset_text == text
+    assert not projection.weekly.warning
+    assert quota.used_percent == 18.0