feat: drop WSL and multi-language support

chore: bump version to 0.4.1
fix(update): use self-replace for portable updates
2026-09-08 20:19:52 +00:00 · 2026-06-02 16:32:21 +07:00 · 2026-06-02 15:52:03 +07:00 · 2026-06-02 15:50:45 +07:00 · 2026-06-02 15:11:26 +07:00 · 2026-06-02 15:09:50 +07:00
40 changed files with 2840 additions and 1086 deletions
@@ -8,6 +8,12 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 [[package]]
 name = "anyhow"
 version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 [[package]]
 name = "arrayref"
 version = "0.3.9"
@@ -26,6 +32,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 [[package]]
 name = "bitflags"
 version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -59,18 +71,18 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 [[package]]
 name = "claude-code-usage-bubble"
-version = "0.1.14"
+version = "0.5.0"
 dependencies = [
 "dirs",
 "embed-resource",
 "log",
 "self-replace",
 "serde",
 "serde_json",
 "sha2",
 "simplelog",
 "thiserror",
 "tiny-skia",
 "toml 0.8.23",
 "windows",
 ]
@@ -151,7 +163,7 @@ dependencies = [
 "cc",
 "memchr",
 "rustc_version",
- "toml 1.1.2+spec-1.1.0",
+ "toml",
 "vswhom",
 "winreg",
 ]
@@ -162,6 +174,22 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 [[package]]
 name = "errno"
 version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
 "libc",
 "windows-sys 0.61.2",
 ]
 [[package]]
 name = "fastrand"
 version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 [[package]]
 name = "fdeflate"
 version = "0.3.7"
@@ -187,6 +215,12 @@ dependencies = [
 "miniz_oxide",
 ]
 [[package]]
 name = "foldhash"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -208,12 +242,46 @@ dependencies = [
 "wasi",
 ]
 [[package]]
 name = "getrandom"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
 dependencies = [
 "cfg-if",
 "libc",
 "r-efi",
 "wasip2",
 "wasip3",
 ]
 [[package]]
 name = "hashbrown"
 version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
 "foldhash",
 ]
 [[package]]
 name = "hashbrown"
 version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 [[package]]
 name = "heck"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 [[package]]
 name = "id-arena"
 version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
 [[package]]
 name = "indexmap"
 version = "2.14.0"
@@ -221,7 +289,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
 "equivalent",
- "hashbrown",
+ "hashbrown 0.17.1",
 "serde",
 "serde_core",
 ]
 [[package]]
@@ -230,6 +300,12 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 [[package]]
 name = "leb128fmt"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
 [[package]]
 name = "libc"
 version = "0.2.186"
@@ -245,6 +321,12 @@ dependencies = [
 "libc",
 ]
 [[package]]
 name = "linux-raw-sys"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 [[package]]
 name = "log"
 version = "0.4.29"
@@ -282,6 +364,12 @@ dependencies = [
 "libc",
 ]
 [[package]]
 name = "once_cell"
 version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -294,7 +382,7 @@ version = "0.17.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "crc32fast",
 "fdeflate",
 "flate2",
@@ -307,6 +395,16 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 [[package]]
 name = "prettyplease"
 version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 dependencies = [
 "proc-macro2",
 "syn",
 ]
 [[package]]
 name = "proc-macro2"
 version = "1.0.106"
@@ -325,13 +423,19 @@ dependencies = [
 "proc-macro2",
 ]
 [[package]]
 name = "r-efi"
 version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 [[package]]
 name = "redox_users"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.17",
 "libredox",
 "thiserror",
 ]
@@ -345,6 +449,30 @@ dependencies = [
 "semver",
 ]
 [[package]]
 name = "rustix"
 version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
 "bitflags 2.11.1",
 "errno",
 "libc",
 "linux-raw-sys",
 "windows-sys 0.61.2",
 ]
 [[package]]
 name = "self-replace"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03ec815b5eab420ab893f63393878d89c90fdd94c0bcc44c07abb8ad95552fb7"
 dependencies = [
 "fastrand",
 "tempfile",
 "windows-sys 0.52.0",
 ]
 [[package]]
 name = "semver"
 version = "1.0.28"
@@ -394,15 +522,6 @@ dependencies = [
 "zmij",
 ]
 [[package]]
 name = "serde_spanned"
 version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
 dependencies = [
 "serde",
 ]
 [[package]]
 name = "serde_spanned"
 version = "1.1.1"
@@ -463,6 +582,19 @@ dependencies = [
 "unicode-ident",
 ]
 [[package]]
 name = "tempfile"
 version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
 "fastrand",
 "getrandom 0.4.2",
 "once_cell",
 "rustix",
 "windows-sys 0.61.2",
 ]
 [[package]]
 name = "termcolor"
 version = "1.4.1"
@@ -551,18 +683,6 @@ dependencies = [
 "strict-num",
 ]
 [[package]]
 name = "toml"
 version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
 "serde",
 "serde_spanned 0.6.9",
 "toml_datetime 0.6.11",
 "toml_edit",
 ]
 [[package]]
 name = "toml"
 version = "1.1.2+spec-1.1.0"
@@ -571,20 +691,11 @@ checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
 dependencies = [
 "indexmap",
 "serde_core",
- "serde_spanned 1.1.1",
+ "serde_spanned",
- "toml_datetime 1.1.1+spec-1.1.0",
+ "toml_datetime",
 "toml_parser",
 "toml_writer",
- "winnow 1.0.3",
+ "winnow",
 ]
 [[package]]
 name = "toml_datetime"
 version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
 dependencies = [
 "serde",
 ]
 [[package]]
@@ -596,35 +707,15 @@ dependencies = [
 "serde_core",
 ]
 [[package]]
 name = "toml_edit"
 version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
 "indexmap",
 "serde",
 "serde_spanned 0.6.9",
 "toml_datetime 0.6.11",
 "toml_write",
 "winnow 0.7.15",
 ]
 [[package]]
 name = "toml_parser"
 version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
- "winnow 1.0.3",
+ "winnow",
 ]
 [[package]]
 name = "toml_write"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
 [[package]]
 name = "toml_writer"
 version = "1.1.1+spec-1.1.0"
@@ -643,6 +734,12 @@ version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 [[package]]
 name = "unicode-xid"
 version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -675,6 +772,58 @@ version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 [[package]]
 name = "wasip2"
 version = "1.0.3+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
 dependencies = [
 "wit-bindgen 0.57.1",
 ]
 [[package]]
 name = "wasip3"
 version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 dependencies = [
 "wit-bindgen 0.51.0",
 ]
 [[package]]
 name = "wasm-encoder"
 version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
 dependencies = [
 "leb128fmt",
 "wasmparser",
 ]
 [[package]]
 name = "wasm-metadata"
 version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
 dependencies = [
 "anyhow",
 "indexmap",
 "wasm-encoder",
 "wasmparser",
 ]
 [[package]]
 name = "wasmparser"
 version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
 "bitflags 2.11.1",
 "hashbrown 0.15.5",
 "indexmap",
 "semver",
 ]
 [[package]]
 name = "winapi-util"
 version = "0.1.11"
@@ -754,6 +903,15 @@ dependencies = [
 "windows-targets",
 ]
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
 "windows-targets",
 ]
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
@@ -836,15 +994,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 [[package]]
 name = "winnow"
 version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
 dependencies = [
 "memchr",
 ]
 [[package]]
 name = "winnow"
 version = "1.0.3"
@@ -861,6 +1010,100 @@ dependencies = [
 "windows-sys 0.59.0",
 ]
 [[package]]
 name = "wit-bindgen"
 version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
 dependencies = [
 "wit-bindgen-rust-macro",
 ]
 [[package]]
 name = "wit-bindgen"
 version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 [[package]]
 name = "wit-bindgen-core"
 version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
 dependencies = [
 "anyhow",
 "heck",
 "wit-parser",
 ]
 [[package]]
 name = "wit-bindgen-rust"
 version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
 dependencies = [
 "anyhow",
 "heck",
 "indexmap",
 "prettyplease",
 "syn",
 "wasm-metadata",
 "wit-bindgen-core",
 "wit-component",
 ]
 [[package]]
 name = "wit-bindgen-rust-macro"
 version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
 dependencies = [
 "anyhow",
 "prettyplease",
 "proc-macro2",
 "quote",
 "syn",
 "wit-bindgen-core",
 "wit-bindgen-rust",
 ]
 [[package]]
 name = "wit-component"
 version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
 "anyhow",
 "bitflags 2.11.1",
 "indexmap",
 "log",
 "serde",
 "serde_derive",
 "serde_json",
 "wasm-encoder",
 "wasm-metadata",
 "wasmparser",
 "wit-parser",
 ]
 [[package]]
 name = "wit-parser"
 version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
 dependencies = [
 "anyhow",
 "id-arena",
 "indexmap",
 "log",
 "semver",
 "serde",
 "serde_derive",
 "serde_json",
 "unicode-xid",
 "wasmparser",
 ]
 [[package]]
 name = "zmij"
 version = "1.0.21"
@@ -1,6 +1,6 @@
 [package]
 name = "claude-code-usage-bubble"
-version = "0.1.14"
+version = "0.5.0"
 edition = "2021"
 license = "Apache-2.0"
 description = "Floating bubble showing Claude Code and Codex usage on Windows"
@@ -14,9 +14,9 @@ dirs = "6"
 log = "0.4"
 simplelog = "0.12"
 thiserror = "2"
 toml = "0.8"
 tiny-skia = "0.11"
 sha2 = "0.10"
 self-replace = "1.5"
 [dependencies.windows]
 version = "0.58"
@@ -18,7 +18,7 @@ which solves the same "how close am I to the Claude Code limit?" problem
 with a horizontal taskbar widget. This project takes the UX in a different
 direction — a floating, draggable circular bubble that the user can place
 anywhere on screen — and is a clean-room implementation: the HTTP client,
-provider polling, credential discovery, localisation, tray rendering, and
+provider polling, credential discovery, tray rendering, and
 self-updater are all written from scratch against the same public APIs
 (Anthropic, ChatGPT, GitHub Releases).
@@ -28,24 +28,22 @@ self-updater are all written from scratch against the same public APIs
  Codex usage as a percentage and a colored progress ring
 - Drag anywhere — the bubble snaps to monitor work-area edges when
  released
- Resize with `Ctrl + MouseWheel` on the bubble (32–128 pixels)
+- Resize with `Ctrl + MouseWheel` on the bubble, or use **Controls** →
  **Make smaller / Make larger / Reset size** from the right-click menu
  (140–360 logical pixels)
 - Left-click the bubble for an expanded panel with both **5h** and **7d**
  bars plus reset countdowns
- Right-click for refresh, displayed models, update frequency, language,
+- Right-click for refresh, displayed providers, update frequency, startup,
-  startup, updates, exit
+  updates, exit
- Optional system tray icons (one per enabled model)
+- Optional system tray icons (one per enabled provider)
 - Auto-hide when a fullscreen app is in the foreground (games, video,
  presentations) — reappears when you leave fullscreen
 ## Who this is for
 Windows 10/11 users who already have **Claude Code (CLI or App) installed
-and signed in**. Codex support is optional — install and sign in to the
+and signed in on Windows**. Codex support is optional — install and sign in
-Codex CLI, then enable Codex from the right-click **Models** menu.
+to the Codex CLI, then enable Codex from the right-click **Providers** menu.
 If you use Claude Code through WSL, that is supported too. The monitor
 can read your Claude Code credentials from Windows or from your WSL
 environment.
 ## Requirements
@@ -83,22 +81,26 @@ corner of your primary monitor on first launch. Drag it where you want it,
 release to snap to the nearest edge if you let go close to one.
 - **Left-click** the bubble to open the expanded panel (5h + 7d + countdowns)
- **Right-click** for refresh, models, refresh frequency, language, "Start
+- **Right-click** for refresh, providers, refresh frequency, "Start with
-  with Windows", auto-update check (Disabled / Hourly / Daily / Weekly),
+  Windows", controls, auto-update check (Disabled / Hourly / Daily / Weekly),
  manual "Check for updates", exit
 - **Drag** anywhere — it floats on top of all other windows
- **Ctrl + MouseWheel** on the bubble to resize it
+- **Ctrl + MouseWheel** on the bubble, or **Controls** in the right-click
  menu, to resize it
 - **Tray icon** (if enabled): left-click toggles the bubble visibility,
  right-click opens the same menu
-### Models
+### Providers
-Use the right-click **Models** menu to choose what is shown:
+Use the right-click **Providers** menu to choose what is shown:
 - **Claude Code** is enabled by default
 - **Codex** can be enabled alongside Claude Code or shown by itself
 - **OpenCode Go** is listed for future support; usage bars remain disabled
  until OpenCode exposes a stable quota source or console integration is
  explicitly enabled
-When both models are shown, each gets its own bubble that you can position
+When multiple providers are shown, each gets its own bubble that you can position
 independently.
 ## Diagnostics
@@ -124,7 +126,6 @@ Settings are saved to:
 What the app reads:
 - Your local Claude Code OAuth credentials from `~/.claude/.credentials.json`
 - If needed, the same credentials file inside an installed WSL distro
 - If Codex is enabled, your local Codex credentials from `$CODEX_HOME/auth.json`
  or `~/.codex/auth.json`
@@ -139,9 +140,8 @@ What the app stores locally:
 - Bubble position(s) per model
 - Bubble size
 - Polling frequency
 - Language preference
 - Last update check time
- Displayed model preferences
+- Displayed provider preferences
 What it does **not** do: send credentials to any third-party server, run a
 backend service, collect analytics, upload your project files, or write to
@@ -0,0 +1,57 @@
 ---
 phase: 1
 title: "Lock geometry"
 status: pending
 priority: P1
 effort: "45m"
 dependencies: []
 ---
 # Phase 1: Lock geometry
 ## Overview
 Define the tail layout contract in `compute_bubble_layout` so both rows consume the same horizontal geometry and differ only in vertical placement and bar height.
 ## Requirements
 - Functional: percent text and countdown text appear after the bar, not inside it.
 - Functional: `tail_usage_bar_rect.left/right == tail_time_bar_rect.left/right`.
 - Functional: `tail_usage_pct_rect.left/right == tail_time_text_rect.left/right`.
 - Non-functional: preserve the 140-360 logical size behavior and the minimum bar-width guard.
 - Non-functional: no new renderer inputs from `src/app.rs`.
 ## Architecture
 - Data flow: `src/app.rs:639-655` -> `bubble::update_data` -> `PaintInputs` -> `compute_bubble_layout` -> `paint_bubble_pixmap` / `paint_bubble_text`.
 - Geometry source of truth: shared `text_w`, `text_left`, `bar_left`, and `bar_right` in `src/bubble.rs:1114-1126`.
 - Current rect assignment already fans those shared values into both tail rows at `src/bubble.rs:1141-1163`.
 ## Related Code Files
 - Modify: `src/bubble.rs`
 - Read-only check: `src/app.rs`
 ## Implementation Steps
 1. Re-verify the live mismatch before changing code; the current source already shares bar and text columns.
 2. Make the target contract explicit in `compute_bubble_layout`: one shared bar lane, one shared text lane, row-specific `top/bottom` only.
 3. Preserve `bar_min` fallback so long countdowns shrink text first, not bar width below usability.
 4. Keep bar-height asymmetry unless the user confirms that equal thickness is also required.
 ## Todo List
 - [ ] Confirm whether the bug is still reproducible on `main`.
 - [ ] Document the target geometry near `compute_bubble_layout`.
 - [ ] Ensure no later row-specific width override remains.
 ## Success Criteria
 - [ ] Both tail bars have identical `left/right` bounds.
 - [ ] Both tail texts start at the same `left` and end at the same `right`.
 - [ ] No upstream data-contract change is required.
 ## Risk Assessment
 - High: the source may already satisfy the request; unnecessary edits would add churn. Mitigation: prove the runtime mismatch first.
 - Medium: long localized countdown strings can starve bar width at minimum size. Mitigation: keep `bar_min` and shared fallback math.
 - Rollback: revert only the `compute_bubble_layout` diff.
 ## Security Considerations
 - None beyond normal memory-safety review; change is layout-only.
 ## Next Steps
 - Hand off the shared-geometry contract to Phase 2 for text painting and stale-comment cleanup.
@@ -0,0 +1,57 @@
 ---
 phase: 2
 title: "Apply renderer change"
 status: pending
 priority: P2
 effort: "45m"
 dependencies: [1]
 ---
 # Phase 2: Apply renderer change
 ## Overview
 Apply the tail text-placement change in the renderer so the weekly percent lane and weekly remaining-time lane follow the same `bar -> text` behavior, without changing provider or state plumbing.
 ## Requirements
 - Functional: weekly percent text renders from `tail_usage_pct_rect`; weekly countdown renders from `tail_time_text_rect`.
 - Functional: both texts stay right-aligned after the bar using `DT_RIGHT`.
 - Functional: no tail text is drawn inside the bar fill.
 - Non-functional: preserve the existing pulse behavior for `weekly_pct >= 95`.
 - Non-functional: avoid touching `PaintInputs`, polling, or panel code unless a stale comment must be corrected.
 ## Architecture
 - Bar drawing is tiny-skia-only in `src/bubble.rs:1298-1331`.
 - Tail text drawing is a later GDI overlay in `src/bubble.rs:1643-1661`.
 - `src/app.rs:636-638` currently describes the bubble percent as inline in the bar fill; if that wording is now false, correct it in the same phase.
 ## Related Code Files
 - Modify: `src/bubble.rs`
 - Optional modify: `src/app.rs`
 ## Implementation Steps
 1. Align `paint_bubble_text` with the Phase 1 geometry contract and keep the percent/countdown text outside the bars.
 2. Remove any remaining inline-percent assumption in comments or naming if it conflicts with the final behavior.
 3. Keep the weekly percent highlight behavior and empty-countdown handling intact.
 4. Stop scope creep: no changes to provider snapshots, update timers, or panel layout.
 ## Todo List
 - [ ] Confirm `paint_bubble_text` is the only text-placement site for the tail rows.
 - [ ] Update or remove stale inline-bar comments if they become misleading.
 - [ ] Re-check placeholder and `None` states after the layout change.
 ## Success Criteria
 - [ ] Weekly percent text appears after the top tail bar.
 - [ ] Weekly countdown text appears after the bottom tail bar.
 - [ ] Tail bar widths are driven only by shared geometry from `compute_bubble_layout`.
 ## Risk Assessment
 - Medium: if the reported mismatch is only visual perception from unequal bar heights, text-placement edits alone will not fix it. Mitigation: compare runtime screenshots before and after Phase 1.
 - Low: optional comment cleanup in `src/app.rs` can drift from renderer reality. Mitigation: change comments only after the final behavior is locked.
 - Rollback: revert only the text-placement and comment diffs.
 ## Security Considerations
 - None; no auth, network, or filesystem behavior changes.
 ## Next Steps
 - Hand off to Phase 3 for compile checks and Windows visual verification.
@@ -0,0 +1,64 @@
 ---
 phase: 3
 title: "Validate on Windows"
 status: pending
 priority: P2
 effort: "30m"
 dependencies: [2]
 ---
 # Phase 3: Validate on Windows
 ## Overview
 Verify that the scoped renderer change compiles and that the native layered-window bubble actually presents equal-width tail bars with text after each bar across common runtime conditions.
 ## Requirements
 - Functional: both tail rows visually render as `bar -> text`.
 - Functional: both tail bars have the same visible width.
 - Non-functional: confirm no regression to head ring, head text, or tray/panel refresh behavior.
 - Non-functional: validation stays command-light and uses the existing Windows runtime.
 ## Architecture
 - Compile-time validation covers the Rust renderer path end to end.
 - Runtime validation must observe the real layered window because there are no snapshot/golden tests for `tiny-skia + GDI` composition in this repo.
 ## Related Code Files
 - Verify: `src/bubble.rs`
 - Verify if touched: `src/app.rs`
 ## Implementation Steps
 1. Run the compile/test commands below.
 2. Launch the app and verify the bubble at 140, default, and max logical sizes.
 3. Check light and dark theme, Claude and Codex bubbles, and a long countdown string if available.
 4. Capture before/after notes so a no-op or perception-only result is explicit.
 ## Validation Commands
 ```powershell
 cargo check
 cargo test
 cargo run
 ```
 ## Todo List
 - [ ] `cargo check` passes.
 - [ ] `cargo test` passes, or any pre-existing failures are called out separately.
 - [ ] Manual runtime check confirms equal bar widths and text-after-bar alignment.
 - [ ] No regression is seen in the head ring/text or bubble refresh path.
 ## Success Criteria
 - [ ] Compile succeeds on the current branch.
 - [ ] The top and bottom tail bars share the same left/right edges at runtime.
 - [ ] The percent and countdown texts both sit to the right of their bars at runtime.
 - [ ] Any remaining mismatch is explained with evidence, not assumption.
 ## Risk Assessment
 - High: native renderer issues are hard to prove without manual observation. Mitigation: test at minimum/default/maximum sizes and common DPI settings.
 - Medium: reproducing the original complaint may require a specific locale, DPI, or stale binary. Mitigation: record the runtime conditions used during verification.
 - Rollback: revert the renderer change if compile or visual regression appears.
 ## Security Considerations
 - None.
 ## Next Steps
 - If validation passes, implementation can be approved as a scoped `src/bubble.rs` change. If not, reopen Phase 1 with the observed runtime evidence.
@@ -0,0 +1,50 @@
 ---
 title: "Bubble tail bar layout alignment"
 description: "Scoped renderer-only plan to align weekly percent and remaining-time tail bar geometry."
 status: pending
 priority: P2
 effort: 2h
 branch: "main"
 tags: [rust, renderer, bubble, layout]
 blockedBy: []
 blocks: []
 created: 2026-05-23
 createdBy: "ck:plan"
 source: skill
 ---
 # Bubble tail bar layout alignment
 ## Scope
 - User-facing goal: weekly percent lane and weekly remaining-time lane both render as `bar -> text`, and both bars share identical left/right bounds.
 - Expected code scope: `src/bubble.rs`; touch `src/app.rs` only if comment cleanup is needed.
 - Backwards compatibility: no settings, storage, IPC, or provider-data changes.
 ## Verified Codebase Facts
 - Bubble data already provides `weekly_pct`, `weekly_text`, and `weekly_resets_at` through `bubble::update_data`; no new inputs are needed (`src/app.rs:639-655`).
 - `compute_bubble_layout` already derives one shared text column and one shared bar lane for the two tail rows (`src/bubble.rs:1114-1163`).
 - `paint_bubble_text` already renders weekly percent and weekly countdown as separate right-aligned texts (`src/bubble.rs:1644-1661`).
 - `paint_bubble_pixmap` paints both tail bars from rects only; text is a GDI overlay, so geometry must stay the single source of truth (`src/bubble.rs:1298-1331`).
 ## Phases
 | Phase | Name | Status |
 |-------|------|--------|
 | 1 | [Lock geometry](./phase-01-lock-geometry.md) | Pending |
 | 2 | [Apply renderer change](./phase-02-apply-renderer-change.md) | Pending |
 | 3 | [Validate on Windows](./phase-03-validate-on-windows.md) | Pending |
 ## Dependencies
 - Sequence: Phase 1 -> Phase 2 -> Phase 3.
 - File ownership: `src/bubble.rs` stays single-owner across phases; optional `src/app.rs` comment cleanup happens only in Phase 2.
 - Related existing plan: `plans/260523-ui-ux-improvement-plan/plan.md` Phase 3 overlaps in theme but does not block this scoped renderer-only change.
 ## Rollback
 - Revert layout math and text-placement changes in `src/bubble.rs`.
 - Revert optional comment cleanup in `src/app.rs`.
 - No data migration or persisted-state rollback is needed.
 ## Unresolved Questions
 - Does "same length" mean equal width only, or should the two tail bars also share the same height? Current code intentionally uses different heights (`src/bubble.rs:1105-1110`).
 - The current source already looks close to the requested behavior. If runtime still differs, is the issue in this branch, a stale binary, or perception caused by different bar heights?
@@ -0,0 +1,91 @@
 # UI/UX Improvement Plan
 ## Context
 - Product: native Windows floating usage bubble for Claude Code/Codex.
 - Current UI stack: Win32 popup/layered windows, tiny-skia drawing, GDI text, Shell tray icons.
 - Current baseline: `cargo check` passes on 2026-05-23.
 - Primary files: `src/bubble.rs`, `src/panel.rs`, `src/app.rs`, `src/tray/*`, `src/usage_color.rs`, `src/i18n/locales/*.toml`.
 ## Phase 1 - Accessibility And Status Clarity
 - Status: Partially Complete
 - Priority: High
 - Files: `src/usage_color.rs`, `src/bubble.rs`, `src/panel.rs`, `src/tray/mod.rs`, locale TOMLs.
 - Improve non-color status cues for normal/warning/critical/auth/error states.
 - Add richer tray tooltips: model, 5h percent/countdown, 7d percent/countdown, current state.
 - Add localized strings for warning/critical labels and unavailable/auth states.
 - Keep usage colors centralized in `usage_color.rs`; avoid per-surface color drift.
 - Validation: contrast check for light/dark colors, manual tray tooltip check, `cargo check`.
 - Completed 2026-05-23: richer tray tooltip now includes model, 5h, 7d, and left-click hint.
 - Completed 2026-05-23: tray tooltip uses shorter localized tray hint text to reduce truncation risk.
 ## Phase 2 - Discoverability And Native Controls
 - Status: Partially Complete
 - Priority: High
 - Files: `src/app.rs`, `src/bubble.rs`, locale TOMLs.
 - Add menu items for common hidden actions: resize smaller/larger, reset size, show details.
 - Add a short localized "Help" or "Controls" submenu listing drag, click, right-click, Ctrl+wheel.
 - Make resize available through menu commands, not only Ctrl+MouseWheel.
 - Review context-menu grouping so status/update/model/settings actions scan as separate groups.
 - Validation: keyboard-access menu traversal, menu command behavior, persisted settings.
 - Completed 2026-05-23: added localized Controls submenu with resize actions and disabled help rows.
 - Completed 2026-05-23: disabled resize commands when they would no-op and unified menu/wheel resize through shared bubble size.
 ## Phase 3 - Bubble Legibility And Interaction Robustness
 - Status: Planned
 - Priority: Medium
 - Files: `src/bubble.rs`, optional extracted bubble modules.
 - Improve layout for smallest sizes: reserve stable text bounds, handle `100%`, placeholder, `!`, and long countdowns.
 - Consider minimum size/shape copy update because code uses 140-360 logical width while README mentions 32-128 pixels.
 - Add drag threshold and click behavior review around `WM_EXITSIZEMOVE` to reduce accidental panel opens.
 - Add optional pulse reduction path if Windows animation/reduced-motion preference is available.
 - Validation: manual checks at min/default/max size, 100/125/150/200% DPI, both models enabled.
 ## Phase 4 - Expanded Panel Redesign
 - Status: Planned
 - Priority: Medium
 - Files: `src/panel.rs`, locale TOMLs, maybe `src/app.rs`.
 - Replace fixed 280x120 assumptions with measured or wider adaptive layout.
 - Make rows self-explanatory: model header, 5h and 7d labels, percent plus reset countdown.
 - Add explicit error/auth/loading state rendering instead of only symbols/placeholders.
 - Improve panel placement near screen edges and multi-monitor boundaries.
 - Consider extracting panel layout/painting into smaller modules before behavior changes.
 - Validation: all locales, long countdown text, light/dark theme, focus-loss close behavior.
 ## Phase 5 - Tray And Notification Polish
 - Status: Planned
 - Priority: Medium
 - Files: `src/tray/mod.rs`, `src/tray/badge.rs`, `src/app.rs`.
 - Make tray icon state readable without exact color distinction: tooltip carries exact data, icon bands remain coarse.
 - Review notification throttling and text for threshold crossings.
 - Ensure tray left-click/right-click behavior matches Windows notification-area conventions.
 - Add manual test matrix for one-provider and two-provider modes.
 - Validation: tray add/modify/delete, balloon messages, no stale icons after exit/restart.
 ## Phase 6 - Structure And Verification
 - Status: Planned
 - Priority: Medium
 - Files: `src/bubble.rs`, `src/panel.rs`, `src/app.rs`, docs if behavior changes.
 - Split only where it reduces real risk: bubble layout/rendering/interaction and panel layout/rendering first.
 - Keep public behavior stable while extracting.
 - Add unit tests for pure functions where practical: color bands, size clamps, layout math, countdown formatting.
 - Run `cargo check`; run `cargo test` if tests are added.
 - Update README/docs after behavior changes, especially controls and size range.
 - Completed 2026-05-23: added locale schema tests covering embedded locale parsing and Controls/tray strings.
 ## Success Criteria
 - Bubble and panel remain readable at min/default/max sizes and common DPI scales.
 - Warning/critical/auth/error states are understandable without relying only on color.
 - Hidden interactions have menu alternatives or discoverable help text.
 - Panel handles all existing locales without clipping core data.
 - Tray tooltip and notifications communicate exact state.
 - Source still compiles; new pure behavior has focused tests where feasible.
 ## Risks
 - Native Win32 UI changes require manual Windows runtime verification; screenshots/tests are limited.
 - `src/bubble.rs` and `src/app.rs` are large and coupled; extract before broad changes when touching multiple concerns.
 - Adaptive text/layout can regress small-size readability if not verified at 140 logical width.
 ## Unresolved Questions
 - Should the bubble stay stadium-shaped, or should compact circular mode return as an option?
 - Should menu help be always present, or only shown on first run/first right-click?
 - Should reduced-motion preference disable only pulse, or all nonessential animation?
@@ -0,0 +1,56 @@
 ---
 phase: 1
 title: Research OpenCode Go contracts
 status: blocked
 priority: P1
 effort: 2h
 dependencies: []
 ---
 # Phase 1: Research OpenCode Go Contracts
 ## Overview
 Prove the OpenCode Go credential, provider ID, and usage-data contracts before implementation. This is the gate that prevents guessed percentages.
 Current result: blocked. Provider/model IDs and console quota math are verified, but there is no verified stable CLI/public API for this app to fetch current weekly/monthly quota usage.
 ## Requirements
 - Functional: Identify exact local credential path(s), JSON shape, auth key name, refresh/login command, weekly/monthly usage percent, and weekly/monthly reset time.
 - Non-functional: Use primary sources first: official OpenCode docs, OpenCode source, locally installed `opencode` behavior if available.
 ## Architecture
 OpenCode Go will only become a supported provider if it can return normalized weekly/monthly data from a stable source. Official docs confirm Go limits are 5h/weekly/monthly and dollar-value based, but not a public usage endpoint. For this app, OpenCode Go must render a custom four-bar layout: weekly usage percent + weekly remaining time in the upper section, monthly usage percent + monthly remaining time in the lower section.
 ## Related Code Files
 - Read: `src/creds/mod.rs`
 - Read: `src/creds/codex_auth.rs`
 - Read: `src/usage/chatgpt.rs`
 - Read: `src/usage/types.rs`
 - Read: `src/usage/registry.rs`
 - Created: `plans/260602-1115-opencode-go-provider-support/reports/research-opencode-go-contracts.md`
 ## Implementation Steps
 1. Check official OpenCode Go docs for provider ID, limits, endpoints, and console usage semantics.
 2. Check official OpenCode CLI/source for `auth.json` storage path and schema.
 3. If OpenCode is installed locally, run safe read-only commands: `opencode stats --help`, `opencode providers --help`, `opencode models --help`.
 4. Inspect local `~/.local/share/opencode/auth.json` only with user approval if privacy hook blocks or if file may contain API keys.
 5. Search for an official usage endpoint or CLI command that returns current weekly/monthly usage percent or used/limit values plus reset/period end times.
 6. Record exact request/response shape or command output needed by Phase 3, including how to compute remaining time for weekly and monthly sections.
 7. If only console-authenticated usage exists, stop and ask user before planning implementation beyond auth detection.
 ## Success Criteria
 - [x] Exact credential docs path documented.
 - [x] Exact provider key documented: `opencode-go`.
 - [x] Weekly/monthly usage percent and reset-time shape verified in console source.
 - [x] Stable app-callable quota source confirmed unavailable from current CLI/docs.
 - [ ] User decision recorded: console integration, limited detector, or defer.
 ## Risk Assessment
 Main risk: OpenCode docs mention tracking usage in the console but do not document a public usage API. Mitigation: make Phase 3 blocked until a stable source exists; do not infer usage from price tables.
@@ -0,0 +1,61 @@
 ---
 phase: 2
 title: Refactor provider metadata and settings
 status: completed
 priority: P1
 effort: 4h
 dependencies:
  - 1
 ---
 # Phase 2: Refactor Provider Metadata And Settings
 ## Overview
 Remove hard-coded two-provider assumptions before adding OpenCode Go. Keep behavior identical for Claude Code and Codex.
 ## Requirements
 - Functional: Represent enabled providers and positions by `ProviderId`, not one field per provider.
 - Non-functional: Preserve old `settings.json` compatibility for `show_claude_code`, `show_codex`, and `bubble_positions.{claude,codex}`.
 ## Architecture
 Introduce a small provider metadata layer near `usage::types` or `usage::registry`: stable ID, slug, display label key, tray icon ID, default enabled, and display mode. Existing providers use the current two-window mode. OpenCode Go uses a custom weekly/monthly four-bar mode.
 Keep `ProviderId::ChatGpt` internally unless touching the code anyway. The user-facing label remains Codex. Avoid a mechanical rename that adds risk without feature value.
 ## Related Code Files
 - Modify: `src/usage/types.rs`
 - Modify: `src/usage/registry.rs`
 - Modify: `src/settings.rs`
 - Modify: `src/app.rs`
 - Modify: `src/tray/mod.rs`
 - Modify: `src/tray/badge.rs`
 - Modify: `src/usage_color.rs`
 - Modify: `src/bubble.rs`
 - Modify: `src/panel.rs`
 ## Implementation Steps
 1. Add `ProviderId::OpenCodeGo` and a stable `slug()` value `opencode-go`.
 2. Add `ProviderId::all()` or equivalent ordered provider list: Claude, Codex, OpenCode Go.
 3. Replace `Settings { show_claude_code, show_codex }` runtime logic with a provider-enabled map or compact struct that can hold `opencode_go`.
 4. Preserve serde compatibility: deserialize old fields and write new fields only after migration, or keep old fields plus add `show_opencode_go` if map migration is too broad.
 5. Extend `BubblePositions` to store OpenCode Go position while keeping old `claude` and `codex` JSON keys.
 6. Update tray icon IDs and badge colors for third provider.
 7. Add provider-specific display metadata: Claude/Codex mode=`two-window`; OpenCode Go mode=`weekly-monthly-four-bar`.
 8. Update app loops to iterate providers instead of hand-writing Claude/Codex branches where this reduces match duplication.
 ## Success Criteria
 - [ ] Existing `settings.json` with only Claude/Codex still loads.
 - [ ] If all providers disabled, Claude Code is re-enabled as today.
 - [ ] Three providers can have separate positions and tray icon IDs.
 - [ ] OpenCode Go can select a custom four-bar renderer without changing Claude/Codex labels.
 - [ ] No behavior change for existing Claude Code/Codex users.
 ## Risk Assessment
 Settings migration is the highest regression risk. Mitigation: add serde/default tests with old two-provider JSON and new three-provider JSON.
@@ -0,0 +1,56 @@
 ---
 phase: 3
 title: "Implement OpenCode Go provider"
 status: pending
 priority: P1
 effort: "5h"
 dependencies: [1, 2]
 ---
 # Phase 3: Implement OpenCode Go Provider
 ## Overview
 Add OpenCode Go credential discovery and polling once Phase 1 proves the source of truth.
 ## Requirements
 - Functional: When enabled and authenticated, OpenCode Go returns weekly/monthly usage percent and reset time, enough for four bars: usage percent + remaining time for each section.
 - Non-functional: Do not store or transmit API keys outside OpenCode/OpenCode Go endpoints. Do not mutate OpenCode auth files.
 ## Architecture
 Create an OpenCode Go credential source that reads OpenCode's auth store and a provider implementation that maps verified weekly/monthly usage percent + reset time into a provider-specific snapshot. Do not force OpenCode Go into the existing `UsageWindows.primary/secondary` shape if that would lose the grouped weekly/monthly rendering semantics.
 ## Related Code Files
 - Create: `src/creds/opencode_auth.rs`
 - Create: `src/usage/opencode_go.rs`
 - Modify: `src/creds/mod.rs`
 - Modify: `src/usage/mod.rs`
 - Modify: `src/usage/registry.rs`
 - Modify: `src/usage/refresh.rs`
 - Modify: `src/app.rs`
 ## Implementation Steps
 1. Add `LocalOpenCodeGoCreds` with path detection from Phase 1. Expected primary path: `%LOCALAPPDATA%`/XDG-equivalent for `opencode/auth.json`; verify exact Windows path before coding.
 2. Parse only the OpenCode Go auth entry. Support API-key style auth if Phase 1 confirms schema.
 3. Add `RefreshHint::LocalOpenCodeCli` and spawn `opencode auth login` or equivalent only if Phase 1 confirms the command.
 4. Add `OpenCodeGoProvider::poll`, using the verified usage endpoint/command.
 5. Add a provider-specific snapshot type if needed, for example `ProviderUsage::TwoWindow(UsageWindows)` and `ProviderUsage::WeeklyMonthly { weekly: Window, monthly: Window }`.
 6. Map returned weekly/monthly source data to usage percent and reset-time windows. Existing renderer can then draw usage and remaining-time bars for each window.
 7. Return `AuthRequired` on 401/403 or missing provider auth.
 8. Add unit tests for credential parsing and response-to-snapshot mapping.
 ## Success Criteria
 - [ ] Provider compiles behind the existing registry.
 - [ ] Missing OpenCode auth produces `NoCredentials`, not panic.
 - [ ] Expired/invalid auth produces `AuthRequired`.
 - [ ] Weekly/monthly usage percent clamps to 0-100 and remaining-time bars derive from verified reset times.
 - [ ] If Phase 1 cannot verify usage, this phase is not implemented.
 ## Risk Assessment
 OpenCode Go limits are dollar-value based. If the usage source returns dollars instead of percentages, compute percent only as `used / limit * 100` from server-provided weekly/monthly values. Never estimate usage from model prices. If reset times are unavailable, stop and ask before shipping remaining-time bars with guessed periods.
@@ -0,0 +1,60 @@
 ---
 phase: 4
 title: Rename Models UI to Providers
 status: in-progress
 priority: P2
 effort: 2h
 dependencies:
  - 2
 ---
 # Phase 4: Rename Models UI To Providers
 ## Overview
 Rename the menu and documentation wording from "Models" to "Providers" where the app is selecting quota sources.
 Current result: partial. Provider wording and OpenCode Go listing are implemented. The OpenCode Go four-bar renderer is still blocked by Phase 1 because no stable quota source is available.
 ## Requirements
 - Functional: Context menu uses "Providers" and lists Claude Code, Codex, OpenCode Go.
 - Functional: OpenCode Go panel/bubble layout renders two grouped parts: Weekly on top and Monthly below, each with usage percent and remaining-time bars. Claude/Codex keep their current 5h/7d labels.
 - Non-functional: Keep real model wording where it means actual LLM models, not provider selection.
 ## Architecture
 This is mostly i18n and README copy. Keep internal `model` variable renames scoped to files touched by provider iteration. Do not churn every `model` local in renderer code just for style.
 ## Related Code Files
 - Modify: `src/i18n/mod.rs`
 - Modify: `src/i18n/locales/en.toml`
 - Modify: `src/i18n/locales/ja.toml`
 - Modify: `src/i18n/locales/ko.toml`
 - Modify: `src/i18n/locales/vi.toml`
 - Modify: `src/i18n/locales/zh-TW.toml`
 - Modify: `src/app.rs`
 - Modify: `README.md`
 ## Implementation Steps
 1. Rename `LocaleStrings.models` to `providers`, or keep field name and change values if minimizing code churn is preferred.
 2. Update English label to `Providers`; update other locales with best available translation.
 3. Add `opencode_go_label = "OpenCode Go"` to all locale files.
 4. Add localized generic labels for Weekly and Monthly group headers. Reuse existing usage-percent and remaining-time visual conventions.
 5. Add or branch rendering for OpenCode Go's four-bar layout in `bubble.rs` and `panel.rs`; do not distort Claude/Codex two-bar layout.
 6. Update README sections: "displayed models" -> "displayed providers"; "### Models" -> "### Providers".
 7. Add locale schema tests for the new label.
 ## Success Criteria
 - [x] Right-click menu says Providers.
 - [x] README consistently describes selectable services as providers.
 - [ ] OpenCode Go UI has Weekly and Monthly grouped sections, each with usage percent and remaining-time bars.
 - [x] No accidental rename of OpenCode's documented `/models` command.
 - [x] All embedded locale tests pass.
 ## Risk Assessment
 Translations may be imperfect. Mitigation: keep provider product names untranslated and only translate the generic "Providers" label.
@@ -0,0 +1,56 @@
 ---
 phase: 5
 title: "Verify and document"
 status: pending
 priority: P1
 effort: "3h"
 dependencies: [3, 4]
 ---
 # Phase 5: Verify And Document
 ## Overview
 Prove the third-provider workflow works and document setup/privacy accurately.
 ## Requirements
 - Functional: Claude Code, Codex, and OpenCode Go can be toggled independently; polling and tray refresh do not regress.
 - Non-functional: Privacy docs must list every local file read and network endpoint called.
 ## Architecture
 Verification must cover pure tests, build, and Windows manual smoke tests. OpenCode Go cannot be fully claimed without a real authenticated account or a captured fixture from Phase 1.
 ## Related Code Files
 - Modify: `README.md`
 - Optional Modify: `docs/release-process.md` only if release steps change
 - Read: `src/app.rs`
 - Read: `src/settings.rs`
 - Read: `src/usage/*`
 - Read: `src/creds/*`
 ## Implementation Steps
 1. Run `cargo test`.
 2. Run `cargo build --release`.
 3. Run app with old settings file and confirm migration/defaults.
 4. Run app with all three providers enabled; verify separate bubbles, positions, tray icons, panel labels, and menu toggles.
 5. Verify missing OpenCode Go auth shows auth/no-credentials state without breaking other providers.
 6. With real OpenCode Go auth, verify weekly/monthly percent and remaining-time bars match the official console/source found in Phase 1.
 7. Update README privacy section with OpenCode auth file and endpoints.
 ## Success Criteria
 - [ ] Tests pass.
 - [ ] Release build passes.
 - [ ] Existing two-provider settings migrate.
 - [ ] Three-provider UI works on Windows.
 - [ ] OpenCode Go renders four bars: weekly usage percent, weekly remaining time, monthly usage percent, monthly remaining time.
 - [ ] README setup/privacy docs are accurate.
 - [ ] No unresolved OpenCode Go usage-source uncertainty remains.
 ## Risk Assessment
 Manual verification needs real OpenCode Go auth. If unavailable, ship code only behind disabled-by-default toggle and explicitly mark e2e verification deferred.
@@ -0,0 +1,72 @@
 ---
 title: OpenCode Go provider support and providers terminology
 description: >-
  Add OpenCode Go as a usage provider and rename user-facing Models wording to
  Providers.
 status: in-progress
 priority: P2
 branch: main
 tags:
  - providers
  - opencode-go
  - usage
  - ui-copy
 blockedBy: []
 blocks: []
 created: '2026-06-02T04:20:10.983Z'
 createdBy: 'ck:plan'
 source: skill
 ---
 # OpenCode Go Provider Support And Providers Terminology
 ## Overview
 Add OpenCode Go as a third selectable usage provider beside Claude Code and Codex. Rename the app's user-facing "Models" menu/copy to "Providers" because the app chooses quota sources/services, not individual model IDs.
 I agree with the rename. OpenCode itself still has a `/models` command, but this app's menu toggles Claude Code, Codex, and OpenCode Go providers. Internals already use `ProviderId`, so the naming is conceptually aligned.
 ## Codebase Findings
 - Rust Win32 app; usage abstraction lives under `src/usage/*`.
 - Current extension points: `UsageProvider`, `ProviderId`, `Registry`, `CredentialSource`, `RefreshHint`.
 - Two-provider assumptions remain in `src/settings.rs`, `src/app.rs`, `src/tray/mod.rs`, `src/tray/badge.rs`, `src/panel.rs`, `src/usage_color.rs`, i18n TOMLs, and README.
 - OpenCode official docs say Go is configured as an OpenCode provider, uses `/connect`, stores credentials in `~/.local/share/opencode/auth.json`, has 5h/weekly/monthly dollar-value limits, and current usage is visible in the console.
 - User decision: OpenCode Go should display four bars in two parts: upper part is weekly usage, lower part is monthly usage. Each part has the same two concepts as current Claude/Codex: usage percent and remaining time. Keep Claude/Codex on their existing two-bar presentation unless a separate UI redesign decides otherwise.
 - OpenCode docs expose model endpoints and `https://opencode.ai/zen/go/v1/models`, but do not document a stable usage endpoint. Do not fake usage percentages.
 - Phase 1 found the OpenCode console computes `weeklyUsage` and `monthlyUsage` with `usagePercent` and `resetInSec`, but only through an authenticated console server query. `opencode stats` is local cost/token history and cannot drive the requested Go bars.
 ## Related Plans
 - `plans/260516-0707-cleanroom-rewrite/plan.md`: introduced current provider abstraction; related, no blocking dependency.
 - `plans/260523-ui-ux-improvement-plan/plan.md`: overlaps labels/tooltips; related, no blocking dependency.
 ## Phases
 | Phase | Name | Status |
 |-------|------|--------|
 | 1 | [Research OpenCode Go contracts](./phase-01-research-opencode-go-contracts.md) | Blocked |
 | 2 | [Refactor provider metadata and settings](./phase-02-refactor-provider-metadata-and-settings.md) | Completed |
 | 3 | [Implement OpenCode Go provider](./phase-03-implement-opencode-go-provider.md) | Pending |
 | 4 | [Rename Models UI to Providers](./phase-04-rename-models-ui-to-providers.md) | In Progress |
 | 5 | [Verify and document](./phase-05-verify-and-document.md) | Pending |
 ## Dependencies
 Phase 1 gates Phase 3. If no stable OpenCode Go usage source is found, pause before Phase 3 and ask user whether to defer usage support or ship a limited connectivity/auth detector.
 Phase 2 is implemented. Phase 4 provider wording is implemented; OpenCode Go remains listed but disabled until Phase 1's quota-source decision is resolved.
 ## Success Criteria
 - OpenCode Go can be enabled/disabled independently without breaking Claude Code or Codex.
 - Existing settings migrate safely; at least one provider remains enabled.
 - UI and README say "Providers" where the app means selectable services.
 - No guessed OpenCode Go usage. Weekly/monthly percent and reset-time data comes from verified source, or feature pauses.
 - `cargo test` and `cargo build --release` pass.
 ## Sources
 - OpenCode Go docs: https://dev.opencode.ai/docs/go/
 - OpenCode CLI docs: https://opencode.ai/docs/cli/
 - Current repo README: `README.md`
@@ -0,0 +1,42 @@
 # Research: OpenCode Go Contracts
 Date: 2026-06-02
 Status: blocked
 ## Summary
 OpenCode Go provider/model identity is verified, and the official console computes the exact quota fields we want. Implementation should not proceed yet because the verified quota source is an authenticated console server query, not a documented CLI command or public endpoint this desktop app can call safely.
 ## Verified Facts
 - Provider/model ID format: OpenCode Go models use `opencode-go/<model-id>`, for example `opencode-go/kimi-k2.6`.
 - Official limits: Go has a rolling 5-hour window, a weekly window, and a monthly window. The requested UI only needs weekly and monthly sections.
 - Limits are cost based, not request-count based: weekly `$30`, monthly `$60`, and rolling 5-hour `$12`.
 - CLI auth docs say credentials are stored at `~/.local/share/opencode/auth.json`; locally, `opencode providers` is an alias for auth management.
 - Local `opencode stats` only aggregates local sessions from the OpenCode database and reports cost/token totals. It does not report Go quota percentages or reset times.
 - Console source has the desired shape:
  - `weeklyUsage: { status, resetInSec, usagePercent }`
  - `monthlyUsage: { status, resetInSec, usagePercent }`
 - Console source derives those from `LiteTable.weeklyUsage`, `LiteTable.monthlyUsage`, `LiteTable.timeWeeklyUpdated`, `LiteTable.timeMonthlyUpdated`, `LiteTable.timeCreated`, and `LiteData.getLimits()`.
 ## Sources
 - OpenCode Go docs: https://dev.opencode.ai/docs/go/
 - OpenCode CLI docs: https://opencode.ai/docs/cli/
 - OpenCode source: `packages/opencode/src/cli/cmd/stats.ts`
 - OpenCode source: `packages/console/app/src/routes/workspace/[id]/go/lite-section.tsx`
 - OpenCode source: `packages/console/core/src/subscription.ts`
 - Local command: `opencode stats --help`
 ## Decision
 Do not implement OpenCode Go four-bar usage yet. The app cannot honestly render weekly/monthly usage percent and remaining time until one of these is chosen:
 1. Use an official/detected console endpoint with user-approved authentication.
 2. Ship only provider/auth detection now and hide/disable Go usage bars until quota data is available.
 3. Ask OpenCode upstream for a documented quota API or CLI output.
 ## Unresolved Questions
 - Should this app integrate with the authenticated OpenCode console, or should Go support be limited to detection until OpenCode exposes a stable quota API?
 - Do we still want to continue Phase 2/4 now for the provider terminology rename, while deferring Phase 3?
@@ -0,0 +1,221 @@
 # UI Design Review — Floating Bubble
 Date: 2026-05-23
 Scope: Visual-only redesign of the stadium bubble (head ring + tail bars).
 Constraints: tiny-skia primitives only (AA fills, AA stroked arcs, AA pills) + GDI text. No new deps. No animations beyond existing pulse. Logical px values; `scale_to_dpi` handles HiDPI.
 Files reviewed:
 - `D:\tiennm99\claude-code-usage-bubble\src\bubble.rs` (lines 1032–1703)
 - `D:\tiennm99\claude-code-usage-bubble\src\usage_color.rs`
 - `D:\tiennm99\claude-code-usage-bubble\src\os\color.rs`
 ---
 ## 1. Issues Found
 ### A. Information hierarchy is flat
 The big head "31%" and the tail "64%" are typographically equal in weight against their backgrounds — but they answer different questions (now vs. weekly). The eye has no anchor. Add weight contrast.
 ### B. Tail text is cramped
 `tail_usage_pct_rect` and `tail_time_text_rect` share the same right edge (`content_right`) with no rule for the gap between the bar end and the percent label. With `pad = 6 logical` and `pct_reserve_w` literally just `measure("100%") + 2 logical`, the "64% / 3d" pair reads as one glyph blob. The two right-aligned tokens stack with only ~2 logical px of internal breathing.
 ### C. The inner time ring is nearly invisible
 At ring_stroke_w 3 logical and time_ring_stroke_w 2 logical with only a 3-logical gap between them (line 1074), and using `#303030` track on a `#1F1F1F` background, the ratio is ~1.13:1. Below the visibility threshold; users won't read it as a ring.
 ### D. Two bubbles read as one merged blob
 Claude and Codex stagger vertically by `height_px + gap=24` (line 1750) but visually the dark-on-dark stadia float without anchor — there's no provider identifier inside the bubble itself. The accent color is the *only* differentiator, and it disappears below 60% (Codex teal vs. orange both reduce to white at that range for tail text — see line 1646).
 ### E. Track contrast vs. fill is loud
 `track = #3A3A3A` on `#1F1F1F` bg (4.0:1) is louder than the fill at low percentages. At 5% usage the dim track screams more than the bright fill — backwards visual priority.
 ### F. Time-bar reads as a second-quota
 The grey time bar fills *left-to-right* same direction as the usage bar, and shares the same shape, position, and visual weight class. A user glancing sees "two progress bars" and assumes both are quotas. The grey hue helps but the *gestalt* fights it.
 ### G. Head "5h" label is buried
 `small_font_px ≈ 55% of big_font_px` and uses `#888888`. At 200 logical width the label is ~10px and dim. It's the only thing telling the user the ring is the *5-hour* window.
 ### H. Ring uses round caps but track does not — visual mismatch
 Active arc has `LineCap::Round` (line 1249) but the track is a full circle. At low percentages the rounded start cap juts out above the track — looks unfinished. The track should be `LineCap::Butt` (default closed circle is fine) but the *visual idiom* would benefit from the track being a hint subtler.
 ### I. Corner radius of pill = `canvas_h / 2` is fine, but the head circle inscribed in the same height feels visually small
 `ring_radius = head_diameter/2 - 4 - stroke/2` makes the ring fill ~92% of the head square — but the head_square equals the canvas height, so the head looks slightly under-sized vs. the visual weight of the tail bars. Slight padding nudge.
 ### J. No separator/cue between the two stacked bubbles
 Not a per-bubble issue, but worth noting: when both providers run, a faint provider mark inside each bubble would let users disambiguate without remembering "the upper one is Codex."
 ---
 ## 2. Proposed Changes
 All values are **logical px**. Hex colors are dark-theme; the light-theme entry shown after `/`.
 ### Change 1 — Demote the head "5h" label, promote into a chip
 **What:** Keep the small label, but render it as an uppercase, letter-spaced micro-cap inside a 1-px-stroke pill (no fill).
 **Why:** Reads as a "window selector" tag rather than disambiguated noise.
 **Values:**
 - text: `"5H"` (uppercase, was `"5h"`)
 - font weight: `FW_SEMIBOLD` (was normal)
 - letter-spacing: simulate via `+1 logical px` between glyphs — actually, just keep tracking from font; the uppercase alone reads stronger.
 - color: `#A8A8A8` / `#5E5E5E` (was `#888888` / `#6E6E6E`)
 - no chip border for v1 — KISS. Just style the text. If chip is wanted later, AA stroke a pill rect.
 - Keep current vertical position; the `label_pct_gap` is fine.
 ### Change 2 — Bump big-percent weight + tighten size
 **What:** Big number gets heavier and slightly smaller; tightens visual mass.
 **Why:** Heavier weight = stronger anchor without taking more space.
 **Values:**
 - weight: `FW_BOLD` (was `FW_SEMIBOLD`)
 - size factor: `big_font_px = head_diameter * 24/100` (was `26/100`)
 - color unchanged: `#EAEAEA` / `#1F1F1F`
 ### Change 3 — Lift the inner time ring above noise
 **What:** Increase contrast of the time-ring track and fill; thicken slightly.
 **Why:** Current ratio of 1.13:1 against bg is invisible. Per WCAG 1.4.11 non-text 3:1 minimum.
 **Values:**
 - `time_ring_stroke_w`: `scale_to_dpi(2, dpi).clamp(2, 3)` (was `1..3`, effective 1px floor → too thin)
 - gap between outer ring inner edge and inner ring outer edge: `4 logical` (was `3`)
 - time_track: `#2F2F2F` → **`#404040`** (3.5:1) / light unchanged
 - time_fill (used for inner-ring active arc *and* tail time-bar fill): `#9A9A9A` → **`#B0B0B0`** / `#777777` → `#666666`
 - Keep `LineCap::Round` on the active arc.
 ### Change 4 — Reserve a real gap between tail bar and tail text
 **What:** Add a `bar_text_gap = 8` between bar end and text left edge (currently `pad = 6`).
 **Why:** Eight is the eyeballed minimum where the eye registers "two columns" instead of "one wall of glyphs."
 **Values:**
 - new constant: `bar_text_gap = scale_to_dpi(8, dpi)` (was effectively `pad = 6`)
 - `bar_right = (text_left - bar_text_gap).max(bar_left + bar_min);` (line 1126)
 - `pad` stays `6` for the head→tail content_left inset.
 ### Change 5 — Right-edge inset
 **What:** Increase inner right margin of the tail.
 **Why:** The current `scale_to_dpi(12, dpi)` insetinto the pill's rounded right cap leaves text near the curvature. Bump to clear the cap visually.
 **Values:**
 - `tail_right = width_px - scale_to_dpi(14, dpi)` (was `12`)
 ### Change 6 — Reweight tail percent vs. tail countdown
 **What:** Make the tail percent a touch heavier than the countdown so the *number* anchors the lane.
 **Why:** Today both are FW_NORMAL same size, both `text_color` — flat. Bigger number with smaller dimmer suffix establishes hierarchy.
 **Values:**
 - weekly percent: `FW_SEMIBOLD`, color `text_color` (`#EAEAEA` / `#1F1F1F`)
 - weekly countdown: `FW_NORMAL`, color **`muted_color`** (`#A8A8A8` / `#5E5E5E`) — was `text_color`
 - Font sizes unchanged: both `small_font_px` / `main_font_px`.
 ### Change 7 — Tone down the usage-bar track
 **What:** Drop track contrast so the *fill* dominates, not the track.
 **Why:** At low percent (5–10%) the bright track outscreams the fill. Track should be a hint.
 **Values:**
 - `track`: `#3A3A3A` → **`#2C2C2C`** (was 4.0:1 vs. bg; now 1.6:1 — the *fill* hits 4.5:1+ from accent colors and carries the signal)
 - light theme: `#D6D6D6` → `#E2E2E2`
 ### Change 8 — Differentiate the time-bar shape from the usage-bar shape
 **What:** Make the time bar visibly *thinner and lower-contrast* so it doesn't read as a second quota.
 **Why:** Current ratio: usage_bar 9% of height, time_bar 5% — close. Push the spread.
 **Values:**
 - `usage_bar_h = (height_px * 10 / 100).clamp(6, 12)` (was 9% / clamp 5–12)
 - `time_bar_h = (height_px * 4 / 100).clamp(3, 6)` (was 5% / clamp 3–7)
 - `lane_gap = scale_to_dpi(6, dpi)` (was 5)
 - This gives the usage bar ~2.5× the visual mass of the time bar — clear "primary" vs. "context."
 ### Change 9 — Pull the head ring in by 1 px so the head circle feels deliberate
 **What:** Slightly more head padding; ring sits 1 logical px farther in.
 **Why:** Ring currently kisses the visual edge of the head square; a touch of breathing room makes the head feel composed and balances vs. the heavier tail.
 **Values:**
 - `head_pad = scale_to_dpi(5, dpi)` (was 4)
 - `ring_stroke_w`: keep `scale_to_dpi(3, dpi).clamp(2, 4)` — already good.
 ### Change 10 — Provider mark dot (subtle disambiguator)
 **What:** A 4×4 logical solid circle in the accent color, positioned at the *outer* edge of the ring at 12 o'clock — between the ring and the head's left edge.
 **Why:** Today the only provider tell is the accent of the active arc; below 60% the arc *is* the accent so it works, but at >60% the arc shifts to amber/red and the provider identity vanishes. A constant dot fixes that. Also helps when two bubbles stack.
 **Values:**
 - center: `(ring_cx, ring_cy - ring_radius - ring_stroke_w/2 - 4)` — i.e. 4 logical px above the ring's outer edge
 - radius: `scale_to_dpi(2, dpi)` (logical 2 → diameter 4)
 - color: `accent_color_for(model, is_dark)` (existing function — `#D97757` Claude / `#10A37F` Codex)
 - Implemented as one extra `pb.push_circle(...)` fill before the ring strokes — zero new dependencies.
 ### Change 11 — Round-cap the active tail bars; flat-cap the tracks
 **What:** Keep the existing `paint_pill` for the *track*, but reduce its end-cap radius. For the *fill*, keep full cap. Actually, simpler: leave both as full-cap pills (current behavior) — just ensure the fill never paints below `2 * cap` width.
 **Why:** Already correct in code (`paint_pill` does both end-caps). No change needed visually, but lock in a min-fill so the bar at 1% doesn't render as a dot.
 **Values:**
 - in the weekly-pct render block (line 1300+): if `fill_w > 0.0 && fill_w < bar_h`, set `fill_w = bar_h` (a one-cap-diameter minimum). Cosmetic only — preserves "I see some progress" cue when usage is 0.1–2%.
 ### Change 12 — Text-color for tail percent when bar is in alarm range
 **What:** When `weekly_pct >= 95`, tint the percent text toward the alarm color instead of bumping its luminance via `brighten` only.
 **Why:** Today, at 98%, the text just gets *brighter* via the pulse — but in dark mode the bar is already pulsing deep red. Tinting the number red ties it to the bar.
 **Values:**
 - if `pct >= 95.0`: `text_color_for_pct = #E08070` (dark) / `#B02810` (light), then apply pulse `brighten` on top.
 - Keep the FW_SEMIBOLD from Change 6.
 - 80 ≤ pct < 95: leave at default text color (the bar carries the warning).
 ---
 ## 3. ASCII Mockup (one bubble, dark, ~270 logical px wide)
 ```
                    canvas_w = 270 (logical)
   <─────────────────────────────────────────────────────────────────>
   ┌─────────────────────────────────────────────────────────────────┐
   │       •  <─ accent dot (2-logical r, 4 above ring outer)        │
   │      ╭───╮                                                      │
   │     /     \      ┌─────────────────────────────────────┐        │ ^
   │    │ ┌───┐ │     │▓▓▓▓▓▓▓░░░░░░░░░░░░░░░░░░░░░░░░│ 64% │  ←lane │ |
   │    │ │5H │ │     └─────────────────────────────────┴─────┘        │ |
   │    │ │31%│ │     ┌─────────────────────────────┐  3d ←FW_NORMAL│ | height
   │    │ └───┘ │     │██░░░░░░░░░░░░░░░░░░░░░░░░░░░│           │  muted│ |
   │     \     /      └─────────────────────────────┘                │ |
   │      ╰───╯                                                      │ v
   └─────────────────────────────────────────────────────────────────┘
   <──head_diameter──><pad=6><────────bar_w────────><gap=8><text_w>
   = canvas_h                                                <r-inset=14>
 ```
 Key:
 - `•` accent dot (4-logical px diameter, provider color)
 - Outer thick ring = 5h usage (active arc in accent / amber / red)
 - Inner thinner ring = 5h remaining time (now `#B0B0B0` on `#404040`, visible)
 - `5H` = uppercase semibold label, `muted` color, sits above the big number
 - `31%` = big bold pct, `text_color`
 - `▓▓▓` top tail bar = weekly usage fill (accent/amber/red), `usage_bar_h ≈ 10% of canvas_h`
 - `░░░` track = `#2C2C2C` (toned down)
 - `64%` = right-aligned, FW_SEMIBOLD, text_color
 - `██░░` bottom tail bar = remaining time, `time_bar_h ≈ 4% of canvas_h` (visibly thinner)
 - `3d` = right-aligned, FW_NORMAL, muted_color
 - 8-logical gap between bar end and right-aligned text column (Change 4)
 ---
 ## 4. Do Not Change
 - **Overall stadium shape with `corner_radius = canvas_h/2`** — clean and iconic, photographs well in screenshots.
 - **Head-on-left, tail-on-right layout** — well-established mental model; sweeping arc + horizontal bar = "circular thing for now-ish, linear thing for week-ish."
 - **Accent ramp by percent** (60/80/95 thresholds in `usage_color.rs`) — solid color logic; don't touch.
 - **Pulse animation at ≥95%** — subtle, draws the right amount of attention. Keep.
 - **`paint_pill` two-circle + middle-rect construction** — exactly right for tiny-skia. Don't refactor to a rounded-rect path; the current is faster and AA-clean.
 - **`LineCap::Round` on the active arc** — feels alive; the "unfinished" look at low % I mentioned in issue (H) is acceptable trade-off.
 - **DPI scaling via `scale_to_dpi`** — keep all proposed values in logical px and let the function do its job.
 - **Locale-aware countdown width via `COUNTDOWN_TEMPLATE = "999시간"`** — clever and right; preserve.
 - **`DT_END_ELLIPSIS` on tail text** — graceful degradation at narrow widths.
 - **Existing fallback from countdown to `"5H"` when label rect is too narrow** — keep, just change the static fallback to uppercase per Change 1.
 - **Aspect ratio taper (`aspect_at_width`)** — tail breathes better at wider sizes; preserve.
 ---
 ## Implementation Notes
 - All proposed color tokens belong inline in `paint_bubble_pixmap` and `paint_bubble_text` — no new modules needed.
 - The accent dot (Change 10) is ~3 new lines in the ring block.
 - Bar height and gap changes (Change 8) are 3 single-line edits in `compute_bubble_layout`.
 - Min-fill (Change 11) is a one-line guard before `paint_pill` for the weekly fill.
 - No new geometry struct fields needed. No new fonts. No new dependencies.
 ---
 ## Unresolved Questions
 1. **Light-theme accent dot**: Claude `#D97757` and Codex `#10A37F` on `#F3F3F3` — Codex teal contrast is ~3.0:1, borderline. Accept (it's a 4-px decorative dot, not text) or use a darkened variant for light theme?
 2. **Change 12 alarm-tint**: should it apply to the head big-pct too, or only to the tail pct? Current proposal is tail-only. Confirm whether the head should also tint red at ≥95%.
 3. **Change 10 dot position**: 12 o'clock is canonical but could be at 10–11 o'clock so the start of the active arc (which begins at 12 sweeping clockwise) doesn't visually merge with the dot. Open to either.
 ---
 **Status:** DONE
 **Summary:** Twelve concrete, primitive-implementable changes that hierarchically organize percentages, raise the invisible inner time ring above WCAG 1.4.11, breathe the cramped tail text by 8 logical px, and add a 4-px provider dot for identity — all without new deps or animation engines.
@@ -0,0 +1,187 @@
 # UI Rendering Code Review
 Scope: `src/bubble.rs` (renderer), `src/usage_color.rs`, `src/os/color.rs`,
 drawing portions of `src/panel.rs`, `src/tray/badge.rs`.
 ## Findings
 1. **`src/bubble.rs:1178-1197` — severity: high.** Eight neutral surface
   colours (`#1F1F1F`, `#F3F3F3`, `#3A3A3A`, `#D6D6D6`, `#303030`, `#E0E0E0`,
   `#9A9A9A`, `#777777`) are hex literals inside `paint_bubble_pixmap` and
   duplicated near-verbatim in `panel.rs:279-293` (`#1F1F1F`, `#FAFAFA`,
   `#EAEAEA`, `#3A3A3A`, `#D6D6D6`) plus `bubble.rs:1590-1597` text colours.
   Three surfaces silently disagree (`#F3F3F3` bubble bg vs `#FAFAFA` panel
   bg) and a designer cannot retune the palette without grepping. Fix:
   centralise into a `palette` module alongside `usage_color.rs` exposing
   `bg(is_dark)`, `track(is_dark)`, `time_track(is_dark)`, `time_fill(is_dark)`,
   `text(is_dark)`, `muted(is_dark)`; have `panel.rs` consume the same helpers.
 2. **`src/tray/badge.rs:53, 112, 114` — severity: high.** Badge colours go
   through `paint.set_color_rgba8(0x3a, 0x3a, 0x3a, 255)` and raw
   `[u8; 3]` arrays instead of `Rgb` / `os::color`. `#3A3A3A` already exists
   as the shared "track" colour in `bubble.rs:1184`, but the tray hard-codes
   it. The two Claude/Codex base tints (`#2A1F1C`, `#1A1F26`) also live only
   here. Fix: route through the same palette module, even if the badge keeps
   its own dark inner-disk variants (named constants beat magic byte arrays).
 3. **`src/bubble.rs:1064-1117` — severity: high.** Padding/gap literals
   `scale_to_dpi(2|4|5|6|8|12, dpi)` appear 15+ times inside
   `compute_bubble_layout` with no naming. Same logical "edge padding"
   (`scale_to_dpi(4, dpi)`) is used for `head_pad`, head-label left/right,
   head-pct left/right (lines 1064, 1086, 1088, 1092, 1094); same "small
   nudge" (`scale_to_dpi(2, dpi)`) is the ring stroke clamp, label/pct
   row vertical breathing room, pct-reserve gap, and time-text padding. A
   designer tweaking head-text padding will touch four lines and miss the
   fifth. Fix: hoist named DPI-scaled constants at the top of the function
   (`HEAD_PAD`, `TEXT_VPAD`, `LANE_GAP`, `TAIL_PAD`, `RIGHT_INSET`,
   `BAR_MIN_W`) and reuse — same pattern `panel.rs` uses with its
   `*_LOGICAL` constants (line 24-30).
 4. **`src/panel.rs:333-340` — severity: med.** Bar-x / bar-w / row-y math
   mixes `scaled(PADDING_LOGICAL)`, `scaled(LABEL_W_LOGICAL)`,
   `scaled(RIGHT_TEXT_W_LOGICAL)` with bare `scaled(4)`, `scaled(8)`,
   `scaled(24)`, `scaled(18)` — four un-named "small" values doing
   semantically distinct jobs (label-bar gap, bar-text gap, header height,
   row-1 offset). Fix: name them (`LABEL_BAR_GAP_LOGICAL`,
   `BAR_TEXT_GAP_LOGICAL`, `HEADER_H_LOGICAL`, `HEADER_OFFSET_LOGICAL`) so
   the row geometry is auditable in one place.
 5. **`src/panel.rs:340` — severity: med.** `row2_y = row1_y +
   scale_to_dpi(BAR_HEIGHT_LOGICAL, dpi) + scale_to_dpi(ROW_GAP_LOGICAL, dpi)
   + scaled(8)`. The trailing `+ scaled(8)` is an unexplained extra gap on
   top of `ROW_GAP_LOGICAL`; this is exactly the inconsistency `ROW_GAP_LOGICAL`
   was created to prevent. Fix: fold into `ROW_GAP_LOGICAL` (16) or rename
   the extra into a labelled `ROW_TEXT_GAP_LOGICAL`.
 6. **`src/bubble.rs:1099, 1126` — severity: med.** `tail_right = width_px -
   scale_to_dpi(12, dpi)` and `bar_right = (text_left - pad).max(bar_left +
   bar_min)`. The `12` is the right-edge inset to clear the stadium's right
   end-cap; this is conceptually `corner_radius / 2`-ish but encoded as a
   constant that won't track if aspect ratio changes. Fix: derive from
   `layout.corner_radius` or hoist a `TAIL_RIGHT_INSET` constant with a
   comment tying it to the end-cap curvature.
 7. **`src/bubble.rs:1360-1377` and `src/tray/badge.rs:86-106` — severity:
   med.** `build_arc` is duplicated verbatim between the bubble renderer
   and the tray badge — same 64-segment sampling, same `FRAC_PI_2` start,
   same edge-case `.max(1)` segment count. Fix: lift into a small
   `geometry` / `tiny_skia_helpers` module shared by both call sites;
   change neither call site to keep behaviour identical.
 8. **`src/bubble.rs:1339-1352` — severity: med.** `paint_pill` is a perfect
   helper candidate for `panel.rs`'s bar drawing — `panel.rs` uses
   `FillRect` rectangles with hard corners (`draw_row` lines 406-428),
   visually inconsistent with the bubble's rounded pill caps. Fix: extract
   `paint_pill` to a shared rendering helper module and have panel use it
   so the two surfaces have matching bar geometry. (Cross-surface
   consistency was the stated reason for `usage_color.rs` existing — same
   logic applies to bar shape.)
 9. **`src/bubble.rs:1080-1083, 1111-1112` — severity: med.** `head_label_h`,
   `head_pct_h`, `time_text_h`, `usage_pct_h` all add `scale_to_dpi(2, dpi)`
   of "breathing room" to a font height, but never call it that — and the
   computed rect height is then used by `DrawTextW` with `DT_VCENTER` so a
   too-tight value would clip ascenders/descenders. Currently safe because
   2 px (logical) ≈ font leading, but the magic `2` is load-bearing. Fix:
   `const FONT_VPAD_LOGICAL: i32 = 2;` with a one-line comment "ascender/
   descender slack for DT_VCENTER".
 10. **`src/bubble.rs:1141-1146, 1153-1158` — severity: low.** The vertical
    centring expression `usage_bar_top + (usage_bar_h - usage_pct_h) / 2`
    is computed twice for `tail_usage_pct_rect` (top + bottom). Tiny but
    if a designer asks "where does the % text sit relative to the bar?"
    they have to mentally simplify. Fix: compute `pct_text_top` /
    `time_text_top` as named locals before the struct literal.
 11. **`src/bubble.rs:1076, 1077` — severity: low.** `big_font_px =
    head_diameter * 26 / 100`; `small_font_px = big_font_px * 55 / 100`.
    The 26 % and 55 % ratios are the core typographic scale of the head
    text — promote to `BIG_FONT_RATIO_PCT`, `SMALL_TO_BIG_FONT_PCT`
    constants with a "tweak these to retune head proportions" comment.
 12. **`src/bubble.rs:1078` — severity: low (dead-code adjacent).**
    `main_font_px = small_font_px;` — `main_font_px` is identical to
    `small_font_px` but kept as a separate field on `BubbleLayout`
    (line 1056) and used for the countdown (line 1604, 1658). If the
    intent is "may diverge in future", document it; otherwise drop the
    duplicate field and use `small_font_px` directly.
 13. **`src/bubble.rs:1085-1096` — severity: low.** `head_label_rect` and
    `head_pct_rect` both use `left: scale_to_dpi(4, dpi)` and `right:
    head_diameter - scale_to_dpi(4, dpi)` — identical horizontal extents.
    Could share a single `head_text_left`/`head_text_right` pair to make
    "head text is centered in the head circle" structurally visible.
 14. **`src/bubble.rs:1216 vs 1339-1352` — severity: low.** Stadium
    background uses inline two-circle-plus-rect path; the pill helper
    does the same shape. The stadium could call `paint_pill(pixmap, 0.0,
    0.0, w, h, h/2.0, bg)` and shed ~15 lines. Worth doing once
    `paint_pill` moves to a shared module (finding 8).
 15. **`src/bubble.rs:1653` — severity: low (text layout).**
    `draw_tail_text_in_rect` is called with `DT_RIGHT | DT_VCENTER |
    DT_SINGLELINE | DT_END_ELLIPSIS`. The `DT_END_ELLIPSIS` on a
    right-aligned 3-char string ("100%") inside a tight rect will produce
    `1…` if the rect collapses by even a pixel — fine, but worth
    confirming the `pct_reserve_w` (line 1103) leaves a 1-px AA safety
    margin. Current `+ scale_to_dpi(2, dpi)` looks adequate. No fix
    needed; flag for future locale changes.
 16. **`src/bubble.rs:1674-1685` — severity: low.** `draw_text_in_rect`
    always uses `DT_NOCLIP`; `draw_tail_text_in_rect` uses
    `DT_END_ELLIPSIS` (no `DT_NOCLIP`). The two helpers diverge silently
    on whether text may escape its rect. Document the contract on each
    helper ("head text trusts layout, tail text fits-or-ellipsises").
 17. **`src/panel.rs:447-501` — severity: low.** `draw_text` creates and
    destroys a font on every call (4× per `paint`). Same anti-pattern in
    `bubble.rs:paint_bubble_text` is amortised by caching `big_font`,
    `small_font`, `main_font` for the whole paint. Not a correctness
    issue but means the panel allocates 4 GDI fonts on every
    InvalidateRect. Cache by `(size, bold)` keyed on the HDC.
 ## Quick wins
 1. **Centralise the neutral palette** (findings 1, 2). One new module
   `palette.rs` exposing `bg / track / time_track / time_fill / text /
   muted` plus tray-specific tints. Replace all `Color::from_hex(...)`
   calls in `bubble.rs:1178-1197`, `bubble.rs:1589-1598`,
   `panel.rs:279-293`, and the byte arrays in `tray/badge.rs`. ~20-line
   diff, kills cross-surface drift.
 2. **Name the padding constants in `compute_bubble_layout`** (finding 3,
   9). Add ~6 `const` declarations at the top of the function — keeps
   them locally scoped, matches `panel.rs` style. Designer can retune
   metrics from one block.
 3. **Lift `build_arc` to a shared `tiny_skia_helpers` module** (finding
   7). Two-file delete-and-import. Identical behaviour.
 4. **Promote `paint_pill` and reuse in `panel.rs` rows + stadium bg**
   (findings 8, 14). Makes bar visual style consistent between bubble
   and panel; bonus simplification of the stadium fill.
 5. **Drop / rename `main_font_px`** (finding 12). Either delete the field
   and use `small_font_px` directly, or split the constants (`MAIN_FONT_RATIO`)
   so future divergence is intentional.
 ## Defer
 - Finding 4-6 (panel/bubble padding naming, derived `TAIL_RIGHT_INSET`):
  worth doing alongside the palette refactor but not blocking.
 - Finding 10, 13 (local temporaries for centring math, shared
  `head_text_*` extents): pure readability, low payoff.
 - Finding 15 (ellipsis safety margin on locale changes): keep an eye on
  this when adding a locale wider than `999시간`.
 - Finding 17 (panel GDI font caching): only matters if the panel starts
  refreshing more often than once per poll cycle.
 Out-of-scope sighting (one-line flag as instructed): `compute_bubble_layout`
 takes an `HDC` purely to measure text — couples geometry calc to a live GDI
 device. Not a render bug, but it makes the function untestable without a
 window and is worth refactoring when convenient.
 **Status:** DONE
 **Summary:** Renderer is functionally solid; the dominant problem is
 duplicated/un-named geometry and colour literals scattered across bubble /
 panel / badge that drift independently and resist designer-led tuning.
@@ -66,21 +66,20 @@ const IDM_FREQ_15MIN: u16 = 12;
 const IDM_FREQ_1HOUR: u16 = 13;
 const IDM_MODEL_CLAUDE: u16 = 20;
 const IDM_MODEL_CHATGPT: u16 = 21;
 const IDM_MODEL_OPENCODE_GO: u16 = 22;
 const IDM_START_WITH_WINDOWS: u16 = 30;
 const IDM_RESET_POSITION: u16 = 31;
 const IDM_VERSION_ACTION: u16 = 32;
 const IDM_RESTART: u16 = 33;
-const IDM_LANG_SYSTEM: u16 = 40;
+const IDM_SIZE_SMALLER: u16 = 34;
 const IDM_SIZE_LARGER: u16 = 35;
 const IDM_RESET_SIZE: u16 = 36;
 // 50 is reserved by tray::IDM_TOGGLE_WIDGET — keep the auto-update range
 // clear of it (and any future tray ids in the 5x band).
 const IDM_UPDATE_AUTO_OFF: u16 = 60;
 const IDM_UPDATE_AUTO_HOURLY: u16 = 61;
 const IDM_UPDATE_AUTO_DAILY: u16 = 62;
 const IDM_UPDATE_AUTO_WEEKLY: u16 = 63;
 // IMPORTANT: language ids are dynamic and start at IDM_LANG_BASE.
 // Keep IDM_LANG_BASE the highest static id so the catch-all match arm
 // stays unambiguous.
 const IDM_LANG_BASE: u16 = 100;
 // ---------- State ----------
@@ -209,7 +208,7 @@ pub fn run(args: crate::AppArgs) {
    };
    let settings = settings::load();
-    let i18n = I18n::load(settings.language.as_deref());
+    let i18n = I18n::load();
    let is_dark = os::theme::is_dark();
    let install_channel = update::current_channel();
    let http = match net::Client::new(HTTP_USER_AGENT) {
@@ -264,6 +263,7 @@ pub fn run(args: crate::AppArgs) {
    if let Ok(exe_path) = std::env::current_exe() {
        update::handoff::cleanup_stale_old_exes(&exe_path);
    }
    update::install::cleanup_staged_update_files();
    let poll_interval = lock_state()
        .as_ref()
@@ -321,11 +321,10 @@ fn create_initial_bubbles() {
        Some(s) => (s.settings.clone(), s.is_dark),
        None => return,
    };
-    if settings.show_claude_code {
+    for provider in ProviderId::LIVE_USAGE {
-        spawn_bubble(ProviderId::Claude, &settings, is_dark);
+        if settings.is_provider_enabled(provider) {
-    }
+            spawn_bubble(provider, &settings, is_dark);
-    if settings.show_codex {
+        }
        spawn_bubble(ProviderId::ChatGpt, &settings, is_dark);
    }
 }
@@ -340,8 +339,10 @@ fn spawn_bubble(kind: ProviderId, settings: &Settings, is_dark: bool) {
        position: settings.bubble_positions.get(kind),
        session_pct: None,
        session_text: placeholder.clone(),
        session_resets_at: None,
        weekly_pct: None,
        weekly_text: placeholder,
        weekly_resets_at: None,
        is_dark,
    });
    if hwnd != HWND::default() {
@@ -401,7 +402,7 @@ fn on_bubble_moved(model: ProviderId, pos: (i32, i32)) {
 }
 fn on_bubble_resized(_model: ProviderId, size_logical: i32) {
-    update_settings(|s| s.settings.bubble_size_logical = size_logical);
+    set_bubble_size(size_logical);
 }
 fn on_menu_command(id: u32, _owner_hwnd: HWND) {
@@ -415,26 +416,23 @@ fn on_menu_command(id: u32, _owner_hwnd: HWND) {
        IDM_FREQ_1HOUR => set_poll_interval(POLL_1_HOUR),
        IDM_MODEL_CLAUDE => toggle_model(ProviderId::Claude),
        IDM_MODEL_CHATGPT => toggle_model(ProviderId::ChatGpt),
        IDM_MODEL_OPENCODE_GO => {}
        IDM_START_WITH_WINDOWS => toggle_startup(),
        IDM_RESET_POSITION => reset_positions(),
        IDM_VERSION_ACTION => version_action(),
        IDM_SIZE_SMALLER => resize_bubbles(-bubble::RESIZE_STEP_LOGICAL),
        IDM_SIZE_LARGER => resize_bubbles(bubble::RESIZE_STEP_LOGICAL),
        IDM_RESET_SIZE => set_bubble_size(bubble::DEFAULT_BUBBLE_SIZE),
        IDM_UPDATE_AUTO_OFF => set_update_check_interval(None),
        IDM_UPDATE_AUTO_HOURLY => {
            set_update_check_interval(Some(settings::UPDATE_CHECK_HOURLY_SECS))
        }
-        IDM_UPDATE_AUTO_DAILY => {
+        IDM_UPDATE_AUTO_DAILY => set_update_check_interval(Some(settings::UPDATE_CHECK_DAILY_SECS)),
            set_update_check_interval(Some(settings::UPDATE_CHECK_DAILY_SECS))
        }
        IDM_UPDATE_AUTO_WEEKLY => {
            set_update_check_interval(Some(settings::UPDATE_CHECK_WEEKLY_SECS))
        }
        IDM_LANG_SYSTEM => set_language(None),
        // Static ids in the 30-99 band must match BEFORE the dynamic
        // language guard, otherwise `x >= IDM_LANG_BASE` would swallow any
        // future id that creeps into the >=100 range.
        tray::IDM_TOGGLE_WIDGET => toggle_widget_visibility(),
        IDM_RESTART => restart_app(),
        x if x >= IDM_LANG_BASE => set_language_by_index((x - IDM_LANG_BASE) as usize),
        _ => {}
    }
 }
@@ -636,12 +634,16 @@ fn propagate_to_ui() {
        let weekly_text = entry
            .map(|s| i18n::format_countdown(s.windows.secondary.resets_at, &snap.i18n_strings))
            .unwrap_or_default();
        let session_resets_at = entry.and_then(|s| s.windows.primary.resets_at);
        let weekly_resets_at = entry.and_then(|s| s.windows.secondary.resets_at);
        bubble::update_data(
            hwnd.to_hwnd(),
            session_pct,
            session_text,
            session_resets_at,
            weekly_pct,
            weekly_text,
            weekly_resets_at,
        );
    }
    refresh_tray_icons_with(&snap);
@@ -698,7 +700,7 @@ fn build_panel_data_from(snap: &UiSnapshot, model: ProviderId, p: &ProviderUiSta
 }
 fn placeholder_panel(model: ProviderId) -> PanelData {
-    let strings = i18n::I18n::load(None).strings().clone();
+    let strings = i18n::I18n::load().strings().clone();
    PanelData {
        model,
        session_pct: 0.0,
@@ -750,47 +752,51 @@ fn refresh_tray_icons() {
 fn refresh_tray_icons_with(snap: &UiSnapshot) {
    let mut icons = Vec::new();
-    if snap.settings.show_claude_code {
+    for provider in ProviderId::LIVE_USAGE {
-        let entry = snap.snapshots.get(&ProviderId::Claude);
+        if !snap.settings.is_provider_enabled(provider) {
            continue;
        }
        let entry = snap.snapshots.get(&provider);
        icons.push(TrayIconData {
-            kind: ProviderId::Claude,
+            kind: provider,
            percent: if snap.last_poll_ok {
                entry.map(|e| e.windows.primary.utilization)
            } else {
                None
            },
-            tooltip: format!(
+            tooltip: tray_tooltip(
-                "{} {}: {} | {}: {}",
+                &provider_label(provider, &snap.i18n_strings),
-                snap.i18n_strings.claude_label,
+                entry,
-                snap.i18n_strings.session_window,
+                &snap.i18n_strings,
                entry.map(|e| e.primary_text.as_str()).unwrap_or(""),
                snap.i18n_strings.weekly_window,
                entry.map(|e| e.secondary_text.as_str()).unwrap_or(""),
            ),
        });
    }
    if snap.settings.show_codex {
        let entry = snap.snapshots.get(&ProviderId::ChatGpt);
        icons.push(TrayIconData {
            kind: ProviderId::ChatGpt,
            percent: if snap.last_poll_ok {
                entry.map(|e| e.windows.primary.utilization)
            } else {
                None
            },
            tooltip: format!(
                "{} {}: {} | {}: {}",
                snap.i18n_strings.chatgpt_label,
                snap.i18n_strings.session_window,
                entry.map(|e| e.primary_text.as_str()).unwrap_or(""),
                snap.i18n_strings.weekly_window,
                entry.map(|e| e.secondary_text.as_str()).unwrap_or(""),
            ),
        });
    }
    tray::sync(snap.msg_hwnd.to_hwnd(), &icons);
 }
 fn tray_tooltip(label: &str, entry: Option<&ProviderUiState>, strings: &LocaleStrings) -> String {
    let session = entry
        .map(|e| e.primary_text.as_str())
        .filter(|s| !s.is_empty())
        .unwrap_or("...");
    let weekly = entry
        .map(|e| e.secondary_text.as_str())
        .filter(|s| !s.is_empty())
        .unwrap_or("...");
    format!(
        "{label}\n{}: {session}\n{}: {weekly}\n{}",
        strings.session_window, strings.weekly_window, strings.tray_left_click
    )
 }
 fn provider_label(provider: ProviderId, strings: &LocaleStrings) -> String {
    match provider {
        ProviderId::Claude => strings.claude_label.clone(),
        ProviderId::ChatGpt => strings.chatgpt_label.clone(),
        ProviderId::OpenCodeGo => strings.opencode_go_label.clone(),
    }
 }
 fn handle_tray_action(action: TrayAction) {
    match action {
        TrayAction::None => {}
@@ -847,10 +853,7 @@ fn show_threshold_balloon(provider: ProviderId, threshold: u8) {
        }
        s.last_balloon_at = Some(Instant::now());
        let strings = s.i18n.strings();
-        let provider_label = match provider {
+        let provider_label = provider_label(provider, strings);
            ProviderId::Claude => strings.claude_label.clone(),
            ProviderId::ChatGpt => strings.chatgpt_label.clone(),
        };
        let title = format!("{provider_label} · {threshold}%");
        let body = if threshold >= 95 {
            strings.threshold_95_body.clone()
@@ -884,6 +887,10 @@ fn show_token_expired_balloon(failed: ProviderId) {
                strings.chatgpt_token_expired_title.clone(),
                strings.chatgpt_token_expired_body.clone(),
            ),
            ProviderId::OpenCodeGo => (
                strings.opencode_go_label.clone(),
                strings.update_failed.clone(),
            ),
        };
        (s.msg_hwnd, failed, title, body)
    };
@@ -917,34 +924,30 @@ fn announce_update_applied(_msg_hwnd: HWND, version: &str) {
 struct ContextMenuSnapshot {
    strings: LocaleStrings,
    available: Vec<(String, String)>,
    language_override: Option<String>,
    current_interval: u32,
    update_check_interval_secs: Option<u64>,
    show_claude: bool,
    show_chatgpt: bool,
    show_opencode_go: bool,
    widget_visible: bool,
    install_channel: InstallChannel,
    update_status: UpdateStatus,
    bubble_size_logical: i32,
 }
 fn show_context_menu(owner_hwnd: HWND) {
    let snap = match lock_state().as_ref() {
        Some(s) => ContextMenuSnapshot {
            strings: s.i18n.strings().clone(),
            available: s
                .i18n
                .available()
                .map(|(c, n)| (c.to_string(), n.to_string()))
                .collect(),
            language_override: s.settings.language.clone(),
            current_interval: s.settings.poll_interval_ms,
            update_check_interval_secs: s.settings.update_check_interval_secs,
            show_claude: s.settings.show_claude_code,
            show_chatgpt: s.settings.show_codex,
            show_opencode_go: s.settings.show_opencode_go,
            widget_visible: s.settings.widget_visible,
            install_channel: s.install_channel,
            update_status: s.update_status,
            bubble_size_logical: s.settings.bubble_size_logical,
        },
        None => return,
    };
@@ -977,24 +980,42 @@ fn show_context_menu(owner_hwnd: HWND) {
        }
        append_submenu(menu, freq, &snap.strings.update_frequency);
-        let Ok(models) = CreatePopupMenu() else {
+        let Ok(providers) = CreatePopupMenu() else {
-            log::error!("CreatePopupMenu(models) failed");
+            log::error!("CreatePopupMenu(providers) failed");
            let _ = DestroyMenu(menu);
            return;
        };
        append_item(
-            models,
+            providers,
            IDM_MODEL_CLAUDE,
            &snap.strings.claude_label,
-            if snap.show_claude { MF_CHECKED } else { MENU_ITEM_FLAGS(0) },
+            if snap.show_claude {
                MF_CHECKED
            } else {
                MENU_ITEM_FLAGS(0)
            },
        );
        append_item(
-            models,
+            providers,
            IDM_MODEL_CHATGPT,
            &snap.strings.chatgpt_label,
-            if snap.show_chatgpt { MF_CHECKED } else { MENU_ITEM_FLAGS(0) },
+            if snap.show_chatgpt {
                MF_CHECKED
            } else {
                MENU_ITEM_FLAGS(0)
            },
        );
-        append_submenu(menu, models, &snap.strings.models);
+        append_item(
            providers,
            IDM_MODEL_OPENCODE_GO,
            &snap.strings.opencode_go_label,
            if snap.show_opencode_go {
                MF_CHECKED | MF_GRAYED
            } else {
                MF_GRAYED
            },
        );
        append_submenu(menu, providers, &snap.strings.providers);
        let Ok(settings_menu) = CreatePopupMenu() else {
            log::error!("CreatePopupMenu(settings_menu) failed");
@@ -1005,7 +1026,11 @@ fn show_context_menu(owner_hwnd: HWND) {
            settings_menu,
            IDM_START_WITH_WINDOWS,
            &snap.strings.start_with_windows,
-            if is_startup_enabled() { MF_CHECKED } else { MENU_ITEM_FLAGS(0) },
+            if is_startup_enabled() {
                MF_CHECKED
            } else {
                MENU_ITEM_FLAGS(0)
            },
        );
        append_item(
            settings_menu,
@@ -1014,35 +1039,6 @@ fn show_context_menu(owner_hwnd: HWND) {
            MENU_ITEM_FLAGS(0),
        );
        let Ok(lang) = CreatePopupMenu() else {
            log::error!("CreatePopupMenu(lang) failed");
            let _ = DestroyMenu(settings_menu);
            let _ = DestroyMenu(menu);
            return;
        };
        append_item(
            lang,
            IDM_LANG_SYSTEM,
            &snap.strings.system_default,
            if snap.language_override.is_none() { MF_CHECKED } else { MENU_ITEM_FLAGS(0) },
        );
        for (i, (code, name)) in snap.available.iter().enumerate() {
            let id = IDM_LANG_BASE + i as u16;
            let flags = if snap
                .language_override
                .as_deref()
                .map(|c| c == code)
                .unwrap_or(false)
            {
                MF_CHECKED
            } else {
                MENU_ITEM_FLAGS(0)
            };
            append_item(lang, id, name, flags);
        }
        append_submenu(settings_menu, lang, &snap.strings.language);
        let _ = AppendMenuW(settings_menu, MF_SEPARATOR, 0, PCWSTR::null());
        let version_label = version_action_label(&snap);
        let version_flags = if matches!(
            snap.update_status,
@@ -1052,7 +1048,12 @@ fn show_context_menu(owner_hwnd: HWND) {
        } else {
            MENU_ITEM_FLAGS(0)
        };
-        append_item(settings_menu, IDM_VERSION_ACTION, &version_label, version_flags);
+        append_item(
            settings_menu,
            IDM_VERSION_ACTION,
            &version_label,
            version_flags,
        );
        let Ok(auto_update) = CreatePopupMenu() else {
            log::error!("CreatePopupMenu(auto_update) failed");
@@ -1088,11 +1089,58 @@ fn show_context_menu(owner_hwnd: HWND) {
        append_submenu(settings_menu, auto_update, &snap.strings.auto_update_check);
        append_submenu(menu, settings_menu, &snap.strings.settings);
        let Ok(controls) = CreatePopupMenu() else {
            log::error!("CreatePopupMenu(controls) failed");
            let _ = DestroyMenu(menu);
            return;
        };
        append_item(
            controls,
            IDM_SIZE_SMALLER,
            &snap.strings.size_smaller,
            if snap.bubble_size_logical <= bubble::MIN_BUBBLE_SIZE {
                MF_GRAYED
            } else {
                MENU_ITEM_FLAGS(0)
            },
        );
        append_item(
            controls,
            IDM_SIZE_LARGER,
            &snap.strings.size_larger,
            if snap.bubble_size_logical >= bubble::MAX_BUBBLE_SIZE {
                MF_GRAYED
            } else {
                MENU_ITEM_FLAGS(0)
            },
        );
        append_item(
            controls,
            IDM_RESET_SIZE,
            &snap.strings.reset_size,
            if snap.bubble_size_logical == bubble::DEFAULT_BUBBLE_SIZE {
                MF_GRAYED
            } else {
                MENU_ITEM_FLAGS(0)
            },
        );
        let _ = AppendMenuW(controls, MF_SEPARATOR, 0, PCWSTR::null());
        append_item(controls, 0, &snap.strings.control_left_click, MF_GRAYED);
        append_item(controls, 0, &snap.strings.control_right_click, MF_GRAYED);
        append_item(controls, 0, &snap.strings.control_drag, MF_GRAYED);
        append_item(controls, 0, &snap.strings.control_ctrl_wheel, MF_GRAYED);
        append_item(controls, 0, &snap.strings.control_tray_click, MF_GRAYED);
        append_submenu(menu, controls, &snap.strings.controls);
        append_item(
            menu,
            tray::IDM_TOGGLE_WIDGET,
            &snap.strings.show_widget,
-            if snap.widget_visible { MF_CHECKED } else { MENU_ITEM_FLAGS(0) },
+            if snap.widget_visible {
                MF_CHECKED
            } else {
                MENU_ITEM_FLAGS(0)
            },
        );
        let _ = AppendMenuW(menu, MF_SEPARATOR, 0, PCWSTR::null());
        append_item(menu, IDM_RESTART, &snap.strings.restart, MENU_ITEM_FLAGS(0));
@@ -1116,7 +1164,12 @@ fn append_item(menu: HMENU, id: u16, label: &str, flags: MENU_ITEM_FLAGS) {
 fn append_submenu(menu: HMENU, submenu: HMENU, label: &str) {
    let w = os::to_utf16_nul(label);
    unsafe {
-        let _ = AppendMenuW(menu, MF_POPUP, submenu.0 as usize, PCWSTR::from_raw(w.as_ptr()));
+        let _ = AppendMenuW(
            menu,
            MF_POPUP,
            submenu.0 as usize,
            PCWSTR::from_raw(w.as_ptr()),
        );
    }
 }
@@ -1163,25 +1216,21 @@ fn toggle_model(model: ProviderId) {
        let Some(s) = s.as_mut() else {
            return;
        };
-        match model {
+        if !model.metadata().live_usage {
-            ProviderId::Claude => s.settings.show_claude_code = !s.settings.show_claude_code,
+            return;
            ProviderId::ChatGpt => s.settings.show_codex = !s.settings.show_codex,
        }
-        if !s.settings.show_claude_code && !s.settings.show_codex {
+        s.settings.toggle_provider(model);
-            match model {
+        if !s.settings.has_enabled_live_provider() {
-                ProviderId::Claude => s.settings.show_claude_code = true,
+            s.settings.set_provider_enabled(model, true);
                ProviderId::ChatGpt => s.settings.show_codex = true,
            }
        }
        (s.settings.clone(), s.is_dark)
    };
    settings::save(&settings);
-    let want = match model {
+    let want = settings.is_provider_enabled(model);
-        ProviderId::Claude => settings.show_claude_code,
+    let existing = lock_state()
-        ProviderId::ChatGpt => settings.show_codex,
+        .as_ref()
-    };
+        .and_then(|s| s.bubbles.get(&model).copied());
    let existing = lock_state().as_ref().and_then(|s| s.bubbles.get(&model).copied());
    match (want, existing) {
        (true, None) => spawn_bubble(model, &settings, is_dark),
        (false, Some(h)) => {
@@ -1244,23 +1293,32 @@ fn reset_positions() {
    spawn_poll_thread();
 }
-fn set_language(_dummy: Option<()>) {
+fn resize_bubbles(delta: i32) {
-    update_settings(|s| {
+    let current = lock_state()
-        s.i18n.set_active(None);
+        .as_ref()
-        s.settings.language = None;
+        .map(|s| s.settings.bubble_size_logical)
-    });
+        .unwrap_or(bubble::DEFAULT_BUBBLE_SIZE);
-    propagate_to_ui();
+    set_bubble_size(current + delta);
 }
-fn set_language_by_index(idx: usize) {
+fn set_bubble_size(size_logical: i32) {
-    update_settings(|s| {
+    let (hwnds, snap) = {
-        let code = s.i18n.available().nth(idx).map(|(c, _)| c.to_string());
+        let mut s = lock_state();
-        if let Some(c) = code.as_deref() {
+        let Some(s) = s.as_mut() else {
-            s.i18n.set_active(Some(c));
+            return;
        };
        let new_size = size_logical.clamp(bubble::MIN_BUBBLE_SIZE, bubble::MAX_BUBBLE_SIZE);
        if new_size == s.settings.bubble_size_logical {
            return;
        }
-        s.settings.language = code;
+        s.settings.bubble_size_logical = new_size;
-    });
+        let hwnds = s.bubbles.values().map(|h| h.to_hwnd()).collect::<Vec<_>>();
-    propagate_to_ui();
+        (hwnds, s.settings.clone())
    };
    settings::save(&snap);
    for hwnd in hwnds {
        bubble::set_size_logical(hwnd, snap.bubble_size_logical);
    }
 }
 fn version_action() {
@@ -51,8 +51,7 @@ impl super::CredentialSource for LocalClaudeCreds {
    }
 }
-/// Shared between local-fs and wsl-bridge sources — both parse the same
+/// Parse the Claude credential JSON shape written by the official CLI.
 /// JSON shape, the only difference is how they get to the file content.
 pub(crate) fn parse_claude_json(content: &str) -> Result<super::Token, super::Error> {
    let value: serde_json::Value = serde_json::from_str(content)?;
    let oauth = value
@@ -1,13 +1,12 @@
 // Pluggable credential discovery.
 //
 // Each `CredentialSource` knows how to read a single OAuth token from
-// somewhere (a local JSON file, a WSL filesystem, …). The `Locator`
+// somewhere, such as a local JSON file. The `Locator`
 // holds a priority-ordered list and serves the first source that
 // actually has a token. New sources drop in without touching the locator.
 pub mod codex_auth;
 pub mod local_fs;
 pub mod wsl_bridge;
 #[derive(Clone, Debug)]
 pub struct Token {
@@ -23,8 +22,6 @@ pub struct Token {
 pub enum RefreshHint {
    /// `claude.cmd` / `claude.exe` on PATH.
    LocalClaudeCli,
    /// Run `claude -p .` inside a specific WSL distro.
    WslClaudeCli { distro: String },
    /// `codex` / `codex.cmd` / `codex.ps1` on PATH.
    LocalCodexCli,
 }
@@ -37,10 +34,6 @@ pub enum Error {
    Json(#[from] serde_json::Error),
    #[error("required field missing from credential JSON: {0}")]
    MissingField(&'static str),
    #[error("WSL command in {distro:?} failed: {detail}")]
    WslCommand { distro: String, detail: String },
    #[error("timeout while talking to WSL")]
    WslTimeout,
    #[error("credential source unavailable")]
    Unavailable,
 }
@@ -50,7 +43,7 @@ pub trait CredentialSource: Send + Sync {
    /// signatures (e.g. `"local:C:\\Users\\me\\.claude\\.credentials.json"`).
    fn id(&self) -> &str;
-    /// Read the current token. May spawn subprocesses (for WSL).
+    /// Read the current token.
    fn read(&self) -> Result<Token, Error>;
    /// Cheap change-detection fingerprint. `None` means "source is missing".
@@ -70,16 +63,12 @@ impl Locator {
        Self { sources }
    }
-    /// Build a Claude locator with the standard search order: Windows
+    /// Build a Claude locator with the standard Windows credential path.
    /// home directory first, then every installed WSL distro.
    pub fn for_claude() -> Self {
        let mut sources: Vec<Box<dyn CredentialSource>> = Vec::new();
        if let Some(s) = local_fs::LocalClaudeCreds::detect() {
            sources.push(Box::new(s));
        }
        for distro in wsl_bridge::list_distros() {
            sources.push(Box::new(wsl_bridge::WslClaudeCreds::new(distro)));
        }
        Self { sources }
    }
@@ -1,155 +0,0 @@
 // Reach into installed WSL distros to read their Claude credentials.
 //
 // We never mount the WSL filesystem ourselves — instead we shell out to
 // `wsl.exe -d <distro> -- sh -lc '...'` and read stdout. Every call has
 // a hard timeout so a hung WSL doesn't freeze the poll thread.
 use std::os::windows::process::CommandExt;
 use std::process::{Command, Output, Stdio};
 use std::time::{Duration, Instant};
 use super::local_fs::parse_claude_json;
 const CREATE_NO_WINDOW: u32 = 0x0800_0000;
 const COMMAND_TIMEOUT: Duration = Duration::from_secs(5);
 /// Enumerate installed WSL distributions. Returns an empty vec if WSL is
 /// not installed or the probe fails.
 pub fn list_distros() -> Vec<String> {
    let Some(output) = run_with_timeout(
        Command::new("wsl.exe").args(["-l", "-q"]),
        COMMAND_TIMEOUT,
    ) else {
        return Vec::new();
    };
    if !output.status.success() {
        return Vec::new();
    }
    decode_wsl_text(&output.stdout)
        .lines()
        .map(str::trim)
        .filter(|l| !l.is_empty())
        .map(ToOwned::to_owned)
        .collect()
 }
 pub struct WslClaudeCreds {
    distro: String,
    id: String,
 }
 impl WslClaudeCreds {
    pub fn new(distro: String) -> Self {
        let id = format!("wsl:{distro}");
        Self { distro, id }
    }
    pub fn distro(&self) -> &str {
        &self.distro
    }
 }
 impl super::CredentialSource for WslClaudeCreds {
    fn id(&self) -> &str {
        &self.id
    }
    fn read(&self) -> Result<super::Token, super::Error> {
        let output = wsl_run(&self.distro, "cat ~/.claude/.credentials.json")?;
        if !output.status.success() {
            return Err(super::Error::WslCommand {
                distro: self.distro.clone(),
                detail: format!("cat exited {}", output.status),
            });
        }
        let content = String::from_utf8(output.stdout).map_err(|_| super::Error::WslCommand {
            distro: self.distro.clone(),
            detail: "non-UTF-8 stdout".into(),
        })?;
        parse_claude_json(&content)
    }
    fn signature(&self) -> Option<String> {
        let output = wsl_run(
            &self.distro,
            "if [ -f ~/.claude/.credentials.json ]; then \
             stat -c '%s|%Y' ~/.claude/.credentials.json; \
             else echo MISSING; fi",
        )
        .ok()?;
        if !output.status.success() {
            return None;
        }
        let body = decode_wsl_text(&output.stdout).trim().to_string();
        if body == "MISSING" {
            return None;
        }
        Some(format!("{}|{}", self.id, body))
    }
    fn refresh_hint(&self) -> super::RefreshHint {
        super::RefreshHint::WslClaudeCli {
            distro: self.distro.clone(),
        }
    }
 }
 fn wsl_run(distro: &str, script: &str) -> Result<Output, super::Error> {
    run_with_timeout(
        Command::new("wsl.exe")
            .arg("-d")
            .arg(distro)
            .arg("--")
            .arg("sh")
            .arg("-lc")
            .arg(script),
        COMMAND_TIMEOUT,
    )
    .ok_or(super::Error::WslTimeout)
 }
 fn run_with_timeout(cmd: &mut Command, timeout: Duration) -> Option<Output> {
    let mut child = cmd
        .creation_flags(CREATE_NO_WINDOW)
        .stdout(Stdio::piped())
        .stderr(Stdio::null())
        .spawn()
        .ok()?;
    let start = Instant::now();
    loop {
        match child.try_wait() {
            Ok(Some(_)) => return child.wait_with_output().ok(),
            Ok(None) => {
                if start.elapsed() > timeout {
                    let _ = child.kill();
                    let _ = child.wait();
                    return None;
                }
                std::thread::sleep(Duration::from_millis(80));
            }
            Err(_) => return None,
        }
    }
 }
 /// `wsl.exe -l -q` historically emits UTF-16LE on stdout; other commands
 /// emit UTF-8. Detect by sampling high bytes and decode appropriately.
 pub(crate) fn decode_wsl_text(bytes: &[u8]) -> String {
    if bytes.len() >= 2 && bytes.len() % 2 == 0 {
        let sample_end = bytes.len().min(256);
        let mut high_nul = 0usize;
        for chunk in bytes[..sample_end].chunks_exact(2) {
            if chunk[1] == 0 {
                high_nul += 1;
            }
        }
        if high_nul * 2 >= sample_end / 2 {
            let units: Vec<u16> = bytes
                .chunks_exact(2)
                .map(|c| u16::from_le_bytes([c[0], c[1]]))
                .collect();
            return String::from_utf16_lossy(&units);
        }
    }
    String::from_utf8_lossy(bytes).into_owned()
 }
@@ -1,73 +0,0 @@
 // Discover the user's preferred Windows UI language.
 //
 // We try three sources in priority order and return the first non-empty
 // result. Callers normalise the returned BCP-47-ish code against the
 // list of locales we actually ship.
 use windows::core::PWSTR;
 use windows::Win32::Globalization::{
    GetUserDefaultLocaleName, GetUserDefaultUILanguage, GetUserPreferredUILanguages,
    LCIDToLocaleName, LOCALE_ALLOW_NEUTRAL_NAMES, MAX_LOCALE_NAME, MUI_LANGUAGE_NAME,
 };
 /// First non-empty locale code from the user's preferences. May be
 /// `Some("en-US")` style; callers do prefix normalisation.
 pub fn detect_system_locale() -> Option<String> {
    preferred_ui()
        .into_iter()
        .next()
        .or_else(default_ui_language)
        .or_else(default_locale_name)
 }
 fn preferred_ui() -> Vec<String> {
    unsafe {
        let mut count: u32 = 0;
        let mut buf_len: u32 = 0;
        if GetUserPreferredUILanguages(MUI_LANGUAGE_NAME, &mut count, PWSTR::null(), &mut buf_len)
            .is_err()
            || buf_len == 0
        {
            return Vec::new();
        }
        let mut buffer = vec![0u16; buf_len as usize];
        if GetUserPreferredUILanguages(
            MUI_LANGUAGE_NAME,
            &mut count,
            PWSTR(buffer.as_mut_ptr()),
            &mut buf_len,
        )
        .is_err()
        {
            return Vec::new();
        }
        buffer
            .split(|u| *u == 0)
            .filter(|s| !s.is_empty())
            .map(String::from_utf16_lossy)
            .collect()
    }
 }
 fn default_ui_language() -> Option<String> {
    unsafe {
        let lcid = GetUserDefaultUILanguage();
        let mut buf = [0u16; MAX_LOCALE_NAME as usize];
        let len = LCIDToLocaleName(lcid as u32, Some(&mut buf), LOCALE_ALLOW_NEUTRAL_NAMES);
        if len <= 1 {
            return None;
        }
        Some(String::from_utf16_lossy(&buf[..(len as usize - 1)]))
    }
 }
 fn default_locale_name() -> Option<String> {
    unsafe {
        let mut buf = [0u16; MAX_LOCALE_NAME as usize];
        let len = GetUserDefaultLocaleName(&mut buf);
        if len <= 1 {
            return None;
        }
        Some(String::from_utf16_lossy(&buf[..(len as usize - 1)]))
    }
 }
@@ -1,49 +0,0 @@
 code = "en"
 native_name = "English"
 window_title = "Claude Code Usage Bubble"
 refresh = "Refresh"
 update_frequency = "Update frequency"
 one_minute = "1 minute"
 five_minutes = "5 minutes"
 fifteen_minutes = "15 minutes"
 one_hour = "1 hour"
 models = "Models"
 claude_label = "Claude Code"
 chatgpt_label = "Codex"
 settings = "Settings"
 start_with_windows = "Start with Windows"
 reset_position = "Reset position"
 language = "Language"
 system_default = "System default"
 check_for_updates = "Check for updates"
 checking_for_updates = "Checking for updates…"
 up_to_date = "Up to date"
 update_failed = "Update failed"
 applying_update = "Applying update…"
 update_available = "Update available"
 update_via_winget = "via WinGet"
 auto_update_check = "Auto-update check"
 auto_check_disabled = "Disabled"
 auto_check_hourly = "Hourly"
 auto_check_daily = "Daily"
 auto_check_weekly = "Weekly"
 exit = "Exit"
 restart = "Restart"
 show_widget = "Show widget"
 session_window = "5h"
 weekly_window = "7d"
 now = "now"
 day_suffix = "d"
 hour_suffix = "h"
 minute_suffix = "m"
 second_suffix = "s"
 token_expired_title = "Claude Code session expired"
 token_expired_body = "Sign in again to keep tracking your usage."
 chatgpt_token_expired_title = "Codex session expired"
 chatgpt_token_expired_body = "Sign in again to keep tracking your usage."
 threshold_80_body = "Approaching the 5-hour limit."
 threshold_95_body = "Limit is close — consider easing up."
 update_applied_title = "Update applied"
 update_applied_body = "Updated to v"
 update_rollback_failed_body = "Update failed. Your original binary is saved at: "
@@ -1,49 +0,0 @@
 code = "ja"
 native_name = "日本語"
 window_title = "Claude Code Usage Bubble"
 refresh = "更新"
 update_frequency = "更新間隔"
 one_minute = "1分"
 five_minutes = "5分"
 fifteen_minutes = "15分"
 one_hour = "1時間"
 models = "モデル"
 claude_label = "Claude Code"
 chatgpt_label = "Codex"
 settings = "設定"
 start_with_windows = "Windows起動時に開始"
 reset_position = "位置をリセット"
 language = "言語"
 system_default = "システム既定"
 check_for_updates = "更新を確認"
 checking_for_updates = "確認中…"
 up_to_date = "最新です"
 update_failed = "更新に失敗しました"
 applying_update = "更新を適用中…"
 update_available = "更新あり"
 update_via_winget = "WinGet経由"
 auto_update_check = "更新の自動確認"
 auto_check_disabled = "無効"
 auto_check_hourly = "1時間ごと"
 auto_check_daily = "毎日"
 auto_check_weekly = "毎週"
 exit = "終了"
 restart = "再起動"
 show_widget = "ウィジェットを表示"
 session_window = "5時間"
 weekly_window = "7日"
 now = "今"
 day_suffix = "日"
 hour_suffix = "時"
 minute_suffix = "分"
 second_suffix = "秒"
 token_expired_title = "Claude Codeのセッションが切れました"
 token_expired_body = "使用状況の追跡を続けるには再度サインインしてください。"
 chatgpt_token_expired_title = "Codexのセッションが切れました"
 chatgpt_token_expired_body = "使用状況の追跡を続けるには再度サインインしてください。"
 threshold_80_body = "5時間の上限に近づいています。"
 threshold_95_body = "上限に近づきました — ペースを落としましょう。"
 update_applied_title = "更新を適用しました"
 update_applied_body = "バージョン v"
 update_rollback_failed_body = "更新に失敗しました。元のバイナリは次の場所に保存されています: "
@@ -1,49 +0,0 @@
 code = "ko"
 native_name = "한국어"
 window_title = "Claude Code Usage Bubble"
 refresh = "새로 고침"
 update_frequency = "업데이트 주기"
 one_minute = "1분"
 five_minutes = "5분"
 fifteen_minutes = "15분"
 one_hour = "1시간"
 models = "모델"
 claude_label = "Claude Code"
 chatgpt_label = "Codex"
 settings = "설정"
 start_with_windows = "Windows 시작 시 실행"
 reset_position = "위치 초기화"
 language = "언어"
 system_default = "시스템 기본값"
 check_for_updates = "업데이트 확인"
 checking_for_updates = "확인 중…"
 up_to_date = "최신 상태"
 update_failed = "업데이트 실패"
 applying_update = "업데이트 적용 중…"
 update_available = "업데이트 있음"
 update_via_winget = "WinGet 사용"
 auto_update_check = "업데이트 자동 확인"
 auto_check_disabled = "사용 안 함"
 auto_check_hourly = "매시간"
 auto_check_daily = "매일"
 auto_check_weekly = "매주"
 exit = "종료"
 restart = "다시 시작"
 show_widget = "위젯 표시"
 session_window = "5시간"
 weekly_window = "7일"
 now = "지금"
 day_suffix = "일"
 hour_suffix = "시간"
 minute_suffix = "분"
 second_suffix = "초"
 token_expired_title = "Claude Code 세션 만료"
 token_expired_body = "사용량을 계속 추적하려면 다시 로그인하세요."
 chatgpt_token_expired_title = "Codex 세션 만료"
 chatgpt_token_expired_body = "사용량을 계속 추적하려면 다시 로그인하세요."
 threshold_80_body = "5시간 한도에 가까워지고 있어요."
 threshold_95_body = "한도 임박 — 잠시 쉬어가세요."
 update_applied_title = "업데이트가 적용되었습니다"
 update_applied_body = "버전 v"
 update_rollback_failed_body = "업데이트 실패. 원본 바이너리는 다음 위치에 저장되었습니다: "
@@ -1,49 +0,0 @@
 code = "vi"
 native_name = "Tiếng Việt"
 window_title = "Claude Code Usage Bubble"
 refresh = "Làm mới"
 update_frequency = "Tần suất cập nhật"
 one_minute = "1 phút"
 five_minutes = "5 phút"
 fifteen_minutes = "15 phút"
 one_hour = "1 giờ"
 models = "Mô hình"
 claude_label = "Claude Code"
 chatgpt_label = "Codex"
 settings = "Cài đặt"
 start_with_windows = "Khởi động cùng Windows"
 reset_position = "Đặt lại vị trí"
 language = "Ngôn ngữ"
 system_default = "Mặc định hệ thống"
 check_for_updates = "Kiểm tra cập nhật"
 checking_for_updates = "Đang kiểm tra cập nhật…"
 up_to_date = "Đã là phiên bản mới nhất"
 update_failed = "Cập nhật thất bại"
 applying_update = "Đang áp dụng cập nhật…"
 update_available = "Có bản cập nhật mới"
 update_via_winget = "qua WinGet"
 auto_update_check = "Tự động kiểm tra cập nhật"
 auto_check_disabled = "Tắt"
 auto_check_hourly = "Mỗi giờ"
 auto_check_daily = "Hằng ngày"
 auto_check_weekly = "Hằng tuần"
 exit = "Thoát"
 restart = "Khởi động lại"
 show_widget = "Hiện widget"
 session_window = "5g"
 weekly_window = "7n"
 now = "ngay"
 day_suffix = "n"
 hour_suffix = "g"
 minute_suffix = "p"
 second_suffix = "s"
 token_expired_title = "Phiên Claude Code đã hết hạn"
 token_expired_body = "Hãy đăng nhập lại để tiếp tục theo dõi mức sử dụng."
 chatgpt_token_expired_title = "Phiên Codex đã hết hạn"
 chatgpt_token_expired_body = "Hãy đăng nhập lại để tiếp tục theo dõi mức sử dụng."
 threshold_80_body = "Sắp chạm giới hạn 5 giờ."
 threshold_95_body = "Sắp tới giới hạn — hãy cân nhắc giảm tốc."
 update_applied_title = "Đã áp dụng cập nhật"
 update_applied_body = "Đã cập nhật lên v"
 update_rollback_failed_body = "Cập nhật thất bại. Tệp gốc của bạn được lưu tại: "
@@ -1,49 +0,0 @@
 code = "zh-TW"
 native_name = "繁體中文"
 window_title = "Claude Code Usage Bubble"
 refresh = "重新整理"
 update_frequency = "更新頻率"
 one_minute = "1 分鐘"
 five_minutes = "5 分鐘"
 fifteen_minutes = "15 分鐘"
 one_hour = "1 小時"
 models = "模型"
 claude_label = "Claude Code"
 chatgpt_label = "Codex"
 settings = "設定"
 start_with_windows = "隨 Windows 啟動"
 reset_position = "重設位置"
 language = "語言"
 system_default = "系統預設"
 check_for_updates = "檢查更新"
 checking_for_updates = "檢查中…"
 up_to_date = "已是最新"
 update_failed = "更新失敗"
 applying_update = "正在套用更新…"
 update_available = "有可用更新"
 update_via_winget = "透過 WinGet"
 auto_update_check = "自動檢查更新"
 auto_check_disabled = "停用"
 auto_check_hourly = "每小時"
 auto_check_daily = "每天"
 auto_check_weekly = "每週"
 exit = "結束"
 restart = "重新啟動"
 show_widget = "顯示小工具"
 session_window = "5 小時"
 weekly_window = "7 日"
 now = "現在"
 day_suffix = "日"
 hour_suffix = "時"
 minute_suffix = "分"
 second_suffix = "秒"
 token_expired_title = "Claude Code 工作階段已過期"
 token_expired_body = "請重新登入以繼續追蹤使用量。"
 chatgpt_token_expired_title = "Codex 工作階段已過期"
 chatgpt_token_expired_body = "請重新登入以繼續追蹤使用量。"
 threshold_80_body = "接近 5 小時上限。"
 threshold_95_body = "上限將至 — 建議稍作休息。"
 update_applied_title = "已套用更新"
 update_applied_body = "已更新至 v"
 update_rollback_failed_body = "更新失敗。您的原始執行檔已保存於: "
@@ -1,25 +1,9 @@
-// Embedded TOML-based localisation.
+// English UI strings and formatting helpers.
 //
 // Each supported language lives in `locales/<code>.toml`. At startup we
 // `include_str!` every file, parse them with `toml`, and stash them in a
 // HashMap keyed by language code. The active language defaults to whatever
 // Windows reports for the user's preferred UI language; the menu lets the
 // user override that.
 //
 // Adding a translation: copy `en.toml` to `<code>.toml`, translate the
 // strings, then add one `include_str!` entry to `RAW_LOCALES` below.
 use std::collections::BTreeMap;
 use std::time::{Duration, SystemTime};
-use serde::Deserialize;
+/// The strings every UI module needs.
-
+#[derive(Clone, Debug)]
 pub mod detect;
 const FALLBACK_CODE: &str = "en";
 /// The strings every UI module needs. Field names map 1:1 to TOML keys.
 #[derive(Clone, Debug, Deserialize)]
 pub struct LocaleStrings {
    pub window_title: String,
    pub refresh: String,
@@ -28,14 +12,23 @@ pub struct LocaleStrings {
    pub five_minutes: String,
    pub fifteen_minutes: String,
    pub one_hour: String,
-    pub models: String,
+    pub providers: String,
    pub claude_label: String,
    pub chatgpt_label: String,
    pub opencode_go_label: String,
    pub settings: String,
    pub start_with_windows: String,
    pub reset_position: String,
-    pub language: String,
+    pub size_smaller: String,
-    pub system_default: String,
+    pub size_larger: String,
    pub reset_size: String,
    pub controls: String,
    pub control_left_click: String,
    pub control_right_click: String,
    pub control_drag: String,
    pub control_ctrl_wheel: String,
    pub control_tray_click: String,
    pub tray_left_click: String,
    pub check_for_updates: String,
    pub checking_for_updates: String,
    pub up_to_date: String,
@@ -63,141 +56,93 @@ pub struct LocaleStrings {
    pub chatgpt_token_expired_title: String,
    pub chatgpt_token_expired_body: String,
    /// Body text for "your usage just crossed 80% of the 5h limit". The
-    /// title is composed from the provider label + percent so it does not
+    /// title is composed from the provider label + percent.
    /// need to be translated separately.
    pub threshold_80_body: String,
    /// Body text for the 95% threshold balloon.
    pub threshold_95_body: String,
    /// Title for the tray balloon shown on first launch after an auto-update.
    pub update_applied_title: String,
-    /// Prefix for the tray balloon body. Call site appends the version (e.g. "0.1.10").
+    /// Prefix for the tray balloon body. Call site appends the version.
    pub update_applied_body: String,
    /// Prefix for the rollback-failed MessageBox body. Call site appends
    /// the backup path and a separator with the expected target filename.
    pub update_rollback_failed_body: String,
 }
-#[derive(Deserialize)]
+pub struct I18n {
 struct LocaleFile {
    code: String,
    native_name: String,
    #[serde(flatten)]
    strings: LocaleStrings,
 }
 const RAW_LOCALES: &[(&str, &str)] = &[
    ("en", include_str!("locales/en.toml")),
    ("ja", include_str!("locales/ja.toml")),
    ("ko", include_str!("locales/ko.toml")),
    ("vi", include_str!("locales/vi.toml")),
    ("zh-TW", include_str!("locales/zh-TW.toml")),
 ];
 pub struct I18n {
    /// Sorted by code so menus list languages deterministically.
    available: BTreeMap<String, (String, LocaleStrings)>,
    active: String,
 }
 impl I18n {
-    /// Load all embedded TOML files and pick an active language.
+    pub fn load() -> Self {
-    ///
+        Self {
-    /// `requested` overrides system detection. `None` means "ask Windows".
+            strings: english_strings(),
    pub fn load(requested: Option<&str>) -> Self {
        let mut available = BTreeMap::new();
        for (code, body) in RAW_LOCALES {
            match toml::from_str::<LocaleFile>(body) {
                Ok(file) => {
                    available.insert(file.code.clone(), (file.native_name, file.strings));
                }
                Err(e) => {
                    log::error!("failed to parse locale {code}: {e}");
                }
            }
        }
        if !available.contains_key(FALLBACK_CODE) {
            // Embedded TOMLs are validated by tests; this should never
            // happen in practice. Fall through with whatever we have.
            log::error!("fallback locale '{FALLBACK_CODE}' missing");
        }
        let active = requested
            .and_then(|c| normalise(c, &available))
            .or_else(|| detect::detect_system_locale().and_then(|c| normalise(&c, &available)))
            .unwrap_or_else(|| FALLBACK_CODE.to_string());
        Self { available, active }
    }
    pub fn strings(&self) -> &LocaleStrings {
-        self.available
+        &self.strings
            .get(&self.active)
            .map(|(_, s)| s)
            .unwrap_or_else(|| {
                // Defensive: if `active` was set to something unavailable
                // (shouldn't happen given `load` validates) — fall back.
                &self
                    .available
                    .get(FALLBACK_CODE)
                    .expect("fallback locale must exist")
                    .1
            })
    }
    pub fn active_code(&self) -> &str {
        &self.active
    }
    /// Iterate `(code, native_name)` pairs in stable order.
    pub fn available(&self) -> impl Iterator<Item = (&str, &str)> {
        self.available
            .iter()
            .map(|(code, (name, _))| (code.as_str(), name.as_str()))
    }
    pub fn set_active(&mut self, requested: Option<&str>) {
        let new_active = requested
            .and_then(|c| normalise(c, &self.available))
            .or_else(|| {
                detect::detect_system_locale().and_then(|c| normalise(&c, &self.available))
            })
            .unwrap_or_else(|| FALLBACK_CODE.to_string());
        self.active = new_active;
    }
 }
-/// Resolve a user-supplied or system-supplied locale code to one we have.
+fn english_strings() -> LocaleStrings {
-///
+    LocaleStrings {
-/// Handles `en_US`, `en-US`, `EN`, `zh-Hant-TW`, etc. by progressive
+        window_title: "Claude Code Usage Bubble".into(),
-/// fallback: exact → ASCII-lower exact → prefix match.
+        refresh: "Refresh".into(),
-fn normalise(input: &str, available: &BTreeMap<String, (String, LocaleStrings)>) -> Option<String> {
+        update_frequency: "Update frequency".into(),
-    let cleaned = input.trim().replace('_', "-");
+        one_minute: "1 minute".into(),
-    if cleaned.is_empty() || cleaned.eq_ignore_ascii_case("system") {
+        five_minutes: "5 minutes".into(),
-        return None;
+        fifteen_minutes: "15 minutes".into(),
        one_hour: "1 hour".into(),
        providers: "Providers".into(),
        claude_label: "Claude Code".into(),
        chatgpt_label: "Codex".into(),
        opencode_go_label: "OpenCode Go".into(),
        settings: "Settings".into(),
        start_with_windows: "Start with Windows".into(),
        reset_position: "Reset position".into(),
        size_smaller: "Make smaller".into(),
        size_larger: "Make larger".into(),
        reset_size: "Reset size".into(),
        controls: "Controls".into(),
        control_left_click: "Left-click: details".into(),
        control_right_click: "Right-click: menu".into(),
        control_drag: "Drag: move/snap".into(),
        control_ctrl_wheel: "Ctrl+Wheel: resize".into(),
        control_tray_click: "Tray click: show/hide".into(),
        tray_left_click: "Left-click: show/hide".into(),
        check_for_updates: "Check for updates".into(),
        checking_for_updates: "Checking for updates...".into(),
        up_to_date: "Up to date".into(),
        update_failed: "Update failed".into(),
        applying_update: "Applying update...".into(),
        update_available: "Update available".into(),
        update_via_winget: "via WinGet".into(),
        auto_update_check: "Auto-update check".into(),
        auto_check_disabled: "Disabled".into(),
        auto_check_hourly: "Hourly".into(),
        auto_check_daily: "Daily".into(),
        auto_check_weekly: "Weekly".into(),
        exit: "Exit".into(),
        restart: "Restart".into(),
        show_widget: "Show widget".into(),
        session_window: "5h".into(),
        weekly_window: "7d".into(),
        now: "now".into(),
        day_suffix: "d".into(),
        hour_suffix: "h".into(),
        minute_suffix: "m".into(),
        second_suffix: "s".into(),
        token_expired_title: "Claude Code session expired".into(),
        token_expired_body: "Sign in again to keep tracking your usage.".into(),
        chatgpt_token_expired_title: "Codex session expired".into(),
        chatgpt_token_expired_body: "Sign in again to keep tracking your usage.".into(),
        threshold_80_body: "Approaching the 5-hour limit.".into(),
        threshold_95_body: "Limit is close - consider easing up.".into(),
        update_applied_title: "Update applied".into(),
        update_applied_body: "Updated to v".into(),
        update_rollback_failed_body: "Update failed. Your original binary is saved at: ".into(),
    }
    // Exact (case-insensitive)
    for key in available.keys() {
        if key.eq_ignore_ascii_case(&cleaned) {
            return Some(key.clone());
        }
    }
    // Special-case: Traditional Chinese variants → zh-TW
    let lower = cleaned.to_ascii_lowercase();
    if lower.starts_with("zh") && (lower.contains("tw") || lower.contains("hk") || lower.contains("hant")) {
        if available.contains_key("zh-TW") {
            return Some("zh-TW".to_string());
        }
    }
    // Prefix fallback (e.g. "en-US" → "en")
    let prefix = lower.split('-').next().unwrap_or("");
    if !prefix.is_empty() {
        for key in available.keys() {
            if key.split('-').next().map(str::to_ascii_lowercase).as_deref() == Some(prefix) {
                return Some(key.clone());
            }
        }
    }
    None
 }
 // ---------- Free-function helpers ----------
@@ -259,3 +204,30 @@ pub fn time_until_display_change(resets_at: Option<SystemTime>) -> Option<Durati
    };
    Some(Duration::from_secs(secs.saturating_sub(bucket_start) + 1))
 }
 #[cfg(test)]
 mod tests {
    use super::*;
    #[test]
    fn english_strings_include_required_menu_labels() {
        let strings = english_strings();
        for (name, value) in [
            ("refresh", strings.refresh.as_str()),
            ("providers", strings.providers.as_str()),
            ("settings", strings.settings.as_str()),
            ("size_smaller", strings.size_smaller.as_str()),
            ("size_larger", strings.size_larger.as_str()),
            ("reset_size", strings.reset_size.as_str()),
            ("controls", strings.controls.as_str()),
            ("control_left_click", strings.control_left_click.as_str()),
            ("control_right_click", strings.control_right_click.as_str()),
            ("control_drag", strings.control_drag.as_str()),
            ("control_ctrl_wheel", strings.control_ctrl_wheel.as_str()),
            ("control_tray_click", strings.control_tray_click.as_str()),
            ("tray_left_click", strings.tray_left_click.as_str()),
        ] {
            assert!(!value.trim().is_empty(), "empty string: {name}");
        }
    }
 }
@@ -317,6 +317,7 @@ fn paint(hwnd: HWND, hdc: HDC) {
        let header = match data.model {
            ProviderId::Claude => data.strings.claude_label.clone(),
            ProviderId::ChatGpt => data.strings.chatgpt_label.clone(),
            ProviderId::OpenCodeGo => data.strings.opencode_go_label.clone(),
        };
        draw_text(
            hdc,
@@ -331,11 +332,8 @@ fn paint(hwnd: HWND, hdc: HDC) {
        );
        let bar_x = scaled(PADDING_LOGICAL) + scaled(LABEL_W_LOGICAL) + scaled(4);
-        let bar_w = rc.right
+        let bar_w =
-            - bar_x
+            rc.right - bar_x - scaled(PADDING_LOGICAL) - scaled(RIGHT_TEXT_W_LOGICAL) - scaled(4);
            - scaled(PADDING_LOGICAL)
            - scaled(RIGHT_TEXT_W_LOGICAL)
            - scaled(4);
        let row1_y = scaled(PADDING_LOGICAL) + scaled(24);
        let row2_y = row1_y + scaled(BAR_HEIGHT_LOGICAL) + scaled(ROW_GAP_LOGICAL) + scaled(8);
@@ -31,6 +31,9 @@ fn default_show_claude() -> bool {
 fn default_show_codex() -> bool {
    false
 }
 fn default_show_opencode_go() -> bool {
    false
 }
 fn default_widget_visible() -> bool {
    true
 }
@@ -48,30 +51,35 @@ fn default_update_check_interval_secs() -> Option<u64> {
 pub struct BubblePositions {
    pub claude: Option<(i32, i32)>,
    pub codex: Option<(i32, i32)>,
    pub opencode_go: Option<(i32, i32)>,
 }
 impl BubblePositions {
-    pub fn get(&self, model: ProviderId) -> Option<(i32, i32)> {
+    pub fn get(&self, provider: ProviderId) -> Option<(i32, i32)> {
-        match model {
+        match provider {
            ProviderId::Claude => self.claude,
            ProviderId::ChatGpt => self.codex,
            ProviderId::OpenCodeGo => self.opencode_go,
        }
    }
-    pub fn set(&mut self, model: ProviderId, pos: (i32, i32)) {
+    pub fn set(&mut self, provider: ProviderId, pos: (i32, i32)) {
-        match model {
+        match provider {
            ProviderId::Claude => self.claude = Some(pos),
            ProviderId::ChatGpt => self.codex = Some(pos),
            ProviderId::OpenCodeGo => self.opencode_go = Some(pos),
        }
    }
-    pub fn reset(&mut self, model: ProviderId) {
+    pub fn reset(&mut self, provider: ProviderId) {
-        match model {
+        match provider {
            ProviderId::Claude => self.claude = None,
            ProviderId::ChatGpt => self.codex = None,
            ProviderId::OpenCodeGo => self.opencode_go = None,
        }
    }
    pub fn reset_all(&mut self) {
        self.claude = None;
        self.codex = None;
        self.opencode_go = None;
    }
    /// Drop any saved position whose top-left no longer falls on a connected
@@ -80,16 +88,26 @@ impl BubblePositions {
    pub fn validate(&mut self) {
        if let Some((x, y)) = self.claude {
            if !position_on_any_monitor(x, y) {
-                log::warn!("bubble position claude ({x},{y}) outside all monitors; resetting to default");
+                log::warn!(
                    "bubble position claude ({x},{y}) outside all monitors; resetting to default"
                );
                self.claude = None;
            }
        }
        if let Some((x, y)) = self.codex {
            if !position_on_any_monitor(x, y) {
-                log::warn!("bubble position codex ({x},{y}) outside all monitors; resetting to default");
+                log::warn!(
                    "bubble position codex ({x},{y}) outside all monitors; resetting to default"
                );
                self.codex = None;
            }
        }
        if let Some((x, y)) = self.opencode_go {
            if !position_on_any_monitor(x, y) {
                log::warn!("bubble position opencode-go ({x},{y}) outside all monitors; resetting to default");
                self.opencode_go = None;
            }
        }
    }
 }
@@ -112,6 +130,8 @@ pub struct Settings {
    pub show_claude_code: bool,
    #[serde(default = "default_show_codex")]
    pub show_codex: bool,
    #[serde(default = "default_show_opencode_go")]
    pub show_opencode_go: bool,
    #[serde(default)]
    pub bubble_positions: BubblePositions,
    #[serde(default = "default_bubble_size")]
@@ -119,8 +139,6 @@ pub struct Settings {
    #[serde(default = "default_poll_interval_ms")]
    pub poll_interval_ms: u32,
    #[serde(default)]
    pub language: Option<String>,
    #[serde(default)]
    pub last_update_check_unix: Option<u64>,
    #[serde(default = "default_update_check_interval_secs")]
    pub update_check_interval_secs: Option<u64>,
@@ -133,10 +151,10 @@ impl Default for Settings {
        Self {
            show_claude_code: default_show_claude(),
            show_codex: default_show_codex(),
            show_opencode_go: default_show_opencode_go(),
            bubble_positions: BubblePositions::default(),
            bubble_size_logical: default_bubble_size(),
            poll_interval_ms: default_poll_interval_ms(),
            language: None,
            last_update_check_unix: None,
            update_check_interval_secs: default_update_check_interval_secs(),
            widget_visible: default_widget_visible(),
@@ -144,6 +162,35 @@ impl Default for Settings {
    }
 }
 impl Settings {
    pub fn is_provider_enabled(&self, provider: ProviderId) -> bool {
        match provider {
            ProviderId::Claude => self.show_claude_code,
            ProviderId::ChatGpt => self.show_codex,
            ProviderId::OpenCodeGo => self.show_opencode_go,
        }
    }
    pub fn set_provider_enabled(&mut self, provider: ProviderId, enabled: bool) {
        match provider {
            ProviderId::Claude => self.show_claude_code = enabled,
            ProviderId::ChatGpt => self.show_codex = enabled,
            ProviderId::OpenCodeGo => self.show_opencode_go = enabled,
        }
    }
    pub fn toggle_provider(&mut self, provider: ProviderId) {
        let enabled = !self.is_provider_enabled(provider);
        self.set_provider_enabled(provider, enabled);
    }
    pub fn has_enabled_live_provider(&self) -> bool {
        ProviderId::LIVE_USAGE
            .iter()
            .any(|provider| self.is_provider_enabled(*provider))
    }
 }
 pub fn settings_dir() -> Option<PathBuf> {
    dirs::config_dir().map(|d| d.join(APP_DIR_NAME))
 }
@@ -161,19 +208,76 @@ pub fn load() -> Settings {
        Err(_) => return Settings::default(),
    };
    let mut settings: Settings = serde_json::from_str(&content).unwrap_or_default();
-    // At least one model must be visible. Otherwise the app has nothing to show.
+    // At least one live provider must be visible. Otherwise the app has nothing to show.
-    if !settings.show_claude_code && !settings.show_codex {
+    if !settings.has_enabled_live_provider() {
        settings.show_claude_code = true;
    }
    // Clamp bubble size to safe range in case settings.json was hand-edited.
-    settings.bubble_size_logical = settings
+    settings.bubble_size_logical = settings.bubble_size_logical.clamp(
-        .bubble_size_logical
+        crate::bubble::MIN_BUBBLE_SIZE,
-        .clamp(crate::bubble::MIN_BUBBLE_SIZE, crate::bubble::MAX_BUBBLE_SIZE);
+        crate::bubble::MAX_BUBBLE_SIZE,
    );
    // Drop positions on monitors that have since been disconnected.
    settings.bubble_positions.validate();
    settings
 }
 #[cfg(test)]
 mod tests {
    use super::*;
    #[test]
    fn old_two_provider_settings_json_still_loads() {
        let json = r#"{
            "show_claude_code": false,
            "show_codex": true,
            "bubble_positions": {
                "claude": [10, 20],
                "codex": [30, 40]
            }
        }"#;
        let settings: Settings =
            serde_json::from_str(json).expect("old settings json should parse");
        assert!(!settings.show_claude_code);
        assert!(settings.show_codex);
        assert!(!settings.show_opencode_go);
        assert_eq!(
            settings.bubble_positions.get(ProviderId::Claude),
            Some((10, 20))
        );
        assert_eq!(
            settings.bubble_positions.get(ProviderId::ChatGpt),
            Some((30, 40))
        );
        assert_eq!(settings.bubble_positions.get(ProviderId::OpenCodeGo), None);
    }
    #[test]
    fn three_provider_settings_json_loads() {
        let json = r#"{
            "show_claude_code": true,
            "show_codex": false,
            "show_opencode_go": true,
            "bubble_positions": {
                "opencode_go": [50, 60]
            }
        }"#;
        let settings: Settings =
            serde_json::from_str(json).expect("new settings json should parse");
        assert!(settings.show_claude_code);
        assert!(!settings.show_codex);
        assert!(settings.show_opencode_go);
        assert_eq!(
            settings.bubble_positions.get(ProviderId::OpenCodeGo),
            Some((50, 60))
        );
    }
 }
 pub fn save(settings: &Settings) {
    let path = settings_path();
    if let Some(parent) = path.parent() {
@@ -43,7 +43,13 @@ fn render_pixmap(kind: ProviderId, percent: Option<f64>) -> Pixmap {
        let mut pb = PathBuilder::new();
        pb.push_circle(cx, cy, inner);
        if let Some(path) = pb.finish() {
-            pixmap.fill_path(&path, &paint, FillRule::Winding, Transform::identity(), None);
+            pixmap.fill_path(
                &path,
                &paint,
                FillRule::Winding,
                Transform::identity(),
                None,
            );
        }
    }
@@ -112,6 +118,8 @@ fn base_color(kind: ProviderId) -> [u8; 3] {
        ProviderId::Claude => [0x2a, 0x1f, 0x1c],
        // Cool dark slate for ChatGPT/Codex.
        ProviderId::ChatGpt => [0x1a, 0x1f, 0x26],
        // Deep green for OpenCode Go.
        ProviderId::OpenCodeGo => [0x12, 0x2a, 0x20],
    }
 }
@@ -11,8 +11,8 @@ use std::sync::{Mutex, OnceLock};
 use windows::Win32::Foundation::HWND;
 use windows::Win32::UI::Shell::{
-    Shell_NotifyIconW, NIF_ICON, NIF_INFO, NIF_MESSAGE, NIF_TIP, NIIF_INFO, NIIF_WARNING,
+    Shell_NotifyIconW, NIF_ICON, NIF_INFO, NIF_MESSAGE, NIF_TIP, NIIF_INFO, NIIF_WARNING, NIM_ADD,
-    NIM_ADD, NIM_DELETE, NIM_MODIFY, NOTIFYICONDATAW, NOTIFY_ICON_INFOTIP_FLAGS,
+    NIM_DELETE, NIM_MODIFY, NOTIFYICONDATAW, NOTIFY_ICON_INFOTIP_FLAGS,
 };
 use windows::Win32::UI::WindowsAndMessaging::DestroyIcon;
@@ -130,10 +130,7 @@ fn build_data(owner: HWND, kind: IconKind) -> NOTIFYICONDATAW {
 }
 fn icon_id(kind: IconKind) -> u32 {
-    match kind {
+    kind.metadata().tray_icon_id
        IconKind::Claude => 1,
        IconKind::ChatGpt => 2,
    }
 }
 fn write_utf16(dst: &mut [u16], src: &str) {
@@ -22,6 +22,7 @@ use windows::Win32::System::Threading::{
 /// so no zombie wait is required.
 pub fn spawn_detached(exe: &Path, args: &[OsString]) -> io::Result<()> {
    let mut cmdline = build_command_line(exe, args);
    let exe_w: Vec<u16> = exe.as_os_str().encode_wide().chain(Some(0)).collect();
    let si = STARTUPINFOW {
        cb: std::mem::size_of::<STARTUPINFOW>() as u32,
@@ -32,7 +33,7 @@ pub fn spawn_detached(exe: &Path, args: &[OsString]) -> io::Result<()> {
    let flags = CREATE_NO_WINDOW | DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP;
    let ok = unsafe {
        CreateProcessW(
-            PCWSTR::null(),
+            PCWSTR::from_raw(exe_w.as_ptr()),
            windows::core::PWSTR(cmdline.as_mut_ptr()),
            None,
            None,
@@ -1,10 +1,10 @@
-// Download a release asset and swap it in via native Win32 calls.
+// Download a release asset and swap it in through the proven `self_replace`
 // handoff path.
 //
-// After writing the new .exe to a staging path and verifying its
+// The running process cannot reliably replace its own mapped image on
-// SHA-256, we `MoveFileExW` the running exe sideways (so Windows
+// Windows. `self_replace` handles the platform-specific rename/copy sequence
-// releases the file lock on our own image), then `MoveFileExW` the
+// for that case. After the replacement succeeds, we start the installed path
-// staged exe into place, then spawn the new binary detached via
+// with `--wait-pid` and let the current process exit.
 // `handoff::spawn_detached`. No shell, no console allocation.
 use std::ffi::OsString;
 use std::path::{Path, PathBuf};
@@ -16,14 +16,22 @@ use windows::Win32::Storage::FileSystem::{
    MoveFileExW, MOVEFILE_COPY_ALLOWED, MOVEFILE_REPLACE_EXISTING, MOVE_FILE_FLAGS,
 };
 use windows::Win32::System::Threading::GetCurrentProcessId;
-use windows::Win32::UI::WindowsAndMessaging::{
+use windows::Win32::UI::WindowsAndMessaging::{MessageBoxW, MB_ICONERROR, MB_OK};
    MessageBoxW, MB_ICONERROR, MB_OK,
 };
 use crate::net::Client;
 use crate::os::to_utf16_nul;
 pub fn begin(http: &Client, release: &super::Release) -> Result<(), super::Error> {
    match begin_inner(http, release) {
        Ok(()) => Ok(()),
        Err(e) => {
            write_update_error(&e);
            Err(e)
        }
    }
 }
 fn begin_inner(http: &Client, release: &super::Release) -> Result<(), super::Error> {
    let current = std::env::current_exe()?;
    ensure_writable(&current)?;
    let staging = stage_path()?;
@@ -35,20 +43,45 @@ pub fn begin(http: &Client, release: &super::Release) -> Result<(), super::Error
    if let Some(parent) = staging.parent() {
        std::fs::create_dir_all(parent)?;
    }
-    download(http, &release.asset_url, &staging, release.asset_sha256.as_ref())?;
+    download(
-    swap_and_spawn(&staging, &current, &release.version)?;
+        http,
        &release.asset_url,
        &staging,
        release.asset_sha256.as_ref(),
    )?;
    replace_current_exe(&staging)?;
    spawn_replaced_exe(&current, &release.version)?;
    let _ = std::fs::remove_file(&staging);
    Ok(())
 }
-/// CLI entry-point compatibility for `--apply-update <target> <source> <pid>`.
+/// CLI entry point for `--apply-update <target> <source> <parent-pid> <version>`.
-/// The native handoff already does the swap-and-restart; if this binary
+/// Runs from the staged new binary, waits for the old UI process to exit,
-/// is invoked with the legacy flag (e.g. from an older release's helper)
+/// replaces the installed exe, and starts the installed copy.
 /// just exit cleanly so the upgrade still completes.
 pub fn run_cli(args: &[String]) -> Option<i32> {
-    if args.len() >= 2 && args[1] == "--apply-update" {
+    if args.get(1).map(String::as_str) != Some("--apply-update") {
-        Some(0)
+        return None;
-    } else {
+    }
-        None
+    let Some(target) = args.get(2).map(PathBuf::from) else {
        return Some(2);
    };
    let Some(source) = args.get(3).map(PathBuf::from) else {
        return Some(2);
    };
    let Some(parent_pid) = args.get(4).and_then(|s| s.parse::<u32>().ok()) else {
        return Some(2);
    };
    let Some(version) = args.get(5).cloned() else {
        return Some(2);
    };
    super::handoff::wait_for_parent_exit(parent_pid, 15_000);
    match replace_from_helper(&source, &target, &version) {
        Ok(()) => Some(0),
        Err(e) => {
            log::error!("apply-update failed: {e}");
            Some(1)
        }
    }
 }
@@ -63,7 +96,9 @@ fn download(
        .header("User-Agent", super::release::user_agent())
        .send()?;
    if !(200..300).contains(&resp.status()) {
-        return Err(super::Error::Network(crate::net::Error::Status(resp.status())));
+        return Err(super::Error::Network(crate::net::Error::Status(
            resp.status(),
        )));
    }
    let body = resp.body();
    if let Some(expected) = expected_sha256 {
@@ -94,44 +129,38 @@ fn hex_encode(bytes: &[u8]) -> String {
 fn reject_unsafe_path(p: &Path) -> Result<(), super::Error> {
    let s = p.to_string_lossy();
    if s.contains('%') {
-        return Err(super::Error::UnsafePath(format!(
+        return Err(super::Error::UnsafePath(format!("path contains '%': {s}")));
            "path contains '%': {s}"
        )));
    }
    Ok(())
 }
-fn swap_and_spawn(
+fn spawn_update_helper(
-    source: &Path,
+    helper: &Path,
    staging: &Path,
    target: &Path,
    version: &super::release::Version,
 ) -> Result<(), super::Error> {
-    let backup = backup_path(target);
+    let pid = unsafe { GetCurrentProcessId() };
-    // Step 1: rename running exe sideways. Windows allows renaming a
+    let version_str = format!("{}.{}.{}", version.major, version.minor, version.patch);
-    // file even while its image is mapped into memory; this releases
+    let args = vec![
-    // the lock on the original `target` path. Same directory by
+        OsString::from("--apply-update"),
-    // construction, so plain MoveFileExW with no flags is sufficient.
+        target.as_os_str().to_os_string(),
-    move_file(target, &backup, MOVE_FILE_FLAGS(0))?;
+        staging.as_os_str().to_os_string(),
        OsString::from(pid.to_string()),
        OsString::from(version_str),
    ];
    super::handoff::spawn_detached(helper, &args).map_err(super::Error::Io)
 }
-    // Step 2: move staged exe into place. Staging lives under
+fn replace_current_exe(staging: &Path) -> Result<(), super::Error> {
-    // %LOCALAPPDATA%, target lives wherever the user installed —
+    self_replace::self_replace(staging)
-    // COPY_ALLOWED lets MoveFileExW fall back to copy+delete when
+        .map_err(|e| super::Error::SwapFailed(format!("self_replace({}): {e}", staging.display())))
-    // the two paths cross volumes (portable installs on D:/E:/etc.).
+}
    let step2_flags = MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED;
    if let Err(swap_err) = move_file(source, target, step2_flags) {
        // Best-effort revert. Same volume, no COPY_ALLOWED needed.
        if let Err(revert_err) = move_file(&backup, target, MOVEFILE_REPLACE_EXISTING) {
            log::error!("rollback also failed: {revert_err}; surfacing modal");
            let target_name = target
                .file_name()
                .map(|s| s.to_string_lossy().into_owned())
                .unwrap_or_else(|| "claude-code-usage-bubble.exe".to_string());
            surface_rollback_failure(&backup, &target_name);
        }
        return Err(swap_err);
    }
-    // Step 3: spawn the new exe detached with --wait-pid + --updated-to.
+fn spawn_replaced_exe(
    target: &Path,
    version: &super::release::Version,
 ) -> Result<(), super::Error> {
    let pid = unsafe { GetCurrentProcessId() };
    let version_str = format!("{}.{}.{}", version.major, version.minor, version.patch);
    let args = vec![
@@ -140,15 +169,48 @@ fn swap_and_spawn(
        OsString::from("--updated-to"),
        OsString::from(version_str),
    ];
    super::handoff::spawn_detached(target, &args).map_err(super::Error::Io)
 }
 fn replace_from_helper(source: &Path, target: &Path, version: &str) -> Result<(), super::Error> {
    let backup = backup_path(target);
    // Parent has exited, so the install target is no longer mapped.
    move_file(target, &backup, MOVE_FILE_FLAGS(0))?;
    let swap_flags = MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED;
    if let Err(swap_err) = move_file(source, target, swap_flags) {
        // Compatibility for users updating from a release that invoked
        // the downloaded binary itself as the helper. A mapped source exe
        // may not be movable, but it can usually still be copied.
        let copy_result = std::fs::copy(source, target);
        if copy_result.is_err() {
            log::error!("source move failed before copy fallback: {swap_err}");
        }
        if let Err(copy_err) = copy_result {
            if let Err(revert_err) = move_file(&backup, target, MOVEFILE_REPLACE_EXISTING) {
                log::error!("rollback also failed: {revert_err}; surfacing modal");
                let target_name = target
                    .file_name()
                    .map(|s| s.to_string_lossy().into_owned())
                    .unwrap_or_else(|| "claude-code-usage-bubble.exe".to_string());
                surface_rollback_failure(&backup, &target_name);
            }
            return Err(super::Error::Io(copy_err));
        }
    }
    let args = vec![OsString::from("--updated-to"), OsString::from(version)];
    if let Err(spawn_err) = super::handoff::spawn_detached(target, &args) {
        // New binary is on disk but won't auto-launch. Roll back so
        // the user's next "Restart" stays on the known-good version.
        log::error!("spawn_detached failed after swap: {spawn_err}; attempting revert");
        let _ = std::fs::remove_file(target);
        if let Err(revert_err) = move_file(&backup, target, MOVEFILE_REPLACE_EXISTING) {
            log::error!("post-spawn revert failed: {revert_err}");
        }
        return Err(super::Error::Io(spawn_err));
    }
    let _ = std::fs::remove_file(source);
    Ok(())
 }
@@ -183,9 +245,9 @@ fn backup_path(target: &Path) -> PathBuf {
 }
 fn surface_rollback_failure(backup: &Path, target_name: &str) {
-    // Pull the localized body from i18n; the caller passes the
+    // Pull the UI body text from i18n; the caller passes the
    // user-meaningful filename so we can format it in-place.
-    let strings = crate::i18n::I18n::load(None).strings().clone();
+    let strings = crate::i18n::I18n::load().strings().clone();
    let body = format!(
        "{}{}\n\n{}",
        strings.update_rollback_failed_body,
@@ -214,6 +276,72 @@ fn stage_path() -> Result<PathBuf, super::Error> {
        .join("update.exe"))
 }
 fn update_error_log_path() -> Result<PathBuf, super::Error> {
    let base = dirs::data_local_dir().ok_or_else(|| {
        super::Error::NotWritable("no local data directory available".to_string())
    })?;
    Ok(base
        .join("ClaudeCodeUsageBubble")
        .join("updates")
        .join("update-error.log"))
 }
 fn write_update_error(error: &super::Error) {
    let Ok(path) = update_error_log_path() else {
        return;
    };
    if let Some(parent) = path.parent() {
        let _ = std::fs::create_dir_all(parent);
    }
    let ts = std::time::SystemTime::now()
        .duration_since(std::time::UNIX_EPOCH)
        .map(|d| d.as_secs())
        .unwrap_or_default();
    let body = format!("unix_time={ts}\nerror={error}\n");
    let _ = std::fs::write(path, body);
 }
 fn helper_path() -> Result<PathBuf, super::Error> {
    let base = dirs::data_local_dir().ok_or_else(|| {
        super::Error::NotWritable("no local data directory available".to_string())
    })?;
    let pid = unsafe { GetCurrentProcessId() };
    Ok(base
        .join("ClaudeCodeUsageBubble")
        .join("updates")
        .join(format!("updater-helper-{pid}.exe")))
 }
 fn prepare_update_helper(current: &Path, helper: &Path) -> Result<(), super::Error> {
    if let Some(parent) = helper.parent() {
        std::fs::create_dir_all(parent)?;
    }
    std::fs::copy(current, helper)?;
    Ok(())
 }
 pub fn cleanup_staged_update_files() {
    let Ok(stage) = stage_path() else {
        return;
    };
    let Some(dir) = stage.parent() else {
        return;
    };
    let Ok(entries) = std::fs::read_dir(dir) else {
        return;
    };
    for entry in entries.flatten() {
        let path = entry.path();
        let name = entry.file_name();
        let name = name.to_string_lossy();
        if name == "update.exe" || (name.starts_with("updater-helper-") && name.ends_with(".exe")) {
            if let Err(e) = std::fs::remove_file(&path) {
                log::debug!("cleanup_staged_update_files: remove {:?} failed: {e}", path);
            }
        }
    }
 }
 fn ensure_writable(target: &Path) -> Result<(), super::Error> {
    let parent = target.parent().ok_or_else(|| {
        super::Error::NotWritable("could not resolve install directory".to_string())
@@ -223,3 +351,22 @@ fn ensure_writable(target: &Path) -> Result<(), super::Error> {
    let _ = std::fs::remove_file(&probe);
    Ok(())
 }
 #[cfg(test)]
 mod tests {
    use super::*;
    #[test]
    fn stage_and_helper_paths_are_distinct_exes() {
        let stage = stage_path().expect("stage path");
        let helper = helper_path().expect("helper path");
        assert_eq!(stage.file_name().unwrap(), "update.exe");
        assert!(helper
            .file_name()
            .unwrap()
            .to_string_lossy()
            .starts_with("updater-helper-"));
        assert_ne!(stage, helper);
    }
 }
@@ -1,9 +1,9 @@
 // Self-update subsystem.
 //
 // Two stages: `release::fetch_latest` checks GitHub releases for a newer
-// build; `install::begin` downloads the .exe, swaps it in via native
+// build; `install::begin` downloads the .exe, swaps it in via `self_replace`,
-// `MoveFileExW`, then spawns the new binary detached via
+// then spawns the new binary detached via `CreateProcessW`. No shell handoff —
-// `CreateProcessW`. No shell handoff — nothing can flash a console.
+// nothing can flash a console.
 pub mod channel;
 pub mod handoff;
@@ -56,11 +56,13 @@ impl Orchestrator {
 fn spawn_cli(hint: &RefreshHint) -> bool {
    match hint {
-        RefreshHint::LocalClaudeCli => spawn_local(&["claude.cmd", "claude.exe", "claude"], &["-p", "."]),
+        RefreshHint::LocalClaudeCli => {
-        RefreshHint::WslClaudeCli { distro } => spawn_wsl(distro),
+            spawn_local(&["claude.cmd", "claude.exe", "claude"], &["-p", "."])
        RefreshHint::LocalCodexCli => {
            spawn_local(&["codex.cmd", "codex.ps1", "codex.exe", "codex"], &["exec", "."])
        }
        RefreshHint::LocalCodexCli => spawn_local(
            &["codex.cmd", "codex.ps1", "codex.exe", "codex"],
            &["exec", "."],
        ),
    }
 }
@@ -69,7 +71,11 @@ fn spawn_local(candidates: &[&str], args: &[&str]) -> bool {
        let lower = name.to_ascii_lowercase();
        let mut cmd = if lower.ends_with(".ps1") {
            let mut c = Command::new("powershell.exe");
-            c.arg("-NoProfile").arg("-ExecutionPolicy").arg("Bypass").arg("-File").arg(name);
+            c.arg("-NoProfile")
                .arg("-ExecutionPolicy")
                .arg("Bypass")
                .arg("-File")
                .arg(name);
            for a in args {
                c.arg(a);
            }
@@ -100,24 +106,3 @@ fn spawn_local(candidates: &[&str], args: &[&str]) -> bool {
    }
    false
 }
 fn spawn_wsl(distro: &str) -> bool {
    let script = "if command -v claude >/dev/null 2>&1; then claude -p .; \
                  elif [ -x \"$HOME/.local/bin/claude\" ]; then \"$HOME/.local/bin/claude\" -p .; \
                  else exit 127; fi";
    Command::new("wsl.exe")
        .arg("-d")
        .arg(distro)
        .arg("--")
        .arg("bash")
        .arg("-lic")
        .arg(script)
        .env_remove("CLAUDECODE")
        .env_remove("CLAUDE_CODE_ENTRYPOINT")
        .creation_flags(CREATE_NO_WINDOW)
        .stdin(Stdio::null())
        .stdout(Stdio::null())
        .stderr(Stdio::null())
        .spawn()
        .is_ok()
 }
@@ -7,7 +7,10 @@
 use crate::creds::Locator;
 use crate::net::Client;
 use crate::settings::Settings;
-use crate::usage::{anthropic::ClaudeProvider, chatgpt::ChatGptProvider, refresh, Error, ProviderId, UsageProvider, UsageWindows};
+use crate::usage::{
    anthropic::ClaudeProvider, chatgpt::ChatGptProvider, refresh, Error, ProviderId, UsageProvider,
    UsageWindows,
 };
 pub struct Registry {
    claude: ClaudeProvider,
@@ -28,20 +31,32 @@ impl Registry {
        settings: &Settings,
    ) -> Vec<(ProviderId, Result<UsageWindows, Error>)> {
        let mut out = Vec::new();
-        if settings.show_claude_code {
+        for provider in ProviderId::LIVE_USAGE {
-            out.push((ProviderId::Claude, self.claude.poll(http)));
+            if !settings.is_provider_enabled(provider) {
-        }
+                continue;
-        if settings.show_codex {
+            }
-            out.push((ProviderId::ChatGpt, self.chatgpt.poll(http)));
+            let result = match provider {
                ProviderId::Claude => self.claude.poll(http),
                ProviderId::ChatGpt => self.chatgpt.poll(http),
                ProviderId::OpenCodeGo => {
                    unreachable!("OpenCode Go has no live usage provider yet")
                }
            };
            out.push((provider, result));
        }
        out
    }
    /// Attempt to refresh the active source for one provider.
-    pub fn try_refresh(&self, id: ProviderId, orchestrator: &refresh::Orchestrator) -> refresh::Outcome {
+    pub fn try_refresh(
        &self,
        id: ProviderId,
        orchestrator: &refresh::Orchestrator,
    ) -> refresh::Outcome {
        let locator = match id {
            ProviderId::Claude => self.claude.locator(),
            ProviderId::ChatGpt => self.chatgpt.locator(),
            ProviderId::OpenCodeGo => return refresh::Outcome::CliMissing,
        };
        match locator.first_available() {
            Some(src) => orchestrator.refresh(src),
@@ -1,9 +1,4 @@
 // Usage data shapes shared across providers.
 //
 // Every provider reports its quota as two named "windows" (short + long).
 // For Claude: 5-hour and 7-day. For ChatGPT: primary and secondary. We
 // normalise to `primary` + `secondary` so the UI layer doesn't care which
 // provider produced the snapshot.
 use std::time::SystemTime;
@@ -11,15 +6,65 @@ use std::time::SystemTime;
 pub enum ProviderId {
    Claude,
    ChatGpt,
    OpenCodeGo,
 }
 impl ProviderId {
    pub const ALL: [Self; 3] = [Self::Claude, Self::ChatGpt, Self::OpenCodeGo];
    pub const LIVE_USAGE: [Self; 2] = [Self::Claude, Self::ChatGpt];
    pub fn slug(self) -> &'static str {
        match self {
            Self::Claude => "claude",
            Self::ChatGpt => "chatgpt",
            Self::OpenCodeGo => "opencode-go",
        }
    }
    pub fn metadata(self) -> ProviderMetadata {
        match self {
            Self::Claude => ProviderMetadata {
                id: self,
                slug: "claude",
                default_enabled: true,
                tray_icon_id: 1,
                display_mode: ProviderDisplayMode::TwoWindow,
                live_usage: true,
            },
            Self::ChatGpt => ProviderMetadata {
                id: self,
                slug: "chatgpt",
                default_enabled: false,
                tray_icon_id: 2,
                display_mode: ProviderDisplayMode::TwoWindow,
                live_usage: true,
            },
            Self::OpenCodeGo => ProviderMetadata {
                id: self,
                slug: "opencode-go",
                default_enabled: false,
                tray_icon_id: 3,
                display_mode: ProviderDisplayMode::WeeklyMonthlyFourBar,
                live_usage: false,
            },
        }
    }
 }
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum ProviderDisplayMode {
    TwoWindow,
    WeeklyMonthlyFourBar,
 }
 #[derive(Clone, Copy, Debug)]
 pub struct ProviderMetadata {
    pub id: ProviderId,
    pub slug: &'static str,
    pub default_enabled: bool,
    pub tray_icon_id: u32,
    pub display_mode: ProviderDisplayMode,
    pub live_usage: bool,
 }
 /// One usage window: how much you've consumed (0–100), and when it resets.
@@ -5,20 +5,28 @@
 use crate::os::Rgb as Color;
 use crate::usage::ProviderId;
-/// Per-provider identity color. Claude = warm orange `#D97757`. Codex =
+/// Per-provider identity color. Claude = warm orange `#D97757`. Codex tracks
-/// OpenAI brand teal `#10A37F`, used consistently across dark and light
+/// the OpenAI Codex monochrome palette — near-white `#E5E5E5` on dark themes,
-/// themes so the badge/bubble/panel never disagree on Codex identity.
+/// near-black `#1A1A1A` on light — so the accent stays readable against both
-pub fn accent_color_for(model: ProviderId, _is_dark: bool) -> Color {
+/// the dark bubble surface and the `#F3F3F3` light background.
 pub fn accent_color_for(model: ProviderId, is_dark: bool) -> Color {
    match model {
        ProviderId::Claude => Color::from_hex("#D97757"),
-        ProviderId::ChatGpt => Color::from_hex("#10A37F"),
+        ProviderId::ChatGpt => {
            if is_dark {
                Color::from_hex("#E5E5E5")
            } else {
                Color::from_hex("#1A1A1A")
            }
        }
        ProviderId::OpenCodeGo => Color::from_hex("#3BAE75"),
    }
 }
 /// Discrete 4-band fill color. The "safe" band uses the provider's identity
-/// color so Codex bars stay white-on-dark while Claude bars stay orange; the
+/// color so Codex bars render monochrome (light-on-dark / dark-on-light) while
-/// warning bands are theme-aware so light-mode amber stays readable against
+/// Claude bars stay orange; the warning bands are theme-aware so light-mode
-/// the `#F3F3F3` background.
+/// amber stays readable against the `#F3F3F3` background.
 ///
 /// - <60%   → provider accent
 /// - 60–80% → amber (dark `#E0A040`, light `#B47A20` for WCAG AA contrast)
Author	SHA1	Message	Date
tiennm99	4022d3f2de	feat: drop WSL and multi-language support	2026-06-02 16:32:21 +07:00
tiennm99	67f3b8a7ec	chore: bump version to 0.4.1	2026-06-02 15:52:03 +07:00
tiennm99	c46ab57f73	fix(update): use self-replace for portable updates	2026-06-02 15:50:45 +07:00
tiennm99	0ac698e2d1	chore: bump version to 0.4.0	2026-06-02 15:11:26 +07:00
tiennm99	2c67dd1217	feat(providers): prepare provider terminology and metadata	2026-06-02 15:09:50 +07:00
tiennm99	38752ae5c5	chore: bump version to 0.3.13	2026-06-02 11:09:35 +07:00
tiennm99	e099f0a91f	fix(update): restore helper-based self-update	2026-06-02 10:27:31 +07:00
tiennm99	4e9a66cbc8	chore: bump version to 0.3.12	2026-06-01 16:55:59 +07:00
tiennm99	1d9c59b43b	chore: bump version to 0.3.11	2026-06-01 16:10:43 +07:00
tiennm99	7039bf7e98	fix: pass updater executable path to CreateProcess	2026-06-01 16:09:28 +07:00
tiennm99	cc73c3f9b4	chore: bump version to 0.3.10	2026-06-01 15:36:26 +07:00
tiennm99	a68d80415b	chore: bump version to 0.3.9	2026-06-01 15:05:35 +07:00
tiennm99	cce22cc3b7	fix: run self-update through detached helper	2026-06-01 15:04:16 +07:00
tiennm99	5e00009e5a	chore: bump version to 0.3.8	2026-06-01 14:37:26 +07:00
tiennm99	c91dc996f8	fix: tighten fullscreen auto-hide detection	2026-06-01 14:35:26 +07:00
tiennm99	b2e48cc119	chore: bump version to 0.3.7	2026-05-25 11:37:34 +07:00
tiennm99	bee9f3cfa0	fix(ui): use theme-aware monochrome accent for Codex	2026-05-25 11:37:29 +07:00
tiennm99	860eb62d1b	chore: bump version to 0.3.6	2026-05-25 11:15:13 +07:00
tiennm99	c424b17bd7	fix(ui): reverse remaining-time direction to read like a clock Inner ring's consumed wedge now grows clockwise from 12 o'clock (mirroring a clock-hand countdown) and the tail remaining-time bar shrinks toward the right edge instead of the left. Usage ring and weekly usage bar unchanged.	2026-05-25 11:15:07 +07:00
tiennm99	3b0f96f51c	chore: bump version to 0.3.5	2026-05-23 23:36:41 +07:00
tiennm99	5976181cb2	fix(ui): improve bubble visual hierarchy and contrast - Lift inner time ring above WCAG 1.4.11 (track #303030 -> #404040, stroke floor 1 -> 2 logical, ring gap 3 -> 4). - Breathe tail bar/text with bar_text_gap=8 (was pad=6); right inset 12 -> 14 logical so text clears the stadium end-cap. - Reweight typography: head percent FW_BOLD, "5H" tag and tail percent FW_SEMIBOLD, tail countdown stays normal but takes muted color so the percent reads as the headline. - Tone down usage track (#3A3A3A/#D6D6D6 -> #2C2C2C/#E2E2E2) so fill dominates at low percentages. - Differentiate lane mass: usage bar 9%/5..12 -> 10%/6..12, time bar 5%/3..7 -> 4%/3..6, lane gap 5 -> 6. Time bar now reads as supporting context, not a competing quota. - Min-fill guard on weekly bar: sub-cap fills floor at one cap-diameter so 1% renders as a recognizable dot. - head_pad 4 -> 5; big-font ratio 26% -> 24% of head diameter (BOLD compensates for the size cut).	2026-05-23 23:36:34 +07:00
tiennm99	f2b31d3211	fix(ui): align tail bar text layout	2026-05-23 22:53:36 +07:00
tiennm99	5c2b14fc03	feat(ui): show remaining time progress	2026-05-23 22:31:37 +07:00
tiennm99	51889d3c39	fix(ui): scale weekly bar thickness	2026-05-23 21:43:11 +07:00
tiennm99	6661a7a10b	chore: bump version to 0.3.1	2026-05-23 21:07:05 +07:00
tiennm99	6cafffc883	fix(bubble): show 7d percent at default size and 125% DPI v0.3.0 introduced a tail 7d% reading but the layout-collapse guard fired at every common bubble configuration — at the default 200-logical size on both 100% and 125% DPI, after reserving the CJK worst-case countdown column ("999시간") and the "100%" text rect, the tail had less than 20 logical of bar room left. The guard collapsed the % rect to zero width and the paint code's `if rect.right > rect.left` skip ran on every frame, so the feature was effectively dead on arrival for the majority of users. The 20-logical bar minimum was the pre-feature bar floor, used to guarantee a readable bar at very small bubble sizes. It does not need to apply when the % is shown — the % is the actual data and the bar becomes secondary visual context. Split into two thresholds: - `bar_min_with_pct = 8 logical` decides whether the % can fit. With 8 logical of bar room the bar still renders as a short pill. - `bar_min = 20 logical` only applies on the fallback (140-logical minimum bubble) path where the % has been dropped — preserving the pre-feature readable-bar behavior at the smallest size. The bar's render floor now follows the active path (`bar_render_min`) so a thin bar in the pct-active case does not overlap the countdown.	2026-05-23 21:06:26 +07:00
tiennm99	b58811bfe0	chore: bump version to 0.3.0	2026-05-23 20:33:10 +07:00
tiennm99	e50aa3522a	feat(bubble): show 5h countdown in head and 7d percent in tail The stadium bubble previously dropped the 5h reset countdown (only the ring + percent were visible in the head) and never showed the 7d percent as a number (only the tail bar fill suggested it). Two more glanceable data points now live on the bubble face without reopening the panel. Head: the small "5h" tag is replaced by the live 5h countdown (e.g. "2h14m"). Falls back to the literal "5h" when no countdown is available yet (cold start) or when the localized string would overflow the rect — DT_NOCLIP would otherwise leak wide CJK glyphs ("4시간 32분") onto the ring stroke at the 140-logical minimum width. Tail: a new "X%" reading sits between the "7d" label and the bar (layout reads "7d 62% ▰▰▰▰▰▱▱▱ 6d4h"). Foreground text color — not the bar accent — because Codex teal #10A37F on the light theme background only hits ~3.2:1 contrast, below WCAG AA for small text; adjacency to the bar carries the visual grouping without hue. The text brightens in sync with the bar fill when weekly_pct >= 95%. compute_bubble_layout reserves room for a "100%"-sized rect between label and bar; if that would push the bar below the 20-logical minimum, the % rect collapses to zero width and the layout falls back to the original label→bar→countdown geometry, so the 140-logical bubble keeps its bar. No new graphics dependencies; tiny-skia + GDI hybrid render path unchanged. session_text plumbing in src/app.rs was already wired but unused in the render — now consumed. cargo check: clean. cargo test: 2/2. cargo clippy: 13 warnings (unchanged baseline).	2026-05-23 20:32:31 +07:00
tiennm99	a3f1323154	chore: bump version to 0.2.0	2026-05-23 18:18:34 +07:00
tiennm99	081a70a537	feat(ui): improve bubble controls discoverability	2026-05-23 18:17:25 +07:00
tiennm99	391ad0cba2	chore: bump version to 0.1.15	2026-05-23 12:54:46 +07:00
tiennm99	77325b1e00	fix(bubble): restore alpha after GDI text so glyphs aren't transparent User report on v0.1.14: text appears semi-transparent, desktop wallpaper bleeds through glyph pixels. Root cause: GDI's DrawTextW writes only RGB into 32bpp BI_RGB DIBs — the "reserved" alpha byte (byte 3) is not preserved per the BITMAPINFOHEADER contract. When UpdateLayeredWindow later composites with AC_SRC_ALPHA, it reads alpha=0 at every glyph pixel and shows them as fully transparent. The pre-v0.1.13 pipeline worked around this with an apply_alpha_mask post-pass that OR'd 0xFF000000 into every pixel inside the rounded rect. The stadium-shape rewrite (`526786b`) removed it on the false assumption that tiny-skia's per-pixel alpha would "stick" through subsequent GDI writes — but GDI runs after tiny-skia in the pipeline, so any pixel GDI text writes to loses the alpha that tiny-skia set. Fix: re-stamp the alpha channel from the original Pixmap after the GDI text overlay. This restores tiny-skia's exact alpha values (255 in the stadium interior, partial on the AA curved perimeter, 0 outside), including the AA fade at the stadium's rounded ends. Implementation: - new helper `restore_alpha_from_pixmap(pixmap, dst)` next to the existing `copy_pixmap_to_dib` - hoist `pixmap` out of the if-let arm in render() so it survives until after `paint_bubble_text` - call `restore_alpha_from_pixmap` post-text Two parallel reviewers (debugger + code-reviewer) converged on the same diagnosis; the debugger preferred this approach for its simplicity and because it's robust to any GDI behavior (whether alpha is zeroed, untouched, or scribbled on, we overwrite with the known-good value). Build clean.	2026-05-23 12:54:13 +07:00