fix(io): use UTF-8 with locale fallback and preserve line endings on config/text I/O (#1498)
## Description
On non-UTF-8 Windows locales (e.g. GBK/cp936 on zh-CN, cp1252 on Western
installs)
`headroom wrap codex` corrupts `~/.codex/config.toml`. Two root causes,
both in how
we read/write text:
- `Path.read_text()` / bare `open()` default to the **system locale**
encoding, so a
UTF-8 config fails to decode as the locale codec (and a locale-written
file fails to
decode as UTF-8) — raising `UnicodeDecodeError`.
- `Path.write_text()` / text-mode `open()` translate `\n` → `os.linesep`
on write, so
an existing `\r\n` becomes `\r\r\n`, which TOML parsers reject with
*"carriage return must be followed by newline"*.
This adds one small helper module and routes the unsafe config/text I/O
through it.
Closes #733
## Type of Change
- [x] Bug fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Documentation update
- [ ] Performance improvement
- [ ] Code refactoring (no functional changes)
## Changes Made
- New `headroom/fsutil.py` with `read_text` / `write_text` /
`append_text`:
- `read_text`: decode UTF-8 → fall back to
`locale.getpreferredencoding()` (for
files a tool wrote in the locale encoding before this fix) → final UTF-8
with
`errors="replace"` so it never raises on content. Line endings normalise
to `\n`,
so callers that search/rewrite the text see one ending and a later
`write_text`
can't re-double an existing `\r\n`. Supports `default=` for missing
files.
- `write_text` / `append_text`: UTF-8 with `newline=""` so the bytes
written match
the content exactly and existing `\r\n` endings are never doubled.
- Routed the unsafe config/text I/O across the package through `fsutil`
(or added an
explicit `encoding="utf-8"` where only decode safety was missing):
`mcp_registry/codex.py` (TOML read/write + `_load_toml` via
`tomllib.loads`),
`mcp_registry/opencode.py`, `mcp_registry/claude.py`, `cli/wrap.py`,
`cli/mcp.py`,
`cli/memory.py`, `install/providers.py`, `providers/anthropic.py`,
`providers/openai.py`, `providers/opencode/config.py`,
`providers/opencode/install.py`.
- Tests: new `tests/test_fsutil.py` (CRLF preservation, no LF
translation, CRLF
normalisation on read, UTF-8 non-ASCII round trip, locale-decode
fallback, never-raise
replace fallback, missing-file default/raise, append preserves endings)
and two
`test_codex_registrar.py` regression tests (register doesn't double
CRLF; non-ASCII
values survive a register).
## 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
$ pytest tests/test_fsutil.py tests/test_mcp_registry/test_codex_registrar.py -q
tests\test_fsutil.py ......... [ 25%]
tests\test_mcp_registry\test_codex_registrar.py ........................ [100%]
36 passed in 0.32s
$ ruff check <changed files>
All checks passed!
$ ruff format --check <changed files>
14 files already formatted
$ mypy headroom --ignore-missing-imports # (run with --python-version 3.12 to
# parse the local numpy stub)
Success: no issues in changed files
```
Note: locally, the two suites `tests/test_mcp_registry` +
`tests/test_cli` share a
pre-existing cross-test state leak that flakes
`test_wrap_codex_..._serena...` and
`test_dead_client_marker...`; both reproduce identically on `main`
(changes stashed)
and are unrelated to this PR. CI shards run them isolated.
## Real Behavior Proof
- Environment: Windows 11, Python 3.13.11,
`locale.getpreferredencoding()` = `cp1252`
(a non-UTF-8 locale — the exact condition that triggers #733).
- Exact command / steps: pre-seed a `~/.codex/config.toml` the way Codex
writes it on
Windows — CRLF endings plus a non-ASCII value `project = "比赛/机器人"` —
then call
`CodexRegistrar.register_server(headroom)` and re-parse with `tomllib`.
- Observed result: register status REGISTERED, no doubled CRLF,
`tomllib` parses, and the non-ASCII value is preserved. Full output:
```text
python: 3.13.11 | locale preferred encoding: cp1252
register status: RegisterStatus.REGISTERED
doubled CRLF present: False
tomllib parsed OK: True
non-ASCII project value preserved: True
headroom in mcp_servers: True
```
Before this change the same flow produced `\r\r\n` and a `tomllib`
"carriage return
must be followed by newline" error.
- Not tested: a real zh-CN GBK/cp936 Windows install (no such host
available); the
GBK-specific decode path is covered by
`test_read_text_falls_back_to_locale_encoding`
which monkeypatches the preferred encoding to `gbk`.
## Review Readiness
- [x] I have performed a self-review
- [x] This PR is ready for human review
## Additional Notes
- Purely-binary I/O and sites already using
`encoding="utf-8"`+`errors="replace"`
(e.g. `learn/analyzer.py`) and the ASCII-only PID file
(`install/runtime.py`) were
intentionally left untouched.
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-28 22:18:47 +02:00
|
|
|
"""Tests for headroom.fsutil — encoding- and newline-safe text I/O (#733)."""
|
|
|
|
|
|
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
fix: remove rtk and lean-ctx CLI context tools (#2677)
## 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.
2026-07-30 22:59:41 -07:00
|
|
|
import os
|
|
|
|
|
import stat
|
|
|
|
|
|
fix(io): use UTF-8 with locale fallback and preserve line endings on config/text I/O (#1498)
## Description
On non-UTF-8 Windows locales (e.g. GBK/cp936 on zh-CN, cp1252 on Western
installs)
`headroom wrap codex` corrupts `~/.codex/config.toml`. Two root causes,
both in how
we read/write text:
- `Path.read_text()` / bare `open()` default to the **system locale**
encoding, so a
UTF-8 config fails to decode as the locale codec (and a locale-written
file fails to
decode as UTF-8) — raising `UnicodeDecodeError`.
- `Path.write_text()` / text-mode `open()` translate `\n` → `os.linesep`
on write, so
an existing `\r\n` becomes `\r\r\n`, which TOML parsers reject with
*"carriage return must be followed by newline"*.
This adds one small helper module and routes the unsafe config/text I/O
through it.
Closes #733
## Type of Change
- [x] Bug fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Documentation update
- [ ] Performance improvement
- [ ] Code refactoring (no functional changes)
## Changes Made
- New `headroom/fsutil.py` with `read_text` / `write_text` /
`append_text`:
- `read_text`: decode UTF-8 → fall back to
`locale.getpreferredencoding()` (for
files a tool wrote in the locale encoding before this fix) → final UTF-8
with
`errors="replace"` so it never raises on content. Line endings normalise
to `\n`,
so callers that search/rewrite the text see one ending and a later
`write_text`
can't re-double an existing `\r\n`. Supports `default=` for missing
files.
- `write_text` / `append_text`: UTF-8 with `newline=""` so the bytes
written match
the content exactly and existing `\r\n` endings are never doubled.
- Routed the unsafe config/text I/O across the package through `fsutil`
(or added an
explicit `encoding="utf-8"` where only decode safety was missing):
`mcp_registry/codex.py` (TOML read/write + `_load_toml` via
`tomllib.loads`),
`mcp_registry/opencode.py`, `mcp_registry/claude.py`, `cli/wrap.py`,
`cli/mcp.py`,
`cli/memory.py`, `install/providers.py`, `providers/anthropic.py`,
`providers/openai.py`, `providers/opencode/config.py`,
`providers/opencode/install.py`.
- Tests: new `tests/test_fsutil.py` (CRLF preservation, no LF
translation, CRLF
normalisation on read, UTF-8 non-ASCII round trip, locale-decode
fallback, never-raise
replace fallback, missing-file default/raise, append preserves endings)
and two
`test_codex_registrar.py` regression tests (register doesn't double
CRLF; non-ASCII
values survive a register).
## 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
$ pytest tests/test_fsutil.py tests/test_mcp_registry/test_codex_registrar.py -q
tests\test_fsutil.py ......... [ 25%]
tests\test_mcp_registry\test_codex_registrar.py ........................ [100%]
36 passed in 0.32s
$ ruff check <changed files>
All checks passed!
$ ruff format --check <changed files>
14 files already formatted
$ mypy headroom --ignore-missing-imports # (run with --python-version 3.12 to
# parse the local numpy stub)
Success: no issues in changed files
```
Note: locally, the two suites `tests/test_mcp_registry` +
`tests/test_cli` share a
pre-existing cross-test state leak that flakes
`test_wrap_codex_..._serena...` and
`test_dead_client_marker...`; both reproduce identically on `main`
(changes stashed)
and are unrelated to this PR. CI shards run them isolated.
## Real Behavior Proof
- Environment: Windows 11, Python 3.13.11,
`locale.getpreferredencoding()` = `cp1252`
(a non-UTF-8 locale — the exact condition that triggers #733).
- Exact command / steps: pre-seed a `~/.codex/config.toml` the way Codex
writes it on
Windows — CRLF endings plus a non-ASCII value `project = "比赛/机器人"` —
then call
`CodexRegistrar.register_server(headroom)` and re-parse with `tomllib`.
- Observed result: register status REGISTERED, no doubled CRLF,
`tomllib` parses, and the non-ASCII value is preserved. Full output:
```text
python: 3.13.11 | locale preferred encoding: cp1252
register status: RegisterStatus.REGISTERED
doubled CRLF present: False
tomllib parsed OK: True
non-ASCII project value preserved: True
headroom in mcp_servers: True
```
Before this change the same flow produced `\r\r\n` and a `tomllib`
"carriage return
must be followed by newline" error.
- Not tested: a real zh-CN GBK/cp936 Windows install (no such host
available); the
GBK-specific decode path is covered by
`test_read_text_falls_back_to_locale_encoding`
which monkeypatches the preferred encoding to `gbk`.
## Review Readiness
- [x] I have performed a self-review
- [x] This PR is ready for human review
## Additional Notes
- Purely-binary I/O and sites already using
`encoding="utf-8"`+`errors="replace"`
(e.g. `learn/analyzer.py`) and the ASCII-only PID file
(`install/runtime.py`) were
intentionally left untouched.
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-28 22:18:47 +02:00
|
|
|
import pytest
|
|
|
|
|
|
|
|
|
|
from headroom import fsutil
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_write_text_does_not_double_existing_crlf(tmp_path):
|
|
|
|
|
"""A string containing \\r\\n must be written verbatim, never as \\r\\r\\n."""
|
|
|
|
|
p = tmp_path / "config.toml"
|
|
|
|
|
fsutil.write_text(p, 'model = "gpt-5"\r\nport = 8787\r\n')
|
|
|
|
|
raw = p.read_bytes()
|
|
|
|
|
assert b"\r\r\n" not in raw
|
|
|
|
|
assert raw == b'model = "gpt-5"\r\nport = 8787\r\n'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_write_text_does_not_translate_lf(tmp_path):
|
|
|
|
|
"""\\n must stay \\n on every platform (no \\r\\n rewrite)."""
|
|
|
|
|
p = tmp_path / "hook.sh"
|
|
|
|
|
fsutil.write_text(p, "#!/bin/sh\necho hi\n")
|
|
|
|
|
assert p.read_bytes() == b"#!/bin/sh\necho hi\n"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_read_text_normalises_crlf(tmp_path):
|
|
|
|
|
"""read_text returns universal-newline (\\n) text, so a round trip can't double CRLF."""
|
|
|
|
|
p = tmp_path / "config.toml"
|
|
|
|
|
p.write_bytes(b"a = 1\r\nb = 2\r\n")
|
|
|
|
|
text = fsutil.read_text(p)
|
|
|
|
|
assert text == "a = 1\nb = 2\n"
|
|
|
|
|
fsutil.write_text(p, text)
|
|
|
|
|
assert b"\r" not in p.read_bytes()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_read_text_roundtrips_utf8_non_ascii(tmp_path):
|
|
|
|
|
p = tmp_path / "config.toml"
|
|
|
|
|
fsutil.write_text(p, 'project = "比赛/机器人"\n')
|
|
|
|
|
assert fsutil.read_text(p) == 'project = "比赛/机器人"\n'
|
|
|
|
|
|
|
|
|
|
|
fix: remove rtk and lean-ctx CLI context tools (#2677)
## 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.
2026-07-30 22:59:41 -07:00
|
|
|
def test_write_text_leaves_original_intact_when_write_fails(tmp_path, monkeypatch):
|
|
|
|
|
"""A failed write must leave the previous file whole, not truncated.
|
|
|
|
|
|
|
|
|
|
``open(path, "w")`` truncates to zero bytes before the new content lands, so
|
|
|
|
|
a crash mid-write used to leave users with a half-written ~/.claude.json.
|
|
|
|
|
"""
|
|
|
|
|
p = tmp_path / "settings.json"
|
|
|
|
|
fsutil.write_text(p, '{"permissions": {"allow": ["Bash"]}}\n')
|
|
|
|
|
|
|
|
|
|
def boom(src, dst):
|
|
|
|
|
raise OSError("no space left on device")
|
|
|
|
|
|
|
|
|
|
monkeypatch.setattr(os, "replace", boom)
|
|
|
|
|
with pytest.raises(OSError):
|
|
|
|
|
fsutil.write_text(p, '{"hooks": {}}\n')
|
|
|
|
|
|
|
|
|
|
assert p.read_text() == '{"permissions": {"allow": ["Bash"]}}\n'
|
|
|
|
|
# No .tmp litter left behind in the config directory.
|
|
|
|
|
assert [f.name for f in tmp_path.iterdir()] == ["settings.json"]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_write_text_follows_symlink_instead_of_replacing_it(tmp_path):
|
|
|
|
|
"""Dotfile managers symlink these configs; os.replace would clobber the link."""
|
|
|
|
|
real = tmp_path / "real.json"
|
|
|
|
|
real.write_text("{}\n")
|
|
|
|
|
link = tmp_path / "settings.json"
|
|
|
|
|
link.symlink_to(real)
|
|
|
|
|
|
|
|
|
|
fsutil.write_text(link, '{"env": {}}\n')
|
|
|
|
|
|
|
|
|
|
assert link.is_symlink()
|
|
|
|
|
assert real.read_text() == '{"env": {}}\n'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_write_text_preserves_existing_mode(tmp_path):
|
|
|
|
|
"""mkstemp creates 0600 — an existing 0644 config must not be silently tightened."""
|
|
|
|
|
p = tmp_path / "settings.json"
|
|
|
|
|
p.write_text("{}\n")
|
|
|
|
|
p.chmod(0o644)
|
|
|
|
|
fsutil.write_text(p, '{"a": 1}\n')
|
|
|
|
|
assert stat.S_IMODE(p.stat().st_mode) == 0o644
|
|
|
|
|
|
|
|
|
|
|
fix(io): use UTF-8 with locale fallback and preserve line endings on config/text I/O (#1498)
## Description
On non-UTF-8 Windows locales (e.g. GBK/cp936 on zh-CN, cp1252 on Western
installs)
`headroom wrap codex` corrupts `~/.codex/config.toml`. Two root causes,
both in how
we read/write text:
- `Path.read_text()` / bare `open()` default to the **system locale**
encoding, so a
UTF-8 config fails to decode as the locale codec (and a locale-written
file fails to
decode as UTF-8) — raising `UnicodeDecodeError`.
- `Path.write_text()` / text-mode `open()` translate `\n` → `os.linesep`
on write, so
an existing `\r\n` becomes `\r\r\n`, which TOML parsers reject with
*"carriage return must be followed by newline"*.
This adds one small helper module and routes the unsafe config/text I/O
through it.
Closes #733
## Type of Change
- [x] Bug fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Documentation update
- [ ] Performance improvement
- [ ] Code refactoring (no functional changes)
## Changes Made
- New `headroom/fsutil.py` with `read_text` / `write_text` /
`append_text`:
- `read_text`: decode UTF-8 → fall back to
`locale.getpreferredencoding()` (for
files a tool wrote in the locale encoding before this fix) → final UTF-8
with
`errors="replace"` so it never raises on content. Line endings normalise
to `\n`,
so callers that search/rewrite the text see one ending and a later
`write_text`
can't re-double an existing `\r\n`. Supports `default=` for missing
files.
- `write_text` / `append_text`: UTF-8 with `newline=""` so the bytes
written match
the content exactly and existing `\r\n` endings are never doubled.
- Routed the unsafe config/text I/O across the package through `fsutil`
(or added an
explicit `encoding="utf-8"` where only decode safety was missing):
`mcp_registry/codex.py` (TOML read/write + `_load_toml` via
`tomllib.loads`),
`mcp_registry/opencode.py`, `mcp_registry/claude.py`, `cli/wrap.py`,
`cli/mcp.py`,
`cli/memory.py`, `install/providers.py`, `providers/anthropic.py`,
`providers/openai.py`, `providers/opencode/config.py`,
`providers/opencode/install.py`.
- Tests: new `tests/test_fsutil.py` (CRLF preservation, no LF
translation, CRLF
normalisation on read, UTF-8 non-ASCII round trip, locale-decode
fallback, never-raise
replace fallback, missing-file default/raise, append preserves endings)
and two
`test_codex_registrar.py` regression tests (register doesn't double
CRLF; non-ASCII
values survive a register).
## 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
$ pytest tests/test_fsutil.py tests/test_mcp_registry/test_codex_registrar.py -q
tests\test_fsutil.py ......... [ 25%]
tests\test_mcp_registry\test_codex_registrar.py ........................ [100%]
36 passed in 0.32s
$ ruff check <changed files>
All checks passed!
$ ruff format --check <changed files>
14 files already formatted
$ mypy headroom --ignore-missing-imports # (run with --python-version 3.12 to
# parse the local numpy stub)
Success: no issues in changed files
```
Note: locally, the two suites `tests/test_mcp_registry` +
`tests/test_cli` share a
pre-existing cross-test state leak that flakes
`test_wrap_codex_..._serena...` and
`test_dead_client_marker...`; both reproduce identically on `main`
(changes stashed)
and are unrelated to this PR. CI shards run them isolated.
## Real Behavior Proof
- Environment: Windows 11, Python 3.13.11,
`locale.getpreferredencoding()` = `cp1252`
(a non-UTF-8 locale — the exact condition that triggers #733).
- Exact command / steps: pre-seed a `~/.codex/config.toml` the way Codex
writes it on
Windows — CRLF endings plus a non-ASCII value `project = "比赛/机器人"` —
then call
`CodexRegistrar.register_server(headroom)` and re-parse with `tomllib`.
- Observed result: register status REGISTERED, no doubled CRLF,
`tomllib` parses, and the non-ASCII value is preserved. Full output:
```text
python: 3.13.11 | locale preferred encoding: cp1252
register status: RegisterStatus.REGISTERED
doubled CRLF present: False
tomllib parsed OK: True
non-ASCII project value preserved: True
headroom in mcp_servers: True
```
Before this change the same flow produced `\r\r\n` and a `tomllib`
"carriage return
must be followed by newline" error.
- Not tested: a real zh-CN GBK/cp936 Windows install (no such host
available); the
GBK-specific decode path is covered by
`test_read_text_falls_back_to_locale_encoding`
which monkeypatches the preferred encoding to `gbk`.
## Review Readiness
- [x] I have performed a self-review
- [x] This PR is ready for human review
## Additional Notes
- Purely-binary I/O and sites already using
`encoding="utf-8"`+`errors="replace"`
(e.g. `learn/analyzer.py`) and the ASCII-only PID file
(`install/runtime.py`) were
intentionally left untouched.
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-28 22:18:47 +02:00
|
|
|
def test_read_text_falls_back_to_locale_encoding(tmp_path, monkeypatch):
|
|
|
|
|
"""A file a tool wrote in the locale encoding (e.g. GBK) still decodes."""
|
|
|
|
|
monkeypatch.setattr(fsutil.locale, "getpreferredencoding", lambda *_: "gbk")
|
|
|
|
|
p = tmp_path / "config.toml"
|
|
|
|
|
p.write_bytes('path = "模型"\n'.encode("gbk")) # not valid UTF-8
|
|
|
|
|
assert fsutil.read_text(p) == 'path = "模型"\n'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_read_text_replace_fallback_never_raises(tmp_path, monkeypatch):
|
|
|
|
|
"""When neither UTF-8 nor the locale encoding decodes, fall back to replace."""
|
|
|
|
|
monkeypatch.setattr(fsutil.locale, "getpreferredencoding", lambda *_: "ascii")
|
|
|
|
|
p = tmp_path / "config.toml"
|
|
|
|
|
p.write_bytes(b"\xff\xfe bad bytes")
|
|
|
|
|
# Must not raise; returns *something* decodable.
|
|
|
|
|
assert isinstance(fsutil.read_text(p), str)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_read_text_missing_returns_default(tmp_path):
|
|
|
|
|
p = tmp_path / "nope.toml"
|
|
|
|
|
assert fsutil.read_text(p, default="") == ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_read_text_missing_raises_without_default(tmp_path):
|
|
|
|
|
with pytest.raises(OSError):
|
|
|
|
|
fsutil.read_text(tmp_path / "nope.toml")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_append_text_preserves_endings(tmp_path):
|
|
|
|
|
p = tmp_path / "AGENTS.md"
|
|
|
|
|
fsutil.write_text(p, "line1\n")
|
|
|
|
|
fsutil.append_text(p, "line2\n")
|
|
|
|
|
assert p.read_bytes() == b"line1\nline2\n"
|