codex-statusline 0.1.2__tar.gz → 0.2.1__tar.gz

{codex_statusline-0.1.2 → codex_statusline-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-statusline
-Version: 0.1.2
+Version: 0.2.1
 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
@@ -73,6 +73,7 @@ codex                     # same as always, now with a status bar
 codex resume --last
 codex exec 'task'         # non-interactive: passed straight through, no bar
 
+codex-statusline config   # pick segments, theme and colors interactively
 codex-statusline update   # upgrade, whichever way you installed it
 codex-statusline doctor   # check versions and dependencies
 codex-statusline preview --width 80   # try it without launching Codex
@@ -83,7 +84,22 @@ Uninstall removes only what this tool added and still matches exactly. If you ed
 
 ## Configuration
 
-Optional. Create `~/.config/codex-statusline/config.toml`:
+Run `codex-statusline config` to set everything up in an interactive screen with a live preview: toggle and reorder segments, switch theme, set the warning thresholds, then press `s` to save.
+
+```text
+  [x] ctx     context used
+  [x] 5h      5-hour quota
+  [x] week    weekly quota
+  [x] tokens  session tokens
+> Theme            < auto >
+  Quota yellow at  < 20% >
+  Quota red at     < 5% >
+
+Preview (sample numbers):
+    CTX USED ███░░░░░ 35% | 5h ██░░░░░░░░ 18% 3:46pm | week ██████░░░░ 62% Sat 1:46pm | tok 1.2M
+```
+
+It writes `~/.config/codex-statusline/config.toml`, which you can also edit by hand:
 
 ```toml
 segments = ["ctx", "5h", "week", "tokens"]  # pick and reorder
@@ -102,7 +118,7 @@ Invalid values are reported and fall back to defaults.
 
 ## FAQ
 
-**How do I scroll or copy?** It runs inside tmux: press `Ctrl-B` then `[` to scroll and copy. The mouse wheel may behave differently from bare Codex.
+**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).
 

{codex_statusline-0.1.2 → codex_statusline-0.2.1}/README.md

@@ -52,6 +52,7 @@ codex                     # same as always, now with a status bar
 codex resume --last
 codex exec 'task'         # non-interactive: passed straight through, no bar
 
+codex-statusline config   # pick segments, theme and colors interactively
 codex-statusline update   # upgrade, whichever way you installed it
 codex-statusline doctor   # check versions and dependencies
 codex-statusline preview --width 80   # try it without launching Codex
@@ -62,7 +63,22 @@ Uninstall removes only what this tool added and still matches exactly. If you ed
 
 ## Configuration
 
-Optional. Create `~/.config/codex-statusline/config.toml`:
+Run `codex-statusline config` to set everything up in an interactive screen with a live preview: toggle and reorder segments, switch theme, set the warning thresholds, then press `s` to save.
+
+```text
+  [x] ctx     context used
+  [x] 5h      5-hour quota
+  [x] week    weekly quota
+  [x] tokens  session tokens
+> Theme            < auto >
+  Quota yellow at  < 20% >
+  Quota red at     < 5% >
+
+Preview (sample numbers):
+    CTX USED ███░░░░░ 35% | 5h ██░░░░░░░░ 18% 3:46pm | week ██████░░░░ 62% Sat 1:46pm | tok 1.2M
+```
+
+It writes `~/.config/codex-statusline/config.toml`, which you can also edit by hand:
 
 ```toml
 segments = ["ctx", "5h", "week", "tokens"]  # pick and reorder
@@ -81,7 +97,7 @@ Invalid values are reported and fall back to defaults.
 
 ## FAQ
 
-**How do I scroll or copy?** It runs inside tmux: press `Ctrl-B` then `[` to scroll and copy. The mouse wheel may behave differently from bare Codex.
+**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).
 

{codex_statusline-0.1.2 → codex_statusline-0.2.1}/codex_statusline.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-statusline
-Version: 0.1.2
+Version: 0.2.1
 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
@@ -73,6 +73,7 @@ codex                     # same as always, now with a status bar
 codex resume --last
 codex exec 'task'         # non-interactive: passed straight through, no bar
 
+codex-statusline config   # pick segments, theme and colors interactively
 codex-statusline update   # upgrade, whichever way you installed it
 codex-statusline doctor   # check versions and dependencies
 codex-statusline preview --width 80   # try it without launching Codex
@@ -83,7 +84,22 @@ Uninstall removes only what this tool added and still matches exactly. If you ed
 
 ## Configuration
 
-Optional. Create `~/.config/codex-statusline/config.toml`:
+Run `codex-statusline config` to set everything up in an interactive screen with a live preview: toggle and reorder segments, switch theme, set the warning thresholds, then press `s` to save.
+
+```text
+  [x] ctx     context used
+  [x] 5h      5-hour quota
+  [x] week    weekly quota
+  [x] tokens  session tokens
+> Theme            < auto >
+  Quota yellow at  < 20% >
+  Quota red at     < 5% >
+
+Preview (sample numbers):
+    CTX USED ███░░░░░ 35% | 5h ██░░░░░░░░ 18% 3:46pm | week ██████░░░░ 62% Sat 1:46pm | tok 1.2M
+```
+
+It writes `~/.config/codex-statusline/config.toml`, which you can also edit by hand:
 
 ```toml
 segments = ["ctx", "5h", "week", "tokens"]  # pick and reorder
@@ -102,7 +118,7 @@ Invalid values are reported and fall back to defaults.
 
 ## FAQ
 
-**How do I scroll or copy?** It runs inside tmux: press `Ctrl-B` then `[` to scroll and copy. The mouse wheel may behave differently from bare Codex.
+**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).
 

{codex_statusline-0.1.2 → codex_statusline-0.2.1}/codex_statusline.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ codex_statusline.egg-info/top_level.txt
 src/__init__.py
 src/__main__.py
 src/cli.py
+src/configure.py
 src/data.py
 src/entry.py
 src/hook.py
@@ -17,6 +18,7 @@ src/manage.py
 src/render.py
 src/update.py
 tests/test_auto_shells.py
+tests/test_configure.py
 tests/test_data.py
 tests/test_fish.py
 tests/test_management.py

{codex_statusline-0.1.2 → codex_statusline-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codex-statusline"
-version = "0.1.2"
+version = "0.2.1"
 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.1.2 → codex_statusline-0.2.1}/src/__init__.py

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

{codex_statusline-0.1.2 → codex_statusline-0.2.1}/src/cli.py

@@ -42,10 +42,12 @@ def main():
         s.add_argument(
             "--yes",
             action="store_true",
-            help="approve printed diff without interactive prompt",
+            help="apply without asking",
         )
+        s.add_argument("--diff", action="store_true", help="show the exact file changes")
         s.add_argument("--dry-run", action="store_true")
     sub.add_parser("doctor")
+    sub.add_parser("config", help="choose segments, theme and thresholds interactively")
     sub.add_parser("update", help="upgrade codex-statusline the way it was installed")
     p = sub.add_parser("preview")
     p.add_argument("--width", type=int, default=120)
@@ -58,6 +60,10 @@ def main():
             from .manage import installation
 
             return installation(ns, ns.action == "uninstall")
+        if ns.action == "config":
+            from .configure import configure
+
+            return configure()
         if ns.action == "update":
             from .update import update
 

codex_statusline-0.2.1/src/configure.py

@@ -0,0 +1,174 @@
+"""`codex-statusline config`: pick segments, theme and thresholds with a live preview."""
+
+import curses
+import time
+
+from .render import DEFAULT_SEGMENTS, THEMES, config_path, load_config, render
+
+SEGMENT_NAMES = {
+    "ctx": "context used",
+    "5h": "5-hour quota",
+    "week": "weekly quota",
+    "tokens": "session tokens",
+}
+SETTINGS = ["theme", "ascii", "warn_at", "crit_at", "update_check"]
+LABELS = {
+    "theme": "Theme",
+    "ascii": "ASCII only",
+    "warn_at": "Quota yellow at",
+    "crit_at": "Quota red at",
+    "update_check": "Update notice",
+}
+HELP = "↑↓ move  space toggle  ←→ change  J/K reorder  s save  q quit"
+
+
+def model_from(cfg: dict) -> 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]
+    return {**{key: cfg[key] for key in SETTINGS}, "order": order, "enabled": set(enabled)}
+
+
+def to_config(model: dict) -> dict:
+    segments = [name for name in model["order"] if name in model["enabled"]]
+    return {"segments": segments, **{key: model[key] for key in SETTINGS}}
+
+
+def dump_toml(cfg: dict) -> str:
+    def value(v):
+        if isinstance(v, bool):
+            return "true" if v else "false"
+        if isinstance(v, list):
+            return "[" + ", ".join(f'"{x}"' for x in v) + "]"
+        return f'"{v}"' if isinstance(v, str) else str(v)
+
+    return "".join(f"{key} = {value(v)}\n" for key, v in cfg.items())
+
+
+def row_count(model: dict) -> int:
+    return len(model["order"]) + len(SETTINGS)
+
+
+def apply(model: dict, row: int, key: str) -> int:
+    """Apply one key press to the row under the cursor; returns the new cursor row."""
+    rows = row_count(model)
+    if key in ("up", "k"):
+        return (row - 1) % rows
+    if key in ("down", "j"):
+        return (row + 1) % rows
+    order = model["order"]
+    if row < len(order):
+        name = order[row]
+        if key == "space":
+            # Keep at least one segment on, or the bar would be empty.
+            if name not in model["enabled"]:
+                model["enabled"].add(name)
+            elif len(model["enabled"]) > 1:
+                model["enabled"].discard(name)
+        elif key in ("K", "J"):
+            target = row - 1 if key == "K" else row + 1
+            if 0 <= target < len(order):
+                order[row], order[target] = order[target], order[row]
+                return target
+        return row
+    setting = SETTINGS[row - len(order)]
+    current = model[setting]
+    step = {"left": -1, "right": 1}.get(key, 0)
+    if isinstance(current, bool):
+        if key in ("space", "left", "right"):
+            model[setting] = not current
+    elif setting == "theme" and (step or key == "space"):
+        names = list(THEMES)
+        model[setting] = names[(names.index(current) + (step or 1)) % len(names)]
+    elif step:
+        model[setting] = max(0, min(100, current + 5 * step))
+    return row
+
+
+def rows_text(model: dict) -> list[str]:
+    lines = []
+    for name in model["order"]:
+        mark = "x" if name in model["enabled"] else " "
+        lines.append(f"[{mark}] {name:<7} {SEGMENT_NAMES[name]}")
+    for setting in SETTINGS:
+        value = model[setting]
+        if isinstance(value, bool):
+            shown = "[x]" if value else "[ ]"
+        elif setting == "theme":
+            shown = f"< {value} >"
+        else:
+            shown = f"< {value}% >"
+        lines.append(f"{LABELS[setting]:<16} {shown}")
+    return lines
+
+
+def sample_state() -> dict:
+    now = time.time()
+    return {
+        "context_used": 35,
+        "tokens": 1_234_567,
+        "quotas": {
+            "5h": {"remaining": 18, "reset_at": now + 7200, "observed_at": now},
+            "weekly": {"remaining": 62, "reset_at": now + 172800, "observed_at": now},
+        },
+    }
+
+
+KEYS = {
+    curses.KEY_UP: "up",
+    curses.KEY_DOWN: "down",
+    curses.KEY_LEFT: "left",
+    curses.KEY_RIGHT: "right",
+    ord(" "): "space",
+}
+
+
+def _ui(screen, model: dict) -> bool:
+    curses.curs_set(0)
+    row, state = 0, sample_state()
+    while True:
+        screen.erase()
+        height, width = screen.getmaxyx()
+        cfg = to_config(model)
+        preview = render(
+            state,
+            max(1, width - 4),
+            tmux=False,
+            ascii_only=cfg["ascii"],
+            segments=cfg["segments"],
+            warn_at=cfg["warn_at"],
+            crit_at=cfg["crit_at"],
+        )
+        lines = ["codex-statusline config", HELP, ""]
+        lines += [("> " if i == row else "  ") + text for i, text in enumerate(rows_text(model))]
+        lines += ["", "Preview (sample numbers):", "  " + preview, "", f"Saves to {config_path()}"]
+        for y, text in enumerate(lines[: height - 1]):
+            highlight = curses.A_REVERSE if y - 3 == row else curses.A_NORMAL
+            try:
+                screen.addnstr(y, 0, text, width - 1, highlight)
+            except curses.error:
+                pass  # tiny terminal: draw what fits
+        key = screen.getch()
+        name = KEYS.get(key, chr(key) if 0 <= key < 256 else "")
+        if name in ("q", "\x1b"):
+            return False
+        if name in ("s", "\n"):
+            return True
+        row = apply(model, row, name)
+
+
+def configure() -> int:
+    model = model_from(load_config())
+    try:
+        save = curses.wrapper(_ui, model)
+    except curses.error as error:
+        print(f"codex-statusline: needs an interactive terminal ({error}).")
+        print(f"Edit {config_path()} instead.")
+        return 1
+    if not save:
+        print("No changes saved.")
+        return 0
+    path = config_path()
+    path.parent.mkdir(parents=True, exist_ok=True)
+    path.write_text(dump_toml(to_config(model)))
+    print(f"Saved {path}. Takes effect the next time you start codex.")
+    return 0

{codex_statusline-0.1.2 → codex_statusline-0.2.1}/src/data.py

@@ -284,8 +284,15 @@ def merge_quotas(*snapshots: dict[str, Any]) -> dict[str, Any]:
     return merged
 
 
-def newest_quotas(sessions: Path, readers: dict[str, LogReader], limit: int = 3) -> dict[str, Any]:
-    """Freshest quotas across the most recently written local session logs."""
+def sessions_dir() -> Path:
+    return Path(os.environ.get("CODEX_HOME") or Path.home() / ".codex") / "sessions"
+
+
+def newest_quotas(sessions: Path, readers: dict[str, LogReader], limit: int = 10) -> dict[str, Any]:
+    """Freshest quotas from local session logs, newest first, stopping once both windows are seen.
+
+    Sessions opened without a single turn carry no quota, so look past them.
+    """
     found = []
     try:
         for path in sessions.glob("*/*/*/*.jsonl"):
@@ -295,7 +302,13 @@ def newest_quotas(sessions: Path, readers: dict[str, LogReader], limit: int = 3)
                 continue
     except OSError:
         return {}
-    recent = [path for _, path in sorted(found, reverse=True)[:limit]]
-    for stale in set(readers) - set(recent):
+    merged: dict[str, Any] = {}
+    scanned = []
+    for _, path in sorted(found, reverse=True)[:limit]:
+        scanned.append(path)
+        merged = merge_quotas(merged, readers.setdefault(path, LogReader()).update(path)["quotas"])
+        if {"5h", "weekly"} <= merged.keys():
+            break
+    for stale in set(readers) - set(scanned):
         del readers[stale]
-    return merge_quotas(*(readers.setdefault(p, LogReader()).update(p)["quotas"] for p in recent))
+    return merged

{codex_statusline-0.1.2 → codex_statusline-0.2.1}/src/launcher.py

@@ -158,6 +158,7 @@ def branch(cwd):
 
 def placeholder(width=80):
     """Use the normal layout before telemetry arrives or while it is unavailable."""
+    from .data import newest_quotas, sessions_dir
     from .render import load_config, render
 
     try:
@@ -165,7 +166,11 @@ def placeholder(width=80):
     except (TypeError, ValueError):
         width = 80
     cfg = load_config()
-    return render({}, width, theme=cfg["theme"], ascii_only=cfg["ascii"], segments=cfg["segments"])
+    # Quota is account-wide, so even the very first frame can show it.
+    state = {"quotas": newest_quotas(sessions_dir(), {})}
+    return render(
+        state, width, theme=cfg["theme"], ascii_only=cfg["ascii"], segments=cfg["segments"]
+    )
 
 
 def launch(args):
@@ -210,7 +215,7 @@ def launch(args):
         'set -g status-left ""\n'
         "set -g allow-rename off\n"
         "set -g set-titles off\n"
-        "set -g mouse off\n"
+        "set -g mouse on\n"
         "set -g history-limit 10000\n"
         "set -g remain-on-exit on\n"
         "set -g exit-empty on\n"
@@ -236,7 +241,7 @@ def launch(args):
         )
 
     def monitor():
-        from .data import LogReader, merge_quotas, newest_quotas, parse_title
+        from .data import LogReader, merge_quotas, newest_quotas, parse_title, sessions_dir
         from .render import load_config, render
 
         cfg = load_config()
@@ -248,8 +253,7 @@ def launch(args):
             threading.Thread(
                 target=lambda: latest.update(version=newer_version()), daemon=True
             ).start()
-        codex_home = Path(os.environ.get("CODEX_HOME") or Path.home() / ".codex")
-        sessions, readers, others, scan_at = codex_home / "sessions", {}, {}, 0.0
+        sessions, readers, others, scan_at = sessions_dir(), {}, {}, 0.0
         last_branch, branch_at = None, 0
         last_line = None
         while not stop.is_set():

{codex_statusline-0.1.2 → codex_statusline-0.2.1}/src/manage.py

@@ -16,6 +16,7 @@ from .launcher import ENTRY
 
 BEGIN = "# >>> codex-statusline >>>"
 END = "# <<< codex-statusline <<<"
+STATUS_MESSAGE = "codex-statusline binding"
 
 
 def detected_shell():
@@ -96,7 +97,7 @@ def hook_group():
                 "type": "command",
                 "command": shlex.join([*base_command(), "hook"]),
                 "timeout": 2,
-                "statusMessage": "codex-statusline binding",
+                "statusMessage": STATUS_MESSAGE,
             }
         ]
     }
@@ -167,14 +168,45 @@ def modify_hook(raw, group, add):
     return json.dumps(obj, ensure_ascii=False, indent=2) + "\n"
 
 
+def summary(changed, home):
+    """One line per file: what is added or removed, in words rather than a diff."""
+    lines = ["codex-statusline will:"]
+    for p, old, new in changed:
+        what = "the SessionStart hook" if p.name == "hooks.json" else "the codex shell function"
+        if p.name == "hooks.json":  # JSON is re-serialized, so compare our marker instead
+            had, has = (STATUS_MESSAGE in t for t in (old, new))
+            sign, verb = (
+                ("+", "add") if has and not had else ("-", "remove") if had else ("~", "update")
+            )
+        elif old in new:
+            sign, verb = "+", "add"
+        elif new in old:
+            sign, verb = "-", "remove"
+        else:
+            sign, verb = "~", "update"
+        lines.append(f"  {sign} {tilde(p, home):<44} {verb} {what}")
+    return "\n".join(lines)
+
+
+def tilde(p, home):
+    try:
+        return "~/" + str(Path(p).relative_to(home))
+    except ValueError:
+        return str(p)
+
+
 def installation(args, uninstall=False):
     chome, shells, manifest_path = paths(args.home, args.shell)
-    changes = []
     previous = json.loads(text(manifest_path) or "{}")
     if uninstall and not previous:
         print("Nothing installed by codex-statusline.")
         return 0
-    if uninstall:
+    pending = {}  # path -> new text; several steps may edit the same file
+
+    def current(p):
+        return pending.get(p, text(p))
+
+    def remove_previous():
         # Manifest defines owned paths; never use current shell choice to guess.
         expected_home, allowed_shells, _ = paths(args.home, "all")
         if previous.get("hooks_path") != str(expected_home / "hooks.json") or any(
@@ -183,19 +215,20 @@ def installation(args, uninstall=False):
             or not i["block"].endswith(END + "\n")
             for i in previous.get("shells", [])
         ):
-            raise ValueError("Manifest paths/blocks do not match this home; refusing uninstall.")
-        group = previous["hook_group"]
-        hp = Path(previous["hooks_path"])
-        old = text(hp)
-        new = modify_hook(old, group, False)
-        changes.append((hp, old, new))
+            raise ValueError("Manifest paths/blocks do not match this home; refusing to remove it.")
+        php = Path(previous["hooks_path"])
+        pending[php] = modify_hook(current(php), previous["hook_group"], False)
         for item in previous["shells"]:
             p = Path(item["path"])
-            old = text(p)
-            owned = item["block"]
-            if owned not in old and BEGIN in old:
+            old = current(p)
+            if item["block"] not in old and BEGIN in old:
                 raise ValueError(f"Owned shell block was edited; remove it manually: {p}")
-            changes.append((p, old, old.replace(owned, "", 1)))
+            pending[p] = old.replace(item["block"], "", 1)
+
+    migrating = False
+    if uninstall:
+        group, hp = previous["hook_group"], Path(previous["hooks_path"])
+        remove_previous()
     else:
         cfg = tomllib.loads(text(chome / "config.toml"))
         hook_config = cfg.get("hooks", {})
@@ -206,40 +239,37 @@ def installation(args, uninstall=False):
             )
         group = hook_group()
         hp = chome / "hooks.json"
-        old = text(hp)
-        changes.append((hp, old, modify_hook(old, group, True)))
+        # An older install from another path (e.g. a git checkout before uv/pipx):
+        # swap it out in the same reviewed diff instead of asking for an uninstall first.
+        migrating = bool(previous) and (
+            previous.get("hook_group") != group or previous.get("hooks_path") != str(hp)
+        )
+        if migrating:
+            print("Replacing a previous codex-statusline installation from another path.")
+            remove_previous()
+        pending[hp] = modify_hook(current(hp), group, True)
         for p in shells:
             block = shell_block("fish" if p.suffix == ".fish" else "zsh")
-            old = text(p)
+            old = current(p)
             if BEGIN in old and block not in old:
                 raise ValueError(
                     f"A different/edited codex-statusline block exists in {p}; "
                     "uninstall that version first."
                 )
-            changes.append((p, old, old if block in old else old + block))
-        if previous and (
-            previous.get("hook_group") != group or previous.get("hooks_path") != str(hp)
-        ):
-            raise ValueError(
-                "Existing installation uses another project/hook path. Uninstall it first."
-            )
+            pending[p] = old if block in old else old + block
         allowed = paths(args.home, "all")[1]
         if any(Path(x["path"]) not in allowed for x in previous.get("shells", [])):
             raise ValueError("Existing manifest contains unexpected shell paths.")
+    changes = [(p, text(p), new) for p, new in pending.items()]
     changed = [(p, old, new) for p, old, new in changes if old != new]
-    for p, old, new in changed:
-        print(
-            "".join(
-                difflib.unified_diff(
-                    old.splitlines(True),
-                    new.splitlines(True),
-                    fromfile=str(p),
-                    tofile=str(p),
-                    n=0,
-                )
-            ),
-            end="",
-        )
+    if changed:
+        print(summary(changed, Path(args.home).expanduser()))
+    if changed and (getattr(args, "diff", False) or args.dry_run):
+        for p, old, new in changed:
+            diff = difflib.unified_diff(
+                old.splitlines(True), new.splitlines(True), str(p), str(p), n=0
+            )
+            print("".join(diff), end="")
     if args.dry_run:
         print("Dry run: no files written.")
         return 0
@@ -252,7 +282,12 @@ def installation(args, uninstall=False):
         print("Already installed; no configuration changes.")
         return 0
     if not args.yes:
-        if not sys.stdin.isatty() or input("Apply these changes? [y/N] ").strip().lower() != "y":
+        hint = "" if getattr(args, "diff", False) else "  (--diff shows the exact changes)"
+        if not sys.stdin.isatty() or input(f"Apply?{hint} [Y/n] ").strip().lower() not in (
+            "",
+            "y",
+            "yes",
+        ):
             print("No files changed.")
             return 0
     # Refuse symlinks for edited files. User must explicitly manage those targets.
@@ -284,7 +319,8 @@ def installation(args, uninstall=False):
         if uninstall:
             manifest_path.unlink(missing_ok=True)
         else:
-            owned = {item["path"]: item for item in previous.get("shells", [])}
+            kept = [] if migrating else previous.get("shells", [])
+            owned = {item["path"]: item for item in kept}
             for p in shells:
                 owned[str(p)] = {
                     "path": str(p),
@@ -306,10 +342,10 @@ def installation(args, uninstall=False):
                 p.unlink(missing_ok=True)
         raise
     print(
-        "Uninstalled. Open a fresh terminal (existing shell functions remain until then)."
+        "Uninstalled. Open a new terminal to finish."
         if uninstall
-        else "Installed. Open a fresh terminal, run codex, and review/trust "
-        "the codex-statusline hook in the official UI."
+        else "Installed. Open a new terminal and run codex; trust the "
+        f"'{STATUS_MESSAGE}' hook when Codex asks."
     )
-    print(f"Configuration change backup: {backup}")
+    print(f"Backup: {tilde(backup, Path(args.home).expanduser())}")
     return 0

{codex_statusline-0.1.2 → codex_statusline-0.2.1}/src/render.py

@@ -35,11 +35,15 @@ _CONFIG_DEFAULTS = {
 }
 
 
+def config_path() -> Path:
+    base = os.environ.get("XDG_CONFIG_HOME") or str(Path.home() / ".config")
+    return Path(base) / "codex-statusline" / "config.toml"
+
+
 def load_config(path: str | os.PathLike | None = None) -> dict[str, Any]:
     """Read $XDG_CONFIG_HOME/codex-statusline/config.toml; invalid values fall back to defaults."""
     if path is None:
-        base = os.environ.get("XDG_CONFIG_HOME") or str(Path.home() / ".config")
-        path = Path(base) / "codex-statusline" / "config.toml"
+        path = config_path()
     config = dict(_CONFIG_DEFAULTS)
     try:
         raw = tomllib.loads(Path(path).read_text())

{codex_statusline-0.1.2 → codex_statusline-0.2.1}/src/update.py

@@ -38,11 +38,13 @@ def newer_version(timeout: float = 2) -> str | None:
 
 
 def upgrade_command(prefix: str = sys.prefix, package: Path = PACKAGE) -> list[str]:
-    # uv and pipx each leave a marker file in the tool's environment.
+    # uv and pipx each leave a marker file in the tool's environment. Install the latest
+    # release from PyPI explicitly: `upgrade` keeps the original source, so a tool first
+    # installed from a local checkout would otherwise never leave that version.
     if (Path(prefix) / "uv-receipt.toml").exists():
-        return ["uv", "tool", "upgrade", "codex-statusline"]
+        return ["uv", "tool", "install", "codex-statusline@latest"]
     if (Path(prefix) / "pipx_metadata.json").exists():
-        return ["pipx", "upgrade", "codex-statusline"]
+        return ["pipx", "install", "--force", "codex-statusline"]
     if (package.parent / ".git").exists():
         return ["git", "-C", str(package.parent), "pull", "--ff-only"]
     return [sys.executable, "-m", "pip", "install", "--upgrade", "codex-statusline"]

codex_statusline-0.2.1/tests/test_configure.py

@@ -0,0 +1,42 @@
+import tempfile
+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.render import load_config
+
+
+class ConfigureTests(unittest.TestCase):
+    def setUp(self):
+        with patch.dict("os.environ", {}, clear=True):
+            self.model = model_from(load_config("/nonexistent/config.toml"))
+
+    def test_toggle_reorder_and_adjust(self):
+        m = self.model
+        row = apply(m, 3, "space")  # turn tokens off
+        row = apply(m, 1, "J")  # move 5h below week
+        self.assertEqual(row, 2)
+        apply(m, 4, "right")  # theme auto -> dark
+        apply(m, 6, "left")  # warn_at 20 -> 15
+        apply(m, 7, "left")  # crit_at 5 -> 0
+        apply(m, 7, "left")  # clamps at 0
+        apply(m, 8, "space")  # update notice off
+        cfg = to_config(m)
+        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"])
+        self.assertIn("[ ] tokens", "\n".join(rows_text(m)))
+
+    def test_last_segment_cannot_be_turned_off(self):
+        for row in range(4):
+            apply(self.model, row, "space")
+        self.assertEqual(to_config(self.model)["segments"], ["tokens"])
+
+    def test_saved_file_loads_back(self):
+        apply(self.model, 0, "J")
+        with tempfile.TemporaryDirectory() as tmp:
+            path = Path(tmp) / "config.toml"
+            path.write_text(dump_toml(to_config(self.model)))
+            with patch.dict("os.environ", {}, clear=True):
+                self.assertEqual(load_config(path), to_config(self.model))

{codex_statusline-0.1.2 → codex_statusline-0.2.1}/tests/test_data.py

@@ -1,4 +1,5 @@
 import json
+import os
 import tempfile
 import unittest
 from pathlib import Path
@@ -137,6 +138,9 @@ class LogReaderTests(unittest.TestCase):
             day.mkdir(parents=True)
             (day / "old.jsonl").write_bytes(line(token_event(1000, 80, 10)))
             (day / "new.jsonl").write_bytes(line(token_event(2000, 5, 20)))
+            (day / "empty.jsonl").write_bytes(b"")  # a session opened without any turn
+            for name, mtime in (("old", 100), ("new", 200), ("empty", 300)):
+                os.utime(day / f"{name}.jsonl", (mtime, mtime))
             others = newest_quotas(Path(tmp), {})
         self.assertEqual(others["5h"]["remaining"], 95.0)
         self.assertEqual(others["weekly"]["observed_at"], 2000.0)

{codex_statusline-0.1.2 → codex_statusline-0.2.1}/tests/test_management.py

@@ -53,6 +53,21 @@ class InstallTests(unittest.TestCase):
             str(ENTRY), manage.hook_group()["hooks"][0]["command"]
         )  # git-clone mode unchanged
 
+    def test_install_from_new_path_replaces_previous_install(self):
+        (self.root / ".zshrc").write_text("# mine\n")
+        manage.installation(self.args)  # e.g. an old git-checkout install
+        tool = ["/home/u/.local/bin/codex-statusline"]
+        with patch.object(manage, "base_command", return_value=tool):
+            manage.installation(self.args)  # now from uv/pipx
+            rc = (self.root / ".zshrc").read_text()
+            self.assertEqual(rc.count(manage.BEGIN), 1)
+            self.assertIn(tool[0], rc)
+            hooks = json.loads((self.root / ".codex/hooks.json").read_text())
+            commands = [h["hooks"][0]["command"] for h in hooks["hooks"]["SessionStart"]]
+            self.assertEqual(commands, [tool[0] + " hook"])
+            manage.installation(self.args, True)
+        self.assertEqual((self.root / ".zshrc").read_text(), "# mine\n")
+
     def test_install_repeat_uninstall_preserves_later_changes(self):
         original = "# original rc\nexport USER_SETTING=yes\n"
         (self.root / ".zshrc").write_text(original)

{codex_statusline-0.1.2 → codex_statusline-0.2.1}/tests/test_startup.py

@@ -18,14 +18,36 @@ from src.render import visible_width
 
 class PlaceholderTests(unittest.TestCase):
     def test_no_fabricated_values(self):
-        for theme in ("dark", "light"):
-            with patch.dict(os.environ, {"CODEX_STATUSLINE_THEME": theme}):
-                result = placeholder(160)
+        with tempfile.TemporaryDirectory() as home:  # no local sessions at all
+            for theme in ("dark", "light"):
+                env = {"CODEX_STATUSLINE_THEME": theme, "CODEX_HOME": home}
+                with patch.dict(os.environ, env):
+                    result = placeholder(160)
                 for text in ("CTX USED", "5h", "week", "--"):
                     self.assertIn(text, result)
                 for text in ("status unknown", "binding pending", "0%", "100%"):
                     self.assertNotIn(text, result)
 
+    def test_first_frame_shows_quota_from_local_sessions(self):
+        with tempfile.TemporaryDirectory() as home:
+            day = Path(home) / "sessions" / "2026" / "09" / "30"
+            day.mkdir(parents=True)
+            now = time.time()
+            limits = {
+                "primary": {"used_percent": 30, "window_minutes": 300, "resets_at": now + 3600},
+                "secondary": {"used_percent": 60, "window_minutes": 10080, "resets_at": now + 9e4},
+            }
+            event = {
+                "type": "event_msg",
+                "timestamp": now,
+                "payload": {"type": "token_count", "info": {"rate_limits": limits}},
+            }
+            (day / "r.jsonl").write_text(json.dumps(event) + "\n")
+            with patch.dict(os.environ, {"CODEX_HOME": home}):
+                result = placeholder(160)
+        self.assertIn("70%", result)
+        self.assertIn("40%", result)
+
     def test_placeholder_follows_config_file(self):
         with tempfile.TemporaryDirectory() as tmp:
             conf = Path(tmp) / "codex-statusline" / "config.toml"
@@ -94,6 +116,8 @@ class StartupTests(unittest.TestCase):
                 )
                 conf = (root / "tmux.conf").read_text()
                 self.assertIn("CTX USED", conf)
+                # Codex asks tmux for #{mouse}; off makes the wheel recall old prompts.
+                self.assertIn("set -g mouse on", conf)
                 self.assertNotIn("binding pending", conf)
                 # error.json is written before the fallback status is applied.
                 # Faster Linux startup can observe that intermediate state.

{codex_statusline-0.1.2 → codex_statusline-0.2.1}/tests/test_update.py

@@ -27,11 +27,13 @@ class UpdateTests(unittest.TestCase):
         with tempfile.TemporaryDirectory() as tmp:
             (Path(tmp) / "uv-receipt.toml").touch()
             self.assertEqual(
-                upgrade_command(tmp, pkg), ["uv", "tool", "upgrade", "codex-statusline"]
+                upgrade_command(tmp, pkg), ["uv", "tool", "install", "codex-statusline@latest"]
             )
         with tempfile.TemporaryDirectory() as tmp:
             (Path(tmp) / "pipx_metadata.json").touch()
-            self.assertEqual(upgrade_command(tmp, pkg), ["pipx", "upgrade", "codex-statusline"])
+            self.assertEqual(
+                upgrade_command(tmp, pkg), ["pipx", "install", "--force", "codex-statusline"]
+            )
         self.assertEqual(upgrade_command("/nowhere", pkg)[1:3], ["-m", "pip"])
         repo = Path(__file__).resolve().parent.parent
         if (repo / ".git").exists():