usage-cli 0.34.0__tar.gz → 0.34.2__tar.gz

{usage_cli-0.34.0/usage_cli.egg-info → usage_cli-0.34.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usage-cli
-Version: 0.34.0
+Version: 0.34.2
 Summary: usage — 在 macOS menu bar 與 Windows 系統匣顯示 Claude Code、Codex、Antigravity 用量的小工具（也提供終端機 TUI）
 License-Expression: AGPL-3.0-only
 Requires-Python: >=3.13
@@ -15,7 +15,7 @@ Requires-Dist: pyobjc-framework-WebKit>=11.0; sys_platform == "darwin"
 Requires-Dist: rich<16.0.0,>=15.0.0
 Provides-Extra: windows
 Requires-Dist: pystray>=0.19.5; sys_platform == "win32" and extra == "windows"
-Requires-Dist: pillow>=11.0.0; sys_platform == "win32" and extra == "windows"
+Requires-Dist: pillow>=13.0.0; sys_platform == "win32" and extra == "windows"
 Requires-Dist: pywebview>=5.4; sys_platform == "win32" and extra == "windows"
 Requires-Dist: windows-toasts>=1.3.1; sys_platform == "win32" and extra == "windows"
 Dynamic: license-file

{usage_cli-0.34.0 → usage_cli-0.34.2}/i18n.json

@@ -19,6 +19,9 @@
     "panel_world_cup": "世界盃 2026",
     "panel_ai_daily": "AI 更新日報",
     "switch_panel": "更換面板",
+    "settings_button": "⚙ 設定",
+    "statusline_sync_menu": "狀態列同步額度",
+    "statusline_sync_tooltip": "從 Claude Code 的狀態列讀取額度。關掉後，Claude 的額度就不會再更新。",
     "launch_at_login": "開機自動啟動",
     "reset_panel_position": "重設面板位置",
     "hide_sections_menu": "隱藏區塊",
@@ -74,8 +77,8 @@
     "service_degraded": "效能降級",
     "service_partial_outage": "部分中斷",
     "service_major_outage": "大規模中斷",
-    "today_text": "今日：${cost} ({tokens} tokens)",
-    "yesterday_text": "昨日：${cost} ({tokens} tokens)",
+    "today_label": "今日：",
+    "yesterday_label": "昨日：",
     "percent_used": "{value}% 已用",
     "reset_in": "重置 {time}",
     "reset_imminent": "即將重置",
@@ -578,6 +581,9 @@
     "panel_world_cup": "World Cup 2026",
     "panel_ai_daily": "AI Update Daily",
     "switch_panel": "Switch Panel",
+    "settings_button": "⚙ Settings",
+    "statusline_sync_menu": "Sync quota via status line",
+    "statusline_sync_tooltip": "Reads the Claude quota from Claude Code's status line. Turn it off and the Claude quota stops updating.",
     "launch_at_login": "Launch at Login",
     "reset_panel_position": "Reset panel position",
     "hide_sections_menu": "Hide Sections",
@@ -633,8 +639,8 @@
     "service_degraded": "Degraded performance",
     "service_partial_outage": "Partial outage",
     "service_major_outage": "Major outage",
-    "today_text": "Today: ${cost} ({tokens} tokens)",
-    "yesterday_text": "Yesterday: ${cost} ({tokens} tokens)",
+    "today_label": "Today:",
+    "yesterday_label": "Yesterday:",
     "percent_used": "{value}% used",
     "reset_in": "Resets in {time}",
     "reset_imminent": "Reset imminent",
@@ -1137,6 +1143,9 @@
     "panel_world_cup": "世界杯 2026",
     "panel_ai_daily": "AI 更新日报",
     "switch_panel": "切换面板",
+    "settings_button": "⚙ 设置",
+    "statusline_sync_menu": "状态栏同步额度",
+    "statusline_sync_tooltip": "从 Claude Code 的状态栏读取额度。关闭后，Claude 的额度就不会再更新。",
     "launch_at_login": "开机自动启动",
     "reset_panel_position": "重设面板位置",
     "hide_sections_menu": "隐藏区块",
@@ -1192,8 +1201,8 @@
     "service_degraded": "性能降级",
     "service_partial_outage": "部分中断",
     "service_major_outage": "大规模中断",
-    "today_text": "今日：${cost} ({tokens} tokens)",
-    "yesterday_text": "昨天：${cost} ({tokens} tokens)",
+    "today_label": "今日：",
+    "yesterday_label": "昨天：",
     "percent_used": "{value}% 已用",
     "reset_in": "重置 {time}",
     "reset_imminent": "即将重置",
@@ -1696,6 +1705,9 @@
     "panel_world_cup": "ワールドカップ 2026",
     "panel_ai_daily": "AI更新日報",
     "switch_panel": "パネル切替",
+    "settings_button": "⚙ 設定",
+    "statusline_sync_menu": "ステータスラインで使用量を同期",
+    "statusline_sync_tooltip": "Claude Code のステータスラインから使用量を読み取ります。オフにすると Claude の使用量は更新されなくなります。",
     "launch_at_login": "ログイン時に起動",
     "reset_panel_position": "パネルの位置をリセット",
     "hide_sections_menu": "セクションを非表示",
@@ -1751,8 +1763,8 @@
     "service_degraded": "パフォーマンス低下",
     "service_partial_outage": "一部障害",
     "service_major_outage": "大規模障害",
-    "today_text": "今日: ${cost} ({tokens} tokens)",
-    "yesterday_text": "昨日: ${cost} ({tokens} tokens)",
+    "today_label": "今日:",
+    "yesterday_label": "昨日:",
     "percent_used": "{value}% 使用済み",
     "reset_in": "{time}後にリセット",
     "reset_imminent": "まもなくリセット",
@@ -2255,6 +2267,9 @@
     "panel_world_cup": "월드컵 2026",
     "panel_ai_daily": "AI 업데이트 일보",
     "switch_panel": "패널 전환",
+    "settings_button": "⚙ 설정",
+    "statusline_sync_menu": "상태 표시줄로 사용량 동기화",
+    "statusline_sync_tooltip": "Claude Code 상태 표시줄에서 사용량을 읽습니다. 끄면 Claude 사용량이 더 이상 업데이트되지 않습니다.",
     "launch_at_login": "로그인 시 시작",
     "reset_panel_position": "패널 위치 재설정",
     "hide_sections_menu": "섹션 숨기기",
@@ -2310,8 +2325,8 @@
     "service_degraded": "성능 저하",
     "service_partial_outage": "부분 장애",
     "service_major_outage": "대규모 장애",
-    "today_text": "오늘: ${cost} ({tokens} tokens)",
-    "yesterday_text": "어제: ${cost} ({tokens} tokens)",
+    "today_label": "오늘:",
+    "yesterday_label": "어제:",
     "percent_used": "{value}% 사용됨",
     "reset_in": "{time} 후 초기화",
     "reset_imminent": "곧 초기화",

{usage_cli-0.34.0 → usage_cli-0.34.2}/loaders/muse_quota_probe.py

@@ -20,6 +20,7 @@ from pathlib import Path
 from typing import TypedDict, TypeGuard
 
 from loaders import muse_loader
+from usage_common.subprocess_utils import hidden_console_kwargs
 
 logger = logging.getLogger(__name__)
 CACHE_PATH = Path.home() / ".usage/muse_quota.json"
@@ -203,6 +204,7 @@ def _probe_worker(executable: str) -> None:
                 stderr=subprocess.PIPE,
                 encoding="utf-8",
                 cwd=PROBE_DIR,
+                **hidden_console_kwargs(),
             )
             _probe_process = process
         try:

{usage_cli-0.34.0 → usage_cli-0.34.2}/menubar/app.py

@@ -138,10 +138,7 @@ from menubar.state import (
     _group_name as _group_name,
 )
 from menubar.state import (
-    _statusline_payload as _statusline_payload,
-)
-from menubar.state import (
-    _today_title as _today_title,
+    _today_total as _today_total,
 )
 from menubar.state import (
     format_human_time as format_human_time,
@@ -924,7 +921,6 @@ class AppDelegate(NSObject):
 
     def _finishStatuslineAction_(self, result: dict[str, Any]) -> None:
         self._refresh()
-        self._refresh_statusline_state()
         if result.get("ok", True):
             return
         alert = _make_alert()
@@ -932,10 +928,6 @@ class AppDelegate(NSObject):
         alert.setInformativeText_(str(result.get("output") or result.get("action") or ""))
         alert.runModal()
 
-    def _refresh_statusline_state(self) -> None:
-        self.latest_state.statusline = _statusline_payload(self.language)
-        self.popover_controller.setState_(self.latest_state)
-
     def _analyze_usage_in_background(self, period: str) -> None:
         menubar_actions.analyze_usage_in_background(self, period)
 

{usage_cli-0.34.0 → usage_cli-0.34.2}/menubar/menu.py

@@ -11,6 +11,7 @@ from typing import Any, Protocol
 from AppKit import NSMakePoint, NSMenu, NSMenuItem
 
 from installer import claude_pane, login_item, session_hooks
+from installer.statusline_settings import _statusline_enabled
 from menubar.new_badge import apply_badge
 from menubar.prefs import (
     _hide_agy_enabled,
@@ -205,6 +206,16 @@ def build_switch_menu(app: _SwitchMenuApp, sender: Any) -> None:
     menu.addItem_(NSMenuItem.separatorItem())
     # Claude Code-only switches stay collapsed in a submenu, like the panel themes.
     claude_submenu = NSMenu.alloc().initWithTitle_(_t(app.language, "claude_code_section"))
+    claude_submenu.addItem_(
+        build_menu_item(
+            app.language,
+            "statusline_sync_menu",
+            "toggleStatusline:",
+            target=app,
+            state=_statusline_enabled(),
+            tooltip_key="statusline_sync_tooltip",
+        )
+    )
     claude_pane_item = build_menu_item(
         app.language,
         "claude_pane_section_menu",

{usage_cli-0.34.0 → usage_cli-0.34.2}/menubar/refresh.py

@@ -140,9 +140,8 @@ def build_result(app: _RefreshApp, sources: RefreshSources) -> dict[str, Any]:
     project_rows_7d = list(fallback_state.projects_7d)
     project_rows_30d = list(fallback_state.projects_30d)
     project_rows_all = list(fallback_state.projects_all)
-    today_text = fallback_state.today_text
-    yesterday_text = fallback_state.yesterday_text
-    statusline = fallback_state.statusline
+    today_total = fallback_state.today_total
+    yesterday_total = fallback_state.yesterday_total
     hide_claude = fallback_state.hide_claude
     hide_codex = fallback_state.hide_codex
     hide_agy = agy_result.hide_agy or _hide_agy_enabled()
@@ -171,9 +170,8 @@ def build_result(app: _RefreshApp, sources: RefreshSources) -> dict[str, Any]:
                 project_rows_all,
             ) = menubar_state.project_rows_for_windows(all_entries)
         sources.measure("project_rows_windows", started_at)
-        today_text = menubar_state._today_title(app.mock, app.language, entries=all_entries)
-        yesterday_text = menubar_state._yesterday_title(app.mock, app.language, entries=all_entries)
-        statusline = menubar_state._statusline_payload(app.language)
+        today_total = menubar_state._today_total(app.mock, entries=all_entries)
+        yesterday_total = menubar_state._yesterday_total(app.mock, entries=all_entries)
         hide_claude = _hide_claude_enabled()
         hide_codex = _hide_codex_enabled()
         hide_agy = agy_result.hide_agy or _hide_agy_enabled()
@@ -219,9 +217,8 @@ def build_result(app: _RefreshApp, sources: RefreshSources) -> dict[str, Any]:
             language=app.language,
             group=group,
             burn_rate_trackers=app.burn_rate_trackers,
-            today_text=today_text,
-            yesterday_text=yesterday_text,
-            statusline=statusline,
+            today_total=today_total,
+            yesterday_total=yesterday_total,
             show_install_button=show_install_button,
             hide_claude=hide_claude,
             hide_codex=hide_codex,
@@ -283,9 +280,8 @@ def build_result(app: _RefreshApp, sources: RefreshSources) -> dict[str, Any]:
         state.projects_7d = project_rows_7d
         state.projects_30d = project_rows_30d
         state.projects_all = project_rows_all
-        state.today_text = today_text
-        state.yesterday_text = yesterday_text
-        state.statusline = statusline
+        state.today_total = today_total
+        state.yesterday_total = yesterday_total
         state.hide_claude = hide_claude
         state.hide_codex = hide_codex
         state.hide_agy = hide_agy

{usage_cli-0.34.0 → usage_cli-0.34.2}/menubar/state.py

@@ -16,7 +16,6 @@ from datetime import time as datetime_time
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, NotRequired, Protocol, TypedDict, cast
 
-from installer.statusline_settings import _statusline_enabled
 from loaders import codex_loader, grok_loader, muse_loader
 from loaders.claude_paths import claude_config_dirs
 from loaders.claude_usage import PollOutcome, PollState
@@ -90,6 +89,12 @@ def _bar_color(pct: float, brand: tuple[float, float, float]) -> tuple[float, fl
     return brand
 
 
+@dataclass(slots=True, frozen=True)
+class PeriodTotal:
+    tokens: int = 0
+    cost: float = 0.0
+
+
 @dataclass(slots=True)
 class QuotaRowState:
     title: str
@@ -155,9 +160,8 @@ class PopoverState:
     projects_all: list[tuple[str, int, float | None]]
     rate_text: str
     status_text: str
-    today_text: str
-    yesterday_text: str
-    statusline: dict[str, object]
+    today_total: PeriodTotal
+    yesterday_total: PeriodTotal
     service_alerts: tuple[str, ...] = ()
     show_install_button: bool = False
     status_long: bool = False
@@ -855,9 +859,8 @@ def build_popover_state(
     language: str,
     group: int,
     burn_rate_trackers: dict[str, BurnRateTracker],
-    today_text: str,
-    yesterday_text: str,
-    statusline: dict[str, object],
+    today_total: PeriodTotal,
+    yesterday_total: PeriodTotal,
     show_install_button: bool,
     hide_claude: bool,
     hide_codex: bool,
@@ -988,9 +991,8 @@ def build_popover_state(
         projects_all=projects_all,
         rate_text=_t(language, "rate_text", value=group_name),
         status_text=status_text,
-        today_text=today_text,
-        yesterday_text=yesterday_text,
-        statusline=statusline,
+        today_total=today_total,
+        yesterday_total=yesterday_total,
         service_alerts=service_alerts,
         show_install_button=show_install_button,
         status_long=status_long,
@@ -1107,9 +1109,8 @@ def _missing_row(
 
 
 def _format_percent(value: float) -> str:
-    if value.is_integer():
-        return str(int(value))
-    return f"{value:.1f}"
+    # Whole numbers only, rounded down so 99.7% never reads as an exhausted 100%.
+    return str(int(value))
 
 
 def popover_dimensions(state: PopoverState, panel: UsagePanel | None = None) -> tuple[float, float]:
@@ -1222,9 +1223,8 @@ def _empty_state(language: str = "en") -> PopoverState:
         projects_all=[],
         rate_text=_t(language, "rate_text", value="--"),
         status_text=_t(language, "status_text", value=_t(language, "status_loading")),
-        today_text=_t(language, "today_text", cost="0.00", tokens="0"),
-        yesterday_text=_t(language, "yesterday_text", cost="0.00", tokens="0"),
-        statusline=_statusline_payload(language),
+        today_total=PeriodTotal(),
+        yesterday_total=PeriodTotal(),
         service_alerts=(),
         show_install_button=False,
         hide_claude=_hide_claude_enabled(),
@@ -1248,27 +1248,18 @@ def _error_state(message: str, mock: bool, language: str = "en") -> PopoverState
         "status_text",
         value=_t(language, "status_error", message=message),
     )
-    state.today_text = _today_title(mock, language)
-    state.yesterday_text = _yesterday_title(mock, language)
+    state.today_total = _today_total(mock)
+    state.yesterday_total = _yesterday_total(mock)
     state.show_install_button = False
     return state
 
 
-def _statusline_payload(language: str) -> dict[str, object]:
-    return {
-        "enabled": _statusline_enabled(),
-        "enabledText": _t(language, "cli_enabled"),
-        "disabledText": _t(language, "cli_disabled"),
-    }
-
-
-def _today_title(
+def _today_total(
     mock: bool = False,
-    language: str = "en",
     entries: list[UsageEntry] | None = None,
-) -> str:
+) -> PeriodTotal:
     if mock:
-        return _t(language, "today_text", cost="45.20", tokens="50,193,442")
+        return PeriodTotal(tokens=50_193_442, cost=45.20)
 
     try:
         today = datetime.now().astimezone().date()
@@ -1290,18 +1281,17 @@ def _today_title(
     except Exception:
         if os.environ.get("USAGE_DEBUG") == "1":
             logger.warning("today totals load failed", exc_info=True)
-        return _t(language, "today_text", cost="0.00", tokens="0")
+        return PeriodTotal()
 
-    return _t(language, "today_text", cost=f"{total_cost:.2f}", tokens=f"{total_tokens:,}")
+    return PeriodTotal(tokens=total_tokens, cost=total_cost)
 
 
-def _yesterday_title(
+def _yesterday_total(
     mock: bool = False,
-    language: str = "en",
     entries: list[UsageEntry] | None = None,
-) -> str:
+) -> PeriodTotal:
     if mock:
-        return _t(language, "yesterday_text", cost="41.10", tokens="48,200,000")
+        return PeriodTotal(tokens=48_200_000, cost=41.10)
 
     try:
         yesterday = datetime.now().astimezone().date() - timedelta(days=1)
@@ -1318,11 +1308,6 @@ def _yesterday_title(
     except Exception:
         if os.environ.get("USAGE_DEBUG") == "1":
             logger.warning("yesterday totals load failed", exc_info=True)
-        return _t(language, "yesterday_text", cost="0.00", tokens="0")
+        return PeriodTotal()
 
-    return _t(
-        language,
-        "yesterday_text",
-        cost=f"{total_cost:.2f}",
-        tokens=f"{total_tokens:,}",
-    )
+    return PeriodTotal(tokens=total_tokens, cost=total_cost)

{usage_cli-0.34.0 → usage_cli-0.34.2}/panels/payload.py

@@ -14,7 +14,7 @@ from typing import TYPE_CHECKING, Any
 from usage_common.i18n import _load_i18n_bundle
 
 if TYPE_CHECKING:
-    from menubar.state import PopoverState, QuotaRowState
+    from menubar.state import PeriodTotal, PopoverState, QuotaRowState
 
 CORE_SCRIPT_FILENAME = "panels/panel_core.js"
 
@@ -155,12 +155,11 @@ def _state_payload(
         "hideMuse": state.hide_muse,
         "cardOrder": list(state.card_order),
         "historyError": state.history_error,
-        "statusline": state.statusline,
         "footer": {
             "rate": state.rate_text,
             "status": state.status_text,
-            "today": state.today_text,
-            "yesterday": state.yesterday_text,
+            "today": _period_payload(state.today_total),
+            "yesterday": _period_payload(state.yesterday_total),
             "serviceAlerts": list(state.service_alerts),
             "showInstall": state.show_install_button,
         },
@@ -176,3 +175,7 @@ def _fmt_tokens(tokens: int) -> str:
 
 def _fmt_cost(cost: float | None) -> str:
     return "--" if cost is None else f"${cost:.2f}"
+
+
+def _period_payload(total: PeriodTotal) -> dict[str, str]:
+    return {"tokensText": _fmt_tokens(total.tokens), "costText": _fmt_cost(total.cost)}

{usage_cli-0.34.0 → usage_cli-0.34.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usage-cli"
-version = "0.34.0"
+version = "0.34.2"
 description = "usage — 在 macOS menu bar 與 Windows 系統匣顯示 Claude Code、Codex、Antigravity 用量的小工具（也提供終端機 TUI）"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -18,7 +18,7 @@ dependencies = [
 [project.optional-dependencies]
 windows = [
     "pystray>=0.19.5; sys_platform == 'win32'",
-    "pillow>=11.0.0; sys_platform == 'win32'",
+    "pillow>=13.0.0; sys_platform == 'win32'",
     "pywebview>=5.4; sys_platform == 'win32'",
     "windows-toasts>=1.3.1; sys_platform == 'win32'",
 ]

{usage_cli-0.34.0 → usage_cli-0.34.2}/tests/test_analyzer_pipeline.py

@@ -275,7 +275,7 @@ def test_html_panels_expose_analyze_action() -> None:
         assert 'data-i18n="analyze_usage"' in html, path.name
         assert "analyze_all" not in html, path.name
         assert "projectsAll" in html, path.name
-        assert 'data-action="toggle-statusline"' in html, path.name
+        assert 'data-action="toggle-statusline"' not in html, path.name
 
 
 def test_generate_analysis_report_uses_analyzer_pipeline(

{usage_cli-0.34.0 → usage_cli-0.34.2}/tests/test_compact_cards.py

@@ -84,7 +84,9 @@ const context = vm.createContext({
   document: {querySelector: selector => selector.includes('[data-row=')
     ? rowEl : hasCards ? {} : null},
   getComputedStyle: () => ({getPropertyValue: () => 'red'}),
-  window: {PanelHooks: {accentFallback: () => 'red', applyFillVisual() {}}},
+  window: {PanelHooks: {
+    accentFallback: () => 'red', percentColor: (accent) => accent, applyFillVisual() {},
+  }},
   colorFor: () => 'red', labels: () => ({session: 'Session'}), t: key => key,
 });
 const toggle = 'function toggle(state) { const visibleQuotaCards =' + process.argv[1] + '}';

{usage_cli-0.34.0 → usage_cli-0.34.2}/tests/test_desktop_quota_display.py

@@ -170,9 +170,8 @@ def test_desktop_quota_reaches_popover_and_tui(quota_file: Path) -> None:
         burn_rate_trackers={
             name: BurnRateTracker() for name in ("claude_session", "claude_weekly")
         },
-        today_text="",
-        yesterday_text="",
-        statusline={},
+        today_total=state_module.PeriodTotal(),
+        yesterday_total=state_module.PeriodTotal(),
         show_install_button=False,
         hide_claude=False,
         hide_codex=False,

{usage_cli-0.34.0 → usage_cli-0.34.2}/tests/test_menubar.py

@@ -180,9 +180,8 @@ def _build_popover_state(
         language=delegate.language,
         group=delegate.tracker.group(),
         burn_rate_trackers=delegate.burn_rate_trackers,
-        today_text=menubar._today_title(delegate.mock, delegate.language),
-        yesterday_text=menubar_state._yesterday_title(delegate.mock, delegate.language),
-        statusline=menubar._statusline_payload(delegate.language),
+        today_total=menubar._today_total(delegate.mock),
+        yesterday_total=menubar_state._yesterday_total(delegate.mock),
         show_install_button=(
             not hide_claude
             and outcome.state == PollState.TOKEN_ERROR
@@ -241,7 +240,8 @@ def test_format_human_time_minutes_hours_and_days() -> None:
 
 def test_format_percent() -> None:
     assert menubar._format_percent(50.0) == "50"
-    assert menubar._format_percent(50.5) == "50.5"
+    assert menubar._format_percent(50.5) == "50"
+    assert menubar._format_percent(99.7) == "99"
     assert menubar._format_percent(0.0) == "0"
 
 
@@ -310,7 +310,7 @@ def test_quota_row_formats_available_row() -> None:
 
     assert row.available is True
     assert row.percent == 50.5
-    assert row.percent_text == "50.5% 已用"
+    assert row.percent_text == "50% 已用"
     assert row.reset_text.startswith("重置 ")
     assert row.warning is False
     assert row.color == menubar.WARN_COLOR
@@ -548,11 +548,13 @@ def test_quota_row_keeps_reset_text_when_percent_is_below_warning_floor() -> Non
     assert row.reset_text == "重置 51分鐘"
 
 
-def test_today_title_mock() -> None:
-    assert menubar._today_title(mock=True, language="zh-TW") == "今日：$45.20 (50,193,442 tokens)"
+def test_today_total_mock() -> None:
+    assert menubar._today_total(mock=True) == menubar_state.PeriodTotal(
+        tokens=50_193_442, cost=45.20
+    )
 
 
-def test_today_title_returns_zero_fallback_when_loaders_fail(
+def test_today_total_returns_zero_fallback_when_loaders_fail(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     monkeypatch.setattr(
@@ -561,10 +563,10 @@ def test_today_title_returns_zero_fallback_when_loaders_fail(
         lambda *, hours_back=24: (_ for _ in ()).throw(OSError),
     )
 
-    assert menubar._today_title(mock=False, language="zh-TW") == "今日：$0.00 (0 tokens)"
+    assert menubar._today_total(mock=False) == menubar_state.PeriodTotal()
 
 
-def test_today_title_does_not_reload_codex_when_entries_are_provided(
+def test_today_total_does_not_reload_codex_when_entries_are_provided(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     entry = history_loader.UsageEntry(
@@ -585,12 +587,12 @@ def test_today_title_does_not_reload_codex_when_entries_are_provided(
         lambda *, hours_back=24: pytest.fail("Codex should already be included"),
     )
 
-    assert menubar._today_title(mock=False, language="en", entries=[entry]) == (
-        "Today: $0.01 (150 tokens)"
+    assert menubar._today_total(mock=False, entries=[entry]) == menubar_state.PeriodTotal(
+        tokens=150, cost=0.01
     )
 
 
-def test_yesterday_title_uses_provided_entries() -> None:
+def test_yesterday_total_uses_provided_entries() -> None:
     entry = history_loader.UsageEntry(
         timestamp=datetime.now(tz=UTC) - timedelta(days=1),
         session_id="codex",
@@ -605,13 +607,13 @@ def test_yesterday_title_uses_provided_entries() -> None:
         project="usage",
     )
 
-    assert menubar_state._yesterday_title(False, "en", entries=[entry]) == (
-        "Yesterday: $0.01 (150 tokens)"
+    assert menubar_state._yesterday_total(False, entries=[entry]) == menubar_state.PeriodTotal(
+        tokens=150, cost=0.01
     )
 
 
 @pytest.mark.skipif(not hasattr(time, "tzset"), reason="requires POSIX timezone control")
-def test_yesterday_title_uses_dst_specific_day_boundaries(
+def test_yesterday_total_uses_dst_specific_day_boundaries(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     class FixedDateTime(datetime):
@@ -647,8 +649,8 @@ def test_yesterday_title_uses_dst_specific_day_boundaries(
                 entry(datetime(2026, 3, 9, 4, 0, tzinfo=UTC)),
             ]
 
-            assert menubar_state._yesterday_title(False, "en", entries=entries) == (
-                "Yesterday: $0.01 (10 tokens)"
+            assert menubar_state._yesterday_total(False, entries=entries) == (
+                menubar_state.PeriodTotal(tokens=10, cost=0.01)
             )
     finally:
         if previous_tz is None:
@@ -673,9 +675,8 @@ def test_empty_state() -> None:
     assert state.projects_7d == []
     assert state.projects_30d == []
     assert state.projects_all == []
-    assert isinstance(state.statusline["enabled"], bool)
     assert state.show_install_button is False
-    assert state.yesterday_text == "Yesterday: $0.00 (0 tokens)"
+    assert state.yesterday_total == menubar_state.PeriodTotal()
 
 
 @pytest.mark.parametrize("quota_enabled", [True, False])
@@ -760,11 +761,14 @@ def test_switch_panel_menu_contains_update_items(
     ]
     assert settings[7].submenu is claude_submenu
     assert [item.title for item in claude_submenu.items] == [
+        "Sync quota via status line",
         "Side pane",
         "Beginner Mode",
         "Quota-Aware Mode",
     ]
-    pane, beginner, quota = claude_submenu.items
+    statusline, pane, beginner, quota = claude_submenu.items
+    assert statusline.action == "toggleStatusline:"
+    assert statusline.tooltip == _t("en", "statusline_sync_tooltip")
     assert pane.title == _t("en", "claude_pane_section_menu")
     assert pane.action == "toggleClaudePane:"
     assert pane.tooltip == _t("en", "claude_pane_tooltip")
@@ -1415,11 +1419,11 @@ def test_statusline_switch_survives_agy_failure(
     assert menubar._enable_statusline_settings() == 0
 
 
-def test_error_state_uses_message_and_mock_today_title() -> None:
+def test_error_state_uses_message_and_mock_today_total() -> None:
     state = menubar._error_state("boom", mock=True, language="zh-TW")
 
     assert "boom" in state.status_text
-    assert state.today_text == "今日：$45.20 (50,193,442 tokens)"
+    assert state.today_total == menubar_state.PeriodTotal(tokens=50_193_442, cost=45.20)
 
 
 def test_popover_size_has_positive_dimensions() -> None:
@@ -2447,7 +2451,7 @@ def test_apply_codex_refresh_result_updates_quota_before_full_refresh(
     assert delegate.codex_5h_pct == 18.5
     assert delegate.codex_model == "gpt-test"
     assert controller.calls == [delegate.latest_state]
-    assert button.titles[-1].endswith("18.5%")
+    assert button.titles[-1].endswith("18%")
 
 
 def test_refresh_error_preserves_codex_quota(monkeypatch: pytest.MonkeyPatch) -> None:
@@ -2601,7 +2605,7 @@ def test_refresh_error_preserves_project_usage(monkeypatch: pytest.MonkeyPatch)
     assert state.projects_7d == [("Eric-Tools", 165, 0.01)]
     assert state.projects_30d == [("Eric-Tools", 165, 0.01)]
     assert state.projects_all == [("Eric-Tools", 165, 0.01)]
-    assert "165 tokens" in state.today_text
+    assert state.today_total.tokens == 165
 
 
 def test_refresh_success_builds_popover_state_and_pings_window_keeper(
@@ -2653,11 +2657,6 @@ def test_refresh_success_builds_popover_state_and_pings_window_keeper(
         lambda reset_at, percent, source, mock: pings.append((reset_at, percent, source, mock)),
     )
     monkeypatch.setattr(agy_window_keeper, "maybe_ping", lambda *args: None)
-    monkeypatch.setattr(
-        menubar_state,
-        "_statusline_payload",
-        lambda language: {"enabled": False, "language": language},
-    )
 
     class Delegate:
         mock = False
@@ -3378,7 +3377,6 @@ def test_refresh_preserves_muse_on_success_and_fetch_error(
         "get_service_status",
         lambda config: ServiceStatus(config.service_name, False, "operational", "", "cache"),
     )
-    monkeypatch.setattr(state, "_statusline_payload", lambda _language: {})
     monkeypatch.setattr("quota.codex_window_keeper.maybe_ping", lambda _mock: None)
     monkeypatch.setattr("quota.agy_window_keeper.maybe_ping", lambda *_args: None)