usage-cli 0.31.5__tar.gz → 0.31.6__tar.gz

{usage_cli-0.31.5 → usage_cli-0.31.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usage-cli
-Version: 0.31.5
+Version: 0.31.6
 Summary: usage — 在 macOS menu bar 與 Windows 系統匣顯示 Claude Code、Codex、Antigravity 用量的小工具（也提供終端機 TUI）
 License-Expression: AGPL-3.0-only
 Requires-Python: >=3.13

{usage_cli-0.31.5 → usage_cli-0.31.6}/pyproject.toml

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

{usage_cli-0.31.5 → usage_cli-0.31.6}/tests/test_usage_statusline_grok.py

@@ -7,6 +7,7 @@
 from __future__ import annotations
 
 import json
+import os
 import re
 import tomllib
 from pathlib import Path
@@ -71,6 +72,11 @@ def _visible(value: str) -> str:
     return _ANSI.sub("", value)
 
 
+def test_progress_bar_chars_are_platform_specific() -> None:
+    assert usage_statusline_grok._progress_bar_chars("nt") == ("█", "░")
+    assert usage_statusline_grok._progress_bar_chars("posix") == ("■", "□")
+
+
 def test_render_fixture_contains_expected_status(
     monkeypatch: pytest.MonkeyPatch,
     tmp_path: Path,
@@ -82,11 +88,12 @@ def test_render_fixture_contains_expected_status(
     monkeypatch.setenv("COLUMNS", "300")
 
     output = _visible(usage_statusline_grok.render(_fixture_data()))
+    filled, empty = usage_statusline_grok._progress_bar_chars(os.name)
 
     assert "project(main)" in output
-    assert "週配額:■■■□□□□□ 42%" in output
+    assert f"週配額:{filled * 3}{empty * 5} 42%" in output
     assert re.search(r"\(剩[0-9]+d[0-9]+h\)", output)
-    assert "對話窗:■□□□□□□□ 8% / 2.0M" in output
+    assert f"對話窗:{filled}{empty * 7} 8% / 2.0M" in output
     assert "會話時長:20min" in output
     assert "Grok 4.6/深思" in output
     assert output.count("\n") == 1
@@ -160,7 +167,8 @@ def test_render_degrades_for_narrow_terminal(
     assert "Weekly:42%" in first_line
     assert "Context:8%" in first_line
     assert "left" not in first_line
-    assert "■" not in first_line
+    filled, _empty = usage_statusline_grok._progress_bar_chars(os.name)
+    assert filled not in first_line
 
 
 def _patch_grok_paths(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> tuple[Path, Path, Path]:
@@ -377,5 +385,6 @@ def test_render_shows_zero_quota_when_percent_is_omitted(
     monkeypatch.setenv("COLUMNS", "300")
 
     output = _visible(usage_statusline_grok.render(_fixture_data()))
+    _filled, empty = usage_statusline_grok._progress_bar_chars(os.name)
 
-    assert "週配額:□□□□□□□□ 0%" in output
+    assert f"週配額:{empty * 8} 0%" in output

{usage_cli-0.31.5 → usage_cli-0.31.6}/tests/test_wintray.py

@@ -1612,7 +1612,9 @@ def test_panel_and_tray_menus_render_the_shared_model(
     assert [
         "separator" if item is FakeMenu.SEPARATOR else item.label for item in tray_menu.items[1:]
     ] == [
-        "separator" if isinstance(entry, wintray_menu.MenuSeparator) else _t("en", entry.i18n_key)
+        "separator"
+        if isinstance(entry, wintray_menu.MenuSeparator)
+        else wintray._without_power_glyph(_t("en", entry.i18n_key))
         for entry in tray_model
     ]
     assert model_keys(tray_model) == ["reset_panel_position", "separator", "quit"]
@@ -1631,6 +1633,34 @@ def test_panel_body_keeps_refresh_and_quit_escape_controls(
     assert 'data-action="quit"' in html
 
 
+@pytest.mark.parametrize("_panel_id,_key,filename", wintray.WINDOWS_PANELS)
+def test_panel_html_removes_the_power_glyph(_panel_id: str, _key: str, filename: str) -> None:
+    html = wintray.panel_html(filename)
+
+    assert "⏻" not in html
+    assert '"quit": "結束"' in html
+    assert '"quit": "⏻ 結束"' not in html
+
+
+def test_tray_quit_label_removes_the_power_glyph() -> None:
+    class FakeMenuItem:
+        def __init__(self, label: str, action: object, **kwargs: object) -> None:
+            self.label = label
+
+    class FakeMenu:
+        SEPARATOR = object()
+
+    controller = wintray._WindowsTrayController(mock=True, interval=60)
+    controller.language = "zh-TW"
+    entry = wintray_menu.MenuCommand("quit", "quit", surfaces=frozenset({wintray_menu.TRAY}))
+    item = wintray._tray_menu_entry(
+        SimpleNamespace(Menu=FakeMenu, MenuItem=FakeMenuItem), controller, entry
+    )
+
+    assert "⏻" not in item.label
+    assert item.label == item.label.lstrip()
+
+
 @pytest.mark.parametrize(
     ("payload", "method", "expected"),
     [

{usage_cli-0.31.5 → usage_cli-0.31.6}/usage_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usage-cli
-Version: 0.31.5
+Version: 0.31.6
 Summary: usage — 在 macOS menu bar 與 Windows 系統匣顯示 Claude Code、Codex、Antigravity 用量的小工具（也提供終端機 TUI）
 License-Expression: AGPL-3.0-only
 Requires-Python: >=3.13

{usage_cli-0.31.5 → usage_cli-0.31.6}/usage_statusline_grok.py

@@ -175,12 +175,18 @@ def color_by_pct(pct: float) -> str:
     return "\033[38;5;160m"
 
 
+def _progress_bar_chars(os_name: str) -> Tuple[str, str]:
+    # Legacy Windows consoles draw ■□ double-width.
+    return ("█", "░") if os_name == "nt" else ("■", "□")
+
+
 def progress_bar(value: Any, bar_width: int = 8) -> str:
     pct = max(0.0, min(100.0, float(value)))
     filled = round(pct / 100 * bar_width)
+    filled_char, empty_char = _progress_bar_chars(os.name)
     return (
-        f"{color_by_pct(pct)}{'■' * filled}{C['reset']}"
-        f"{'□' * (bar_width - filled)} "
+        f"{color_by_pct(pct)}{filled_char * filled}{C['reset']}"
+        f"{empty_char * (bar_width - filled)} "
         f"{color_by_pct(pct)}{pct:.0f}%{C['reset']}"
     )
 

{usage_cli-0.31.5 → usage_cli-0.31.6}/wintray/app.py

@@ -604,12 +604,17 @@ def draw_tray_icon(used_percent: float | None) -> Image:
     return image
 
 
+def _without_power_glyph(text: str) -> str:
+    """Windows fonts lack U+23FB."""
+    return text.replace("⏻ ", "")
+
+
 def panel_html(filename: str) -> str:
     html = _load_panel_html(filename)
     html = html.replace("{{PANEL_FLAVOR}}", _panel_flavor())
     html = inject_content_height_script(html)
     marker = "<head>"
-    return html.replace(marker, f"{marker}\n{JS_SHIM}", 1)
+    return _without_power_glyph(html.replace(marker, f"{marker}\n{JS_SHIM}", 1))
 
 
 def _active_panel_id() -> str:
@@ -2250,7 +2255,10 @@ def _tray_menu_entry(
         return pystray.Menu.SEPARATOR
     if isinstance(entry, wintray_menu.MenuGroup):
         children = tuple(_tray_menu_entry(pystray, controller, child) for child in entry.children)
-        return pystray.MenuItem(_t(controller.language, entry.i18n_key), pystray.Menu(*children))
+        return pystray.MenuItem(
+            _without_power_glyph(_t(controller.language, entry.i18n_key)),
+            pystray.Menu(*children),
+        )
     action = getattr(controller, entry.action)
     kwargs: dict[str, object] = {"radio": entry.radio}
     if entry.checked_by is not None:
@@ -2261,7 +2269,9 @@ def _tray_menu_entry(
         def action(_icon: Any, _item: Any, *, value: str = value) -> Any:
             return getattr(controller, entry.action)(value)
 
-    return pystray.MenuItem(_t(controller.language, entry.i18n_key), action, **kwargs)
+    return pystray.MenuItem(
+        _without_power_glyph(_t(controller.language, entry.i18n_key)), action, **kwargs
+    )
 
 
 def _session_resume_enabled() -> bool: