codex-switch-cli 0.1.2__tar.gz → 0.1.3__tar.gz

{codex_switch_cli-0.1.2 → codex_switch_cli-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-switch-cli
-Version: 0.1.2
+Version: 0.1.3
 Summary: Transparent account-aware wrapper for the Codex CLI
 Project-URL: Homepage, https://github.com/ForeverHYX/codex-switch
 Project-URL: Repository, https://github.com/ForeverHYX/codex-switch
@@ -67,6 +67,7 @@ Once setup is done, day-to-day usage stays the same:
 ```bash
 codex "review this branch"
 codex exec "make test"
+codex-switch list
 ```
 
 ## How it works

{codex_switch_cli-0.1.2 → codex_switch_cli-0.1.3}/README.md

@@ -52,6 +52,7 @@ Once setup is done, day-to-day usage stays the same:
 ```bash
 codex "review this branch"
 codex exec "make test"
+codex-switch list
 ```
 
 ## How it works

{codex_switch_cli-0.1.2 → codex_switch_cli-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "codex-switch-cli"
-version = "0.1.2"
+version = "0.1.3"
 description = "Transparent account-aware wrapper for the Codex CLI"
 readme = "README.md"
 requires-python = ">=3.11"

codex_switch_cli-0.1.3/src/codex_switch/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.3"

{codex_switch_cli-0.1.2 → codex_switch_cli-0.1.3}/src/codex_switch/cli.py

@@ -21,6 +21,13 @@ from codex_switch.doctor import create_doctor_report
 from codex_switch.install import install_shim, runtime_wrapper_dir, uninstall_shim
 from codex_switch.models import AppConfig
 from codex_switch.paths import config_path
+from codex_switch.rate_limits import (
+    FIVE_HOUR_WINDOW_MINS,
+    SEVEN_DAY_WINDOW_MINS,
+    format_reset_timestamp,
+    read_instance_rate_limits,
+    select_window_for_duration,
+)
 from codex_switch.runtime import find_real_codex, resolve_real_codex
 from codex_switch.wizard import bootstrap_from_prompt, clear_existing_state, initialize_app
 
@@ -73,6 +80,22 @@ def _resolve_instance(config: AppConfig, instance_name: str):
     return instance
 
 
+def _render_table(headers: list[str], rows: list[list[str]]) -> list[str]:
+    widths = [len(header) for header in headers]
+    for row in rows:
+        for index, cell in enumerate(row):
+            widths[index] = max(widths[index], len(cell))
+
+    rendered = [
+        "  ".join(header.ljust(widths[index]) for index, header in enumerate(headers))
+    ]
+    for row in rows:
+        rendered.append(
+            "  ".join(cell.ljust(widths[index]) for index, cell in enumerate(row))
+        )
+    return rendered
+
+
 @app.command()
 def init(
     instance_count: int | None = typer.Option(None, min=1),
@@ -129,8 +152,51 @@ def init(
 @app.command("list")
 def list_instances() -> None:
     config = _load_initialized_config()
+    real_codex_path = _resolve_real_codex_for_management(config)
+
+    rows: list[list[str]] = []
     for instance in config.instances:
-        typer.echo(f"{instance.name}\t{instance.home_dir}")
+        result = read_instance_rate_limits(real_codex_path, instance)
+        if not result.ok or result.snapshot is None:
+            rows.append(
+                [
+                    instance.name,
+                    "unavailable",
+                    "-",
+                    "unavailable",
+                    "-",
+                    result.reason or "Unavailable",
+                ]
+            )
+            continue
+
+        five_hour = select_window_for_duration(
+            result.snapshot,
+            FIVE_HOUR_WINDOW_MINS,
+            fallback="primary",
+        )
+        seven_day = select_window_for_duration(
+            result.snapshot,
+            SEVEN_DAY_WINDOW_MINS,
+            fallback="secondary",
+        )
+
+        rows.append(
+            [
+                instance.name,
+                f"{five_hour.remaining_percent}%" if five_hour is not None else "-",
+                format_reset_timestamp(five_hour.resets_at) if five_hour is not None else "-",
+                f"{seven_day.remaining_percent}%" if seven_day is not None else "-",
+                format_reset_timestamp(seven_day.resets_at) if seven_day is not None else "-",
+                result.snapshot.plan_type or "ok",
+            ]
+        )
+
+    for line in _render_table(
+        ["INSTANCE", "5H REMAINING", "5H RESET", "7D REMAINING", "7D RESET", "STATUS"],
+        rows,
+    ):
+        typer.echo(line)
 
 
 @app.command()

codex_switch_cli-0.1.3/src/codex_switch/rate_limits.py

@@ -0,0 +1,280 @@
+from __future__ import annotations
+
+import json
+import select
+import subprocess
+import time
+from dataclasses import dataclass
+from datetime import datetime
+from pathlib import Path
+
+from codex_switch.auth import CodexCommandError
+from codex_switch.models import InstanceConfig
+from codex_switch.runtime import build_instance_env
+
+
+INITIALIZE_REQUEST_ID = 1
+RATE_LIMITS_REQUEST_ID = 2
+FIVE_HOUR_WINDOW_MINS = 300
+SEVEN_DAY_WINDOW_MINS = 10080
+
+
+@dataclass(slots=True)
+class RateLimitWindow:
+    used_percent: int
+    window_duration_mins: int | None = None
+    resets_at: int | None = None
+
+    @property
+    def remaining_percent(self) -> int:
+        return max(0, 100 - self.used_percent)
+
+
+@dataclass(slots=True)
+class RateLimitSnapshot:
+    limit_id: str | None
+    limit_name: str | None
+    plan_type: str | None
+    primary: RateLimitWindow | None = None
+    secondary: RateLimitWindow | None = None
+
+
+@dataclass(slots=True)
+class InstanceRateLimitResult:
+    instance_name: str
+    ok: bool
+    snapshot: RateLimitSnapshot | None = None
+    reason: str | None = None
+
+
+def _start_app_server(
+    real_codex_path: str | Path,
+    instance: InstanceConfig,
+) -> subprocess.Popen[str]:
+    instance_home = Path(instance.home_dir)
+    instance_home.mkdir(parents=True, exist_ok=True)
+    try:
+        return subprocess.Popen(
+            [str(real_codex_path), "app-server"],
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            env=build_instance_env(instance.name, instance_home),
+            cwd=instance_home,
+        )
+    except FileNotFoundError as exc:
+        raise CodexCommandError(f"Unable to launch the real Codex binary: {exc}") from exc
+
+
+def _write_request(
+    process: subprocess.Popen[str],
+    request_id: int,
+    method: str,
+    params: object,
+) -> None:
+    if process.stdin is None:
+        raise CodexCommandError("Codex app-server stdin is unavailable")
+    process.stdin.write(
+        json.dumps(
+            {
+                "jsonrpc": "2.0",
+                "id": request_id,
+                "method": method,
+                "params": params,
+            }
+        )
+        + "\n"
+    )
+    process.stdin.flush()
+
+
+def _read_response(
+    process: subprocess.Popen[str],
+    request_id: int,
+    *,
+    timeout: float,
+) -> dict[str, object]:
+    if process.stdout is None:
+        raise CodexCommandError("Codex app-server stdout is unavailable")
+
+    deadline = time.monotonic() + timeout
+    stdout_fd = process.stdout.fileno()
+
+    while True:
+        remaining = deadline - time.monotonic()
+        if remaining <= 0:
+            raise subprocess.TimeoutExpired(cmd=process.args, timeout=timeout)
+
+        ready, _, _ = select.select([stdout_fd], [], [], remaining)
+        if not ready:
+            raise subprocess.TimeoutExpired(cmd=process.args, timeout=timeout)
+
+        line = process.stdout.readline()
+        if not line:
+            stderr_output = ""
+            if process.stderr is not None:
+                stderr_output = process.stderr.read().strip()
+            message = "Codex app-server exited before returning a response"
+            if stderr_output:
+                message = f"{message}: {stderr_output}"
+            raise CodexCommandError(message)
+
+        payload = json.loads(line)
+        if payload.get("id") != request_id:
+            continue
+        return payload
+
+
+def _extract_result(payload: dict[str, object], method: str) -> dict[str, object]:
+    error = payload.get("error")
+    if isinstance(error, dict):
+        message = error.get("message")
+        if isinstance(message, str) and message:
+            raise CodexCommandError(f"{method} failed: {message}")
+        raise CodexCommandError(f"{method} failed")
+
+    result = payload.get("result")
+    if not isinstance(result, dict):
+        raise CodexCommandError(f"{method} returned an invalid payload")
+    return result
+
+
+def _parse_window(payload: object) -> RateLimitWindow | None:
+    if payload is None:
+        return None
+    if not isinstance(payload, dict):
+        raise CodexCommandError("Rate limit window payload is malformed")
+
+    used_percent = payload.get("usedPercent")
+    if not isinstance(used_percent, int) or isinstance(used_percent, bool):
+        raise CodexCommandError("Rate limit window is missing usedPercent")
+
+    window_duration_mins = payload.get("windowDurationMins")
+    if window_duration_mins is not None and (
+        not isinstance(window_duration_mins, int) or isinstance(window_duration_mins, bool)
+    ):
+        raise CodexCommandError("Rate limit window has an invalid windowDurationMins")
+
+    resets_at = payload.get("resetsAt")
+    if resets_at is not None and (not isinstance(resets_at, int) or isinstance(resets_at, bool)):
+        raise CodexCommandError("Rate limit window has an invalid resetsAt")
+
+    return RateLimitWindow(
+        used_percent=used_percent,
+        window_duration_mins=window_duration_mins,
+        resets_at=resets_at,
+    )
+
+
+def _parse_snapshot(payload: dict[str, object]) -> RateLimitSnapshot:
+    return RateLimitSnapshot(
+        limit_id=payload.get("limitId") if isinstance(payload.get("limitId"), str) else None,
+        limit_name=payload.get("limitName") if isinstance(payload.get("limitName"), str) else None,
+        plan_type=payload.get("planType") if isinstance(payload.get("planType"), str) else None,
+        primary=_parse_window(payload.get("primary")),
+        secondary=_parse_window(payload.get("secondary")),
+    )
+
+
+def _select_snapshot(result_payload: dict[str, object]) -> dict[str, object]:
+    by_limit = result_payload.get("rateLimitsByLimitId")
+    if isinstance(by_limit, dict):
+        codex_snapshot = by_limit.get("codex")
+        if isinstance(codex_snapshot, dict):
+            return codex_snapshot
+
+    rate_limits = result_payload.get("rateLimits")
+    if isinstance(rate_limits, dict):
+        return rate_limits
+
+    raise CodexCommandError("account/rateLimits/read returned no rate limit snapshot")
+
+
+def read_rate_limits(
+    real_codex_path: str | Path,
+    instance: InstanceConfig,
+    *,
+    timeout: float = 8,
+) -> RateLimitSnapshot:
+    process = _start_app_server(real_codex_path, instance)
+    try:
+        _write_request(
+            process,
+            INITIALIZE_REQUEST_ID,
+            "initialize",
+            {
+                "clientInfo": {
+                    "name": "codex-switch",
+                    "version": "0.1.3",
+                },
+                "capabilities": {
+                    "experimentalApi": True,
+                },
+            },
+        )
+        init_payload = _read_response(
+            process, INITIALIZE_REQUEST_ID, timeout=max(1.0, timeout / 2)
+        )
+        _extract_result(init_payload, "initialize")
+
+        _write_request(process, RATE_LIMITS_REQUEST_ID, "account/rateLimits/read", None)
+        rate_limit_payload = _read_response(
+            process, RATE_LIMITS_REQUEST_ID, timeout=max(1.0, timeout / 2)
+        )
+        result = _extract_result(rate_limit_payload, "account/rateLimits/read")
+        return _parse_snapshot(_select_snapshot(result))
+    except subprocess.TimeoutExpired as exc:
+        raise CodexCommandError("Timed out while reading account rate limits") from exc
+    finally:
+        if process.stdin is not None and not process.stdin.closed:
+            process.stdin.close()
+        try:
+            process.terminate()
+            process.wait(timeout=1)
+        except subprocess.TimeoutExpired:
+            process.kill()
+            process.wait(timeout=1)
+
+
+def read_instance_rate_limits(
+    real_codex_path: str | Path,
+    instance: InstanceConfig,
+) -> InstanceRateLimitResult:
+    try:
+        snapshot = read_rate_limits(real_codex_path, instance)
+    except CodexCommandError as exc:
+        return InstanceRateLimitResult(
+            instance_name=instance.name,
+            ok=False,
+            reason=str(exc),
+        )
+    return InstanceRateLimitResult(
+        instance_name=instance.name,
+        ok=True,
+        snapshot=snapshot,
+    )
+
+
+def select_window_for_duration(
+    snapshot: RateLimitSnapshot,
+    duration_mins: int,
+    *,
+    fallback: str | None = None,
+) -> RateLimitWindow | None:
+    candidates = [snapshot.primary, snapshot.secondary]
+    for window in candidates:
+        if window is not None and window.window_duration_mins == duration_mins:
+            return window
+
+    if fallback == "primary":
+        return snapshot.primary
+    if fallback == "secondary":
+        return snapshot.secondary
+    return None
+
+
+def format_reset_timestamp(timestamp: int | None) -> str:
+    if timestamp is None:
+        return "-"
+    return datetime.fromtimestamp(timestamp).strftime("%Y-%m-%d %H:%M")

{codex_switch_cli-0.1.2 → codex_switch_cli-0.1.3}/src/codex_switch_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-switch-cli
-Version: 0.1.2
+Version: 0.1.3
 Summary: Transparent account-aware wrapper for the Codex CLI
 Project-URL: Homepage, https://github.com/ForeverHYX/codex-switch
 Project-URL: Repository, https://github.com/ForeverHYX/codex-switch
@@ -67,6 +67,7 @@ Once setup is done, day-to-day usage stays the same:
 ```bash
 codex "review this branch"
 codex exec "make test"
+codex-switch list
 ```
 
 ## How it works

{codex_switch_cli-0.1.2 → codex_switch_cli-0.1.3}/src/codex_switch_cli.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ src/codex_switch/instances.py
 src/codex_switch/models.py
 src/codex_switch/paths.py
 src/codex_switch/probe.py
+src/codex_switch/rate_limits.py
 src/codex_switch/routing.py
 src/codex_switch/runtime.py
 src/codex_switch/wizard.py
@@ -26,6 +27,7 @@ tests/test_doctor.py
 tests/test_instances.py
 tests/test_integration_wrapper.py
 tests/test_probe.py
+tests/test_rate_limits.py
 tests/test_routing.py
 tests/test_runtime.py
 tests/test_smoke.py

codex_switch_cli-0.1.3/tests/test_rate_limits.py

@@ -0,0 +1,124 @@
+from __future__ import annotations
+
+import json
+import os
+import sys
+from pathlib import Path
+
+from typer.testing import CliRunner
+
+from codex_switch.cli import app
+from codex_switch.models import AppConfig, InstanceConfig
+
+
+def _make_launcher(tmp_path: Path, fake_codex: Path) -> Path:
+    launcher = tmp_path / "codex"
+    launcher.write_text(
+        "#!/bin/sh\n"
+        f'exec "{sys.executable}" "{fake_codex}" "$@"\n'
+    )
+    os.chmod(launcher, 0o755)
+    return launcher
+
+
+def test_read_rate_limits_returns_structured_windows(tmp_path, fake_codex_path: Path) -> None:
+    from codex_switch.rate_limits import read_rate_limits
+
+    launcher = _make_launcher(tmp_path, fake_codex_path)
+    home = tmp_path / "acct-001"
+    home.mkdir()
+    (home / "rate-limits.json").write_text(
+        json.dumps(
+            {
+                "rateLimits": {
+                    "limitId": "codex",
+                    "limitName": None,
+                    "planType": "plus",
+                    "primary": {
+                        "usedPercent": 64,
+                        "windowDurationMins": 300,
+                        "resetsAt": 1_775_461_397,
+                    },
+                    "secondary": {
+                        "usedPercent": 29,
+                        "windowDurationMins": 10080,
+                        "resetsAt": 1_776_001_304,
+                    },
+                }
+            }
+        )
+    )
+    instance = InstanceConfig(name="acct-001", order=1, home_dir=str(home))
+
+    snapshot = read_rate_limits(str(launcher), instance)
+
+    assert snapshot.plan_type == "plus"
+    assert snapshot.primary is not None
+    assert snapshot.primary.used_percent == 64
+    assert snapshot.primary.window_duration_mins == 300
+    assert snapshot.secondary is not None
+    assert snapshot.secondary.used_percent == 29
+    assert snapshot.secondary.window_duration_mins == 10080
+
+
+def test_list_command_displays_live_rate_limits(tmp_path, monkeypatch) -> None:
+    from codex_switch.rate_limits import (
+        InstanceRateLimitResult,
+        RateLimitSnapshot,
+        RateLimitWindow,
+    )
+
+    config = AppConfig(
+        real_codex_path="/usr/local/bin/codex",
+        instances=[
+            InstanceConfig(name="acct-001", order=1, home_dir=str(tmp_path / "acct-001")),
+            InstanceConfig(name="acct-002", order=2, home_dir=str(tmp_path / "acct-002")),
+        ],
+    )
+
+    def fake_read(real_codex_path: str, instance: InstanceConfig) -> InstanceRateLimitResult:
+        if instance.name == "acct-001":
+            return InstanceRateLimitResult(
+                instance_name=instance.name,
+                ok=True,
+                snapshot=RateLimitSnapshot(
+                    limit_id="codex",
+                    limit_name=None,
+                    plan_type="plus",
+                    primary=RateLimitWindow(
+                        used_percent=64,
+                        window_duration_mins=300,
+                        resets_at=1_775_461_397,
+                    ),
+                    secondary=RateLimitWindow(
+                        used_percent=29,
+                        window_duration_mins=10080,
+                        resets_at=1_776_001_304,
+                    ),
+                ),
+            )
+        return InstanceRateLimitResult(
+            instance_name=instance.name,
+            ok=False,
+            reason="Not logged in",
+        )
+
+    monkeypatch.setattr("codex_switch.cli._load_initialized_config", lambda: config)
+    monkeypatch.setattr(
+        "codex_switch.cli._resolve_real_codex_for_management",
+        lambda config: config.real_codex_path,
+    )
+    monkeypatch.setattr("codex_switch.cli.read_instance_rate_limits", fake_read)
+
+    result = CliRunner().invoke(app, ["list"])
+
+    assert result.exit_code == 0
+    assert "INSTANCE" in result.stdout
+    assert "5H REMAINING" in result.stdout
+    assert "7D REMAINING" in result.stdout
+    assert "acct-001" in result.stdout
+    assert "36%" in result.stdout
+    assert "71%" in result.stdout
+    assert "acct-002" in result.stdout
+    assert "unavailable" in result.stdout
+

{codex_switch_cli-0.1.2 → codex_switch_cli-0.1.3}/tests/test_smoke.py

@@ -5,7 +5,7 @@ from codex_switch.cli import app
 
 
 def test_package_exposes_version() -> None:
-    assert __version__ == "0.1.2"
+    assert __version__ == "0.1.3"
 
 
 def test_cli_app_displays_help() -> None:

codex_switch_cli-0.1.2/src/codex_switch/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.2"