mirror of
https://github.com/nearai/ironclaw.git
synced 2026-09-03 08:06:01 +08:00
Brings this branch up to date and resolves a conflict that a local merge rehearsal surfaced before the merge queue could: #7797 consolidated the tests/ guidance onto the AGENTS.md convention, so on main `tests/AGENTS.md` is the real file (100644) and `tests/CLAUDE.md` is a symlink to it (120000). This branch predates that and still carried `tests/CLAUDE.md` as a regular file — which is where this PR's earlier doc edit (39 -> 40 top-level bins plus the hermetic_network_guard_probe row) had landed. Git reports that as "distinct types on each side", and the naive resolutions both lose: keeping our regular file clobbers upstream's symlink, taking theirs silently drops the doc edit while the counts stay wrong. Resolution: take main's shape (CLAUDE.md stays the symlink) and port the edit into `tests/AGENTS.md`, the file that now actually holds the content. Its counts were still 39 upstream and it had no probe row, so the edit is still needed — it just belongs in the other file now. Verified on the merged tree: ws12 self-tests 101 OK, ws12 live gate passed, planner suite 87 OK, check-guidance OK (386 guidance files, 70 CLAUDE.md aliases verified). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>