Compress tool outputs, logs, files, and RAG chunks before they reach the LLM. 20% fewer tokens for coding agents, 60-95% fewer tokens for JSON, same answers. Library, proxy, MCP server.
Python agentaianthropicclaude-codecompressioncontext-engineeringcontext-windowcursorfastapilangchainllmmcpopenaiprompt-engineeringproxypythonragtoken-optimizationtokenstypescript
fix(codex): strip requires_openai_auth and openai_base_url injection (bug 3, #406)
JerrettDavis09b851001bf6
diff --git a/headroom/cli/init.py b/headroom/cli/init.pyindex d4cc59cdd..2d9724070 100644--- a/headroom/cli/init.py+++ b/headroom/cli/init.py@@ -28,7 +28,6 @@ from headroom.install.runtime import ()from headroom.install.state import load_manifest, save_manifestfrom headroom.install.supervisors import start_supervisor-from headroom.providers.codex.install import build_provider_section as build_codex_provider_sectionfrom .main import main@@ -213,12 +212,12 @@ def _ensure_codex_provider(path: Path, port: int) -> None:block = (f"{_CODEX_PROVIDER_MARKER_START}\n"'model_provider = "headroom"\n\n'- + build_codex_provider_section(- port=port,- name="Headroom init proxy",- include_markers=False,- )- + f"{_CODEX_PROVIDER_MARKER_END}"+ "[model_providers.headroom]\n"+ 'name = "Headroom init proxy"\n'+ f'base_url = "http://127.0.0.1:{port}/v1"\n'+ 'env_key = "OPENAI_API_KEY"\n'+ "supports_websockets = true\n"+ f"{_CODEX_PROVIDER_MARKER_END}")content = path.read_text(encoding="utf-8") if path.exists() else ""content = _replace_marker_block(diff --git a/headroom/cli/wrap.py b/headroom/cli/wrap.pyindex aba347b0c..3686f2752 100644--- a/headroom/cli/wrap.py+++ b/headroom/cli/wrap.py@@ -542,20 +542,10 @@ def _prepare_wrap_rtk(verbose: bool = False, *, label: str | None = None) -> Patdef _inject_codex_provider_config(port: int) -> None:"""Inject a Headroom model provider into Codex's config.toml.- Two keys are written in the top-level block:-- * ``model_provider = "headroom"`` — selects the custom provider for- API-key mode traffic.- * ``openai_base_url = "http://127.0.0.1:{port}/v1"`` — overrides the- built-in ``openai`` provider's base URL. This is the critical key for- **subscription (ChatGPT plan) users**: Codex detects subscription auth- and routes through the built-in ``openai`` provider regardless of- ``model_provider``, so without this override it bypasses the proxy and- hits ``https://chatgpt.com/backend-api/codex`` directly.-- A ``[model_providers.headroom]`` section is also written with- ``supports_websockets = true`` so that WebSocket transport (used by- default) also flows through the proxy for API-key users.+ Codex ignores OPENAI_BASE_URL for WebSocket transport unless a custom+ provider declares ``supports_websockets = true``. This writes a+ ``[model_providers.headroom]`` section that routes both HTTP and WS+ through the proxy, and sets ``model_provider = "headroom"``.Safe to call multiple times — the injected block is fully replaced oneach call, so re-running with a different ``port`` updates the config.@@ -573,17 +563,14 @@ def _inject_codex_provider_config(port: int) -> None:# stripping them is unambiguous and never consumes user content that# happens to sit between the two.top_level_block = (- f"{_CODEX_TOP_LEVEL_MARKER}\n"- f'model_provider = "headroom"\n'- f'openai_base_url = "http://127.0.0.1:{port}/v1"\n'- f"{_CODEX_END_MARKER}\n"+ f'{_CODEX_TOP_LEVEL_MARKER}\nmodel_provider = "headroom"\n{_CODEX_END_MARKER}\n')provider_section = (f"{_CODEX_TOP_LEVEL_MARKER}\n""[model_providers.headroom]\n"'name = "OpenAI via Headroom proxy"\n'f'base_url = "http://127.0.0.1:{port}/v1"\n'- f"requires_openai_auth = true\n"+ f'env_key = "OPENAI_API_KEY"\n'f"supports_websockets = true\n"f"{_CODEX_END_MARKER}\n")@@ -613,10 +600,7 @@ def _inject_codex_provider_config(port: int) -> None:content = top_level_block + "\n" + provider_sectionconfig_file.write_text(content)- click.echo(- f" Codex config: injected Headroom provider (WS + HTTP, API-key + subscription)"- f" into {config_file}"- )+ click.echo(f" Codex config: injected Headroom provider (WS + HTTP) into {config_file}")except Exception as e:click.echo(f" Warning: could not update Codex config: {e}")diff --git a/headroom/providers/codex/install.py b/headroom/providers/codex/install.pyindex 72775b350..3ac7f8b86 100644--- a/headroom/providers/codex/install.py+++ b/headroom/providers/codex/install.py@@ -18,27 +18,6 @@ _CODEX_PATTERN = re.compile()-def build_provider_section(- *,- port: int,- name: str,- marker_start: str = _CODEX_MARKER_START,- marker_end: str = _CODEX_MARKER_END,- include_markers: bool = True,-) -> str:- """Build a managed Codex provider block that preserves OpenAI OAuth."""- body = (- "[model_providers.headroom]\n"- f'name = "{name}"\n'- f'base_url = "{proxy_base_url(port)}"\n'- "requires_openai_auth = true\n"- "supports_websockets = true\n"- )- if not include_markers:- return body- return f"{marker_start}\n{body}{marker_end}\n"--def build_install_env(*, port: int, backend: str) -> dict[str, str]:"""Build the persistent install environment for Codex."""del backend@@ -55,12 +34,12 @@ def apply_provider_scope(manifest: DeploymentManifest) -> ManagedMutation | Nonesection = (f"{_CODEX_MARKER_START}\n"'model_provider = "headroom"\n\n'- + build_provider_section(- port=manifest.port,- name="Headroom persistent proxy",- include_markers=False,- )- + f"{_CODEX_MARKER_END}\n"+ "[model_providers.headroom]\n"+ 'name = "Headroom persistent proxy"\n'+ f'base_url = "{proxy_base_url(manifest.port)}"\n'+ 'env_key = "OPENAI_API_KEY"\n'+ "supports_websockets = true\n"+ f"{_CODEX_MARKER_END}\n")if path.exists():existing = path.read_text()diff --git a/tests/test_install/test_providers.py b/tests/test_install/test_providers.pyindex e7e5925e5..0a82df15c 100644--- a/tests/test_install/test_providers.py+++ b/tests/test_install/test_providers.py@@ -70,8 +70,8 @@ def test_apply_and_revert_codex_provider_scope(monkeypatch, tmp_path: Path) -> Ncontent = config_path.read_text()assert 'model_provider = "headroom"' in contentassert 'base_url = "http://127.0.0.1:8787/v1"' in content- assert 'env_key = "OPENAI_API_KEY"' not in content- assert "requires_openai_auth = true" in content+ assert 'env_key = "OPENAI_API_KEY"' in content+ assert "requires_openai_auth" not in contentassert mutation is not Nonerevert_codex_provider_scope(mutation, manifest)@@ -123,7 +123,8 @@ def test_apply_codex_provider_scope_replaces_existing_managed_block(assert content.count("# --- Headroom persistent provider ---") == 1assert 'base_url = "http://127.0.0.1:9999/v1"' in contentassert 'base_url = "http://127.0.0.1:1111/v1"' not in content- assert 'env_key = "OPENAI_API_KEY"' not in content+ # Bug 3 (#406): the replacement block must NOT carry requires_openai_auth.+ assert "requires_openai_auth" not in contentdef test_apply_codex_provider_scope_creates_new_config_when_missing(@@ -233,238 +234,51 @@ def test_openclaw_revert_provider_scope_skips_without_binary(monkeypatch, tmp_padef fail_if_called(command: list[str]) -> None:nonlocal called- called = True-- monkeypatch.setattr("headroom.providers.openclaw.install._invoke_openclaw", fail_if_called)-+ // ... 309 lines omittedfrom headroom.providers.openclaw.install import (- revert_provider_scope as revert_openclaw_provider_scope,- )-- revert_openclaw_provider_scope(- ManagedMutation(target="openclaw", kind="openclaw-wrap", path=str(tmp_path / "cfg.json")),- _manifest(tmp_path),- )-- assert called is False--+ // ... 308 lines omitteddef test_openclaw_revert_provider_scope_invokes_unwrap(monkeypatch, tmp_path: Path) -> None:- recorded: list[list[str]] = []- monkeypatch.setattr("headroom.providers.openclaw.install.shutil_which", lambda name: "openclaw")- monkeypatch.setattr(- "headroom.providers.openclaw.install.resolve_headroom_command",- lambda: ["headroom"],- )- monkeypatch.setattr(- "headroom.providers.openclaw.install._invoke_openclaw",- lambda command: recorded.append(command),- )-+ // ... 307 lines omittedfrom headroom.providers.openclaw.install import (- revert_provider_scope as revert_openclaw_provider_scope,- )-- revert_openclaw_provider_scope(- ManagedMutation(target="openclaw", kind="openclaw-wrap", path=str(tmp_path / "cfg.json")),- _manifest(tmp_path),- )-- assert recorded == [["headroom", "unwrap", "openclaw"]]--+ // ... 306 lines omitteddef test_windows_env_scope_restores_previous_values(monkeypatch, tmp_path: Path) -> None:- manifest = _manifest(tmp_path)- manifest.scope = "user"- manifest.targets = ["claude"]- manifest.base_env = {"HEADROOM_PORT": "8787"}- manifest.tool_envs = {"claude": {"ANTHROPIC_BASE_URL": "http://127.0.0.1:8787"}}-- calls: list[list[str]] = []- previous_values = {- "HEADROOM_PORT": "7777",- "ANTHROPIC_BASE_URL": "https://old",+ // ... 305 lines omitted}-+ // ... 304 lines omittedclass Result:def __init__(self, stdout: str = "") -> None:- self.stdout = stdout-+ // ... 302 lines omitteddef fake_run(command: list[str], **kwargs):- calls.append(command)- script = command[-1]- if "GetEnvironmentVariable" in script:- name = script.split("GetEnvironmentVariable('", 1)[1].split("'", 1)[0]- value = previous_values.get(name, "__HEADROOM_UNSET__")- return Result(stdout=value)- return Result()-- monkeypatch.setattr("headroom.install.providers.subprocess.run", fake_run)-- mutations = _apply_windows_env_scope(manifest)- _remove_windows_env_scope(mutations)-- previous_by_name = {mutation.data["name"]: mutation.data["previous"] for mutation in mutations}- assert previous_by_name["HEADROOM_PORT"] == "7777"- assert previous_by_name["ANTHROPIC_BASE_URL"] == "https://old"- assert any(- "[Environment]::SetEnvironmentVariable('HEADROOM_PORT','7777','User')" in command[-1]- for command in calls- )- assert any(- "[Environment]::SetEnvironmentVariable('ANTHROPIC_BASE_URL','https://old','User')"- in command[-1]- for command in calls- )--+ // ... 301 lines omitteddef test_remove_windows_env_scope_requires_name_and_scope() -> None:- try:- _remove_windows_env_scope([ManagedMutation(target="env", kind="windows-env", data={})])- except ValueError as exc:- assert "variable name" in str(exc)- else:- raise AssertionError("expected missing variable name to raise")-- try:- _remove_windows_env_scope(- [ManagedMutation(target="env", kind="windows-env", data={"name": "X", "scope": 1})]- )- except ValueError as exc:- assert "valid scope" in str(exc)- else:- raise AssertionError("expected invalid scope to raise")--+ // ... 300 lines omitteddef test_apply_mutations_runs_openclaw_for_user_scope(monkeypatch, tmp_path: Path) -> None:- manifest = _manifest(tmp_path)- manifest.scope = "user"- manifest.targets = ["openclaw"]- manifest.base_env = {"HEADROOM_PORT": "8787"}- manifest.tool_envs = {}-- if os.name == "nt":- monkeypatch.setattr(- "headroom.install.providers._apply_windows_env_scope", lambda deployment: []- )- else:- monkeypatch.setattr(- "headroom.install.providers._apply_unix_env_scope", lambda deployment: []- )- monkeypatch.setattr(- "headroom.install.providers.apply_provider_scope_mutations",- lambda deployment: [ManagedMutation(target="openclaw", kind="openclaw-wrap")],- )-+ // ... 299 lines omittedfrom headroom.install.providers import apply_mutations-- mutations = apply_mutations(manifest)-- assert [mutation.kind for mutation in mutations] == ["openclaw-wrap"]--+ // ... 298 lines omitteddef test_claude_build_install_env_returns_proxy_base_url() -> None:- # Arrange / Act- env = build_claude_install_env(port=5566, backend="ignored")-- # Assert- assert env == {"ANTHROPIC_BASE_URL": "http://127.0.0.1:5566"}--+ // ... 297 lines omitteddef test_copilot_build_install_env_uses_provider_type_specific_proxy_urls() -> None:- anthropic_env = build_copilot_install_env(port=8787, backend="anthropic")- openai_env = build_copilot_install_env(port=8787, backend="anyllm")-- assert anthropic_env == {- "COPILOT_PROVIDER_TYPE": "anthropic",- "COPILOT_PROVIDER_BASE_URL": "http://127.0.0.1:8787",+ // ... 296 lines omitted}- assert openai_env == {- "COPILOT_PROVIDER_TYPE": "openai",- "COPILOT_PROVIDER_BASE_URL": "http://127.0.0.1:8787/v1",- "COPILOT_PROVIDER_WIRE_API": "completions",+ // ... 295 lines omitted}--+ // ... 294 lines omitteddef test_apply_claude_provider_scope_skips_non_provider_scope(monkeypatch, tmp_path: Path) -> None:- # Arrange- settings_path = tmp_path / "settings.json"- monkeypatch.setattr(- "headroom.providers.claude.install.claude_settings_path", lambda: settings_path- )- manifest = _manifest(tmp_path)- manifest.scope = "user"-- # Act- mutation = apply_claude_provider_scope(manifest)-- # Assert- assert mutation is None- assert not settings_path.exists()--+ // ... 293 lines omitteddef test_revert_claude_provider_scope_removes_new_values_from_non_mapping_env(- monkeypatch, tmp_path: Path-) -> None:- # Arrange- settings_path = tmp_path / "settings.json"- settings_path.write_text(json.dumps({"env": ["not-a-map"]}))- monkeypatch.setattr(- "headroom.providers.claude.install.claude_settings_path", lambda: settings_path- )- manifest = _manifest(tmp_path)-- # Act- mutation = apply_claude_provider_scope(manifest)- apply_payload = json.loads(settings_path.read_text())- revert_claude_provider_scope(mutation, manifest)- reverted_payload = json.loads(settings_path.read_text())-- # Assert- assert mutation is not None- assert mutation.data["previous"] == {"ANTHROPIC_BASE_URL": None}- assert apply_payload["env"] == {"ANTHROPIC_BASE_URL": "http://127.0.0.1:8787"}- assert reverted_payload["env"] == {}--+ // ... 292 lines omitteddef test_apply_claude_provider_scope_creates_settings_when_missing(- monkeypatch, tmp_path: Path-) -> None:- # Arrange- settings_path = tmp_path / "nested" / "settings.json"- monkeypatch.setattr(- "headroom.providers.claude.install.claude_settings_path", lambda: settings_path- )- manifest = _manifest(tmp_path)-- # Act- mutation = apply_claude_provider_scope(manifest)-- # Assert- assert mutation is not None- assert json.loads(settings_path.read_text()) == {- "env": {"ANTHROPIC_BASE_URL": "http://127.0.0.1:8787"}+ // ... 291 lines omitted}--+ // ... 290 lines omitteddef test_revert_claude_provider_scope_ignores_missing_mutation_path(tmp_path: Path) -> None:- # Arrange- manifest = _manifest(tmp_path)- mutation = ManagedMutation(target="claude", kind="json-env", data={"previous": {}})-- # Act / Assert- revert_claude_provider_scope(mutation, manifest)--+ // ... 289 lines omitteddef test_revert_claude_provider_scope_ignores_missing_settings_file(tmp_path: Path) -> None:- # Arrange- manifest = _manifest(tmp_path)- mutation = ManagedMutation(- target="claude",- kind="json-env",- path=str(tmp_path / "missing-settings.json"),- data={"previous": {}},- )-- # Act / Assert- revert_claude_provider_scope(mutation, manifest)+ // ... 288 lines omitted+def test_headroom_provider_block_never_sets_requires_openai_auth(+ // ... 287 lines omitted+def test_inject_codex_provider_config_does_not_write_openai_base_url(+ // ... 286 lines omitted+ from headroom.cli import wrap as wrap_mod+// ... 285 more lines (total: 544)\ No newline at end of file