diff --git a/headroom/cli/install.py b/headroom/cli/install.py index a8cd274ca..bf6b79991 100644 --- a/headroom/cli/install.py +++ b/headroom/cli/install.py @@ -452,7 +452,11 @@ def _echo_installed(manifest: DeploymentManifest, *, prefix: str = "Installed pe ) @click.option("--region", default=None, help="Cloud region for Bedrock / Vertex style backends.") @click.option( - "--mode", "proxy_mode", default="token", show_default=True, help="Proxy optimization mode." + "--mode", + "proxy_mode", + default="cache", + show_default=True, + help="Proxy optimization mode. cache = delta-only compression at ~0 prefix-cache busts.", ) @click.option("--memory", is_flag=True, help="Enable persistent memory in the proxy runtime.") @click.option( @@ -612,7 +616,11 @@ def install_apply( ) @click.option("--region", default=None, help="Cloud region for Bedrock / Vertex style backends.") @click.option( - "--mode", "proxy_mode", default="token", show_default=True, help="Proxy optimization mode." + "--mode", + "proxy_mode", + default="cache", + show_default=True, + help="Proxy optimization mode. cache = delta-only compression at ~0 prefix-cache busts.", ) @click.option( "--scope", diff --git a/headroom/install/models.py b/headroom/install/models.py index 1f08e09c1..c37c19f66 100644 --- a/headroom/install/models.py +++ b/headroom/install/models.py @@ -102,7 +102,7 @@ class DeploymentManifest: backend: str anyllm_provider: str | None = None region: str | None = None - proxy_mode: str = "token" + proxy_mode: str = "cache" memory_enabled: bool = False memory_db_path: str = "" telemetry_enabled: bool = True diff --git a/tests/test_install/test_proxy_mode_default.py b/tests/test_install/test_proxy_mode_default.py new file mode 100644 index 000000000..1bbbf153c --- /dev/null +++ b/tests/test_install/test_proxy_mode_default.py @@ -0,0 +1,76 @@ +"""`headroom install` must default to cache mode, like `headroom proxy` does. + +#1893 shipped the coding/cache posture as Headroom's out-of-box default, but it +only touched `cli/proxy.py` and `proxy/server.py` — the install path kept the +older `token` default from #1404. Since `planner.py` writes `HEADROOM_MODE` into +the install env, an installed Headroom actively *overrode* the good server default +with the cache-busting one. + +Cache mode freezes prior turns and compresses only the newest delta ("~0 +prefix-cache busts"); token mode rewrites frozen history, which moves the cached +prefix bytes and forces a full cold re-write. These tests pin the agreement so the +two entry points cannot drift apart again. +""" + +from __future__ import annotations + +from headroom.install.models import DeploymentManifest +from headroom.proxy.proxy_mode_policy import PROXY_MODE_CACHE + + +def _mode_option_default(command) -> str: + """The declared default of a command's ``--mode`` option.""" + for param in command.params: + if param.name == "proxy_mode": + return str(param.default) + raise AssertionError(f"{command.name} has no --mode/proxy_mode option") + + +def test_install_apply_defaults_to_cache_mode() -> None: + from headroom.cli.install import install_apply + + assert _mode_option_default(install_apply) == PROXY_MODE_CACHE + + +def test_deploy_defaults_to_cache_mode() -> None: + from headroom.cli.install import deploy + + assert _mode_option_default(deploy) == PROXY_MODE_CACHE + + +def test_manifest_default_is_cache_mode() -> None: + """A manifest that omits proxy_mode must not fall back to token.""" + assert DeploymentManifest.__dataclass_fields__["proxy_mode"].default == PROXY_MODE_CACHE + + +def test_install_and_proxy_agree_on_the_default() -> None: + """The whole point: both entry points land on the same posture. + + `headroom proxy` resolves `mode or HEADROOM_MODE or PROXY_MODE_CACHE`, so its + default is PROXY_MODE_CACHE. Install must match, or installing Headroom + silently changes the compression posture versus running it directly. + """ + from headroom.cli.install import deploy, install_apply + + assert _mode_option_default(install_apply) == _mode_option_default(deploy) == PROXY_MODE_CACHE + + +def test_token_mode_is_still_reachable() -> None: + """Changing the default must not take the choice away. + + The option carries no restrictive ``type``, and the normalizer still accepts + token (plus its aliases), so `--mode token` remains available to anyone who + wants maximum compression and accepts the prefix-cache busts. + """ + from headroom.cli.install import deploy, install_apply + from headroom.proxy.proxy_mode_policy import ( + PROXY_MODE_TOKEN, + normalize_proxy_mode_value, + ) + + for command in (install_apply, deploy): + param = next(p for p in command.params if p.name == "proxy_mode") + assert param.type.name == "text", f"{command.name} --mode became restrictive" + + assert normalize_proxy_mode_value("token") == PROXY_MODE_TOKEN + assert normalize_proxy_mode_value("token_headroom") == PROXY_MODE_TOKEN