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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-switch-cli
-Version: 0.1.1
+Version: 0.1.2
 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

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

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

codex_switch_cli-0.1.2/src/codex_switch/__init__.py

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

codex_switch_cli-0.1.2/src/codex_switch/probe.py

@@ -0,0 +1,241 @@
+from __future__ import annotations
+
+import os
+import pty
+import re
+import select
+import subprocess
+import time
+from pathlib import Path
+
+from codex_switch.auth import CodexCommandError, login_status
+from codex_switch.models import InstanceConfig, ProbeResult
+from codex_switch.runtime import build_instance_env
+
+
+QUOTA_PATTERNS = (
+    re.compile(r"remaining[^0-9]*(\d+)", re.IGNORECASE),
+    re.compile(r"(\d+)[^0-9]*remaining", re.IGNORECASE),
+)
+READY_PATTERNS = (
+    "OpenAI Codex",
+    "tab to queue message",
+    "context left",
+    "Codex ready",
+    "BOOTED",
+)
+ANSI_ESCAPE_RE = re.compile(
+    r"\x1b\[[0-?]*[ -/]*[@-~]|\x1b\][^\x07]*(?:\x07|\x1b\\)|\x1b[@-_]"
+)
+
+
+def parse_remaining_quota(output: str) -> int:
+    for pattern in QUOTA_PATTERNS:
+        match = pattern.search(output)
+        if match:
+            return int(match.group(1))
+    raise ValueError("Unable to parse remaining quota from /status output")
+
+
+def _failure(instance: InstanceConfig, reason: str) -> ProbeResult:
+    return ProbeResult(
+        instance_name=instance.name,
+        order=instance.order,
+        quota_remaining=None,
+        ok=False,
+        reason=reason,
+    )
+
+
+def _sanitize_terminal_output(raw_output: bytes) -> str:
+    text = raw_output.decode("utf-8", errors="ignore").replace("\r", "\n")
+    text = ANSI_ESCAPE_RE.sub("", text)
+    text = text.replace("\b", "")
+    return text
+
+
+def _trusted_project_override(path: Path) -> str:
+    escaped = str(path).replace("\\", "\\\\").replace('"', '\\"')
+    return f'projects."{escaped}".trust_level="trusted"'
+
+
+def _looks_ready(output: str) -> bool:
+    return any(pattern in output for pattern in READY_PATTERNS)
+
+
+def _fallback_logged_in_result(
+    real_codex_path: str,
+    instance: InstanceConfig,
+    reason: str,
+) -> ProbeResult | None:
+    try:
+        status = login_status(real_codex_path, instance)
+    except CodexCommandError:
+        return None
+    if not status.logged_in:
+        return None
+    return ProbeResult(
+        instance_name=instance.name,
+        order=instance.order,
+        quota_remaining=0,
+        ok=True,
+        reason=f"{reason}. Falling back to login-only availability.",
+    )
+
+
+def _run_status_probe(
+    real_codex_path: str,
+    instance: InstanceConfig,
+    *,
+    timeout: int = 6,
+) -> tuple[int, str]:
+    instance_home = Path(instance.home_dir)
+    instance_home.mkdir(parents=True, exist_ok=True)
+    env = build_instance_env(instance.name, instance_home)
+    command = [
+        real_codex_path,
+        "-C",
+        str(instance_home),
+        "-c",
+        _trusted_project_override(instance_home),
+        "--no-alt-screen",
+    ]
+
+    master_fd, slave_fd = pty.openpty()
+    process: subprocess.Popen[bytes] | None = None
+    sent_status = False
+    sent_exit = False
+    sent_trust = False
+    status_sent_at: float | None = None
+    exit_sent_at: float | None = None
+    output = bytearray()
+    deadline = time.monotonic() + timeout
+    startup_deadline = time.monotonic() + min(3.0, timeout / 2)
+
+    try:
+        process = subprocess.Popen(
+            command,
+            stdin=slave_fd,
+            stdout=slave_fd,
+            stderr=slave_fd,
+            env=env,
+            cwd=instance_home,
+            close_fds=True,
+        )
+    finally:
+        os.close(slave_fd)
+
+    try:
+        while True:
+            now = time.monotonic()
+            if now >= deadline:
+                raise subprocess.TimeoutExpired(cmd=command, timeout=timeout)
+
+            wait_for = min(0.2, deadline - now)
+            ready, _, _ = select.select([master_fd], [], [], wait_for)
+            if ready:
+                try:
+                    chunk = os.read(master_fd, 4096)
+                except OSError:
+                    chunk = b""
+                if chunk:
+                    output.extend(chunk)
+
+            cleaned_output = _sanitize_terminal_output(output)
+
+            if (
+                not sent_trust
+                and "Do you trust the contents of this directory?" in cleaned_output
+            ):
+                os.write(master_fd, b"1\n")
+                sent_trust = True
+
+            if not sent_status and (
+                _looks_ready(cleaned_output) or time.monotonic() >= startup_deadline
+            ):
+                os.write(master_fd, b"/status\n")
+                sent_status = True
+                status_sent_at = time.monotonic()
+
+            if sent_status and not sent_exit:
+                try:
+                    parse_remaining_quota(cleaned_output)
+                except ValueError:
+                    if status_sent_at is not None and time.monotonic() - status_sent_at > 2:
+                        os.write(master_fd, b"/exit\n")
+                        sent_exit = True
+                        exit_sent_at = time.monotonic()
+                else:
+                    os.write(master_fd, b"/exit\n")
+                    sent_exit = True
+                    exit_sent_at = time.monotonic()
+
+            if (
+                sent_exit
+                and exit_sent_at is not None
+                and time.monotonic() - exit_sent_at > 1
+                and process.poll() is None
+            ):
+                process.terminate()
+
+            poll_result = process.poll()
+            if poll_result is not None:
+                while True:
+                    ready, _, _ = select.select([master_fd], [], [], 0)
+                    if not ready:
+                        break
+                    try:
+                        chunk = os.read(master_fd, 4096)
+                    except OSError:
+                        break
+                    if not chunk:
+                        break
+                    output.extend(chunk)
+                return poll_result, _sanitize_terminal_output(output)
+    except subprocess.TimeoutExpired:
+        process.kill()
+        process.wait(timeout=1)
+        raise
+    finally:
+        os.close(master_fd)
+
+
+def probe_instance(real_codex_path: str, instance: InstanceConfig) -> ProbeResult:
+    try:
+        returncode, output = _run_status_probe(real_codex_path, instance)
+    except FileNotFoundError as exc:
+        return _failure(instance, f"Probe could not launch the real Codex binary: {exc}")
+    except subprocess.TimeoutExpired:
+        fallback = _fallback_logged_in_result(
+            real_codex_path,
+            instance,
+            "Probe timed out",
+        )
+        if fallback is not None:
+            return fallback
+        return _failure(instance, "Probe timed out")
+
+    if returncode != 0:
+        fallback = _fallback_logged_in_result(
+            real_codex_path,
+            instance,
+            f"Probe exited with exit code {returncode}",
+        )
+        if fallback is not None:
+            return fallback
+        return _failure(instance, f"Probe exited with exit code {returncode}")
+
+    try:
+        remaining = parse_remaining_quota(output)
+    except ValueError as exc:
+        fallback = _fallback_logged_in_result(real_codex_path, instance, str(exc))
+        if fallback is not None:
+            return fallback
+        return _failure(instance, str(exc))
+
+    return ProbeResult(
+        instance_name=instance.name,
+        order=instance.order,
+        quota_remaining=remaining,
+        ok=True,
+    )

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-switch-cli
-Version: 0.1.1
+Version: 0.1.2
 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

codex_switch_cli-0.1.2/tests/test_probe.py

@@ -0,0 +1,160 @@
+import subprocess
+import os
+import sys
+from pathlib import Path
+
+from codex_switch.models import InstanceConfig
+from codex_switch.auth import LoginStatus
+from codex_switch.probe import parse_remaining_quota
+from codex_switch.probe import probe_instance
+
+
+def test_parse_remaining_quota_from_status_output() -> None:
+    output = """
+    Account: acct-001
+    Requests remaining: 42
+    """
+
+    assert parse_remaining_quota(output) == 42
+
+
+def test_probe_instance_returns_failure_for_malformed_output(
+    tmp_path, monkeypatch
+) -> None:
+    instance = InstanceConfig(
+        name="acct-001",
+        order=1,
+        home_dir=str(tmp_path / "home"),
+    )
+
+    monkeypatch.setattr(
+        "codex_switch.probe._run_status_probe",
+        lambda *args, **kwargs: (0, "Account: acct-001\n"),
+    )
+    monkeypatch.setattr(
+        "codex_switch.probe.login_status",
+        lambda *args, **kwargs: LoginStatus(logged_in=False, output="", returncode=1),
+    )
+
+    result = probe_instance("/usr/local/bin/codex", instance)
+
+    assert result.ok is False
+    assert result.quota_remaining is None
+    assert "Unable to parse remaining quota" in result.reason
+
+
+def test_probe_instance_returns_failure_for_nonzero_exit(
+    tmp_path, monkeypatch
+) -> None:
+    instance = InstanceConfig(
+        name="acct-001",
+        order=1,
+        home_dir=str(tmp_path / "home"),
+    )
+
+    monkeypatch.setattr(
+        "codex_switch.probe._run_status_probe",
+        lambda *args, **kwargs: (1, "Requests remaining: 42\npermission denied"),
+    )
+
+    result = probe_instance("/usr/local/bin/codex", instance)
+
+    assert result.ok is False
+    assert result.quota_remaining is None
+    assert "exit code 1" in result.reason
+
+
+def test_probe_instance_returns_failure_for_timeout(tmp_path, monkeypatch) -> None:
+    instance = InstanceConfig(
+        name="acct-001",
+        order=1,
+        home_dir=str(tmp_path / "home"),
+    )
+
+    def raise_timeout(*args, **kwargs):
+        raise subprocess.TimeoutExpired(cmd=["codex"], timeout=15)
+
+    monkeypatch.setattr("codex_switch.probe._run_status_probe", raise_timeout)
+
+    result = probe_instance("/usr/local/bin/codex", instance)
+
+    assert result.ok is False
+    assert result.quota_remaining is None
+    assert result.reason == "Probe timed out"
+
+
+def test_probe_instance_handles_tty_only_codex_process(tmp_path) -> None:
+    home_dir = tmp_path / "acct-home"
+    home_dir.mkdir()
+    instance = InstanceConfig(
+        name="acct-001",
+        order=1,
+        home_dir=str(home_dir),
+    )
+    script_path = tmp_path / "fake_tty_codex.py"
+    launcher_path = tmp_path / "fake-codex"
+    script_path.write_text(
+        "import os\n"
+        "import sys\n"
+        "print('OpenAI Codex ready', flush=True)\n"
+        "if not sys.stdin.isatty():\n"
+        "    print('stdin is not a terminal', file=sys.stderr, flush=True)\n"
+        "    raise SystemExit(1)\n"
+        "expected_cwd = os.environ.get('EXPECTED_CWD')\n"
+        "if expected_cwd and os.getcwd() != expected_cwd:\n"
+        "    print(f'bad cwd: {os.getcwd()}', file=sys.stderr, flush=True)\n"
+        "    raise SystemExit(2)\n"
+        "for raw_line in sys.stdin:\n"
+        "    line = raw_line.strip()\n"
+        "    if line == '/status':\n"
+        "        print('Requests remaining: 42', flush=True)\n"
+        "    elif line == '/exit':\n"
+        "        raise SystemExit(0)\n"
+    )
+    launcher_path.write_text(
+        "#!/bin/sh\n"
+        f'exec "{sys.executable}" "{script_path}" "$@"\n'
+    )
+    os.chmod(launcher_path, 0o755)
+
+    previous_expected_cwd = os.environ.get("EXPECTED_CWD")
+    os.environ["EXPECTED_CWD"] = str(home_dir)
+    try:
+        result = probe_instance(str(launcher_path), instance)
+    finally:
+        if previous_expected_cwd is None:
+            os.environ.pop("EXPECTED_CWD", None)
+        else:
+            os.environ["EXPECTED_CWD"] = previous_expected_cwd
+
+    assert result.ok is True
+    assert result.quota_remaining == 42
+
+
+def test_probe_instance_falls_back_to_logged_in_account_when_quota_parse_fails(
+    tmp_path, monkeypatch
+) -> None:
+    instance = InstanceConfig(
+        name="acct-001",
+        order=1,
+        home_dir=str(tmp_path / "home"),
+    )
+
+    monkeypatch.setattr(
+        "codex_switch.probe._run_status_probe",
+        lambda *args, **kwargs: (0, "Account status unavailable\n"),
+    )
+    monkeypatch.setattr(
+        "codex_switch.probe.login_status",
+        lambda *args, **kwargs: LoginStatus(
+            logged_in=True,
+            output="Logged in using ChatGPT",
+            returncode=0,
+        ),
+    )
+
+    result = probe_instance("/usr/local/bin/codex", instance)
+
+    assert result.ok is True
+    assert result.quota_remaining == 0
+    assert "falling back" in (result.reason or "").lower()

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

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

codex_switch_cli-0.1.1/src/codex_switch/__init__.py

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

codex_switch_cli-0.1.1/src/codex_switch/probe.py

@@ -1,69 +0,0 @@
-from __future__ import annotations
-
-import re
-import subprocess
-from pathlib import Path
-
-from codex_switch.models import InstanceConfig, ProbeResult
-from codex_switch.runtime import build_instance_env
-
-
-QUOTA_PATTERNS = (
-    re.compile(r"remaining[^0-9]*(\d+)", re.IGNORECASE),
-    re.compile(r"(\d+)[^0-9]*remaining", re.IGNORECASE),
-)
-
-
-def parse_remaining_quota(output: str) -> int:
-    for pattern in QUOTA_PATTERNS:
-        match = pattern.search(output)
-        if match:
-            return int(match.group(1))
-    raise ValueError("Unable to parse remaining quota from /status output")
-
-
-def _failure(instance: InstanceConfig, reason: str) -> ProbeResult:
-    return ProbeResult(
-        instance_name=instance.name,
-        order=instance.order,
-        quota_remaining=None,
-        ok=False,
-        reason=reason,
-    )
-
-
-def probe_instance(real_codex_path: str, instance: InstanceConfig) -> ProbeResult:
-    env = build_instance_env(instance.name, Path(instance.home_dir))
-    try:
-        completed = subprocess.run(
-            [real_codex_path, "--no-alt-screen"],
-            input="/status\n/exit\n",
-            text=True,
-            capture_output=True,
-            env=env,
-            check=False,
-            timeout=15,
-        )
-    except FileNotFoundError as exc:
-        return _failure(instance, f"Probe could not launch the real Codex binary: {exc}")
-    except subprocess.TimeoutExpired:
-        return _failure(instance, "Probe timed out")
-
-    output = f"{completed.stdout}\n{completed.stderr}"
-    if completed.returncode != 0:
-        return _failure(
-            instance,
-            f"Probe exited with exit code {completed.returncode}",
-        )
-
-    try:
-        remaining = parse_remaining_quota(output)
-    except ValueError as exc:
-        return _failure(instance, str(exc))
-
-    return ProbeResult(
-        instance_name=instance.name,
-        order=instance.order,
-        quota_remaining=remaining,
-        ok=True,
-    )

codex_switch_cli-0.1.1/tests/test_probe.py

@@ -1,85 +0,0 @@
-import subprocess
-
-from codex_switch.models import InstanceConfig
-from codex_switch.probe import parse_remaining_quota
-from codex_switch.probe import probe_instance
-
-
-def test_parse_remaining_quota_from_status_output() -> None:
-    output = """
-    Account: acct-001
-    Requests remaining: 42
-    """
-
-    assert parse_remaining_quota(output) == 42
-
-
-def test_probe_instance_returns_failure_for_malformed_output(
-    tmp_path, monkeypatch
-) -> None:
-    instance = InstanceConfig(
-        name="acct-001",
-        order=1,
-        home_dir=str(tmp_path / "home"),
-    )
-
-    monkeypatch.setattr(
-        "codex_switch.probe.subprocess.run",
-        lambda *args, **kwargs: subprocess.CompletedProcess(
-            args=["codex"],
-            returncode=0,
-            stdout="Account: acct-001\n",
-            stderr="",
-        ),
-    )
-
-    result = probe_instance("/usr/local/bin/codex", instance)
-
-    assert result.ok is False
-    assert result.quota_remaining is None
-    assert "Unable to parse remaining quota" in result.reason
-
-
-def test_probe_instance_returns_failure_for_nonzero_exit(
-    tmp_path, monkeypatch
-) -> None:
-    instance = InstanceConfig(
-        name="acct-001",
-        order=1,
-        home_dir=str(tmp_path / "home"),
-    )
-
-    monkeypatch.setattr(
-        "codex_switch.probe.subprocess.run",
-        lambda *args, **kwargs: subprocess.CompletedProcess(
-            args=["codex"],
-            returncode=1,
-            stdout="Requests remaining: 42\n",
-            stderr="permission denied",
-        ),
-    )
-
-    result = probe_instance("/usr/local/bin/codex", instance)
-
-    assert result.ok is False
-    assert result.quota_remaining is None
-    assert "exit code 1" in result.reason
-
-
-def test_probe_instance_returns_failure_for_timeout(tmp_path, monkeypatch) -> None:
-    instance = InstanceConfig(
-        name="acct-001",
-        order=1,
-        home_dir=str(tmp_path / "home"),
-    )
-
-    def raise_timeout(*args, **kwargs):
-        raise subprocess.TimeoutExpired(cmd=["codex"], timeout=15)
-
-    monkeypatch.setattr("codex_switch.probe.subprocess.run", raise_timeout)
-
-    result = probe_instance("/usr/local/bin/codex", instance)
-
-    assert result.ok is False
-    assert result.quota_remaining is None
-    assert result.reason == "Probe timed out"