Fourth reviewer.py pass surfaced one more security finding and a handful of correctness gaps. Each is small but the env-scrub for the SDK path closes the asymmetric-fix loop opened in the previous round. * Codex SDK construction now passes an `AppServerConfig(env=...)` that overrides every non-safe-listed env key to an empty string. Upstream openai/codex/sdk/python/client.py builds the spawn env as `os.environ.copy()` then `env.update(self.config.env)`, so this scrubs HF_TOKEN / GH_TOKEN / WANDB_API_KEY / ANTHROPIC_API_KEY etc. out of the codex app-server subprocess env on the chat / parallel / synthesis paths, matching the CLI/login paths from the previous round. The helper falls back to bare `AsyncCodex()` when the SDK version does not expose AppServerConfig, with logged warning. * Install hint now names the actual upstream PyPI project, `openai-codex` (canonical), with `codex_app_server` documented as the legacy alias. The probe still accepts both import names so forward compat is preserved. * Device-auth URL regex broadened to accept upstream's current `chatgpt.com/activate` shape and any `/device|/activate|/verify` variant, not just `/codex/device`. The frontend can now open the verification page on CLI builds that print the documented ChatGPT-style URL. * `_run_codex_synthesis` now takes a `system` arg and forwards it to `thread_start(system=...)`, falling back to a prompt-prefix on older SDK revs that reject the kwarg. Previously a fan-out with "Always answer in Spanish" produced Spanish per-tab attempts but an English synthesis. * `_detect_logged_in` negative regex now also matches "Not signed in", "Please sign in" (alternative localisations / future CLI releases). Same word-boundary anchoring as before. * Frontend `CodexLoginEvent` union gains `device_code` and a `code` field. `CodexLoginButton` now renders the one-time code under the verification URL so users on a headless / remote install can copy the code without scraping the log pane. Also fixes a closure-stale bug where setError(message) was followed by a stale `error` read, losing specific backend errors; the new path keeps `lastStreamError` inside the closure. * Replaced four hardcoded `/mnt/disks/...` paths in the new regression tests with `_backend_file()` resolved from `__file__`, so the suite runs in any checkout (CI, local dev, the review worker tree). Found by the round-4 reviewer. Four new pytest cases pin the behaviour: `test_not_signed_in_wording_also_handled`, `test_device_url_accepts_generic_verification_url`, `test_synthesis_call_forwards_system_prompt`, and `test_sdk_env_scrubbed_via_appserverconfig`. 32/32 codex_provider tests pass; `tsc --noEmit` clean.
299 lines
11 KiB
Python
299 lines
11 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-only
|
|
# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0
|
|
|
|
"""
|
|
Codex CLI / SDK availability probe.
|
|
|
|
This module never imports the Codex Python SDK at module top level.
|
|
The SDK is optional and not pinned in pyproject.toml -- if it's
|
|
installed locally, we use it; if it isn't, the probe simply returns
|
|
``installed=False`` and the provider stays hidden in the frontend.
|
|
|
|
The frontend calls ``GET /api/codex/status`` at startup to decide
|
|
whether to surface the "codex" entry in the provider picker. Three
|
|
states matter:
|
|
|
|
* ``installed=False`` -- either the CLI is missing OR the SDK
|
|
(``openai_codex`` canonical, or ``codex_app_server`` legacy alias)
|
|
is not importable. The picker hides the entry entirely.
|
|
* ``installed=True, logged_in=False`` -- everything resolves on the
|
|
Python side but ``codex login status`` reports no active credentials.
|
|
The provider config dialog shows a ``Sign in to Codex`` button
|
|
instead of the regular API-key field.
|
|
* ``installed=True, logged_in=True`` -- ready to use; the picker
|
|
shows the regular model dropdown.
|
|
|
|
Detection is best-effort and cheap: we shell out to ``which codex``
|
|
plus ``codex --version`` for the CLI and use ``importlib.util.find_spec``
|
|
for the SDK. No long-running CLI commands are invoked here so the
|
|
status endpoint is safe to poll on every page load.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import importlib.util
|
|
import os
|
|
import shutil
|
|
from typing import Any, Optional
|
|
|
|
import structlog
|
|
|
|
logger = structlog.get_logger(__name__)
|
|
|
|
|
|
# Default catalog of models surfaced in the picker when the CLI is
|
|
# present but doesn't advertise a list. The SDK accepts arbitrary model
|
|
# ids; this is purely a sensible default. Mirrored from upstream
|
|
# ``codex-rs/models-manager/models.json``.
|
|
_DEFAULT_SUPPORTED_MODELS: tuple[str, ...] = (
|
|
"gpt-5.5",
|
|
"gpt-5.4",
|
|
"gpt-5.4-mini",
|
|
"gpt-5.3-codex",
|
|
"gpt-5.2",
|
|
)
|
|
|
|
# Names the upstream Python SDK has shipped under. ``openai_codex`` is the
|
|
# canonical package at ``openai/codex/sdk/python``; ``codex_app_server`` is
|
|
# kept as a forward-compat alias because the Rust crate uses that name and
|
|
# an internal alpha may publish under it.
|
|
_SDK_MODULE_NAMES: tuple[str, ...] = ("openai_codex", "codex_app_server")
|
|
|
|
# Safe-list of environment variables forwarded to the codex subprocess.
|
|
# Studio's parent env contains secrets (HF_TOKEN, GH_TOKEN, WANDB_API_KEY,
|
|
# OPENAI key for non-codex providers, etc.); a malicious or shimmed codex
|
|
# binary earlier on PATH would receive all of them via plain os.environ
|
|
# inheritance. We pass only what codex actually needs: PATH for spawning
|
|
# its own helpers, HOME / USER for auth config lookup, the Windows /
|
|
# macOS equivalents, the codex-specific CODEX_HOME override, and the
|
|
# OPENAI_API_KEY that codex's own ``--with-api-key`` flow expects.
|
|
_SAFE_CODEX_ENV_KEYS: tuple[str, ...] = (
|
|
"PATH",
|
|
"HOME",
|
|
"USER",
|
|
"USERNAME",
|
|
"SHELL",
|
|
"LANG",
|
|
"LC_ALL",
|
|
"TMPDIR",
|
|
"TEMP",
|
|
"TMP",
|
|
"SYSTEMROOT",
|
|
"WINDIR",
|
|
"APPDATA",
|
|
"LOCALAPPDATA",
|
|
"PROGRAMDATA",
|
|
"CODEX_HOME",
|
|
"OPENAI_API_KEY",
|
|
"OPENAI_BASE_URL",
|
|
)
|
|
|
|
|
|
def _codex_subprocess_env() -> dict[str, str]:
|
|
"""Return a scrubbed env mapping for codex subprocess spawning.
|
|
|
|
Forwards only keys from `_SAFE_CODEX_ENV_KEYS` that are actually set
|
|
in the parent environment, so secrets from other providers never
|
|
reach the codex CLI.
|
|
"""
|
|
env: dict[str, str] = {}
|
|
for key in _SAFE_CODEX_ENV_KEYS:
|
|
value = os.environ.get(key)
|
|
if value is not None:
|
|
env[key] = value
|
|
return env
|
|
|
|
|
|
def _which_codex() -> Optional[str]:
|
|
"""Return absolute path to the ``codex`` CLI, or None if missing.
|
|
|
|
Uses :func:`shutil.which` so the lookup honours ``PATH`` exactly
|
|
the way the user's shell would. Returns ``None`` on any failure
|
|
so callers can treat "missing" and "broken probe" the same way.
|
|
"""
|
|
try:
|
|
return shutil.which("codex")
|
|
except Exception as exc:
|
|
# shutil.which itself is documented as raising only on
|
|
# genuinely unusual conditions, but a hardened wrapper costs
|
|
# nothing and keeps the status endpoint from 500'ing.
|
|
logger.warning("codex_availability.which_failed", error = str(exc))
|
|
return None
|
|
|
|
|
|
def _sdk_importable() -> bool:
|
|
"""True iff the Codex Python SDK is importable in this interpreter.
|
|
|
|
We deliberately use :func:`importlib.util.find_spec` instead of an
|
|
actual ``import`` so the import never runs -- that keeps the cost
|
|
negligible and avoids the SDK's own side effects (which include
|
|
reaching out to the CLI subprocess for an RPC ping) during a
|
|
simple availability check.
|
|
|
|
Probes both ``openai_codex`` (the canonical upstream package name
|
|
at ``openai/codex/sdk/python``) and ``codex_app_server`` (the Rust
|
|
crate name, kept as a forward-compat alias).
|
|
"""
|
|
for name in _SDK_MODULE_NAMES:
|
|
try:
|
|
if importlib.util.find_spec(name) is not None:
|
|
return True
|
|
except Exception as exc:
|
|
logger.warning(
|
|
"codex_availability.find_spec_failed",
|
|
module = name,
|
|
error = str(exc),
|
|
)
|
|
return False
|
|
|
|
|
|
async def _run_cli(args: list[str], *, timeout: float = 4.0) -> tuple[int, str, str]:
|
|
"""Run a short ``codex`` CLI command and return (rc, stdout, stderr).
|
|
|
|
The probe uses 4s as the wall-clock cap because ``codex --version``
|
|
and ``codex auth status`` both return in well under a second on a
|
|
healthy install. A longer probe would block the
|
|
``/api/codex/status`` route -- and that route fires on every chat
|
|
page load, so a tight cap matters.
|
|
"""
|
|
try:
|
|
proc = await asyncio.create_subprocess_exec(
|
|
"codex",
|
|
*args,
|
|
stdout = asyncio.subprocess.PIPE,
|
|
stderr = asyncio.subprocess.PIPE,
|
|
env = _codex_subprocess_env(),
|
|
)
|
|
except FileNotFoundError:
|
|
return -1, "", "codex binary not on PATH"
|
|
except Exception as exc:
|
|
logger.warning(
|
|
"codex_availability.spawn_failed",
|
|
args = args,
|
|
error = str(exc),
|
|
)
|
|
return -1, "", str(exc)
|
|
|
|
try:
|
|
stdout_b, stderr_b = await asyncio.wait_for(proc.communicate(), timeout = timeout)
|
|
except asyncio.TimeoutError:
|
|
proc.kill()
|
|
try:
|
|
await proc.wait()
|
|
except Exception:
|
|
pass
|
|
return -1, "", f"codex {' '.join(args)} timed out after {timeout:.1f}s"
|
|
|
|
return (
|
|
proc.returncode if proc.returncode is not None else -1,
|
|
stdout_b.decode("utf-8", errors = "replace").strip(),
|
|
stderr_b.decode("utf-8", errors = "replace").strip(),
|
|
)
|
|
|
|
|
|
async def _detect_version() -> Optional[str]:
|
|
rc, stdout, stderr = await _run_cli(["--version"])
|
|
if rc != 0:
|
|
return None
|
|
# ``codex --version`` prints something like "codex-cli 0.133.0".
|
|
# Surface the whole line so the UI can show the exact build the
|
|
# user has installed -- it's useful when troubleshooting.
|
|
text = stdout or stderr
|
|
return text.split("\n", 1)[0].strip() if text else None
|
|
|
|
|
|
async def _detect_logged_in() -> bool:
|
|
"""Best-effort: parse ``codex login status`` output.
|
|
|
|
The upstream subcommand is ``codex login status`` (no ``auth``
|
|
parent). Output shapes seen in the wild:
|
|
* "Logged in using ChatGPT" / "Logged in as user@x.com" -> True
|
|
* "Not logged in. Run `codex login` ..." -> False
|
|
* "Not authenticated" -> False
|
|
Return code is the most stable signal but ``not logged in`` also
|
|
exits 0 on current releases, so we substring-check explicitly.
|
|
|
|
Note: a naive ``"logged in" in combined`` check is wrong because
|
|
the substring appears inside "not logged in" too -- we use an
|
|
explicit negative-prefix check first.
|
|
"""
|
|
import re
|
|
|
|
rc, stdout, stderr = await _run_cli(["login", "status"])
|
|
combined = f"{stdout}\n{stderr}".lower()
|
|
|
|
# Negative prefixes win, regardless of rc. We anchor on word
|
|
# boundaries so "not logged in" / "not authenticated" both match
|
|
# without being fooled by the substring "logged in" inside them.
|
|
# Covers the variants seen across CLI releases and locales.
|
|
negative = re.compile(
|
|
r"\b(not\s+(?:logged|signed)\s+in|"
|
|
r"not\s+authenticated|"
|
|
r"please\s+(?:log|sign)\s+in|"
|
|
r"run\s+`?codex\s+login`?)\b"
|
|
)
|
|
if negative.search(combined):
|
|
return False
|
|
|
|
positive = re.compile(r"\b(logged in|authenticated as|signed in)\b")
|
|
if positive.search(combined):
|
|
return True
|
|
|
|
if rc == 0:
|
|
# rc=0 with nothing useful on either pipe: optimistic default,
|
|
# the user is probably authenticated and the CLI just stayed
|
|
# quiet (e.g. a future release).
|
|
if not combined.strip():
|
|
return True
|
|
return False
|
|
return False
|
|
|
|
|
|
async def probe_codex_availability() -> dict[str, Any]:
|
|
"""Return the full status payload consumed by ``GET /api/codex/status``.
|
|
|
|
Returns a dict with keys:
|
|
|
|
* ``installed`` (bool) -- True iff both CLI and SDK are present.
|
|
Note this is the gate the frontend uses to surface the provider
|
|
at all, so if EITHER is missing the picker hides the entry.
|
|
* ``cli_path`` (str | None) -- absolute path to the CLI, or None.
|
|
* ``sdk_importable`` (bool) -- the Python SDK is importable.
|
|
* ``logged_in`` (bool) -- best-effort auth check; meaningless when
|
|
``installed`` is False.
|
|
* ``version`` (str | None) -- the ``codex --version`` first line.
|
|
* ``supported_models`` (list[str]) -- default model id catalog.
|
|
"""
|
|
cli_path = _which_codex()
|
|
sdk_ok = _sdk_importable()
|
|
|
|
payload: dict[str, Any] = {
|
|
"installed": bool(cli_path) and sdk_ok,
|
|
"cli_path": cli_path,
|
|
"sdk_importable": sdk_ok,
|
|
"logged_in": False,
|
|
"version": None,
|
|
"supported_models": list(_DEFAULT_SUPPORTED_MODELS),
|
|
}
|
|
|
|
if cli_path:
|
|
# version + login probes only matter when the CLI is present;
|
|
# they would otherwise just churn subprocess errors. Run them
|
|
# in parallel because both are independent CLI invocations.
|
|
version, logged_in = await asyncio.gather(
|
|
_detect_version(),
|
|
_detect_logged_in(),
|
|
)
|
|
payload["version"] = version
|
|
payload["logged_in"] = bool(logged_in)
|
|
|
|
logger.info(
|
|
"codex_availability.probed",
|
|
installed = payload["installed"],
|
|
sdk_importable = payload["sdk_importable"],
|
|
cli_path = payload["cli_path"],
|
|
version = payload["version"],
|
|
logged_in = payload["logged_in"],
|
|
)
|
|
return payload
|