Align report range defaults with project selection

Author: ericweichun

README.en.md

@@ -10,7 +10,7 @@
 
 🌐 **Landing page**: [ericweichun.github.io/usage](https://ericweichun.github.io/usage/)
 
-`usage` is a macOS menu bar tool that pins your **Codex** usage to the top-right of your screen, while keeping **Claude Code** as an optional integration. Click the icon for a popover showing Session, Weekly, per-project usage (today / 7-day / monthly / all-time), and today's token usage and cost estimate; click Report to generate an all-time HTML report.
+`usage` is a macOS menu bar tool that pins your **Codex** usage to the top-right of your screen, while keeping **Claude Code** as an optional integration. Click the icon for a popover showing Session, Weekly, per-project usage (today / 7-day / monthly / all-time), and today's token usage and cost estimate; click Report for a last-30-days HTML report, or switch Project Usage to All Time before reporting to generate an all-time report.
 
 It **never calls the Anthropic / OpenAI API** and **never reads the Keychain**, so it avoids the observer effect of "pinging once a minute counts as usage."
 
@@ -229,7 +229,7 @@ Press `Ctrl+C` to exit.
 
 ## Reports and deep analytics
 
-Beyond the menu bar and TUI, the popover's **Report** button generates an **all-time HTML report**. If you want a specific range, the `usage_cli.py` analytics entrypoint can export HTML reports or run an interactive terminal dashboard:
+Beyond the menu bar and TUI, the popover's **Report** button generates an HTML report: All Time project range generates an all-time report, while the other project ranges keep the report on the last 30 days. The `usage_cli.py` analytics entrypoint can also export HTML reports for explicit ranges or run an interactive terminal dashboard:
 
 <p align="center">
   <img src="docs/report.en.png" alt="HTML report screen: Your AI Usage Recap" width="520">
@@ -245,7 +245,7 @@ python3 usage_cli.py
 python3 usage_cli.py claude
 python3 usage_cli.py codex
 
-# Generate an HTML report and open it in your default browser (default range: all data)
+# Generate an HTML report and open it in your default browser (default range: last 30 days)
 python3 usage_cli.py report
 python3 usage_cli.py report --last30            # last 30 days
 python3 usage_cli.py report --today              # today

README.md

@@ -10,7 +10,7 @@
 
 🌐 **介紹頁**：[ericweichun.github.io/usage](https://ericweichun.github.io/usage/)
 
-`usage` 是一個 macOS menu bar（螢幕右上角的選單列）小工具，把 **Codex** 的用量釘在你的螢幕右上角，並保留 **Claude Code** 作為可選整合。點開可以看到 Session、Weekly、各專案用量（今日 / 7 日 / 月 / 全部），以及今日 token 用量與成本估算；按「報告」會產生 all-time HTML report。
+`usage` 是一個 macOS menu bar（螢幕右上角的選單列）小工具，把 **Codex** 的用量釘在你的螢幕右上角，並保留 **Claude Code** 作為可選整合。點開可以看到 Session、Weekly、各專案用量（今日 / 7 日 / 月 / 全部），以及今日 token 用量與成本估算；按「報告」預設會產生近 30 天 HTML report，只有專案用量切到「全部」時才產生 all-time report。
 
 不呼叫 Anthropic / OpenAI 的 API（接口）、也不讀 Keychain（macOS 內建的密碼保險箱），所以不會發生「自己每分鐘 ping 一次也算用量」這種事。
 
@@ -231,7 +231,7 @@ python3 main.py --tui
 
 ## 報告與深度分析
 
-除了選單列跟 TUI，popover 裡的「報告」按鈕會直接產生 **all-time HTML report**。如果你想指定時間範圍，也可以用 CLI 進入點 `usage_cli.py` 匯出 HTML 報告、或在終端機開互動式 dashboard（儀表板，互動式統計面板）：
+除了選單列跟 TUI，popover 裡的「報告」按鈕會產生 HTML report：專案用量切到「全部」時產生 **all-time HTML report**，其他範圍維持近 30 天 report。你也可以用 CLI 進入點 `usage_cli.py` 指定時間範圍、或在終端機開互動式 dashboard（儀表板，互動式統計面板）：
 
 <p align="center">
   <img src="docs/report.png" alt="HTML 報告畫面：你的 AI 用量回顧" width="520">
@@ -247,7 +247,7 @@ python3 usage_cli.py
 python3 usage_cli.py claude
 python3 usage_cli.py codex
 
-# 產生 HTML 報告並用預設瀏覽器打開（預設範圍：全部資料）
+# 產生 HTML 報告並用預設瀏覽器打開（預設範圍：近 30 天）
 python3 usage_cli.py report
 python3 usage_cli.py report --last30            # 近 30 天
 python3 usage_cli.py report --today              # 今日

menubar.py

@@ -427,7 +427,6 @@ def uninstallStatusline_(self, sender: Any) -> None:
     def analyzeUsage_(self, sender: Any) -> None:
         thread = threading.Thread(
             target=self._analyze_usage_in_background,
-            args=("all",),
             daemon=True,
         )
         thread.start()

tests/test_analyzer_pipeline.py

@@ -77,7 +77,9 @@ def fake_save_and_open(received_data: dict[str, object]) -> str:
     assert calls == {"agents": agents, "period": "last30", "data": report_data}
 
 
-def test_app_analyze_uses_all_time_report(monkeypatch: Any) -> None:
+def test_app_analyze_uses_last30_by_default_and_all_time_when_requested(
+    monkeypatch: Any,
+) -> None:
     calls: list[str] = []
 
     class InlineThread:
@@ -102,7 +104,7 @@ def fake_generate_analysis_report(
         language: str | None = None,
     ) -> str:
         calls.append(period)
-        return "~/.usage-reports/all.html"
+        return "~/.usage-reports/report.html"
 
     monkeypatch.setattr(
         menubar,
@@ -116,8 +118,9 @@ def fake_generate_analysis_report(
     )
 
     delegate.analyzeUsage_(None)
+    delegate.analyzeAllUsage_(None)
 
-    assert calls == ["all"]
+    assert calls == ["last30", "all"]
 
 
 def test_last30_report_uses_rolling_720_hours(monkeypatch: Any) -> None:

tests/test_usage_cli.py

@@ -91,11 +91,12 @@ def test_main_daily_sort_flag_controls_render_order(monkeypatch: pytest.MonkeyPa
 @pytest.mark.parametrize(
     ("argv", "expected_period"),
     [
-        (["usage", "report"], "all"),
+        (["usage", "report"], "last30"),
         (["usage", "report", "--last30"], "last30"),
+        (["usage", "report", "--all"], "all"),
     ],
 )
-def test_main_report_defaults_to_all_time(
+def test_main_report_parses_period(
     monkeypatch: pytest.MonkeyPatch,
     argv: list[str],
     expected_period: str,

usage_cli.py

@@ -26,13 +26,13 @@
     "output": ("output_tokens", True),
 }
 
-REPORT_HELP = """Usage: usage report [--all|--last30|--today|--week|--month] [--out PATH]
+REPORT_HELP = """Usage: usage report [--last30|--all|--today|--week|--month] [--out PATH]
 
 Generate an HTML usage report.
 
 Options:
-  --all       Include all usage data (default)
-  --last30    Include the last 30 days
+  --last30    Include the last 30 days (default)
+  --all       Include all usage data
   --today     Include today only
   --week      Include this week
   --month     Include this month
@@ -64,7 +64,7 @@ def _parse_sort_args(args: list[str]) -> tuple[list[str], str | None, bool]:
 
 
 def _parse_report_args(args: list[str]) -> tuple[str, str | None, bool]:
-    period = "all"
+    period = "last30"
     out_path = None
     show_help = False
     i = 0