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(wrap): keep agent savings opt-in (#1294)
JD Davisb829ceba84ce
diff --git a/headroom/cli/wrap.py b/headroom/cli/wrap.pyindex 35cdc0478..846f38a58 100644--- a/headroom/cli/wrap.py+++ b/headroom/cli/wrap.py@@ -143,7 +143,6 @@ _WRAP_PROXY_TIMEOUT_ML_MODULES = ("torch", "sentence_transformers", "spacy")_TOOL_SEARCH_ENV = TOOL_SEARCH_ENV_TOOL_SEARCH_DEFAULT = TOOL_SEARCH_DEFAULT_AGENT_SAVINGS_WRAP_AGENTS = {"claude", "codex", "cursor"}-_DEFAULT_AGENT_SAVINGS_PROFILE = "agent-90"def _normalize_tool_search_mode(value: str) -> str:@@ -238,7 +237,7 @@ def _wrap_agent_savings_profile(agent_type: str) -> str | None:if agent_type not in _AGENT_SAVINGS_WRAP_AGENTS:return None- return os.environ.get("HEADROOM_SAVINGS_PROFILE") or _DEFAULT_AGENT_SAVINGS_PROFILE+ return os.environ.get("HEADROOM_SAVINGS_PROFILE") or Nonedef _default_wrap_proxy_timeout_seconds() -> int:@@ -399,9 +398,6 @@ def _start_proxy(# Ensure proxy subprocess uses UTF-8 (Windows defaults to cp1252)proxy_env = os.environ.copy()proxy_env["PYTHONIOENCODING"] = "utf-8"- if agent_type in {"claude", "codex", "cursor"}:- apply_agent_savings_env_defaults(proxy_env)-# Tell the proxy which agent is being wrapped (for traffic learning output)if agent_type != "unknown":proxy_env["HEADROOM_AGENT_TYPE"] = agent_type@@ -1936,6 +1932,9 @@ def _agent_savings_config_mismatches(if agent_type not in _AGENT_SAVINGS_TARGET_AGENTS:return []+ if _wrap_agent_savings_profile(agent_type) is None:+ return []+desired_env = os.environ.copy()apply_agent_savings_env_defaults(desired_env)checks: tuple[tuple[str, str, str, str], ...] = (diff --git a/headroom/install/runtime.py b/headroom/install/runtime.pyindex feaa815e9..badd5394c 100644--- a/headroom/install/runtime.py+++ b/headroom/install/runtime.py@@ -192,7 +192,8 @@ def acquire_runtime_start_lock(profile: str) -> Iterator[bool]:import fcntltry:- fcntl.flock(lock_file.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)+ fcntl_any = cast(Any, fcntl)+ fcntl_any.flock(lock_file.fileno(), fcntl_any.LOCK_EX | fcntl_any.LOCK_NB)acquired = Trueexcept BlockingIOError:yield False@@ -217,7 +218,8 @@ def acquire_runtime_start_lock(profile: str) -> Iterator[bool]:else:import fcntl- fcntl.flock(lock_file.fileno(), fcntl.LOCK_UN)+ fcntl_any = cast(Any, fcntl)+ fcntl_any.flock(lock_file.fileno(), fcntl_any.LOCK_UN)def run_foreground(manifest: DeploymentManifest) -> int:diff --git a/headroom/release_version.py b/headroom/release_version.pyindex 75561cfad..395f1f9ea 100644--- a/headroom/release_version.py+++ b/headroom/release_version.py@@ -283,9 +283,10 @@ def write_github_outputs(info: ReleaseVersionInfo, output_path: str) -> None:def main() -> None:root = Path.cwd()manual_version = os.environ.get("MANUAL_VER", "").strip()+ manual_raw = os.environ.get("MANUAL_VER") or os.environ.get("LEVEL") or "patch"manual_match = re.fullmatch(r"v?(\d+\.\d+\.\d+(?:[abrc]\d+)?)",- (os.environ.get("MANUAL_VER") or os.environ.get("LEVEL", "patch")).strip(),+ manual_raw.strip(),)if manual_match:version = manual_match.group(1)diff --git a/headroom/subscription/tracker.py b/headroom/subscription/tracker.pyindex a2b3c1d78..9b6547978 100644--- a/headroom/subscription/tracker.py+++ b/headroom/subscription/tracker.py@@ -29,7 +29,7 @@ import threadingimport timefrom datetime import timedeltafrom pathlib import Path-from typing import Any+from typing import Any, castfrom headroom import paths as _pathsfrom headroom.subscription.base import QuotaTracker@@ -487,7 +487,8 @@ class SubscriptionTracker(QuotaTracker):try:lock_path.parent.mkdir(parents=True, exist_ok=True)fd = open(lock_path, "w") # noqa: SIM115- fcntl.flock(fd, fcntl.LOCK_EX | fcntl.LOCK_NB)+ fcntl_any = cast(Any, fcntl)+ fcntl_any.flock(fd, fcntl_any.LOCK_EX | fcntl_any.LOCK_NB)fd.write(str(os.getpid()))fd.flush()self._rtk_poll_lock_fd = fd@@ -517,7 +518,8 @@ class SubscriptionTracker(QuotaTracker):try:import fcntl- fcntl.flock(fd, fcntl.LOCK_UN)+ fcntl_any = cast(Any, fcntl)+ fcntl_any.flock(fd, fcntl_any.LOCK_UN)except Exception:passtry:diff --git a/tests/test_agent_savings.py b/tests/test_agent_savings.pyindex 21451bab7..38dbe2b4c 100644--- a/tests/test_agent_savings.py+++ b/tests/test_agent_savings.py@@ -174,7 +174,74 @@ def test_compress_savings_profile_does_not_mutate_supplied_config(monkeypatch) -assert config.min_tokens_to_compress == 999-def test_agent_savings_config_mismatches_returns_specific_labels() -> None:+def test_wrap_agent_savings_profile_is_opt_in(monkeypatch) -> None:+ monkeypatch.delenv("HEADROOM_SAVINGS_PROFILE", raising=False)++ assert wrap_module._wrap_agent_savings_profile("codex") is None++ monkeypatch.setenv("HEADROOM_SAVINGS_PROFILE", AGENT_90_PROFILE)++ assert wrap_module._wrap_agent_savings_profile("codex") == AGENT_90_PROFILE+++def test_agent_savings_config_mismatches_requires_explicit_profile(monkeypatch) -> None:+ monkeypatch.delenv("HEADROOM_SAVINGS_PROFILE", raising=False)++ assert wrap_module._agent_savings_config_mismatches({}, "claude") == []+++def test_start_proxy_does_not_inject_agent_savings_by_default(monkeypatch, tmp_path) -> None:+ captured_env: dict[str, str] = {}++ class Proc:+ returncode = None++ def poll(self) -> None:+ return None++ def popen(cmd, **kwargs): # noqa: ANN001+ captured_env.update(kwargs["env"])+ return Proc()++ monkeypatch.delenv("HEADROOM_SAVINGS_PROFILE", raising=False)+ monkeypatch.setattr(wrap_module.subprocess, "Popen", popen)+ monkeypatch.setattr(wrap_module.time, "sleep", lambda seconds: None)+ monkeypatch.setattr(wrap_module, "_check_proxy", lambda port: True)+ monkeypatch.setattr(wrap_module, "_get_log_path", lambda: tmp_path / "proxy.log")++ wrap_module._start_proxy(8787, agent_type="codex")++ assert "HEADROOM_SAVINGS_PROFILE" not in captured_env+ assert "HEADROOM_TARGET_RATIO" not in captured_env+++def test_start_proxy_injects_explicit_agent_savings_profile(monkeypatch, tmp_path) -> None:+ captured_env: dict[str, str] = {}++ class Proc:+ returncode = None++ def poll(self) -> None:+ return None++ def popen(cmd, **kwargs): # noqa: ANN001+ captured_env.update(kwargs["env"])+ return Proc()++ monkeypatch.setenv("HEADROOM_SAVINGS_PROFILE", AGENT_90_PROFILE)+ monkeypatch.setattr(wrap_module.subprocess, "Popen", popen)+ monkeypatch.setattr(wrap_module.time, "sleep", lambda seconds: None)+ monkeypatch.setattr(wrap_module, "_check_proxy", lambda port: True)+ monkeypatch.setattr(wrap_module, "_get_log_path", lambda: tmp_path / "proxy.log")++ wrap_module._start_proxy(8787, agent_type="codex")++ assert captured_env["HEADROOM_SAVINGS_PROFILE"] == AGENT_90_PROFILE+ assert captured_env["HEADROOM_TARGET_RATIO"] == "0.10"+++def test_agent_savings_config_mismatches_returns_specific_labels(monkeypatch) -> None:+ monkeypatch.setenv("HEADROOM_SAVINGS_PROFILE", AGENT_90_PROFILE)profile = get_agent_savings_profile(AGENT_90_PROFILE)running_config = {"savings_profile": profile.name,@@ -196,7 +263,8 @@ def test_agent_savings_config_mismatches_ignores_non_target_agents() -> None:assert wrap_module._agent_savings_config_mismatches({}, "openhands") == []-def test_agent_savings_config_mismatches_accepts_matching_runtime_config() -> None:+def test_agent_savings_config_mismatches_accepts_matching_runtime_config(monkeypatch) -> None:+ monkeypatch.setenv("HEADROOM_SAVINGS_PROFILE", AGENT_90_PROFILE)profile = get_agent_savings_profile(AGENT_90_PROFILE)running_config = {"savings_profile": profile.name,@@ -214,7 +282,8 @@ def test_agent_savings_config_mismatches_accepts_matching_runtime_config() -> Noassert wrap_module._agent_savings_config_mismatches(running_config, "cursor") == []-def test_agent_savings_config_mismatches_reports_unparseable_values() -> None:+def test_agent_savings_config_mismatches_reports_unparseable_values(monkeypatch) -> None:+ monkeypatch.setenv("HEADROOM_SAVINGS_PROFILE", AGENT_90_PROFILE)running_config = {"savings_profile": None,"target_ratio": "not-a-float",diff --git a/tests/test_cli/test_wrap_codex.py b/tests/test_cli/test_wrap_codex.pyindex 1fff7eb67..1aaa0173f 100644--- a/tests/test_cli/test_wrap_codex.py+++ b/tests/test_cli/test_wrap_codex.py@@ -761,10 +761,10 @@ def test_start_proxy_uses_separate_session_for_signal_isolation(@pytest.mark.parametrize("agent_type", ["claude", "codex", "cursor"])-def test_start_proxy_applies_agent_90_defaults(+def test_start_proxy_does_not_apply_agent_90_defaults(monkeypatch: pytest.MonkeyPatch, tmp_path: Path, agent_type: str) -> None:- """Wrapped coding agents should start the proxy with high-savings defaults."""+ """Wrapped coding agents keep agent-savings opt-in by default."""popen_kwargs: dict[str, object] = {}class FakeProc:@@ -785,10 +785,10 @@ def test_start_proxy_applies_agent_90_defaults(env = popen_kwargs["env"]assert isinstance(env, dict)- assert env["HEADROOM_SAVINGS_PROFILE"] == "agent-90"- assert env["HEADROOM_TARGET_RATIO"] == "0.10"- assert env["HEADROOM_MAX_ITEMS"] == "8"- assert env["HEADROOM_SMART_CRUSHER_COMPACTION"] == "0"+ assert "HEADROOM_SAVINGS_PROFILE" not in env+ assert "HEADROOM_TARGET_RATIO" not in env+ assert "HEADROOM_MAX_ITEMS" not in env+ assert "HEADROOM_SMART_CRUSHER_COMPACTION" not in envdef test_start_proxy_preserves_explicit_savings_overrides(diff --git a/tests/test_cli/test_wrap_persistent.py b/tests/test_cli/test_wrap_persistent.pyindex 7bdfb5654..e440dc8db 100644--- a/tests/test_cli/test_wrap_persistent.py+++ b/tests/test_cli/test_wrap_persistent.py@@ -321,7 +321,38 @@ def test_ensure_proxy_restarts_ephemeral_proxy_for_openai_api_url_mismatch(monkeassert calls[1][2]["openai_api_url"] == "https://api.individual.githubcopilot.com"-def test_ensure_proxy_restarts_agent_proxy_without_savings_profile(monkeypatch) -> None:+def test_ensure_proxy_reuses_agent_proxy_without_savings_profile(monkeypatch) -> None:+ health = {+ "version": wrap_cli._HEADROOM_VERSION,+ "runtime": {"websocket_sessions": {"active_sessions": 0, "active_relay_tasks": 0}},+ "config": {"pid": "12345", "memory": False, "learn": False, "code_graph": False},+ }++ monkeypatch.delenv("HEADROOM_SAVINGS_PROFILE", raising=False)+ monkeypatch.setattr(wrap_cli, "_find_persistent_manifest", lambda port: None)+ monkeypatch.setattr(wrap_cli, "_check_proxy", lambda port: True)+ monkeypatch.setattr(wrap_cli, "_query_proxy_health", lambda port: health)+ monkeypatch.setattr(+ wrap_cli,+ "_kill_proxy_by_pid",+ lambda *args, **kwargs: (_ for _ in ()).throw(+ AssertionError("default agent proxy should not restart for savings profile")+ ),+ )+ monkeypatch.setattr(+ wrap_cli,+ "_start_proxy",+ lambda *args, **kwargs: (_ for _ in ()).throw(+ AssertionError("replacement proxy should not start")+ ),+ )++ result = wrap_cli._ensure_proxy(8787, False, agent_type="codex")++ assert result is None+++def test_ensure_proxy_restarts_for_explicit_agent_savings_profile(monkeypatch) -> None:calls: list[object] = []health = {"version": wrap_cli._HEADROOM_VERSION,@@ -329,6 +360,7 @@ def test_ensure_proxy_restarts_agent_proxy_without_savings_profile(monkeypatch)"config": {"pid": "12345", "memory": False, "learn": False, "code_graph": False},}+ monkeypatch.setenv("HEADROOM_SAVINGS_PROFILE", "agent-90")monkeypatch.setattr(wrap_cli, "_find_persistent_manifest", lambda port: None)monkeypatch.setattr(wrap_cli, "_check_proxy", lambda port: len(calls) == 0)monkeypatch.setattr(wrap_cli, "_query_proxy_health", lambda port: health)@@ -373,6 +405,7 @@ def test_ensure_proxy_reuses_agent_proxy_with_savings_profile(monkeypatch) -> No},}+ monkeypatch.setenv("HEADROOM_SAVINGS_PROFILE", "agent-90")monkeypatch.setattr(wrap_cli, "_find_persistent_manifest", lambda port: None)monkeypatch.setattr(wrap_cli, "_check_proxy", lambda port: True)monkeypatch.setattr(wrap_cli, "_query_proxy_health", lambda port: health)