Sync upstream 0.11.5 into Codex-first fork

Author: ericweichun

.github/ISSUE_TEMPLATE/bug_report.md

@@ -23,7 +23,13 @@ labels: bug
 
 **Logs**
 Run with `USAGE_DEBUG=1 python3 main.py` and paste any warnings here.
-Redact paths or identifiers as needed.
+
+> ⚠️ **Privacy**: usage reads files under `~/.claude/` and `~/.codex/`. **Do not paste**:
+> - the contents of `~/.claude/usage-status.json` or any `tt-status.json` / `usag-status.json`
+> - any `~/.codex/sessions/**/*.jsonl` (these may include prompts, project names, and absolute paths)
+> - absolute paths, project / repo names, session IDs, or cost figures
+>
+> Trim to the smallest snippet that reproduces the issue. When in doubt, replace identifiers with `<redacted>`.
 
 ```
 

.github/workflows/check.yml

@@ -13,9 +13,9 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
 
-      - uses: astral-sh/setup-uv@v6
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6
 
       - run: uv python install 3.13
 

CHANGELOG.en.md

@@ -11,6 +11,19 @@ Format follows [Keep a Changelog](https://keepachangelog.com/).
 - **README now frames this fork more clearly as Codex-first**: clarified Codex as the primary path, Claude Code as optional, and documented the Project Usage all-time range.
 - **Reports now default to all-time**: the popover Analyze button and `usage_cli.py report` now generate all-data reports by default; use `--last30` in the CLI for the previous rolling 30-day range.
 
+## [0.11.5+codex.1] - 2026-05-27
+
+### Changed
+- **Version base now matches upstream 0.11.5**: this fork build now uses `0.11.5+codex.1`, bringing over upstream v0.11.5 language detection, report opening, docs, and privacy fixes while preserving Codex-first behavior.
+- **Added the GitHub Pages landing page**: synced upstream's multilingual landing page and latest panel screenshots, then retargeted it to `ericweichun/usage` and Codex-first messaging.
+- **Popover labels now match upstream wording**: "Analyze" is now "Report", and "CLI" is now "Terminal".
+
+### Fixed
+- **Reports follow the app language**: menubar now passes the active UI language into the HTML report renderer.
+- **statusLine update hints no longer pollute status JSON**: update hints are appended only when rendering statusLine text, avoiding accidental text in the JSON payload read by the app.
+- **Language detection is centralized through `usage_lang.detect_lang()`**: `.app` launches from Finder / launchd now honor macOS preferred languages.
+- **Privacy and CI hygiene**: issue templates now warn against pasting `~/.codex/sessions/**/*.jsonl` or Claude status files; CI actions are pinned by SHA; an unused Antigravity icon asset was removed.
+
 ## [0.11.4+codex.2] - 2026-05-26
 
 ### Fixed

CHANGELOG.md

@@ -10,6 +10,19 @@
 - **README 改成更明確的 Codex-first fork 說明**：補清楚 Codex 是主要流程、Claude Code 是可選整合，並同步 Project Usage 的 all-time range。
 - **Report 預設改為 all-time**：popover 的「分析」與 `usage_cli.py report` 現在預設產生全部資料報告；CLI 需要近 30 天時可使用 `--last30`。
 
+## [0.11.5+codex.1] - 2026-05-27
+
+### 變更
+- **版本基底對齊 upstream 0.11.5**：fork build 改用 `0.11.5+codex.1`，同步 upstream v0.11.5 的語言偵測、report 開啟與文件/隱私修正，同時保留 Codex-first 行為。
+- **新增 GitHub Pages landing page**：同步 upstream 的多語介紹頁與最新面板截圖，並改成 `ericweichun/usage` 與 Codex-first 文案。
+- **Popover 文案同步 upstream**：「分析」改為「報告」，「CLI」改為「終端」，更貼近實際功能。
+
+### 修正
+- **Report 語言跟隨 app 語言**：menubar 產生 HTML report 時會把目前 UI 語言傳入 report renderer。
+- **statusLine update hint 不再污染狀態 JSON**：只有真正渲染 statusLine 文字時才附加新版提示，避免寫入給 app 讀的 JSON payload。
+- **語言偵測共用 `usage_lang.detect_lang()`**：Finder / launchd 啟動 `.app` 時也會依 macOS preferred languages 判定語言。
+- **隱私與 CI hygiene**：issue template 明確提醒不要貼上 `~/.codex/sessions/**/*.jsonl` 或 Claude 狀態檔；CI actions 改 pin SHA；移除未使用的 Antigravity icon asset。
+
 ## [0.11.4+codex.2] - 2026-05-26
 
 ### 修正

README.en.md

@@ -8,7 +8,9 @@
 [![Platform](https://img.shields.io/badge/platform-macOS-lightgrey.svg)](https://www.apple.com/macos/)
 [![License: AGPL-3.0](https://img.shields.io/badge/license-AGPL--3.0-blue.svg)](LICENSE)
 
-`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 Analyze to generate an all-time HTML report.
+🌐 **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.
 
 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."
 
@@ -125,7 +127,7 @@ After the hook is installed and Claude Code is restarted, the bottom of the Clau
   <img src="docs/statusline.en.png" alt="Claude Code statusLine display (English)" width="640">
 </p>
 
-To toggle the statusLine on / off later (e.g. you want to see Claude Code's native status line), click the **CLI ✓** button in the menubar popover's "Projects" section toolbar — no need to run `--unsetup` / `--setup` again.
+To toggle the statusLine on / off later (e.g. you want to see Claude Code's native status line), click the **Terminal ✓** button in the menubar popover's "Projects" section toolbar — no need to run `--unsetup` / `--setup` again.
 
 ## Download
 
@@ -225,7 +227,7 @@ Press `Ctrl+C` to exit.
 
 ## Reports and deep analytics
 
-Beyond the menu bar and TUI, the popover's **Analyze** 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 **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:
 
 <p align="center">
   <img src="docs/report.en.png" alt="HTML report screen: Your AI Usage Recap" width="520">

README.md

@@ -8,7 +8,9 @@
 [![Platform](https://img.shields.io/badge/platform-macOS-lightgrey.svg)](https://www.apple.com/macos/)
 [![License: AGPL-3.0](https://img.shields.io/badge/license-AGPL--3.0-blue.svg)](LICENSE)
 
-`usage` 是一個 macOS menu bar（螢幕右上角的選單列）小工具，把 **Codex** 的用量釘在你的螢幕右上角，並保留 **Claude Code** 作為可選整合。點開可以看到 Session、Weekly、各專案用量（今日 / 7 日 / 月 / 全部），以及今日 token 用量與成本估算；按「分析」會產生 all-time HTML report。
+🌐 **介紹頁**：[ericweichun.github.io/usage](https://ericweichun.github.io/usage/)
+
+`usage` 是一個 macOS menu bar（螢幕右上角的選單列）小工具，把 **Codex** 的用量釘在你的螢幕右上角，並保留 **Claude Code** 作為可選整合。點開可以看到 Session、Weekly、各專案用量（今日 / 7 日 / 月 / 全部），以及今日 token 用量與成本估算；按「報告」會產生 all-time HTML report。
 
 不呼叫 Anthropic / OpenAI 的 API（接口）、也不讀 Keychain（macOS 內建的密碼保險箱），所以不會發生「自己每分鐘 ping 一次也算用量」這種事。
 
@@ -125,7 +127,7 @@ ln -s $(brew --prefix)/Cellar/usage/$(brew list --versions usage | awk '{print $
   <img src="docs/statusline.png" alt="Claude Code statusLine 顯示樣式（繁中）" width="640">
 </p>
 
-裝完之後，若想隨時關掉 / 重裝 statusLine（例如想看看 Claude Code 原本的狀態列），可以從 menubar popover 的「專案」section 工具列點 **CLI ✓** 按鈕一鍵切換 —— 不需要再跑 `--unsetup` / `--setup`。
+裝完之後，若想隨時關掉 / 重裝 statusLine（例如想看看 Claude Code 原本的狀態列），可以從 menubar popover 的「專案」section 工具列點 **終端 ✓** 按鈕一鍵切換 —— 不需要再跑 `--unsetup` / `--setup`。
 
 ## 拿到原始碼
 
@@ -227,7 +229,7 @@ python3 main.py --tui
 
 ## 報告與深度分析
 
-除了選單列跟 TUI，popover 裡的「分析」按鈕會直接產生 **all-time HTML report**。如果你想指定時間範圍，也可以用 CLI 進入點 `usage_cli.py` 匯出 HTML 報告、或在終端機開互動式 dashboard（儀表板，互動式統計面板）：
+除了選單列跟 TUI，popover 裡的「報告」按鈕會直接產生 **all-time HTML report**。如果你想指定時間範圍，也可以用 CLI 進入點 `usage_cli.py` 匯出 HTML 報告、或在終端機開互動式 dashboard（儀表板，互動式統計面板）：
 
 <p align="center">
   <img src="docs/report.png" alt="HTML 報告畫面：你的 AI 用量回顧" width="520">