## Description Removes both third-party CLI context tools — **rtk** and **lean-ctx** — and with them the context-tool selector itself. Headroom no longer downloads, installs or configures either one, and there is no replacement. The previous pass (#2344) gated only three entry points inside `headroom/cli/wrap.py`. That left the feature reachable in practice: | Gap | Effect | |---|---| | `scripts/install.sh:1544`, `install.ps1:1681` | Ran `rtk init --global --auto-patch` from bash/PowerShell, **bypassing the Python gate entirely** — `curl \| sh` still wrote a Claude Code `PreToolUse` hook regardless of `HEADROOM_RTK` | | `wrap.py` `_setup_context_tool_for_agent` | **`wrap openhands` was broken by default**: `rtk_required=True` met a gate returning `None` → `SystemExit(1)`. Invisible because all 8 openhands tests patched `_ensure_rtk_binary` to a fake path | | `proxy/helpers.py`, `subscription/tracker.py` | Proxy shelled out to `rtk gain` from `/stats`, the dashboard and `headroom perf`; the tracker polled it per contribution (`_RTK_WIRING_DEFAULT = "enabled"`) | | No cleanup path | Nothing removed artifacts an earlier default had installed, so a machine that once ran the old default kept rtk in the loop forever (#1669, #1955) | Also worth noting: the rtk binary download had **no SHA or signature verification** — only `rtk --version` as a smoke test. ## Type of Change - [x] Bug fix (non-breaking change that fixes an issue) - [ ] New feature (non-breaking change that adds functionality) - [x] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Documentation update - [ ] Performance improvement - [x] Code refactoring (no functional changes) ## Changes Made **Removed** — `headroom/rtk/` and `headroom/lean_ctx/` packages, `headroom/cli/wrap_rtk_metrics.py`, `_selected_context_tool` / `_setup_context_tool_for_agent` / `_VALID_CONTEXT_TOOLS`, the `--rtk` / `--no-rtk` / `--no-project-rtk` / `--keep-rtk` flags across all 18 wrap subcommands, `HEADROOM_RTK*`, the proxy-side `rtk gain` polling, the dashboard CLI-filtering panel (rows + all 8 `cliFiltering*` Alpine getters), `paths.rtk_path()` / `lean_ctx_path()`, the SDK path helpers, `benchmarks/rtk_loop_learn_eval.py`, and the `headroom/rtk/**` CI path filters. **Fails loudly, not silently** — `--context-tool` / `--no-context-tool` / `HEADROOM_CONTEXT_TOOL` are kept solely to error out. They live in shell profiles, aliases and CI jobs, and accepting them as a no-op would read as Headroom having quietly stopped working. The installers reject them too, which matters more than it looks: their arg parsers forward the first unknown flag **and everything after it** to the wrapped tool, so a leftover `--no-rtk` would have silently swallowed a following `--port` and then been ignored downstream. **New `headroom/context_tool_cleanup.py`** — deleting the code cannot help a machine that already ran the old default, since the hooks, binaries and injected guidance are durable on disk. `purge_context_tool_artifacts()` runs once per `wrap`/`unwrap` and removes the registered hook entries, the generated hook scripts, the Headroom-managed `~/.local/bin` symlinks, the vendored `~/.headroom/bin/{rtk,lean-ctx}` binaries, the `lean-ctx` MCP server entry and the marker-fenced instruction blocks. Deliberately conservative: idempotent, **skips** a malformed config rather than overwriting it, and only unlinks a symlink resolving inside Headroom's own bin dir so a user's own build is untouched. It reports on **stderr**, because `wrap/unwrap openclaw --prepare-only` emit machine-readable JSON on stdout as their entire contract. Skipped for `wrap selfheal` (runs from a SessionStart hook; must not race Claude Code's writer for `~/.claude.json`) and for `--help`, which must stay read-only. **Client-config hardening** (discovered while investigating a "corrupted Serena settings file" report) — `wrap.py` reset a settings file to `{}` when an existing file would not parse, then wrote that back. One hand-edited typo or a transient `EACCES`/`EINTR` on a valid file destroyed the user's `permissions`, `env` and `hooks`, on **every `headroom wrap claude`**. It now refuses to write. Separately, `fsutil.write_text` is now atomic (temp file + `fsync` + `os.replace`), fixing all 14 non-atomic client-config writes at once; it follows symlinks rather than replacing them (dotfile managers) and preserves an existing file's mode. **Deliberately kept** — `rtk` stays in the wrapper-peel list in `transforms/content_router.py`. It sits beside `sudo`/`env`/`timeout` as shell-command grammar, so `rtk cat f` is still classified as a file read for anyone running their own rtk install, which the purge intentionally leaves alone. ## Testing - [x] Unit tests pass (`pytest`) - [x] Linting passes (`ruff check .`) - [x] Type checking passes (`mypy headroom`) - [x] New tests added for new functionality - [x] Manual testing performed ### Test Output ```text $ ruff check headroom/ tests/ e2e/ --exclude headroom/dashboard/templates All checks passed! $ ruff format --check headroom/ tests/ e2e/ --exclude headroom/dashboard/templates 1255 files already formatted $ mypy headroom/ Success: no issues found in 508 source files $ pytest tests/test_context_tool_cleanup.py -q 11 passed $ pytest tests/test_fsutil.py -q 12 passed $ pytest tests/test_cli/test_wrap_codex.py -q # 89 tests 89 passed in 431.68s $ pytest tests/test_cli/test_wrap_opencode.py -q 39 passed in 257.46s $ pytest tests/test_cli/test_wrap_helpers.py -q 45 passed $ pytest tests/test_paths.py -q 75 passed $ pytest tests/test_cli/test_unwrap_claude.py -q 14 passed $ pytest tests/test_proxy_savings_history.py -q 39 passed $ pytest tests/test_cli/test_wrap_copilot.py -q 27 passed $ pytest tests/test_cli/test_wrap_zcode.py -q 20 passed $ pytest tests/test_subscription_tracker.py -q 9 passed $ pytest tests/test_proxy_dashboard_stats_cache.py -q 5 passed, 1 skipped ``` Repo-wide grep for 14 removed symbols (`headroom.rtk`, `headroom.lean_ctx`, `_ensure_rtk_binary`, `_selected_context_tool`, `_get_context_tool_stats`, `rtk_path`, `lean_ctx_path`, `wrap_rtk_metrics`, `HEADROOM_RTK`, `cli_tokens_avoided`, `tokens_saved_rtk`, …) across `*.py`, `*.ts`, `*.sh`, `*.ps1`, `*.yml`, `*.html`: **zero hits**. Notable test changes: `test_wrap_openhands.py` no longer patches `_ensure_rtk_binary` and asserts `wrap openhands --prepare-only` exits 0 unpatched — the regression that was previously masked. `test_wrap_continue.py` and `test_wrap_hintfile_agents.py` were removed (every test drove RTK instruction injection). A new `test_subscription_tracker.py::test_load_state_written_before_cli_context_tools_were_removed` proves a pre-removal `subscription_state.json` still loads. ## Real Behavior Proof - **Environment:** macOS 15.4 (darwin 25.4.0), Python 3.12.6, Headroom @ this branch, real `~/.headroom` and `~/.claude` on the dev machine. - **Exact command / steps and observed result:** ```text # 1. Retired flag fails loudly instead of silently no-op'ing $ headroom wrap codex --prepare-only --context-tool rtk Error: CLI context tools (rtk, lean-ctx) have been removed from Headroom: they rewrote shell commands through a third-party binary Headroom no longer manages. Drop --context-tool / --no-context-tool and unset HEADROOM_CONTEXT_TOOL; `headroom wrap` uninstalls what they left behind on first run. $ HEADROOM_CONTEXT_TOOL=lean-ctx headroom wrap codex --prepare-only Error: CLI context tools (rtk, lean-ctx) have been removed from Headroom: ... # 2. install.sh rejects the retired flags (extracted parse_wrap_args harness) ['--no-rtk', '--port', '9999'] rc=1 ERROR: CLI context tools ... Drop --no-rtk ['--context-tool=rtk'] rc=1 ERROR: CLI context tools ... Drop --context-tool $ bash -n scripts/install.sh # syntax OK # 3. Purge ran against the real machine, which had all the orphaned artifacts $ python -c "from headroom.context_tool_cleanup import purge_context_tool_artifacts; ..." removed ~/.headroom/bin/lean-ctx (51 MB) removed ~/.headroom/bin/rtk (7.7 MB) removed ~/.local/bin/rtk (symlink into ~/.headroom/bin) removed ~/.claude/hooks/rtk-rewrite.sh removed 8 lean-ctx-* hook scripts # ~/.claude.json afterwards: 90 top-level keys, 19 projects, mcpServers unchanged # → ~59 MB reclaimed, no unrelated key touched # 4. stdout stays machine-readable while the purge reports (planted a fake artifact) $ headroom wrap openclaw --prepare-only --gateway-provider-id codex >out 2>err $ cat out {"enabled":true,"config":{"proxyPort":8787,...}} # parses as JSON $ cat err Retired CLI context tool cleanup: removed /Users/tcms/.headroom/bin/rtk # 5. --help is inert (planted artifact survives), a real run purges $ headroom wrap codex --help → artifact survived: CORRECT $ headroom wrap openclaw --prepare-only → purged: CORRECT # 6. MCP purge dry-run against a copy of the real 82 KB ~/.claude.json top-level keys 90 -> 90; projects 19 -> 19; LOST keys: none all content outside mcpServers byte-identical: True ``` Dashboard rendered via the Playwright test after the panel removal: "Token Savings" shows only `Proxy 0 (0.0%)` / `Of total wire: 36.86%`, and "Token Usage" reads Before Compression → Proxy Removed → After Compression with no "Filtered (this session)" row. Nothing below the removed panel broke. - **Not tested:** Windows and Linux (macOS only) — `install.ps1` is verified by brace-balance and inspection, not executed, since no `pwsh` is available locally. The wrap e2e suite (`e2e/wrap/run.py`) was updated but not run; it needs the Docker e2e image. `serena project index` interaction is exercised in the stacked base PR. ## Review Readiness - [x] I have performed a self-review - [x] This PR is ready for human review ## Checklist - [x] My code follows the project's style guidelines - [x] I have performed a self-review of my code - [x] I have commented my code, particularly in hard-to-understand areas - [x] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [x] I did **not** edit `CHANGELOG.md` — it is generated by release-please from my Conventional Commit PR title (a CI guard enforces this) ## Additional Notes **Stacked on #2676** (`tejas/serena-config-bootstrap`) — please merge that first; this PR's base should then be retargeted to `main`, or it will read as containing that fix too. **Breaking-change migration for users:** - Drop `--rtk`, `--no-rtk`, `--no-project-rtk`, `--keep-rtk`, `--context-tool`, `--no-context-tool` from any alias, script or CI job, and unset `HEADROOM_RTK*` / `HEADROOM_CONTEXT_TOOL`. They now error rather than being ignored, so the failure is immediate and self-explaining. - Previously-installed artifacts are purged automatically on the next `wrap`/`unwrap`; no manual cleanup needed. - `headroom perf --json` no longer carries a `cli_filtering` key, and `/stats` no longer returns a `context_tool` section. **Docs:** `docs/rtk-architecture.md` deleted; RTK/lean-ctx removed from `README.md`, `docs/content/docs/{configuration,opencode,grok-build,docker-install,filesystem-contract}.mdx`, `docs/observability.md` and the matching `wiki/` pages. `REALIGNMENT/09-phase-G-rtk-observability.md` is marked SUPERSEDED rather than deleted, to keep the planning record. **Follow-ups not in scope:** `_emit_wrap_interrupted` was deleted as dead code — its only caller was the `except KeyboardInterrupt` guarding the binary download, so with no download there is nothing slow left to interrupt.
11 KiB
Observability — proxy metrics
The Headroom Rust proxy exposes Prometheus-format metrics on the
/metrics endpoint of every running proxy instance. The metric
catalogue below covers Phase D (Bedrock route instrumentation) and
Phase G PR-G3 (proxy-wide observability).
All metric names + label keys are constants in
crates/headroom-proxy/src/observability/metric_names.rs, so any
rename catches one file in code review.
Metric catalogue
Bedrock route (Phase D PR-D3)
| Name | Type | Labels | Purpose |
|---|---|---|---|
bedrock_invoke_count_total |
Counter | model, region, auth_mode |
One increment per Bedrock /invoke or /converse request. |
bedrock_invoke_latency_seconds |
Histogram | model, region |
Latency from proxy entry to upstream completion. Buckets target 50ms–60s. |
bedrock_eventstream_message_count_total |
Counter | model, region, event_type |
One increment per parsed binary EventStream message. |
Proxy-wide (Phase G PR-G3)
Cache + compression
| Name | Type | Labels | Purpose |
|---|---|---|---|
proxy_cache_hit_rate_per_session |
Histogram | provider |
Per-session cache hit rate. Phase H canary gate. |
proxy_compression_ratio_by_strategy |
Histogram | strategy, content_type |
compressed_tokens / original_tokens per shrunk block. |
proxy_compression_rejected_by_token_check_total |
Counter | strategy |
Compressor ran but failed the shrink check. |
Cache-safety alarm
| Name | Type | Labels | Purpose |
|---|---|---|---|
proxy_passthrough_bytes_modified_total |
Counter | path |
Bytes mutated on a passthrough path. Must stay 0 outside the compression hot path — any non-zero rate fires the cache-safety alarm. |
The alarm metric is wired in crates/headroom-proxy/src/proxy.rs:
when the dispatcher returns Outcome::NoCompression or
Outcome::Passthrough, the post-dispatcher byte length is compared
to the original buffered length and any delta increments the
counter (by the byte delta) under the request's path label. The
PR-E4 prompt_cache_key injector runs AFTER the alarm check, so its
intentional byte mutations do not trip the alarm.
Upstream rate limits
| Name | Type | Labels | Purpose |
|---|---|---|---|
proxy_rate_limit_remaining_requests |
Gauge | provider |
Last-seen remaining requests in the current window. |
proxy_rate_limit_remaining_tokens |
Gauge | provider |
Last-seen remaining tokens in the current window. |
proxy_rate_limit_remaining_input_tokens |
Gauge | provider |
Anthropic-only input-token bucket. |
proxy_rate_limit_remaining_output_tokens |
Gauge | provider |
Anthropic-only output-token bucket. |
OpenAI Responses telemetry
| Name | Type | Labels | Purpose |
|---|---|---|---|
proxy_service_tier_count_total |
Counter | tier |
Service-tier distribution observed at the proxy. |
proxy_response_status_count_total |
Counter | status |
Terminal status distribution (completed, incomplete, failed, cancelled, in_progress). |
Image log redaction (Python-side)
| Name | Type | Labels | Purpose |
|---|---|---|---|
proxy_image_generation_call_log_redacted_total |
Counter | none | Base64-encoded image payloads redacted from request logs. Driven from headroom.proxy.request_logger.redactions_total(). |
C3 remediation: Image redaction is purely a Python-proxy operation (the request logger walks JSON and replaces over- threshold image payloads with placeholders). The counter lives Python-side so we have one source of truth instead of two. The Rust proxy previously held a dead counter for this metric; that has been removed.
How to query
The proxy renders Prometheus text-format on GET /metrics:
curl -s http://127.0.0.1:8787/metrics
Phase H canary gate
The canary script that decides "ship Rust, retire Python" uses
all four of these queries against proxy_cache_hit_rate_per_session
to confirm parity vs the Python baseline. A single percentile is
not enough — a regression that only shows up at the tail (a small
class of long sessions losing cache hits) would slip through a
median-only check.
# p50, p95, p99 of cache hit rate over the last 5 minutes, per provider.
histogram_quantile(0.50, sum by (provider, le) (rate(proxy_cache_hit_rate_per_session_bucket{provider!="__init__"}[5m])))
histogram_quantile(0.95, sum by (provider, le) (rate(proxy_cache_hit_rate_per_session_bucket{provider!="__init__"}[5m])))
histogram_quantile(0.99, sum by (provider, le) (rate(proxy_cache_hit_rate_per_session_bucket{provider!="__init__"}[5m])))
# Mean cache hit rate over the last 5 minutes, per provider. The
# `sum / count` form is the cleanest "average without a quantile"
# query and is what the Python baseline reports.
sum by (provider) (rate(proxy_cache_hit_rate_per_session_sum{provider!="__init__"}[5m]))
/
sum by (provider) (rate(proxy_cache_hit_rate_per_session_count{provider!="__init__"}[5m]))
The canary fails if ANY of p50, p95, p99, or mean regresses
below the Python baseline for any provider over the canary window.
Other common queries
# Cache-safety alarm. Should always be 0 (post-`__init__` row).
sum(rate(proxy_passthrough_bytes_modified_total{path!="__init__"}[5m]))
# Per-strategy compression value at p50 (post-H1 fix: each strategy
# reports its own before/after; pre-fix this was the same aggregate
# ratio repeated per strategy).
histogram_quantile(0.50, sum by (strategy, le) (rate(proxy_compression_ratio_by_strategy_bucket{strategy!="__init__"}[1h])))
# Per-strategy compression value at p95 and p99 (catch outlier
# strategies that fail to shrink at the tail).
histogram_quantile(0.95, sum by (strategy, le) (rate(proxy_compression_ratio_by_strategy_bucket{strategy!="__init__"}[1h])))
histogram_quantile(0.99, sum by (strategy, le) (rate(proxy_compression_ratio_by_strategy_bucket{strategy!="__init__"}[1h])))
# Strategies that ran but failed the token-check (compressor ran
# but its output was not strictly smaller, so the original was
# kept). High rate here means the compressor needs tuning.
sum by (strategy) (rate(proxy_compression_rejected_by_token_check_total{strategy!="__init__"}[1h]))
# Upstream rate-limit headroom (smaller = closer to throttle).
proxy_rate_limit_remaining_tokens{provider="anthropic"}
# Image-redaction rate (Python-side).
rate(proxy_image_generation_call_log_redacted_total[5m])
All queries above include a {... != "__init__"} filter so the
sentinel zero-rows the boot-touch contract emits do not skew the
result. See "Wiring → H3 force-zero" below.
Wiring
Every metric registration is OnceLock-backed and lazy: the first
call to a *_counter() / *_gauge() / *_histogram() helper
registers the family with the shared registry. handle_metrics
force-touches every Phase G PR-G3 family before scraping.
H3 force-zero
The prometheus crate v0.13 skips empty MetricVecs from gather()
entirely — neither HELP/TYPE lines nor rows appear until the
family has been incremented at least once with a label tuple.
Operators expect to see the catalogue from boot, so
handle_metrics increments each counter / gauge MetricVec by 0
under a sentinel __init__ label tuple before the first scrape.
HELP/TYPE then surface from boot and dashboards/alarms see a
predictable scrape shape.
Counters with the __init__ label increment by 0, so the
alarm-able "must stay 0" semantic of
proxy_passthrough_bytes_modified_total is preserved (the family
becomes visible, the rate stays 0). PromQL queries should filter
{... != "__init__"} so the sentinel rows are excluded from
aggregations (the catalogue above does this).
Histograms are NOT force-zeroed: a synthetic observe(0.0) would
contribute a real sample to the per-label distribution and pollute
percentile readings. The two histogram families
(proxy_cache_hit_rate_per_session and
proxy_compression_ratio_by_strategy) only surface in the scrape
after the first real session, by design.
H4 prometheus crate version pin
The H3 contract above relies on the prometheus crate's v0.13
gather() semantics — empty MetricVec families are omitted from
the scrape. This is implementation-defined behaviour. If
crates/headroom-proxy/Cargo.toml ever bumps the prometheus
dependency, retest the alarm contract:
- Start a fresh proxy.
curl /metricsand confirm every counter / gauge family has HELP/TYPE + an__init__row.- Confirm histograms (
*_cache_hit_rate_per_session,*_compression_ratio_by_strategy) DO NOT appear (noobserve()calls yet). - Drive one cache-hit session, scrape again, confirm histograms now appear.
- Confirm
passthrough_bytes_modified_totalstays at 0 across passthrough requests.
The crate version is pinned exactly (= "0.13.4", no caret) in
Cargo.toml precisely so a silent semver bump cannot break the
contract without a code-review trigger.
C2 alarm wiring
proxy_passthrough_bytes_modified_total fires from proxy.rs when
a dispatcher arm that promised byte-equal passthrough
(Outcome::NoCompression or Outcome::Passthrough) produces a
final body of a different byte length. The check runs BEFORE the
PR-E4 prompt_cache_key injector so the injector's intentional byte
mutations do not trip the alarm.
H1 per-strategy ratio wiring
proxy_compression_ratio_by_strategy samples one observation per
strategy using the strategy's OWN before/after token counts
(plumbed through Outcome::Compressed.per_strategy_tokens from
the manifest in live_zone_anthropic / live_zone_openai /
live_zone_responses). Pre-H1 the same aggregate ratio was
emitted per strategy when multiple strategies ran on one body,
making Phase H per-strategy dashboards read garbage.
H2 aborted-stream gate
The proxy_cache_hit_rate_per_session histogram observes ONLY
when the SSE stream completed:
- Anthropic:
state.status == StreamStatus::MessageStopafter the channel closes. - OpenAI Chat:
state.usage.is_some()(the final usage chunk only arrives at stream completion). - OpenAI Responses:
state.terminal_status().is_some().
A client disconnect mid-stream closes the channel without setting the terminal flag — under H2 we log + skip rather than observe a garbage half-stream sample.
Cardinality discipline
Every label vocabulary is bounded by code, not customer input:
model/region: read from path params +Config::bedrock_region.auth_mode: 3-variant enum (payg,oauth,subscription).provider: 3 values (anthropic,openai_chat,openai_responses).strategy:&'static strfrom the compressor'sBlockAction::Compressed.content_type:&'static strfromheadroom_core::transforms::ContentType.tier: validated throughcrate::observability::metric_names::service_tier::validate(raw: &str). Returns one of{auto, default, flex, on_demand, priority, scale}or the sentinel"other"for anything else. The raw inbound value is never used as a label. A malicious client posting{"service_tier":"<random>"}per request gets bucketed to"other"and atracing::warn!is emitted so wire-format drift surfaces loudly in logs.status: 5-variant enum.
There is no code path where a malicious client can drive label cardinality unbounded.
See also
crates/headroom-proxy/src/observability/— implementation.REALIGNMENT/09-phase-G-rtk-observability.md— spec.REALIGNMENT/10-phase-H-python-retirement.md— H1 acceptance gate.