fix(doctor): detect Codex routing via active provider base_url

Resolve model_provider and classify that section's base_url so preserved
provider IDs pointing at the local proxy pass doctor instead of false
negative Headroom-section checks.

Closes #2614
This commit is contained in:
axelray-dev
2026-07-28 03:02:08 +08:00
parent e530de5ad2
commit cab1dde1fd
2 changed files with 70 additions and 20 deletions
+32 -20
View File
@@ -46,7 +46,8 @@ FAIL = "fail"
SKIP = "skip"
_LOOPBACK_URL_RE = re.compile(r"https?://(?:127\.0\.0\.1|localhost):(\d+)")
_CODEX_BASE_URL_RE = re.compile(r'base_url\s*=\s*"https?://(?:127\.0\.0\.1|localhost):(\d+)')
_CODEX_BASE_URL_RE = re.compile(r'(?m)^[ \t]*base_url\s*=\s*"([^"\r\n]+)"')
_CODEX_MODEL_PROVIDER_RE = re.compile(r'(?m)^[ \t]*model_provider\s*=\s*"([^"\r\n]+)"')
@dataclass
@@ -285,9 +286,10 @@ def check_wrap_marker_staleness(settings_path: Path) -> CheckResult:
def check_codex_routing(config_path: Path, port: int) -> CheckResult:
"""Is Codex configured to route through the proxy?
Detection keys on the ``[model_providers.headroom]`` section, which both
writers emit (install's persistent block and wrap's auto-injected block).
Substring matching keeps malformed TOML a WARN instead of a crash.
Detection prefers the active ``model_provider`` section's loopback
``base_url``, while retaining the ``[model_providers.headroom]`` fallback
emitted by persistent and wrap installs. Best-effort matching keeps
malformed TOML a WARN instead of a crash.
"""
name = "codex"
if not config_path.exists():
@@ -301,22 +303,32 @@ def check_codex_routing(config_path: Path, port: int) -> CheckResult:
text = config_path.read_text(encoding="utf-8", errors="replace")
except OSError as exc:
return CheckResult(name=name, status=WARN, summary=f"could not read {config_path}: {exc}")
if "[model_providers.headroom]" not in text:
return CheckResult(
name=name,
status=WARN,
summary="not routed (no Headroom provider in config.toml)",
hint="wrap it: headroom wrap codex",
)
match = _CODEX_BASE_URL_RE.search(text)
if match and int(match.group(1)) != port:
return CheckResult(
name=name,
status=WARN,
summary=f"routed to port {match.group(1)}, but doctor probed port {port}",
hint=f"re-run with: headroom doctor --port {match.group(1)}",
)
return CheckResult(name=name, status=PASS, summary=f"routed ({config_path})")
active_match = _CODEX_MODEL_PROVIDER_RE.search(text)
provider_id = active_match.group(1) if active_match else "headroom"
base_url = _codex_provider_base_url(text, provider_id)
if base_url is not None:
return _classify_routing_url(name, base_url, port, source=str(config_path))
return CheckResult(
name=name,
status=WARN,
summary="not routed (no Headroom provider in config.toml)",
hint="wrap it: headroom wrap codex",
)
def _codex_provider_base_url(text: str, provider_id: str) -> str | None:
section_match = re.search(
rf"(?m)^[ \t]*\[model_providers\.{re.escape(provider_id)}\][ \t]*(?:#.*)?$",
text,
)
if section_match is None:
return None
section = text[section_match.end() :]
next_section = re.search(r"(?m)^[ \t]*\[", section)
if next_section is not None:
section = section[: next_section.start()]
base_url_match = _CODEX_BASE_URL_RE.search(section)
return base_url_match.group(1) if base_url_match else None
def check_shell_env(environ: Mapping[str, str], port: int) -> CheckResult:
+38
View File
@@ -351,6 +351,44 @@ class TestCodexRouting:
)
assert check_codex_routing(path, 8787).status == PASS
def test_preserved_provider_id_right_port_passes(self, tmp_path):
path = tmp_path / "config.toml"
path.write_text(
'model_provider = "codex-lb"\n'
"[model_providers.codex-lb]\n"
'base_url = "http://127.0.0.1:8787/v1"\n',
encoding="utf-8",
)
result = check_codex_routing(path, 8787)
assert result.status == PASS
assert result.hint is None
def test_preserved_provider_id_port_mismatch_warns(self, tmp_path):
path = tmp_path / "config.toml"
path.write_text(
'model_provider = "codex-lb"\n'
"[model_providers.codex-lb]\n"
'base_url = "http://localhost:9999/v1"\n',
encoding="utf-8",
)
result = check_codex_routing(path, 8787)
assert result.status == WARN
assert "9999" in result.summary
def test_active_provider_takes_precedence_over_headroom_block(self, tmp_path):
path = tmp_path / "config.toml"
path.write_text(
'model_provider = "corp"\n'
"[model_providers.corp]\n"
'base_url = "https://gateway.corp.example/v1"\n'
"[model_providers.headroom]\n"
'base_url = "http://127.0.0.1:8787/v1"\n',
encoding="utf-8",
)
result = check_codex_routing(path, 8787)
assert result.status == WARN
assert "gateway.corp.example" in result.summary
def test_port_mismatch_warns(self, tmp_path):
path = tmp_path / "config.toml"
path.write_text(