codex-statusline 0.7.0__tar.gz → 0.7.2__tar.gz

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-statusline
-Version: 0.7.0
+Version: 0.7.2
 Summary: Status bar for OpenAI Codex CLI and Claude Code: context usage, 5h and weekly quota with reset times, tokens, and cost at a glance. Local-only.
 Author: Zimo Xu
 License-Expression: MIT
@@ -65,16 +65,16 @@ Missing tmux? `brew install tmux` or `sudo apt install tmux`.
 
 ## Claude Code
 
-The same bar works in [Claude Code](https://code.claude.com/docs/en/statusline): `cxbar install` sets it as Claude Code's `statusLine` when it finds `~/.claude`, so `claude` shows the same two lines, plus the session cost:
+The same bar works in [Claude Code](https://code.claude.com/docs/en/statusline): `cxbar install` sets it as Claude Code's `statusLine` when it finds `~/.claude`, so `claude` shows the current model and the same two lines, plus the session cost:
 
 ```text
-CTX USED ███░░░░░ 35% | 5h ██░░░░░░░░ 18% 3:46pm | week ██████░░░░ 62% Sat 1:46pm | tok 1.2M
+Opus 5.5 | CTX USED ███░░░░░ 35% | 5h ██░░░░░░░░ 18% 3:46pm | week ██████░░░░ 62% Sat 1:46pm
 in 1.2M · 94% cached · out 44.0k · ≈$1.84
 ```
 
 - **Keeps what you have.** Already using another statusLine? Install leaves it alone; `cxbar install --claude` switches, and `cxbar uninstall` puts yours back.
 - **No tmux needed** on the Claude side: Claude Code passes the numbers to the bar directly.
-- **Every account.** Pro and Max see 5h and weekly quota with reset times; API-key users see context, tokens, and cost.
+- **Every account.** Subscribers see 5h and weekly quota with reset times; plans without a 5-hour window (Claude Ultra, Codex Pro) show only the weekly quota. API-key users see context, tokens, and cost.
 - **One config.** `cxbar config` changes the bar in both tools.
 
 ## Usage
@@ -127,13 +127,15 @@ Run `cxbar config` to set everything up in an interactive screen with a live, co
 
 The second line has four parts:
 
-- `usage` (on by default): tokens sent, how much of that hit the cache, and tokens generated.
+- `usage` (on by default): tokens sent, how much of that hit the cache, and tokens generated. In Claude Code these are the tokens currently in context, as Claude Code reports them, with the session-wide cache hit rate; that is also why the `tokens` segment is off there by default.
 - `cost` (on by default): the session's estimated cost at list price. Claude Code only.
 - `git` (on by default): the branch and how many lines are added and removed since the last commit, counting new files the agent created too, e.g. `⎇ main +42 -10`. Hidden outside a git repo.
 - `pace` (off by default): when your 5h and weekly quota run out at the rate you have used them so far, e.g. `week pace: runs out ~Tue 1:27am`, or `lasts to reset`.
 
 Turn them all off to keep a single line.
 
+The first-line `model` segment shows the current model, including its version when available. It is on by default in Claude Code and off in Codex, whose own footer already shows the model. Toggle or reorder it in `cxbar config`, or set `segments` per tool below. Codex does not supply session cost, so enabling `cost` cannot produce a dollar amount there. The `git` segment appears only when the session's working directory is inside a Git repository.
+
 It writes `~/.config/codex-statusline/config.toml`, which you can also edit by hand:
 
 ```toml
@@ -147,6 +149,7 @@ update_check = true  # show "↑ update available" in the bar when one is out
 line2 = ["usage", "cost", "git"]  # second line: any of "usage", "cost", "git", "pace"; [] for none
 
 [claude]
+segments = ["model", "ctx", "5h", "week"]
 line2 = ["usage", "cost", "git", "pace"]  # e.g. pace only in Claude Code
 ```
 
@@ -160,8 +163,6 @@ Invalid values are reported and fall back to defaults.
 
 ## FAQ
 
-**How do I scroll or copy?** Exactly as in plain Codex: the mouse wheel scrolls the conversation, and text selection works the same way.
-
-**Windows?** Not supported (tmux).
-
 **Is this official?** No. It is a third-party tool built on a version-sensitive integration.
+
+**Windows?** Not supported.

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/README.md

@@ -44,16 +44,16 @@ Missing tmux? `brew install tmux` or `sudo apt install tmux`.
 
 ## Claude Code
 
-The same bar works in [Claude Code](https://code.claude.com/docs/en/statusline): `cxbar install` sets it as Claude Code's `statusLine` when it finds `~/.claude`, so `claude` shows the same two lines, plus the session cost:
+The same bar works in [Claude Code](https://code.claude.com/docs/en/statusline): `cxbar install` sets it as Claude Code's `statusLine` when it finds `~/.claude`, so `claude` shows the current model and the same two lines, plus the session cost:
 
 ```text
-CTX USED ███░░░░░ 35% | 5h ██░░░░░░░░ 18% 3:46pm | week ██████░░░░ 62% Sat 1:46pm | tok 1.2M
+Opus 5.5 | CTX USED ███░░░░░ 35% | 5h ██░░░░░░░░ 18% 3:46pm | week ██████░░░░ 62% Sat 1:46pm
 in 1.2M · 94% cached · out 44.0k · ≈$1.84
 ```
 
 - **Keeps what you have.** Already using another statusLine? Install leaves it alone; `cxbar install --claude` switches, and `cxbar uninstall` puts yours back.
 - **No tmux needed** on the Claude side: Claude Code passes the numbers to the bar directly.
-- **Every account.** Pro and Max see 5h and weekly quota with reset times; API-key users see context, tokens, and cost.
+- **Every account.** Subscribers see 5h and weekly quota with reset times; plans without a 5-hour window (Claude Ultra, Codex Pro) show only the weekly quota. API-key users see context, tokens, and cost.
 - **One config.** `cxbar config` changes the bar in both tools.
 
 ## Usage
@@ -106,13 +106,15 @@ Run `cxbar config` to set everything up in an interactive screen with a live, co
 
 The second line has four parts:
 
-- `usage` (on by default): tokens sent, how much of that hit the cache, and tokens generated.
+- `usage` (on by default): tokens sent, how much of that hit the cache, and tokens generated. In Claude Code these are the tokens currently in context, as Claude Code reports them, with the session-wide cache hit rate; that is also why the `tokens` segment is off there by default.
 - `cost` (on by default): the session's estimated cost at list price. Claude Code only.
 - `git` (on by default): the branch and how many lines are added and removed since the last commit, counting new files the agent created too, e.g. `⎇ main +42 -10`. Hidden outside a git repo.
 - `pace` (off by default): when your 5h and weekly quota run out at the rate you have used them so far, e.g. `week pace: runs out ~Tue 1:27am`, or `lasts to reset`.
 
 Turn them all off to keep a single line.
 
+The first-line `model` segment shows the current model, including its version when available. It is on by default in Claude Code and off in Codex, whose own footer already shows the model. Toggle or reorder it in `cxbar config`, or set `segments` per tool below. Codex does not supply session cost, so enabling `cost` cannot produce a dollar amount there. The `git` segment appears only when the session's working directory is inside a Git repository.
+
 It writes `~/.config/codex-statusline/config.toml`, which you can also edit by hand:
 
 ```toml
@@ -126,6 +128,7 @@ update_check = true  # show "↑ update available" in the bar when one is out
 line2 = ["usage", "cost", "git"]  # second line: any of "usage", "cost", "git", "pace"; [] for none
 
 [claude]
+segments = ["model", "ctx", "5h", "week"]
 line2 = ["usage", "cost", "git", "pace"]  # e.g. pace only in Claude Code
 ```
 
@@ -139,8 +142,6 @@ Invalid values are reported and fall back to defaults.
 
 ## FAQ
 
-**How do I scroll or copy?** Exactly as in plain Codex: the mouse wheel scrolls the conversation, and text selection works the same way.
-
-**Windows?** Not supported (tmux).
-
 **Is this official?** No. It is a third-party tool built on a version-sensitive integration.
+
+**Windows?** Not supported.

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/codex_statusline.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-statusline
-Version: 0.7.0
+Version: 0.7.2
 Summary: Status bar for OpenAI Codex CLI and Claude Code: context usage, 5h and weekly quota with reset times, tokens, and cost at a glance. Local-only.
 Author: Zimo Xu
 License-Expression: MIT
@@ -65,16 +65,16 @@ Missing tmux? `brew install tmux` or `sudo apt install tmux`.
 
 ## Claude Code
 
-The same bar works in [Claude Code](https://code.claude.com/docs/en/statusline): `cxbar install` sets it as Claude Code's `statusLine` when it finds `~/.claude`, so `claude` shows the same two lines, plus the session cost:
+The same bar works in [Claude Code](https://code.claude.com/docs/en/statusline): `cxbar install` sets it as Claude Code's `statusLine` when it finds `~/.claude`, so `claude` shows the current model and the same two lines, plus the session cost:
 
 ```text
-CTX USED ███░░░░░ 35% | 5h ██░░░░░░░░ 18% 3:46pm | week ██████░░░░ 62% Sat 1:46pm | tok 1.2M
+Opus 5.5 | CTX USED ███░░░░░ 35% | 5h ██░░░░░░░░ 18% 3:46pm | week ██████░░░░ 62% Sat 1:46pm
 in 1.2M · 94% cached · out 44.0k · ≈$1.84
 ```
 
 - **Keeps what you have.** Already using another statusLine? Install leaves it alone; `cxbar install --claude` switches, and `cxbar uninstall` puts yours back.
 - **No tmux needed** on the Claude side: Claude Code passes the numbers to the bar directly.
-- **Every account.** Pro and Max see 5h and weekly quota with reset times; API-key users see context, tokens, and cost.
+- **Every account.** Subscribers see 5h and weekly quota with reset times; plans without a 5-hour window (Claude Ultra, Codex Pro) show only the weekly quota. API-key users see context, tokens, and cost.
 - **One config.** `cxbar config` changes the bar in both tools.
 
 ## Usage
@@ -127,13 +127,15 @@ Run `cxbar config` to set everything up in an interactive screen with a live, co
 
 The second line has four parts:
 
-- `usage` (on by default): tokens sent, how much of that hit the cache, and tokens generated.
+- `usage` (on by default): tokens sent, how much of that hit the cache, and tokens generated. In Claude Code these are the tokens currently in context, as Claude Code reports them, with the session-wide cache hit rate; that is also why the `tokens` segment is off there by default.
 - `cost` (on by default): the session's estimated cost at list price. Claude Code only.
 - `git` (on by default): the branch and how many lines are added and removed since the last commit, counting new files the agent created too, e.g. `⎇ main +42 -10`. Hidden outside a git repo.
 - `pace` (off by default): when your 5h and weekly quota run out at the rate you have used them so far, e.g. `week pace: runs out ~Tue 1:27am`, or `lasts to reset`.
 
 Turn them all off to keep a single line.
 
+The first-line `model` segment shows the current model, including its version when available. It is on by default in Claude Code and off in Codex, whose own footer already shows the model. Toggle or reorder it in `cxbar config`, or set `segments` per tool below. Codex does not supply session cost, so enabling `cost` cannot produce a dollar amount there. The `git` segment appears only when the session's working directory is inside a Git repository.
+
 It writes `~/.config/codex-statusline/config.toml`, which you can also edit by hand:
 
 ```toml
@@ -147,6 +149,7 @@ update_check = true  # show "↑ update available" in the bar when one is out
 line2 = ["usage", "cost", "git"]  # second line: any of "usage", "cost", "git", "pace"; [] for none
 
 [claude]
+segments = ["model", "ctx", "5h", "week"]
 line2 = ["usage", "cost", "git", "pace"]  # e.g. pace only in Claude Code
 ```
 
@@ -160,8 +163,6 @@ Invalid values are reported and fall back to defaults.
 
 ## FAQ
 
-**How do I scroll or copy?** Exactly as in plain Codex: the mouse wheel scrolls the conversation, and text selection works the same way.
-
-**Windows?** Not supported (tmux).
-
 **Is this official?** No. It is a third-party tool built on a version-sensitive integration.
+
+**Windows?** Not supported.

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codex-statusline"
-version = "0.7.0"
+version = "0.7.2"
 description = "Status bar for OpenAI Codex CLI and Claude Code: context usage, 5h and weekly quota with reset times, tokens, and cost at a glance. Local-only."
 requires-python = ">=3.11"
 license = "MIT"

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/src/__init__.py

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

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/src/claude.py

@@ -22,11 +22,21 @@ def _num(value: Any) -> float | None:
 
 
 def state_from(data: dict, now: float) -> dict:
+    model = data.get("model") if isinstance(data.get("model"), dict) else {}
+    model_id = model.get("id")
+    name = model.get("display_name")
+    name = name.strip() if isinstance(name, str) else ""
+    if isinstance(model_id, str):
+        match = re.fullmatch(r"claude-([a-z]+)-(\d+)-(\d+)(?:-\d{8})?(\[1m\])?", model_id)
+        if match and (not name or name.casefold() == match[1]):
+            name = f"{match[1].capitalize()} {match[2]}.{match[3]}{match[4] or ''}"
+        name = name or model_id
     window = data.get("context_window") if isinstance(data.get("context_window"), dict) else {}
     limits = data.get("rate_limits") if isinstance(data.get("rate_limits"), dict) else {}
     cost = data.get("cost") if isinstance(data.get("cost"), dict) else {}
     state: dict[str, Any] = {
         "now": now,
+        "model": name,
         "context_used": _num(window.get("used_percentage")),
         "quota_optional": True,  # only subscriptions report rate limits
     }
@@ -46,13 +56,18 @@ def state_from(data: dict, now: float) -> dict:
     given, output = _num(window.get("total_input_tokens")), _num(window.get("total_output_tokens"))
     if given is not None and output is not None:
         state["tokens"] = given + output
-        # Claude reports the cache split for the latest request only; use it as the hit rate.
-        last = window.get("current_usage") if isinstance(window.get("current_usage"), dict) else {}
-        keys = ("input_tokens", "cache_read_input_tokens", "cache_creation_input_tokens")
-        parts = [_num(last.get(k)) or 0.0 for k in keys]
+        # Prefer the session-wide hit ratio; older Claude Code only has the latest request's split.
+        cache = data.get("prompt_cache") if isinstance(data.get("prompt_cache"), dict) else {}
+        ratio = _num(cache.get("hit_ratio"))
+        if ratio is None:
+            last = window.get("current_usage")
+            last = last if isinstance(last, dict) else {}
+            keys = ("input_tokens", "cache_read_input_tokens", "cache_creation_input_tokens")
+            parts = [_num(last.get(k)) or 0.0 for k in keys]
+            ratio = parts[1] / sum(parts) if sum(parts) else None
         state["usage"] = {
             "input_tokens": given,
-            "cached_input_tokens": given * parts[1] / sum(parts) if sum(parts) else None,
+            "cached_input_tokens": given * min(ratio, 1.0) if ratio is not None else None,
             "output_tokens": output,
         }
     state["cost"] = _num(cost.get("total_cost_usd"))

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/src/configure.py

@@ -6,7 +6,6 @@ import re
 import time
 
 from .render import (
-    DEFAULT_SEGMENTS,
     LINE2_SEGMENTS,
     TARGETS,
     THEMES,
@@ -22,6 +21,7 @@ SEGMENT_NAMES = {
     "5h": "5-hour quota",
     "week": "weekly quota",
     "tokens": "session tokens",
+    "model": "current model",
 }
 LINE2_NAMES = {
     "usage": "tokens in / cached / out",
@@ -44,7 +44,7 @@ HELP = "↑↓ move  space toggle  ←→ change  J/K reorder  Tab switch tool
 
 def model_from(cfg: dict, target: str = "claude") -> dict:
     enabled = [name for name in cfg["segments"] if name in SEGMENT_NAMES]
-    order = enabled + [name for name in DEFAULT_SEGMENTS if name not in enabled]
+    order = enabled + [name for name in SEGMENT_NAMES if name not in enabled]
     line2_order = LINE2_FOR[target]
     return {
         **{key: cfg[key] for key in SETTINGS},
@@ -150,6 +150,7 @@ def rows_text(model: dict) -> list[str]:
 def sample_state(target: str = "codex") -> dict:
     now = time.time()
     state = {
+        "model": "gpt-model" if target == "codex" else "Opus 5.5",
         "context_used": 35,
         "tokens": 1_234_567,
         "usage": {

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/src/data.py

@@ -99,6 +99,16 @@ def _timestamp(value: Any) -> float | None:
     return None
 
 
+def _window_label(minutes: Any) -> str | None:
+    """Name a window by its length, within the same 5% tolerance Codex's own TUI uses."""
+    if not _count(minutes):
+        return None
+    for base, label in ((300, "5h"), (10080, "weekly")):
+        if abs(minutes - base) <= base * 0.05:
+            return label
+    return None
+
+
 def _empty_quotas() -> dict[str, dict[str, float | None]]:
     return {
         "5h": {"remaining": None, "reset_at": None, "observed_at": None},
@@ -168,12 +178,16 @@ class LogReader:
         if not isinstance(rate_limits, dict):
             return
 
-        # Slots vary by plan (e.g. Plus may carry only the weekly window in "primary"),
+        # Model-specific buckets (e.g. "codex_other") are not the account-wide quota.
+        limit_id = rate_limits.get("limit_id")
+        if limit_id is not None and limit_id != "codex":
+            return
+
+        # Slots vary by plan (e.g. Pro has no 5h window, so weekly may sit in "primary"),
         # so identify each quota by its window length, not by its key.
-        windows = {300: "5h", 10080: "weekly"}
         for key in ("primary", "secondary"):
             quota = rate_limits.get(key)
-            label = windows.get(quota.get("window_minutes")) if isinstance(quota, dict) else None
+            label = _window_label(quota.get("window_minutes")) if isinstance(quota, dict) else None
             if label is None:
                 continue
             used = quota.get("used_percent")
@@ -233,14 +247,8 @@ class LogReader:
                     probe_stream.seek(self._offset - len(self._probe))
                     overwritten = probe_stream.read(len(self._probe)) != self._probe
             if identity != self._identity or stat.st_size < self._offset or overwritten:
+                self._reset(path)
                 self._identity = identity
-                self._offset = 0
-                self._partial = b""
-                self._discard_until_newline = False
-                self._probe = b""
-                self._quotas = _empty_quotas()
-                self._tokens = None
-                self._usage = None
                 if stat.st_size > _MAX_READ_BYTES:
                     # Start at a bounded tail boundary, discarding its possibly
                     # incomplete first line.  Current quota events remain
@@ -268,14 +276,7 @@ class LogReader:
         except FileNotFoundError:
             # A missing bound file has no metadata yet.  Retain the selected
             # path, but a later appearance will be picked up by identity reset.
-            self._identity = None
-            self._offset = 0
-            self._partial = b""
-            self._discard_until_newline = False
-            self._probe = b""
-            self._quotas = _empty_quotas()
-            self._tokens = None
-            self._usage = None
+            self._reset(path)
         except OSError:
             # Avoid exporting filesystem details or turning transient I/O into
             # fabricated quota data; previously observed metadata remains.

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/src/manage.py

@@ -5,7 +5,6 @@ import json
 import os
 import shlex
 import shutil
-import subprocess
 import sys
 import time
 import tomllib
@@ -19,24 +18,6 @@ END = "# <<< codex-statusline <<<"
 STATUS_MESSAGE = "codex-statusline binding"
 
 
-def detected_shell():
-    # $SHELL can remain zsh even when Ghostty's configured command is fish.
-    try:
-        proc = subprocess.run(
-            ["ps", "-p", str(os.getppid()), "-o", "comm="],
-            capture_output=True,
-            text=True,
-            timeout=1,
-        )
-        name = Path(proc.stdout.strip()).name.lstrip("-")
-        if name in ("fish", "zsh", "bash"):
-            return name
-    except (OSError, subprocess.TimeoutExpired):
-        pass
-    name = Path(os.environ.get("SHELL", "/bin/zsh")).name
-    return name if name in ("fish", "zsh", "bash") else "zsh"
-
-
 def available_shells():
     """Install for every supported shell available on this machine."""
     return [name for name in ("bash", "zsh", "fish") if shutil.which(name)]

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/src/render.py

@@ -53,6 +53,9 @@ def load_config(path: str | os.PathLike | None = None, target: str = "codex") ->
     if path is None:
         path = config_path()
     config = dict(_CONFIG_DEFAULTS)
+    if target == "claude":
+        # Claude's token counts describe the current context only, which ctx already shows.
+        config["segments"] = ["model", "ctx", "5h", "week"]
     try:
         raw = tomllib.loads(Path(path).read_text())
     except FileNotFoundError:
@@ -62,7 +65,9 @@ def load_config(path: str | os.PathLike | None = None, target: str = "codex") ->
         raw = {}
     checks = {
         "segments": lambda v: (
-            isinstance(v, list) and v and all(x in ("ctx", "5h", "week", "tokens") for x in v)
+            isinstance(v, list)
+            and v
+            and all(x in ("model", "ctx", "5h", "week", "tokens") for x in v)
         ),
         "theme": lambda v: v in THEMES,
         "ascii": lambda v: isinstance(v, bool),
@@ -160,13 +165,12 @@ def _pct(value: Any) -> str:
     return "--" if number is None else f"{number}%"
 
 
-def _bar(value: Any, slots: int, ascii_only: bool, *, left: bool = False) -> str:
+def _bar(value: Any, slots: int, ascii_only: bool) -> str:
     number = _percent(value)
     if number is None:
         symbol = "-" if ascii_only else "·"
         return symbol * slots
-    ratio = number
-    filled = round(ratio * slots / 100)
+    filled = round(number * slots / 100)
     if ascii_only:
         return "=" * filled + "-" * (slots - filled)
     return "█" * filled + "░" * (slots - filled)
@@ -199,7 +203,7 @@ def _quota_values(
     left = "--" if remaining is None else f"{remaining}%"
     reset = _reset(data.get("reset_at"), now, weekly)
     compact = f"{label} {left}"
-    bar = _bar(remaining, 10, ascii_only, left=True)
+    bar = _bar(remaining, 10, ascii_only)
     detail = f"{label} {bar} {left} {reset}".rstrip()
     return detail, compact, remaining
 
@@ -369,6 +373,11 @@ def render(
         "week": (qwdetail, qwcompact, _quota_role(qwvalue, warn_at, crit_at)),
         "tokens": (tok, tok, "accent"),
     }
+    model = state.get("model")
+    if isinstance(model, str) and model.strip():
+        text = _safe(model, ascii_only, tmux and not ansi).strip()
+        if text:
+            known["model"] = (text, text, "accent")
     # Plans without a 5h (or weekly) limit report only the other window: hide the missing one.
     if (q5value is None) != (qwvalue is None):
         del known["5h" if q5value is None else "week"]
@@ -378,6 +387,10 @@ def render(
     parts = [known[name] for name in (segments or DEFAULT_SEGMENTS) if name in known] or [
         known["ctx"]
     ]
+    parts = [
+        (detail if i == 0 else detail.lstrip(), compact if i == 0 else compact.lstrip(), role)
+        for i, (detail, compact, role) in enumerate(parts)
+    ]
     update = state.get("update")
     hint = None
     if isinstance(update, str) and re.fullmatch(r"\d+(\.\d+)*", update):

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/src/update.py

@@ -122,7 +122,7 @@ def check(latest=latest_version) -> int:
 
 def update() -> int:
     command = upgrade_command()
-    print("$ " + " ".join(command))
+    print("$ " + " ".join(command), flush=True)  # before the tool's own output
     if not shutil.which(command[0]):
         print(
             f"codex-statusline: {command[0]} not found; run the command above yourself.",

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/tests/test_claude.py

@@ -15,6 +15,7 @@ from src.claude import state_from, statusline
 
 NOW = time.time()
 SUBSCRIBER = {
+    "model": {"id": "claude-opus-5-5", "display_name": "Opus"},
     "context_window": {
         "used_percentage": 35,
         "total_input_tokens": 1_190_000,
@@ -54,6 +55,7 @@ class ClaudeStatuslineTests(unittest.TestCase):
         self.assertIn("\x1b[38;5;", out)  # ANSI colors for Claude Code
         plain = ANSI.sub("", out).splitlines()
         self.assertEqual(len(plain), 2)
+        self.assertTrue(plain[0].startswith("Opus 5.5 | CTX USED"), plain[0])
         self.assertIn("CTX USED", plain[0])
         self.assertIn("5h ██░░░░░░░░ 18%", plain[0])
         self.assertIn("in 1.2M · 94% cached · out 44.0k · ≈$1.84", plain[1])
@@ -73,6 +75,21 @@ class ClaudeStatuslineTests(unittest.TestCase):
         self.assertNotIn("cached", plain)
         self.assertIn("in 52.0k · out 3.1k · ≈$0.43", plain)
 
+    def test_plan_without_5h_window_shows_weekly_only(self):
+        data = dict(SUBSCRIBER, rate_limits={"seven_day": SUBSCRIBER["rate_limits"]["seven_day"]})
+        plain = ANSI.sub("", run_statusline(data, self.home))
+        self.assertNotIn("5h", plain)
+        self.assertIn("week", plain)
+
+    def test_tokens_segment_off_by_default(self):
+        self.assertNotIn("tok ", ANSI.sub("", run_statusline(SUBSCRIBER, self.home)))
+
+    def test_session_hit_ratio_preferred_over_last_request(self):
+        data = dict(SUBSCRIBER, prompt_cache={"hit_ratio": 0.5})
+        self.assertIn("50% cached", ANSI.sub("", run_statusline(data, self.home)))
+        data = dict(SUBSCRIBER, prompt_cache={"hit_ratio": None})
+        self.assertIn("94% cached", ANSI.sub("", run_statusline(data, self.home)))
+
     def test_bad_input_still_prints_a_bar(self):
         for data in ("not json", "[1, 2]", ""):
             self.assertIn("CTX USED", run_statusline(data, self.home))
@@ -83,6 +100,23 @@ class ClaudeStatuslineTests(unittest.TestCase):
         self.assertEqual(state["quotas"]["weekly"]["reset_at"], NOW + 200_000)
         self.assertEqual(state["tokens"], 1_234_000)
 
+    def test_model_name_fallback_and_configurable_segment(self):
+        for model, expected in (
+            ({"id": "claude-opus-5-5", "display_name": "Opus"}, "Opus 5.5"),
+            ({"id": "claude-sonnet-4-5-20250929"}, "Sonnet 4.5"),
+            ({"id": "claude-opus-5-5[1m]", "display_name": "Opus"}, "Opus 5.5[1m]"),
+            ({"id": "custom-model", "display_name": "My Model"}, "My Model"),
+            ({"id": "custom-model"}, "custom-model"),
+            (None, ""),
+        ):
+            with self.subTest(model=model):
+                self.assertEqual(state_from({"model": model}, NOW)["model"], expected)
+        config = self.home / "cfg/codex-statusline/config.toml"
+        config.parent.mkdir(parents=True)
+        config.write_text('[claude]\nsegments = ["ctx", "tokens"]\n')
+        plain = ANSI.sub("", run_statusline(SUBSCRIBER, self.home))
+        self.assertNotIn("Opus", plain)
+
 
 class ClaudeInstallTests(unittest.TestCase):
     def setUp(self):

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/tests/test_configure.py

@@ -3,7 +3,7 @@ import unittest
 from pathlib import Path
 from unittest.mock import patch
 
-from src.configure import apply, dump_toml, model_from, rows_text, to_config
+from src.configure import SETTINGS, apply, dump_toml, model_from, rows_text, to_config
 from src.render import load_config
 
 
@@ -17,15 +17,17 @@ class ConfigureTests(unittest.TestCase):
         row = apply(m, 3, "space")  # turn tokens off
         row = apply(m, 1, "J")  # move 5h below week
         self.assertEqual(row, 2)
-        apply(m, 8, "right")  # theme auto -> dark
-        apply(m, 10, "left")  # warn_at 40 -> 35
-        apply(m, 11, "left")  # crit_at 20 -> 15
-        apply(m, 11, "left")  # 15 -> 10
-        apply(m, 12, "space")  # update notice off
-        apply(m, 4, "space")  # line 2: usage (on by default) -> off
-        apply(m, 5, "space")  # line 2: cost (on by default) -> off
-        apply(m, 6, "space")  # line 2: git (on by default) -> off
-        apply(m, 7, "space")  # line 2: pace on
+        line2 = len(m["order"])
+        settings = line2 + len(m["line2_order"])
+        apply(m, settings, "right")  # theme auto -> dark
+        apply(m, settings + 2, "left")  # warn_at 40 -> 35
+        apply(m, settings + 3, "left")  # crit_at 20 -> 15
+        apply(m, settings + 3, "left")  # 15 -> 10
+        apply(m, settings + 4, "space")  # update notice off
+        apply(m, line2, "space")  # usage off
+        apply(m, line2 + 1, "space")  # cost off
+        apply(m, line2 + 2, "space")  # git off
+        apply(m, line2 + 3, "space")  # pace on
         cfg = to_config(m)
         self.assertEqual(cfg["line2"], ["pace"])
         self.assertEqual(cfg["segments"], ["ctx", "week", "5h"])
@@ -48,6 +50,23 @@ class ConfigureTests(unittest.TestCase):
 
 
 class TwoToolTests(unittest.TestCase):
+    def test_model_toggle_reorder_and_roundtrip(self):
+        from src.configure import dump_sections
+
+        with patch.dict("os.environ", {}, clear=True):
+            model = model_from(load_config("/nonexistent.toml", "claude"), "claude")
+            self.assertIn("model", model["enabled"])
+            row = apply(model, model["order"].index("model"), "J")
+            self.assertEqual(row, 1)
+            apply(model, row, "space")
+            text = dump_sections({"claude": to_config(model)})
+            with tempfile.TemporaryDirectory() as tmp:
+                path = Path(tmp) / "config.toml"
+                path.write_text(text)
+                saved = load_config(path, "claude")
+                self.assertNotIn("model", saved["segments"])
+                self.assertEqual(saved, to_config(model))
+
     def test_each_tool_saves_and_loads_its_own_section(self):
         from src.configure import dump_sections
 
@@ -65,7 +84,9 @@ class TwoToolTests(unittest.TestCase):
                 self.assertNotIn("tokens", load_config(path, "codex")["segments"])
                 self.assertEqual(load_config(path, "codex")["theme"], "auto")
                 self.assertEqual(load_config(path, "claude")["theme"], "light")
-                self.assertIn("tokens", load_config(path, "claude")["segments"])
+                self.assertEqual(
+                    load_config(path, "claude")["segments"], ["model", "ctx", "5h", "week"]
+                )
 
     def test_old_flat_config_applies_to_both_tools(self):
         with tempfile.TemporaryDirectory() as tmp:
@@ -94,8 +115,9 @@ class TwoToolTests(unittest.TestCase):
 
         with patch.dict("os.environ", {}, clear=True):
             model = model_from(load_config("/nonexistent.toml", "codex"), "codex")
+            row = len(model["order"]) + len(model["line2_order"]) + SETTINGS.index("crit_at")
             for _ in range(30):
-                apply(model, 10, "left")  # crit_at all the way down
+                apply(model, row, "left")  # crit_at all the way down
             self.assertEqual(model["crit_at"], 0)
             text = dump_sections({"codex": to_config(model)})
         self.assertEqual(text, "[codex]\ncrit_at = 0\n")

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/tests/test_data.py

@@ -122,7 +122,7 @@ class LogReaderTests(unittest.TestCase):
             self.assertIsNone(reader.update(str(second))["tokens"])
 
     def test_weekly_only_plan_in_primary_slot(self):
-        # Plus plans may report only the weekly window, placed in "primary".
+        # Plans without a 5h window (e.g. Pro) report only the weekly one, in "primary".
         event = token_event(1000, primary_used=11, primary_window=10080)
         event["payload"]["info"]["rate_limits"]["secondary"] = None
         with tempfile.TemporaryDirectory() as tmp:
@@ -132,6 +132,27 @@ class LogReaderTests(unittest.TestCase):
         self.assertEqual(quotas["weekly"]["remaining"], 89.0)
         self.assertIsNone(quotas["5h"]["remaining"])
 
+    def test_windows_match_within_five_percent(self):
+        event = token_event(1000, 10, 20, primary_window=299, secondary_window=10100)
+        with tempfile.TemporaryDirectory() as tmp:
+            path = Path(tmp) / "s.jsonl"
+            path.write_bytes(line(event))
+            quotas = LogReader().update(str(path))["quotas"]
+        self.assertEqual(quotas["5h"]["remaining"], 90.0)
+        self.assertEqual(quotas["weekly"]["remaining"], 80.0)
+
+    def test_model_specific_limit_bucket_is_ignored(self):
+        account = token_event(1000, 10, 20)
+        account["payload"]["info"]["rate_limits"]["limit_id"] = "codex"
+        other = token_event(2000, 90, 90)
+        other["payload"]["info"]["rate_limits"]["limit_id"] = "codex_other"
+        with tempfile.TemporaryDirectory() as tmp:
+            path = Path(tmp) / "s.jsonl"
+            path.write_bytes(line(account) + line(other))
+            quotas = LogReader().update(str(path))["quotas"]
+        self.assertEqual(quotas["5h"]["remaining"], 90.0)
+        self.assertEqual(quotas["weekly"]["observed_at"], 1000.0)
+
     def test_newest_quota_across_sessions_wins(self):
         with tempfile.TemporaryDirectory() as tmp:
             day = Path(tmp) / "2026" / "09" / "30"

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/tests/test_fish.py

@@ -72,13 +72,3 @@ class FishTests(unittest.TestCase):
                 manage.installation(args, True)
                 self.assertEqual(fish.read_text(), "# later user setting\n")
                 self.assertNotIn(manage.BEGIN, (root / ".zshrc").read_text())
-
-    def test_shell_detection_prefers_parent_to_login_shell(self):
-        with (
-            patch.dict(os.environ, {"SHELL": "/bin/zsh"}),
-            patch(
-                "subprocess.run",
-                return_value=subprocess.CompletedProcess([], 0, "/opt/homebrew/bin/fish\n", ""),
-            ),
-        ):
-            self.assertEqual(manage.detected_shell(), "fish")

{codex_statusline-0.7.0 → codex_statusline-0.7.2}/tests/test_render.py

@@ -217,6 +217,24 @@ class RenderTests(unittest.TestCase):
         self.assertNotIn("CTX", result)
         self.assertIn("colour196", render(self.state, 240, segments=["5h"], crit_at=80))
 
+    def test_model_segment_is_optional_safe_and_width_bounded(self):
+        segments = ["model", "ctx", "tokens"]
+        plain = render(self.state, 240, tmux=False, segments=segments)
+        self.assertTrue(plain.startswith("Claude Sonnet 4.5 | CTX USED"), plain)
+        self.assertNotIn("Claude", render(self.state, 240, tmux=False))
+        hostile = dict(self.state, model="Opus#(touch NEVER)\x1b]0;title\x07\u202e長")
+        for width in range(1, 241):
+            for tmux, ansi in ((True, False), (False, True), (False, False)):
+                out = render(hostile, width, segments=segments, tmux=tmux, ansi=ansi)
+                self.assertLessEqual(visible_width(out), width)
+                self.assertNotIn("title", out)
+                self.assertNotIn("\u202e", out)
+                if tmux:
+                    self.assertIsNone(re.search(r"(?<!#)#\(", out), out)
+        for missing in (None, 123, "", "\x1b[31m\u202e"):
+            out = render({"model": missing}, 80, tmux=False, segments=["model"])
+            self.assertIn("CTX USED", out)  # no model metadata yet: retain a useful bar
+
 
 class ConfigTests(unittest.TestCase):
     def test_missing_file_defaults_and_invalid_keys_ignored(self):
@@ -227,6 +245,9 @@ class ConfigTests(unittest.TestCase):
         ):
             path = Path(tmp) / "config.toml"
             self.assertEqual(load_config(path)["segments"], ["ctx", "5h", "week", "tokens"])
+            self.assertEqual(
+                load_config(path, "claude")["segments"], ["model", "ctx", "5h", "week"]
+            )
             path.write_text('segments = ["week", "ctx"]\ntheme = "neon"\nwarn_at = 30\n')
             cfg = load_config(path)
             self.assertEqual(