codex-statusline 0.4.0__tar.gz → 0.4.2__tar.gz

{codex_statusline-0.4.0 → codex_statusline-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-statusline
-Version: 0.4.0
+Version: 0.4.2
 Summary: A tmux statusline for OpenAI Codex CLI: context usage, 5h and weekly quota, and session tokens at a glance. Local-only.
 Author: Zimo Xu
 License-Expression: MIT

{codex_statusline-0.4.0 → codex_statusline-0.4.2}/codex_statusline.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-statusline
-Version: 0.4.0
+Version: 0.4.2
 Summary: A tmux statusline for OpenAI Codex CLI: context usage, 5h and weekly quota, and session tokens at a glance. Local-only.
 Author: Zimo Xu
 License-Expression: MIT

{codex_statusline-0.4.0 → codex_statusline-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codex-statusline"
-version = "0.4.0"
+version = "0.4.2"
 description = "A tmux statusline for OpenAI Codex CLI: context usage, 5h and weekly quota, and session tokens at a glance. Local-only."
 requires-python = ">=3.11"
 license = "MIT"

{codex_statusline-0.4.0 → codex_statusline-0.4.2}/src/__init__.py

@@ -1,3 +1,3 @@
 """A local-only tmux status area for the official Codex CLI."""
 
-__version__ = "0.4.0"
+__version__ = "0.4.2"

{codex_statusline-0.4.0 → codex_statusline-0.4.2}/src/configure.py

@@ -1,6 +1,7 @@
 """`codex-statusline config`: pick segments, theme and thresholds with a live preview."""
 
 import curses
+import locale
 import time
 
 from .render import (
@@ -20,8 +21,8 @@ SEGMENT_NAMES = {
     "tokens": "session tokens",
 }
 LINE2_NAMES = {
+    "usage": "line 2: tokens in / cached / out",
     "pace": "line 2: when quota runs out at this pace",
-    "usage": "line 2: tokens in / cached / out, context size",
 }
 SETTINGS = ["theme", "ascii", "warn_at", "crit_at", "update_check"]
 LABELS = {
@@ -132,7 +133,6 @@ def sample_state() -> dict:
     return {
         "context_used": 35,
         "tokens": 1_234_567,
-        "window": 258_400,
         "usage": {
             "input_tokens": 1_190_000,
             "cached_input_tokens": 1_120_000,
@@ -154,7 +154,7 @@ KEYS = {
 }
 
 
-def _ui(screen, model: dict) -> bool:
+def _ui(screen, model: dict, ascii_only: bool = False) -> bool:
     curses.curs_set(0)
     row, state = 0, sample_state()
     while True:
@@ -165,15 +165,22 @@ def _ui(screen, model: dict) -> bool:
             state,
             max(1, width - 4),
             tmux=False,
-            ascii_only=cfg["ascii"],
+            ascii_only=cfg["ascii"] or ascii_only,
             segments=cfg["segments"],
             warn_at=cfg["warn_at"],
             crit_at=cfg["crit_at"],
         )
-        lines = ["codex-statusline config", HELP, ""]
+        help_text = (
+            HELP.replace("↑↓", "up/down").replace("←→", "left/right") if ascii_only else HELP
+        )
+        lines = ["codex-statusline config", help_text, ""]
         lines += [("> " if i == row else "  ") + text for i, text in enumerate(rows_text(model))]
         second = render_line2(
-            state, max(1, width - 4), cfg["line2"], tmux=False, ascii_only=cfg["ascii"]
+            state,
+            max(1, width - 4),
+            cfg["line2"],
+            tmux=False,
+            ascii_only=cfg["ascii"] or ascii_only,
         )
         lines += ["", "Preview (sample numbers):", "  " + preview]
         lines += ["  " + second] if second else []
@@ -193,10 +200,28 @@ def _ui(screen, model: dict) -> bool:
         row = apply(model, row, name)
 
 
+def utf8_terminal() -> bool:
+    """Put curses in UTF-8 mode; under a C/POSIX locale it mangles block glyphs."""
+    try:
+        locale.setlocale(locale.LC_ALL, "")
+    except locale.Error:
+        pass
+    if "utf" in locale.nl_langinfo(locale.CODESET).lower():
+        return True
+    for name in ("C.UTF-8", "en_US.UTF-8", "UTF-8"):
+        try:
+            locale.setlocale(locale.LC_CTYPE, name)
+            return True
+        except locale.Error:
+            continue
+    return False
+
+
 def configure() -> int:
     model = model_from(load_config())
+    ascii_only = not utf8_terminal()
     try:
-        save = curses.wrapper(_ui, model)
+        save = curses.wrapper(_ui, model, ascii_only)
     except curses.error as error:
         print(f"codex-statusline: needs an interactive terminal ({error}).")
         print(f"Edit {config_path()} instead.")

{codex_statusline-0.4.0 → codex_statusline-0.4.2}/src/data.py

@@ -126,7 +126,6 @@ class LogReader:
         self._quotas = _empty_quotas()
         self._tokens: float | None = None
         self._usage: dict[str, float] | None = None
-        self._window: float | None = None
 
     def _reset(self, path: str) -> None:
         self._path = path
@@ -138,7 +137,6 @@ class LogReader:
         self._quotas = _empty_quotas()
         self._tokens = None
         self._usage = None
-        self._window = None
 
     def _consume_line(self, line: bytes) -> None:
         try:
@@ -162,9 +160,6 @@ class LogReader:
             usage = {key: total.get(key) for key in USAGE_KEYS}
             if all(_count(v) for v in usage.values()):
                 self._usage = {key: float(v) for key, v in usage.items()}
-        window = info.get("model_context_window") if isinstance(info, dict) else None
-        if _count(window) and window > 0:
-            self._window = float(window)
         # Native versions may keep rate_limits inside info; quota-only events
         # can instead carry rate_limits directly on payload (even if info is null).
         rate_limits = info.get("rate_limits") if isinstance(info, dict) else None
@@ -246,7 +241,6 @@ class LogReader:
                 self._quotas = _empty_quotas()
                 self._tokens = None
                 self._usage = None
-                self._window = None
                 if stat.st_size > _MAX_READ_BYTES:
                     # Start at a bounded tail boundary, discarding its possibly
                     # incomplete first line.  Current quota events remain
@@ -282,7 +276,6 @@ class LogReader:
             self._quotas = _empty_quotas()
             self._tokens = None
             self._usage = None
-            self._window = None
         except OSError:
             # Avoid exporting filesystem details or turning transient I/O into
             # fabricated quota data; previously observed metadata remains.
@@ -291,7 +284,6 @@ class LogReader:
             "quotas": {name: dict(value) for name, value in self._quotas.items()},
             "tokens": self._tokens,
             "usage": dict(self._usage) if self._usage else None,
-            "window": self._window,
         }
 
 

{codex_statusline-0.4.0 → codex_statusline-0.4.2}/src/launcher.py

@@ -222,7 +222,8 @@ def launch(args):
         stream.write(f'set -g status-style "{THEMES[cfg["theme"]]}"\n')
         if cfg["line2"]:  # second status row, filled from the @line2 option
             stream.write('set -g status 2\nset -g status-format[1] "#{@line2}"\n')
-    base = [tmux, "-S", str(root / "tmux.sock"), "-f", str(conf)]
+    # -u: draw UTF-8 even when LANG/LC_* say otherwise (e.g. over ssh), or tmux drops the bars.
+    base = [tmux, "-u", "-S", str(root / "tmux.sock"), "-f", str(conf)]
     env = dict(os.environ)
     env.pop("TMUX", None)
     env.pop("TMUX_PANE", None)
@@ -279,7 +280,7 @@ def launch(args):
                     state["cwd"] = bound.get("cwd") or config["cwd"]
                     snapshot = reader.update(bound["transcript_path"])
                     state["quotas"] = snapshot.get("quotas", {})
-                    for key in ("tokens", "usage", "window"):
+                    for key in ("tokens", "usage"):
                         state[key] = snapshot.get(key)
                 state["quotas"] = merge_quotas(state["quotas"], others)
                 state["update"] = latest.get("version")

{codex_statusline-0.4.0 → codex_statusline-0.4.2}/src/render.py

@@ -32,9 +32,9 @@ _CONFIG_DEFAULTS = {
     "ascii": False,
     "warn_at": 20,
     "crit_at": 5,
-    "line2": [],
+    "line2": ["usage"],
 }
-LINE2_SEGMENTS = ["pace", "usage"]
+LINE2_SEGMENTS = ["usage", "pace"]
 
 
 def config_path() -> Path:
@@ -172,8 +172,10 @@ def _reset(reset_at: Any, now: float, weekly: bool = False) -> str:
         return ""  # window already reset; next reset is unknown until Codex reports again
     try:
         moment = datetime.fromtimestamp(stamp)
-        time = moment.strftime("%I:%M%p").lstrip("0").lower()
-        return f"{moment.strftime('%a ' if weekly else '')}{time}"
+        # Built by hand: strftime %p/%a follow the locale (e.g. 午後, 土).
+        clock = f"{moment.hour % 12 or 12}:{moment.minute:02d}{'am' if moment.hour < 12 else 'pm'}"
+        day = ("Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun")[moment.weekday()]
+        return f"{day} {clock}" if weekly else clock
     except (OverflowError, OSError, ValueError):
         return "--"
 
@@ -242,24 +244,20 @@ def _pace(data: Any, minutes: int, now: float, weekly: bool) -> tuple[str, str]
     return f"{label} pace: runs out ~{_reset(empty_at, now, weekly)}", "warning"
 
 
-def _usage(state: dict) -> str | None:
+def _usage(state: dict) -> str:
     usage = state.get("usage")
     if not isinstance(usage, dict):
-        return None
+        return "in -- · out --"  # before the first turn
     numbers = [
         _number(usage.get(k)) for k in ("input_tokens", "cached_input_tokens", "output_tokens")
     ]
     if any(n is None or n < 0 for n in numbers):
-        return None
+        return "in -- · out --"
     given, cached, output = numbers
     text = f"in {_si(given)}"
     if given:
         text += f" · {round(100 * min(cached, given) / given)}% cached"
-    text += f" · out {_si(output)}"
-    window, context = _number(state.get("window")), _number(state.get("context_used"))
-    if window and context is not None:
-        text += f" · ctx {_si(window * context / 100)}/{_si(window)}"
-    return text
+    return text + f" · out {_si(output)}"
 
 
 def render_line2(
@@ -270,12 +268,14 @@ def render_line2(
     ascii_only: bool = False,
     tmux: bool = True,
 ) -> str:
-    """Optional second line: quota pace and token breakdown; drops parts from the end."""
+    """Second line: token breakdown, then quota pace; drops parts from the end."""
     width = max(0, int(width))
     state = state if isinstance(state, dict) else {}
     now = _number(state.get("now")) or datetime.now().timestamp()
     quotas = state.get("quotas") if isinstance(state.get("quotas"), dict) else {}
     parts: list[tuple[str, str]] = []
+    if "usage" in line2:
+        parts.append((_usage(state), "accent"))
     if "pace" in line2:
         for data, minutes, weekly in (
             (quotas.get("5h"), 300, False),
@@ -284,10 +284,6 @@ def render_line2(
             pace = _pace(data, minutes, now, weekly)
             if pace:
                 parts.append(pace)
-    if "usage" in line2:
-        usage = _usage(state)
-        if usage:
-            parts.append((usage, "accent"))
     sep = " | "
     if ascii_only:
         parts = [(text.replace("·", "-"), role) for text, role in parts]

{codex_statusline-0.4.0 → codex_statusline-0.4.2}/tests/test_configure.py

@@ -22,9 +22,10 @@ class ConfigureTests(unittest.TestCase):
         apply(m, 9, "left")  # crit_at 5 -> 0
         apply(m, 9, "left")  # clamps at 0
         apply(m, 10, "space")  # update notice off
-        apply(m, 5, "space")  # line 2: usage on
+        apply(m, 4, "space")  # line 2: usage (on by default) -> off
+        apply(m, 5, "space")  # line 2: pace on
         cfg = to_config(m)
-        self.assertEqual(cfg["line2"], ["usage"])
+        self.assertEqual(cfg["line2"], ["pace"])
         self.assertEqual(cfg["segments"], ["ctx", "week", "5h"])
         self.assertEqual((cfg["theme"], cfg["warn_at"], cfg["crit_at"]), ("dark", 15, 0))
         self.assertFalse(cfg["update_check"])

{codex_statusline-0.4.0 → codex_statusline-0.4.2}/tests/test_line2.py

@@ -32,7 +32,6 @@ class Line2Tests(unittest.TestCase):
         state = {
             "now": NOW,
             "context_used": 50,
-            "window": 258_400,
             "usage": {
                 "input_tokens": 2_000_000,
                 "cached_input_tokens": 1_900_000,
@@ -41,14 +40,16 @@ class Line2Tests(unittest.TestCase):
             "quotas": {"5h": quota(22, 3 * 3600)},
         }
         wide = render_line2(state, 200, ["pace", "usage"], tmux=False)
-        self.assertIn("in 2.0M · 95% cached · out 66.0k · ctx 129.2k/258.4k", wide)
-        narrow = render_line2(state, 40, ["pace", "usage"], tmux=False)
-        self.assertIn("5h pace", narrow)
-        self.assertNotIn("cached", narrow)
+        self.assertIn("in 2.0M · 95% cached · out 66.0k", wide)
+        self.assertLess(wide.index("cached"), wide.index("5h pace"))  # usage first
+        narrow = render_line2(state, 40, ["usage", "pace"], tmux=False)
+        self.assertIn("cached", narrow)
+        self.assertNotIn("pace", narrow)  # pace drops first
+        self.assertIn("in -- · out --", render_line2({}, 80, ["usage"], tmux=False))
         self.assertTrue(render_line2(state, 200, ["usage"], tmux=False, ascii_only=True).isascii())
         self.assertEqual(render_line2(state, 200, [], tmux=False), "")
 
-    def test_reader_keeps_breakdown_and_window(self):
+    def test_reader_keeps_token_breakdown(self):
         info = {
             "total_token_usage": {
                 "input_tokens": 10,
@@ -56,7 +57,6 @@ class Line2Tests(unittest.TestCase):
                 "output_tokens": 2,
                 "total_tokens": 12,
             },
-            "model_context_window": 258_400,
         }
         event = {
             "type": "event_msg",
@@ -70,13 +70,14 @@ class Line2Tests(unittest.TestCase):
         self.assertEqual(
             snap["usage"], {"input_tokens": 10.0, "cached_input_tokens": 4.0, "output_tokens": 2.0}
         )
-        self.assertEqual(snap["window"], 258_400.0)
 
     def test_config_line2_validated(self):
         with tempfile.TemporaryDirectory() as tmp:
             path = Path(tmp) / "c.toml"
             path.write_text('line2 = ["pace", "usage"]\n')
             self.assertEqual(load_config(path)["line2"], ["pace", "usage"])
+            path.write_text("")
+            self.assertEqual(load_config(path)["line2"], ["usage"])  # usage on by default
             path.write_text('line2 = ["bogus"]\n')
             with unittest.mock.patch("sys.stderr"):
-                self.assertEqual(load_config(path)["line2"], [])
+                self.assertEqual(load_config(path)["line2"], ["usage"])  # invalid -> default

{codex_statusline-0.4.0 → codex_statusline-0.4.2}/tests/test_render.py

@@ -237,3 +237,24 @@ class ConfigTests(unittest.TestCase):
 
 if __name__ == "__main__":
     unittest.main()
+
+
+class ClockTests(unittest.TestCase):
+    def test_reset_time_ignores_locale(self):
+        import locale
+        from datetime import datetime
+
+        from src.render import _reset
+
+        stamp = datetime(2026, 10, 3, 18, 5).timestamp()  # a Saturday, 6:05pm
+        previous = locale.setlocale(locale.LC_TIME)
+        try:
+            for name in ("ja_JP.UTF-8", "de_DE.UTF-8", "C"):
+                try:
+                    locale.setlocale(locale.LC_TIME, name)
+                except locale.Error:
+                    continue
+                self.assertEqual(_reset(stamp, 0), "6:05pm")
+                self.assertEqual(_reset(stamp, 0, weekly=True), "Sat 6:05pm")
+        finally:
+            locale.setlocale(locale.LC_TIME, previous)