diff --git a/.cursor/skills/zack-mode/SKILL.md b/.cursor/skills/zack-mode/SKILL.md
index 8bde5becaf..d12229632f 100644
--- a/.cursor/skills/zack-mode/SKILL.md
+++ b/.cursor/skills/zack-mode/SKILL.md
@@ -59,4 +59,3 @@ matching guide instead of copying its rules here:
 - Read the `discovering-tracedecay` skill (tracedecay plugin) for TraceDecay
   operations.
 - Read the `ripwire-router` skill (Ripwire agent skills) for Ripwire task routing.
-- Read the `cargo-hauler` skill (cargo-hauler plugin) for Cargo execution.
diff --git a/.release-please-manifest-beta.json b/.release-please-manifest-beta.json
index 3853e3d6d0..b536e4aa08 100644
--- a/.release-please-manifest-beta.json
+++ b/.release-please-manifest-beta.json
@@ -1,3 +1,3 @@
 {
-  ".": "0.1.0-beta.39"
+  ".": "0.1.0-beta.40"
 }
diff --git a/AGENTS.md b/AGENTS.md
index 9d6c86ea83..2ec7fd6918 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -21,12 +21,20 @@ unauthorized external action after completing independent, authorized work.
 
 ## Working checkout authority
 
-- Always work in the primary checkout at `/fast/projects/tracedecay`.
-- Always work on `codex/tracedecay-total-redesign-plan-reopened`, the head branch
-  of PR #707. Merge outside work into this branch before continuing.
-- Do not create or use linked worktrees or work from another branch.
-- Multiple agents may work concurrently in the primary checkout; preserve peer
-  edits and stage only the paths owned by the current task.
+- Use the checkout supplied by the current task. Resolve its root with
+  `git rev-parse --show-toplevel`; never assume a machine-specific absolute path.
+- Inspect `git status --short`, `git branch --show-current`, and
+  `git worktree list` before changing branches or files. Honor an explicit task
+  branch; otherwise stay on the current branch. For a PR, resolve its head with
+  `gh pr view <number> --json headRefName,headRepositoryOwner,headRepository`.
+- Do not switch branches, merge other work, or create linked worktrees merely
+  because an old plan names them. If the requested checkout or branch is
+  unavailable, report the mismatch instead of substituting an unrelated tree.
+- Keep commands and maintained instructions repo-relative. Put machine-local
+  build caches and host settings in local configuration, not mandatory
+  repository guidance.
+- Multiple agents may work concurrently in a checkout; preserve peer edits and
+  stage only the paths owned by the current task.
 
 ## Layout
 
@@ -57,7 +65,8 @@ unauthorized external action after completing independent, authorized work.
 
 ## Build & test
 
-- Edition 2024, resolver 3.
+- Edition 2024, resolver 3. Use the toolchain pinned in `rust-toolchain.toml`.
+  Run `cargo <subcommand>` normally.
 - Dashboard: `npm run build` (rsbuild), `npm run typecheck` (`tsc --noEmit`),
   `npm test` (vitest) from `dashboard/`.
 - libtest `--exact` requires the full module path and exits 0 when a filter
@@ -80,7 +89,8 @@ unauthorized external action after completing independent, authorized work.
 
 ## Conventions
 
-- Commits: `<type>(<scope>): <subject>` (subject ≤ 72 chars) with one of
+- Commits: `<type>(<scope>): <subject>` (scope optional; full header ≤ 72 chars)
+  with one of
   `build`, `chore`, `ci`, `docs`, `feat`, `fix`, `perf`, `refactor`, `revert`,
   `style`, `test`. Every non-merge commit message must pass commitlint
   (`npm run lint:commit`, configured in `commitlint.config.cjs`; the
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27f9f851ff..b8af07cb42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,304 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.0-beta.40](https://github.com/ScriptedAlchemy/tracedecay/compare/v0.1.0-beta.39...v0.1.0-beta.40) (2026-09-17)
+
+
+### Features
+
+* **agents:** add deterministic delegation topology layout ([6ad0cf6](https://github.com/ScriptedAlchemy/tracedecay/commit/6ad0cf6ae2627b5a9911fa6d07cd010f9efab91f))
+* **agents:** compose topology, inspector and authority register ([13bec38](https://github.com/ScriptedAlchemy/tracedecay/commit/13bec38b3a5a6d81305125717f814c2e4b7aca08))
+* **automations:** implement lookbook V2 scheduler and run ledger ([073b214](https://github.com/ScriptedAlchemy/tracedecay/commit/073b214ad1efc6c3b4be33b5aad5b2877209b0a7))
+* **brain:** draw the registry field as a luminous Three.js scene ([a32836a](https://github.com/ScriptedAlchemy/tracedecay/commit/a32836a8f10d8476dd1fabcc75003a4a065b0e4d))
+* **code:** implement the Cortex lens as the semantic cortex plate ([fa9bb7f](https://github.com/ScriptedAlchemy/tracedecay/commit/fa9bb7fbee4971c556e90f1da3c79db77834aa7f))
+* **dashboard-api:** type savings models route with provider attribution ([274392a](https://github.com/ScriptedAlchemy/tracedecay/commit/274392afd887dbc7a1e130bbaaa780181595ffb2))
+* **dashboard:** adopt V2 night-glass tokens and Archivo display face ([cd99fb7](https://github.com/ScriptedAlchemy/tracedecay/commit/cd99fb7bc62c77f319c9975f8203acc363cdabc9))
+* **dashboard:** rebuild shell chrome on the V2 lookbook rail ([153ea00](https://github.com/ScriptedAlchemy/tracedecay/commit/153ea008713d627e030c1aa4944521d3bb9863b9))
+* **dashboard:** redesign Costs as provider spend attribution ([b79de0e](https://github.com/ScriptedAlchemy/tracedecay/commit/b79de0e34717123579830a5dc7de2b1d65649930))
+* **delivery:** add evidence ladder, umbrella, journey and review models ([9033ea8](https://github.com/ScriptedAlchemy/tracedecay/commit/9033ea86e20411e2e1181705751e31be61359757))
+* **delivery:** add the exact review workspace over provider projections ([f49bfa9](https://github.com/ScriptedAlchemy/tracedecay/commit/f49bfa98afe74dafdda9d66c7954ea99b5c011fd))
+* **delivery:** add the horizontal PR journey field and episode table ([f310a35](https://github.com/ScriptedAlchemy/tracedecay/commit/f310a354949096273d1914c54c7f8b1caed096af))
+* **delivery:** add umbrella outcomes and local-first wing ([250c57a](https://github.com/ScriptedAlchemy/tracedecay/commit/250c57a6a10738c5721809c008c7ba3f1c2a8e3b))
+* **delivery:** admit inbox HTTP proof and proximity attention ([76bf002](https://github.com/ScriptedAlchemy/tracedecay/commit/76bf0025c4c4ad4580b77f982ffafbc93445bb2e))
+* **delivery:** join proximity into attention sources ([6893029](https://github.com/ScriptedAlchemy/tracedecay/commit/689302920c6b112152e2a4d4ba68c6340330043e))
+* **delivery:** own proximity join on typed server authority ([658b062](https://github.com/ScriptedAlchemy/tracedecay/commit/658b062e4a35a0a986233d1eaf72c26e063e9bc7))
+* **delivery:** rebuild inbox with field, filters, inspector, table ([a88e432](https://github.com/ScriptedAlchemy/tracedecay/commit/a88e4327105eae919cb532e144772e14bbd62b06))
+* **delivery:** wire proximity attention into the delivery ui ([0802af2](https://github.com/ScriptedAlchemy/tracedecay/commit/0802af2afd333b86d70ecc399cfad39e4ae57d48))
+* **explorer:** four independent lanes, hover-inspect, typed absences ([a685d76](https://github.com/ScriptedAlchemy/tracedecay/commit/a685d76c8c54ea56608b496b438c85f056eb7af2))
+* **explorer:** surface source freshness and count evidence per lane ([cc23d9a](https://github.com/ScriptedAlchemy/tracedecay/commit/cc23d9afe713181318d45f74149a6e936e9d01d4))
+* **extraction:** name dotted Rust calls on typed bindings by type ([aa0a5c5](https://github.com/ScriptedAlchemy/tracedecay/commit/aa0a5c5ff54e46941466525b6cb80145d9853651))
+* **knowledge:** bring the selected fact's ledger row into view ([d126207](https://github.com/ScriptedAlchemy/tracedecay/commit/d126207eb977f4487965b70fffcb8a8ccf6fc344))
+* **knowledge:** compose facts camera as constellation and inspector ([97f6cff](https://github.com/ScriptedAlchemy/tracedecay/commit/97f6cff320b627ceac8510e15cab892021edd08f))
+* **loom:** add hybrid canvas and svg temporal scene renderer ([d8bcb11](https://github.com/ScriptedAlchemy/tracedecay/commit/d8bcb11b0722f50b0e7d4b283af816ce3aa29ddd))
+* **loom:** add renderer-neutral temporal journey projection and layout ([2d59c3b](https://github.com/ScriptedAlchemy/tracedecay/commit/2d59c3b21987c5d5bdbb124e91ffe43841d74b98))
+* **loom:** replace weave lane chart with temporal execution field ([1396c78](https://github.com/ScriptedAlchemy/tracedecay/commit/1396c7891af0b6433e8c3a3618a766b9c14615e0))
+* **observatory:** system evidence overview with inspector ([1efa12c](https://github.com/ScriptedAlchemy/tracedecay/commit/1efa12cde6bf72a9990c96aaaf394f25a148c23f))
+* **sessions:** implement lookbook V2 timeline, index and inspector ([2df0adb](https://github.com/ScriptedAlchemy/tracedecay/commit/2df0adb88ec9328a63b50dd0f44ac243c8cc81a9))
+* **settings:** implement effective configuration review surface ([d2acb82](https://github.com/ScriptedAlchemy/tracedecay/commit/d2acb82bec6c41e1a91d9e07d757311a5606984a))
+* **shell:** let status registers carry their own glyph ([ecba682](https://github.com/ScriptedAlchemy/tracedecay/commit/ecba6820b43b54e3b3d62f2213c89408a717f9d1))
+* **shell:** let workspaces publish status-strip registers ([7c05dda](https://github.com/ScriptedAlchemy/tracedecay/commit/7c05dda96fb13156dfc7b85c8cc28fc2a3b1dff6))
+* TraceDecay V2 delivery (PR8–PR13) + daemon performance, memory, and reliability overhaul ([e13a353](https://github.com/ScriptedAlchemy/tracedecay/commit/e13a35319f1c5de99e310a32d180dab3f54a802a))
+* **ui:** add evidence-grade tag and UTC clock formatter ([33f4e3a](https://github.com/ScriptedAlchemy/tracedecay/commit/33f4e3a7f14525bebf4b1926b37967788c1c3482))
+* **viz:** add a HUD overlay slot over the graph canvas box ([43de885](https://github.com/ScriptedAlchemy/tracedecay/commit/43de885762aef5f66740e81c144e9d9d01728959))
+* **work:** compose inspector, activity ledger, and register strip ([b938d4c](https://github.com/ScriptedAlchemy/tracedecay/commit/b938d4c36c1cc897e9419aebf3d77eb766bb290c))
+* **work:** draw the task dependency board from the graph authority ([8cc3873](https://github.com/ScriptedAlchemy/tracedecay/commit/8cc38737460fcd514282644d263f18bf4397e747))
+* **workflows:** implement the V2 definition lifecycle ledger ([0b59d18](https://github.com/ScriptedAlchemy/tracedecay/commit/0b59d1864c91edb607ce324e150ef102ef65daeb))
+
+
+### Bug Fixes
+
+* **agents:** keep aperture labels legible on the light shell ([bdaf23e](https://github.com/ScriptedAlchemy/tracedecay/commit/bdaf23ea89db21b5a5a97572dc3857644d6035c4))
+* **agents:** resolve review findings on inspection and folding ([31f2e80](https://github.com/ScriptedAlchemy/tracedecay/commit/31f2e8058c4bacbd7ff2efc97ddd5098df3613f2))
+* **automation:** store skill usage in per-skill files ([0cb1012](https://github.com/ScriptedAlchemy/tracedecay/commit/0cb1012b6f56abbac1b7fb70b1e6d3939ad28ef9))
+* **boundary:** validate at edges and stop re-parsing admitted values ([0620a6c](https://github.com/ScriptedAlchemy/tracedecay/commit/0620a6c2f48e6162253fa322297084e92b10780f))
+* **brain:** keep scene controls accessible and release GL contexts ([35d36c5](https://github.com/ScriptedAlchemy/tracedecay/commit/35d36c5e2c97fc9c98db61a0f1c498d7e7f2e5d7))
+* **brain:** place labels whole, cool heat under reduced motion ([b966589](https://github.com/ScriptedAlchemy/tracedecay/commit/b966589b697c914e2c2ea1a7f305ac65bd640fe9))
+* **build:** clear clippy on the second merged PR train ([bcbac20](https://github.com/ScriptedAlchemy/tracedecay/commit/bcbac206bcd8edc671e2e982de9e9d72fea0c778))
+* **ci:** repair documentation, dogfood, and Hawk gates ([ca3dab8](https://github.com/ScriptedAlchemy/tracedecay/commit/ca3dab8df1d3214fab0301a38f2028d29241a9db))
+* **ci:** use the configured Hawk production entry point ([1fe860b](https://github.com/ScriptedAlchemy/tracedecay/commit/1fe860bb9055251732b1f31477808e6d488afb95))
+* clear tip Format and Clippy failures ([5a0e9f1](https://github.com/ScriptedAlchemy/tracedecay/commit/5a0e9f14f83ac60838fa160d6aa036ed1cf01618))
+* **cli:** honour explicit --project verbatim for registry reads ([3902b36](https://github.com/ScriptedAlchemy/tracedecay/commit/3902b368bdc82349d454175fb33739352a6ccf42))
+* **cli:** proceed on reversible work without a human prompt ([3ea6373](https://github.com/ScriptedAlchemy/tracedecay/commit/3ea6373e9b68d77f09f8205eeb88fef9849049c7))
+* **code-index-runtime:** clear clippy lints from merged lanes ([5941902](https://github.com/ScriptedAlchemy/tracedecay/commit/5941902bb246a33914ec925181faa2fb33f87a07))
+* **code-index-runtime:** count the clone backfill apart from passes ([aa78e4d](https://github.com/ScriptedAlchemy/tracedecay/commit/aa78e4d82fd0077ccd1a84573d315ef3acde1f56))
+* **code-index-runtime:** defer clone backfill until seat matches ([b6aafa5](https://github.com/ScriptedAlchemy/tracedecay/commit/b6aafa5b067cf1ae26de87b609ad716a5a9d73f8))
+* **code-index-runtime:** drive the clone backfill on demand after seat ([dcc942b](https://github.com/ScriptedAlchemy/tracedecay/commit/dcc942b89b361cf7a3ab650d80ffa27d3d095662))
+* **code-index-runtime:** drop stray brace from wedge-sync merge ([90726f9](https://github.com/ScriptedAlchemy/tracedecay/commit/90726f915a613e1d4d2fb8a4d8ec500a383471c3))
+* **code-index-runtime:** keep freshness fresh during clone backfill ([1461c7e](https://github.com/ScriptedAlchemy/tracedecay/commit/1461c7e37ae659b8c3326cf43df1cc71c437fcb3))
+* **code-index-runtime:** probe text projection work without waiting ([292a5ef](https://github.com/ScriptedAlchemy/tracedecay/commit/292a5ef7f5047b2737b639d0c7b5ebc9ec13be74))
+* **code-index-runtime:** read retained segments under a shared lock ([8c78bdd](https://github.com/ScriptedAlchemy/tracedecay/commit/8c78bddae63f07c74d61d544a654139e95a8cd3e))
+* **code-index-runtime:** read retained segments under a shared lock ([e0c0c81](https://github.com/ScriptedAlchemy/tracedecay/commit/e0c0c81452cd970a9ae8231045690bcff217e6e7))
+* **code-index-runtime:** run the clone backfill outside the pass guard ([5cc401a](https://github.com/ScriptedAlchemy/tracedecay/commit/5cc401a1df0601672ef6d70ed4e6c20e0f1edaca))
+* **code-index-runtime:** seat before clone backfill; share owners-ready ([#1103](https://github.com/ScriptedAlchemy/tracedecay/issues/1103)) ([0dbf47e](https://github.com/ScriptedAlchemy/tracedecay/commit/0dbf47e9e41493e31a9a627a4edf606b08b66908))
+* **code-index-runtime:** seat the graph before the clone backfill ([ef6fb44](https://github.com/ScriptedAlchemy/tracedecay/commit/ef6fb4422f574f97990427bb0d53c1ae655aefab))
+* **code-index-runtime:** share owners-ready for seat and replay ([05bd656](https://github.com/ScriptedAlchemy/tracedecay/commit/05bd656972ef2b4476efe61982c6286f218816b3))
+* **code-index-runtime:** wake clone backfill after the seat ([06e318f](https://github.com/ScriptedAlchemy/tracedecay/commit/06e318f4c7ccc4242c245b3b9258bdd899017b8f))
+* **code-index-runtime:** wake deferred mount after root insert ([d9488c8](https://github.com/ScriptedAlchemy/tracedecay/commit/d9488c8aff0dd2b90dddd2254f907c1d8a321786))
+* **code-index:** abstain from constructor-name type inference ([2ef6aa2](https://github.com/ScriptedAlchemy/tracedecay/commit/2ef6aa29609ac18cf7f1892dbfd2bd6ba084049c))
+* **code-index:** admit non-git project initialization ([a3c351e](https://github.com/ScriptedAlchemy/tracedecay/commit/a3c351e084958e4155a218a6b880b67be652f189))
+* **code-index:** admit non-git project initialization ([d9855d1](https://github.com/ScriptedAlchemy/tracedecay/commit/d9855d110332c2bc256e28d87b12445718a21984))
+* **code-index:** admit public trait method callers ([a8c1059](https://github.com/ScriptedAlchemy/tracedecay/commit/a8c1059ab232158565f2e29c47318a97acb73bd7))
+* **code-index:** admit via typed convergence park ([a1c9fca](https://github.com/ScriptedAlchemy/tracedecay/commit/a1c9fca3fd80abad648519adf51582f0c4200dc3))
+* **code-index:** bind inherent methods only to their own type definition ([9027a7d](https://github.com/ScriptedAlchemy/tracedecay/commit/9027a7dba015dc04fcb78f65d0678f5571743231))
+* **code-index:** bind inherent methods only to their own type definition ([690c161](https://github.com/ScriptedAlchemy/tracedecay/commit/690c161b4365588a179d9437596092d23ebcad72))
+* **code-index:** bind qualified Rust paths through crate re-exports ([30be440](https://github.com/ScriptedAlchemy/tracedecay/commit/30be440211b2da79305f53e08d1f70325c1912e0))
+* **code-index:** bind renewed source proof to an unproven seat ([e4904c8](https://github.com/ScriptedAlchemy/tracedecay/commit/e4904c88a2da7224e529f7e4b7faede84efe1598))
+* **code-index:** bound all generation store locks ([35fd34a](https://github.com/ScriptedAlchemy/tracedecay/commit/35fd34ae2d31490976229a1951bb03290858daa7))
+* **code-index:** box the non-canonical clone order detail ([f6619c2](https://github.com/ScriptedAlchemy/tracedecay/commit/f6619c2296daf629f3eba65a0ece1a218d98c3c8))
+* **code-index:** clear clippy denials in scheduler ([713660a](https://github.com/ScriptedAlchemy/tracedecay/commit/713660acb7bc9465e8bccab83bc5ad61c47cd2d6))
+* **code-index:** compile against non-enumerated reuse ([49dc83e](https://github.com/ScriptedAlchemy/tracedecay/commit/49dc83e8fbb47152fb3f4c6ad1ec56c53023c0ff))
+* **code-index:** consult the publication park, not a worker bool ([7a383ee](https://github.com/ScriptedAlchemy/tracedecay/commit/7a383ee638e653829294ae5554b1118c9f06f35f))
+* **code-index:** contain later chunk panics in the sweep ([2ede030](https://github.com/ScriptedAlchemy/tracedecay/commit/2ede0308cb2c94b7e538ab3f68c096fe84eda413))
+* **code-index:** deduplicate admission test imports ([92e44cc](https://github.com/ScriptedAlchemy/tracedecay/commit/92e44cc09ab997c686d5a5a41a0fd664582f704e))
+* **code-index:** drop removed reused chunk list ([6a5982e](https://github.com/ScriptedAlchemy/tracedecay/commit/6a5982e2446ef7675bb2dd4a310967612605742d))
+* **code-index:** drop unreachable admission arm ([626367a](https://github.com/ScriptedAlchemy/tracedecay/commit/626367a409cb72992aabd03d39ccffb411926d52))
+* **code-index:** durable Arc-share lineage and reused seal ([132b6cd](https://github.com/ScriptedAlchemy/tracedecay/commit/132b6cd99880d7ba37079761576deab51574e125))
+* **code-index:** durable Arc-share lineage and reused seal ([48008ec](https://github.com/ScriptedAlchemy/tracedecay/commit/48008ec85df06e91eb90bfea496baebacb1d9b48))
+* **code-index:** fail closed on query reconcile admission ([b955793](https://github.com/ScriptedAlchemy/tracedecay/commit/b955793fc64b137cb80861603a4bbdcff5d6bb18))
+* **code-index:** fold final scheduler closeout into [#707](https://github.com/ScriptedAlchemy/tracedecay/issues/707) ([aeea959](https://github.com/ScriptedAlchemy/tracedecay/commit/aeea959669fb259f5f58abd8829bf1911da62826))
+* **code-index:** fold public trait method callers into [#707](https://github.com/ScriptedAlchemy/tracedecay/issues/707) ([9fbf169](https://github.com/ScriptedAlchemy/tracedecay/commit/9fbf169fe6ef3a9822d64016760266f49ca21cf9))
+* **code-index:** keep activation and caller outcomes truthful ([94485c5](https://github.com/ScriptedAlchemy/tracedecay/commit/94485c5d88adc7e2757779327a991bcb5b8c1419))
+* **code-index:** keep chunk verification ordered ([0f6bef7](https://github.com/ScriptedAlchemy/tracedecay/commit/0f6bef7c0d586c328122b5212d2ef0711f70d29b))
+* **code-index:** keep pool failures out of identity_validation ([5ff0ebb](https://github.com/ScriptedAlchemy/tracedecay/commit/5ff0ebb56726a827c8a0856f60dade90e56f6882))
+* **code-index:** keep pool failures out of identity_validation ([1bdf810](https://github.com/ScriptedAlchemy/tracedecay/commit/1bdf810fe788fc26e273cc0e0030da545d681487))
+* **code-index:** keep restricted re-exports and shared reads truthful ([9b16f30](https://github.com/ScriptedAlchemy/tracedecay/commit/9b16f302b37318215b9536ec5657a941e7033093))
+* **code-index:** keep reused_chunks as u64 through cadence ([7ab493e](https://github.com/ScriptedAlchemy/tracedecay/commit/7ab493ecce3e35c1fe7512a2059ccd916f86a122))
+* **code-index:** keep std module paths off same-stem project files ([57aaf7d](https://github.com/ScriptedAlchemy/tracedecay/commit/57aaf7d6f35be067f312df44836dccc10076c581))
+* **code-index:** keep std module paths off same-stem project files ([8036482](https://github.com/ScriptedAlchemy/tracedecay/commit/80364826e747cb12ff6b31c3829f3e23d1b6fb04))
+* **code-index:** map DomainError to 1:1 reason codes ([584fb80](https://github.com/ScriptedAlchemy/tracedecay/commit/584fb80eac65feae34afa2bece678ab02b69fc69))
+* **code-index:** match generic impls by nominal owner ([cbfd6d4](https://github.com/ScriptedAlchemy/tracedecay/commit/cbfd6d47a64f237014579d9566269695061f8182))
+* **code-index:** preserve admitted branch generation wake ([07e827f](https://github.com/ScriptedAlchemy/tracedecay/commit/07e827f737442e36d6368cf3661e3a500c4841e0))
+* **code-index:** preserve pending clone backfill wake ([ec3f5f7](https://github.com/ScriptedAlchemy/tracedecay/commit/ec3f5f781aa1e315b79c33762190b38ea9d4ef65))
+* **code-index:** preserve semantics across train merges ([8afb9f7](https://github.com/ScriptedAlchemy/tracedecay/commit/8afb9f7f19171fa7e42cb4e0f2bf6886341c35c0))
+* **code-index:** preserve semantics across train merges ([5d91f84](https://github.com/ScriptedAlchemy/tracedecay/commit/5d91f84ccbd1fa0de154a6e812fa81557a0ce2f7))
+* **code-index:** preserve typed causes after tip rebase ([ec15f93](https://github.com/ScriptedAlchemy/tracedecay/commit/ec15f932d85a1e510a42f3438f4dd578caea8665))
+* **code-index:** prove each reused chunk before the seal ([413cc4d](https://github.com/ScriptedAlchemy/tracedecay/commit/413cc4dedb4715260206058ad7d9d3d17565684f))
+* **code-index:** prove reused complement before accepting seal ([f84f494](https://github.com/ScriptedAlchemy/tracedecay/commit/f84f49414f13bbb7720e7a4c05d39f8fe6fc64a3))
+* **code-index:** prove reused complement before accepting seal ([b1125f6](https://github.com/ScriptedAlchemy/tracedecay/commit/b1125f6daade3649003577b3632cf792f87462ce))
+* **code-index:** read terminal publication park not a local flag ([dd88cb6](https://github.com/ScriptedAlchemy/tracedecay/commit/dd88cb68ff2d00ee7f59ee347b9af8624ea7f54e))
+* **code-index:** require reembed rows on profile replay ([2a68b3e](https://github.com/ScriptedAlchemy/tracedecay/commit/2a68b3e40d8c81be512f7be02b8289e6cbf669ee))
+* **code-index:** resolve inherent impls of submodule re-exported types ([844b89c](https://github.com/ScriptedAlchemy/tracedecay/commit/844b89c11645b1fe12b32a2b937305b2271e0d5e))
+* **code-index:** resolve inherent impls of submodule re-exported types ([6903957](https://github.com/ScriptedAlchemy/tracedecay/commit/690395730dc33cf9f22cc598ca54798d15fc2484))
+* **code-index:** resolve qualified Rust paths and typed-receiver callers ([3128498](https://github.com/ScriptedAlchemy/tracedecay/commit/312849889c041ba067f75cd914f9f08d4b786c83))
+* **code-index:** restore Arc-share seals without live parent ([bbff983](https://github.com/ScriptedAlchemy/tracedecay/commit/bbff98322106e59c8f8031d6eaad8f77887a7309))
+* **code-index:** restore nested admission fix lost in integration ([7586101](https://github.com/ScriptedAlchemy/tracedecay/commit/758610142dd27501c104f00e1136402c761e5443))
+* **code-index:** restore nested admission fix lost in integration ([76a8e78](https://github.com/ScriptedAlchemy/tracedecay/commit/76a8e78384b21dfbc39b4703c91ce8450e440fca))
+* **code-index:** restore Type::method recall for trait-impl UFCS ([fd62fe8](https://github.com/ScriptedAlchemy/tracedecay/commit/fd62fe8564ee47fed8801baf4fe01f43958e998f))
+* **code-index:** retire sealed revision 11 for parent-delta seals ([c2d6438](https://github.com/ScriptedAlchemy/tracedecay/commit/c2d6438624dd66a99408aaaa6175d030e393e654))
+* **code-index:** retire sealed revision 11 for parent-delta seals ([e358627](https://github.com/ScriptedAlchemy/tracedecay/commit/e358627c60892841716dc1da6721f0ef4966351d))
+* **code-index:** return terminal sync admission ([2d741c1](https://github.com/ScriptedAlchemy/tracedecay/commit/2d741c17e4e48796ffd13e66a8c4c7e9f803c3a6))
+* **code-index:** satisfy clippy on typed freshness reads ([e42c83c](https://github.com/ScriptedAlchemy/tracedecay/commit/e42c83c5ef6ae243af735ccab5db2c9454b8f445))
+* **code-index:** settle ignored dependency admission ([4d95670](https://github.com/ScriptedAlchemy/tracedecay/commit/4d9567034d37ffa7563afe40ceeb40c15724fc38))
+* **code-index:** stabilize Fresh reads and dirty retained seats ([a5206f6](https://github.com/ScriptedAlchemy/tracedecay/commit/a5206f6dd87cf76a2b96df2d7c53c45017aeeb7f))
+* **code-index:** stop a cancelled redundancy scan before the next family ([b9ba671](https://github.com/ScriptedAlchemy/tracedecay/commit/b9ba67160c17267e85b11773165bf4067785770b))
+* **code-index:** stop a cancelled redundancy scan before the next family ([50a2080](https://github.com/ScriptedAlchemy/tracedecay/commit/50a20807b5cc5dbd1261eee361a18e2e38ecc40f))
+* **code-index:** stop a cancelled similar scan before the next page ([aacb4c1](https://github.com/ScriptedAlchemy/tracedecay/commit/aacb4c11721267ae68df136c336432cea6318f4a))
+* **code-index:** stop a cancelled similar scan before the next page ([1cb1f36](https://github.com/ScriptedAlchemy/tracedecay/commit/1cb1f365f929dcd4599d5eb4483b056d07fe2571))
+* **code-index:** stop arc-share seal before a divergent chunk ([376614c](https://github.com/ScriptedAlchemy/tracedecay/commit/376614caf781c0b9f64bec73e170deba56e9ecc8))
+* **code-index:** stop repeated roles from sticking to one actor ([b28ea54](https://github.com/ScriptedAlchemy/tracedecay/commit/b28ea54712d5a32cd6010f639d99d2cd6cfc509c))
+* **code-index:** type NonCanonical causes with reason codes ([d039bee](https://github.com/ScriptedAlchemy/tracedecay/commit/d039bee8928ffa5d73cf2eb73672825b24087ddc))
+* **code-index:** type NonCanonical causes with reason codes ([db94991](https://github.com/ScriptedAlchemy/tracedecay/commit/db94991ce205f443cd7e02a1f238c42d55c7cfc1))
+* **code-index:** type NonCanonical causes with reason codes ([1c1c199](https://github.com/ScriptedAlchemy/tracedecay/commit/1c1c199c4f6ddf2138b95f4f960da78ceebd502c))
+* **code-index:** use question mark for method owner ([2b02cc2](https://github.com/ScriptedAlchemy/tracedecay/commit/2b02cc2d16f1e9250121125dfa5811afea329108))
+* **code-index:** yield background-cpu units around chunk fan-outs ([3c311c7](https://github.com/ScriptedAlchemy/tracedecay/commit/3c311c7865dbab6fc65dc665c0fe8491090e7ed3))
+* **code-index:** yield background-cpu units around chunk fan-outs ([f81df3b](https://github.com/ScriptedAlchemy/tracedecay/commit/f81df3b34f6588035a0043560fad0fd95a9e3d75))
+* **code:** stack hover previews over the pin; bind Escape globally ([004bdfe](https://github.com/ScriptedAlchemy/tracedecay/commit/004bdfea95d082c71e59731f3f5d935b919103bb))
+* **contracts:** alias similar/redundancy legacy wire schemas ([dfdd8d6](https://github.com/ScriptedAlchemy/tracedecay/commit/dfdd8d6010fa295bb8c0d499e3fdadf68624c773))
+* **contracts:** represent similar protocol via revision range ([a402f9f](https://github.com/ScriptedAlchemy/tracedecay/commit/a402f9f59b77df9b82e9ab33a4db7cad8d138bec))
+* converge retries after crash residue ([1d8f54f](https://github.com/ScriptedAlchemy/tracedecay/commit/1d8f54f479105256216058c6a971b2b385298f0a))
+* **daemon:** classify stalled reads by reason code ([6f05293](https://github.com/ScriptedAlchemy/tracedecay/commit/6f0529324da185dd51ec8bb9c09b47409a5a99ed))
+* **daemon:** decode partitioned generation in fan-out wait ([f40f81f](https://github.com/ScriptedAlchemy/tracedecay/commit/f40f81f9ea2bf7936712addc1829295dcc25996f))
+* **daemon:** decode partitioned sealed gens in fan-out wait ([7d87d65](https://github.com/ScriptedAlchemy/tracedecay/commit/7d87d655ad187b2d6e4e2da683284bcc37e4bb04))
+* **daemon:** decode partitioned sealed gens in fan-out wait ([2db3aad](https://github.com/ScriptedAlchemy/tracedecay/commit/2db3aad853aee788d85210c3b638ac8e0d29fbae))
+* **daemon:** deliver proxied responses after host EOF ([31da7e6](https://github.com/ScriptedAlchemy/tracedecay/commit/31da7e67b3418f2b0ed2e8f0f2ffc255fcf1d2a9))
+* **daemon:** deliver proxied responses after host EOF ([fb2af2d](https://github.com/ScriptedAlchemy/tracedecay/commit/fb2af2d8aaa3ef9c16b78c09fd31deb17fde874b))
+* **daemon:** drop English graph-publication retry matchers ([f60afb1](https://github.com/ScriptedAlchemy/tracedecay/commit/f60afb1ad91fa319181e9f4f0746021db556e355))
+* **daemon:** mount proximity early and align init wording ([41d3e24](https://github.com/ScriptedAlchemy/tracedecay/commit/41d3e2404b397904344a4e94465e72c22ae45f21))
+* **daemon:** retry saturated opens by typed reason ([91c6f94](https://github.com/ScriptedAlchemy/tracedecay/commit/91c6f94924095d3776ce2c2b0886cb7c056c01d7))
+* **daemon:** share one discovery deadline per initialize request ([5e4ee66](https://github.com/ScriptedAlchemy/tracedecay/commit/5e4ee66d600b9b28cd44ddbb6e3589f3ca87bb38))
+* **daemon:** type journey transport retry reasons ([58e85f6](https://github.com/ScriptedAlchemy/tracedecay/commit/58e85f651ea794ef14b52a437fd8be796b451c3f))
+* **dashboard-api:** name noncurrent freshness states ([20d2c01](https://github.com/ScriptedAlchemy/tracedecay/commit/20d2c01b1c88aac179b56d6d982a6f4ada07e734))
+* **dashboard-api:** name noncurrent freshness states ([4bc30a7](https://github.com/ScriptedAlchemy/tracedecay/commit/4bc30a73477bed2dd2bbeacc891c2038cde9b288))
+* **dashboard:** close freshness and relief claim gaps ([63ccb1f](https://github.com/ScriptedAlchemy/tracedecay/commit/63ccb1fed35592e65ae426208cd30f3b092cb3ea))
+* **dashboard:** close freshness and relief claim gaps ([1e8b7b8](https://github.com/ScriptedAlchemy/tracedecay/commit/1e8b7b83673c2d430cffc2fe612c468ef6637f50))
+* **dashboard:** drop controls that cannot finish ([bbc60d0](https://github.com/ScriptedAlchemy/tracedecay/commit/bbc60d0b00348310a4bb7fbb507f98ac6c43c426))
+* **dashboard:** exhaust delivery coverage states ([c11caae](https://github.com/ScriptedAlchemy/tracedecay/commit/c11caae1514c937d95a2dcd5b95e3e2fe10cea20))
+* **dashboard:** poll while the first index is mounting ([e8e5a3c](https://github.com/ScriptedAlchemy/tracedecay/commit/e8e5a3cd72fd9ca93793eec803810f4adeb45f0d))
+* **dashboard:** preserve moving builds and readable relief regions ([663fffe](https://github.com/ScriptedAlchemy/tracedecay/commit/663fffe75c3d989b4365667f678e6497c704ea97))
+* **dashboard:** preserve moving builds and readable relief regions ([36ccff8](https://github.com/ScriptedAlchemy/tracedecay/commit/36ccff8cef3da2f54e54c14adf5cbc8b1d347fad))
+* **dashboard:** reconcile final lookbook integrations ([1576094](https://github.com/ScriptedAlchemy/tracedecay/commit/157609459f24abaa8a375ba8cf5ccac5e6be9549))
+* **dashboard:** reconcile lookbook feature contracts ([9ed3058](https://github.com/ScriptedAlchemy/tracedecay/commit/9ed305827d6dc321f7077a25811d98122e166daf))
+* **dashboard:** reflow Costs aperture and keep query register visible ([4bc6c11](https://github.com/ScriptedAlchemy/tracedecay/commit/4bc6c11d43f18f6809ee90d24e790ef718e97b08))
+* **dashboard:** unify shared evidence grade contracts ([da00b45](https://github.com/ScriptedAlchemy/tracedecay/commit/da00b4587d9937ae18e92bf3b6d8fb4984a04cad))
+* **delivery:** keep unmeasured divergence unsupported ([fd0ca95](https://github.com/ScriptedAlchemy/tracedecay/commit/fd0ca95c6b7460f1a3299ac0105cd7fe7ba23f76))
+* **delivery:** measure outcome field, stack coincident marks ([39ae360](https://github.com/ScriptedAlchemy/tracedecay/commit/39ae360edf17fc39bd3c7cbe2b54482a2bdf853b))
+* **delivery:** pass inbox request control without Extension wrap ([6e276b2](https://github.com/ScriptedAlchemy/tracedecay/commit/6e276b29355a3b526ff906bced03e2365a9bfec0))
+* **delivery:** preserve Denied proximity and skip shared-code promotion ([de4d320](https://github.com/ScriptedAlchemy/tracedecay/commit/de4d32076f7338a12ea8b4b4411aa962c88a2dc5))
+* **delivery:** preserve partial and stale proximity coverage ([e11552c](https://github.com/ScriptedAlchemy/tracedecay/commit/e11552c20df844bd50a7655a3b60862554465ca3))
+* **delivery:** preserve proximity decode failures ([d1586e4](https://github.com/ScriptedAlchemy/tracedecay/commit/d1586e4aebbfb1999ea91ec46efccccc794f99cb))
+* **delivery:** preserve proximity decode failures ([ce248a4](https://github.com/ScriptedAlchemy/tracedecay/commit/ce248a41eb7a12058fcfd8523d295f7e70b0a9c7))
+* **delivery:** type the all-omitted and not-configured inbox states ([ac0c7a9](https://github.com/ScriptedAlchemy/tracedecay/commit/ac0c7a90f749a6750144056c62f8e0188c11fecc))
+* **delivery:** wrap mode tabs at narrow widths ([352988f](https://github.com/ScriptedAlchemy/tracedecay/commit/352988f5be74525c157da3c77d0a1565535c9614))
+* **docs:** reserve rustdoc output for the public library ([059070a](https://github.com/ScriptedAlchemy/tracedecay/commit/059070a6010a0f99728275c7714cc5196d79e92e))
+* **doctor:** preserve convergence details in text output ([d99cb1b](https://github.com/ScriptedAlchemy/tracedecay/commit/d99cb1b8b3b342a10ec54229b886505985a5f76a))
+* **doctor:** preserve convergence details in text output ([cb51bbe](https://github.com/ScriptedAlchemy/tracedecay/commit/cb51bbe7f3a735be4b38f5ef6f8161b76942e285))
+* **doctor:** prove daemon and store health from the artifact ([4de82b0](https://github.com/ScriptedAlchemy/tracedecay/commit/4de82b03e728f6d1e3e2ffa6af20a32061ec8818))
+* **evals:** default hermetic runs to their own checkout ([d6d7e41](https://github.com/ScriptedAlchemy/tracedecay/commit/d6d7e4118b3d7ce77cf07ad838958fb5d4d939e7))
+* **explorer:** clip the lane footer watermark ([c5cf8c8](https://github.com/ScriptedAlchemy/tracedecay/commit/c5cf8c87ed26582a364b317d29d76caa2a82d446))
+* **explorer:** keep facet selects inside the aperture at 320px ([5c1e74c](https://github.com/ScriptedAlchemy/tracedecay/commit/5c1e74c0a3b0b896af33f58357b11273ab1b7684))
+* **explorer:** report scope refusal in the run register ([5c3aada](https://github.com/ScriptedAlchemy/tracedecay/commit/5c3aadad41c8f378268632007cca17f3f69d9c44))
+* **explorer:** stack wrapped lanes, align lane headers, add hover halo ([e67e488](https://github.com/ScriptedAlchemy/tracedecay/commit/e67e48846eb1183497b4089e7aedde42bf8a4107))
+* **global-db:** refuse non-final temporal schemas ([d7eb232](https://github.com/ScriptedAlchemy/tracedecay/commit/d7eb232b688a513051d738370690a93cb1ea1c0d))
+* **graph-db:** clear tip Clippy and sdk packages reds ([b4c9dcf](https://github.com/ScriptedAlchemy/tracedecay/commit/b4c9dcf6d3742a985bcd54a5ecb32670777d2c5c))
+* **hooks:** bound worktree discovery instead of an open git walk ([52e7ae0](https://github.com/ScriptedAlchemy/tracedecay/commit/52e7ae0a8d2ccc32b667740d997f40ceb88a7126))
+* **hooks:** bound worktree discovery instead of an open git walk ([97f97d7](https://github.com/ScriptedAlchemy/tracedecay/commit/97f97d7afb297839975ff5e14289f5ba67e552dd))
+* **hosts:** give each host its own bundle journal and lock ([9a609b9](https://github.com/ScriptedAlchemy/tracedecay/commit/9a609b92da43a98ebdc5c0af2c4532fc7f86fdf7))
+* **hosts:** release advisory writer locks explicitly ([e39201a](https://github.com/ScriptedAlchemy/tracedecay/commit/e39201a0286e73e49655eb4a2be0f0a798535434))
+* **hosts:** release advisory writer locks explicitly ([04fdbbd](https://github.com/ScriptedAlchemy/tracedecay/commit/04fdbbd3c19a61f337dfdd4d064e854500d298c4))
+* **kiro:** close doctor migration advisory gaps ([8ef8fd0](https://github.com/ScriptedAlchemy/tracedecay/commit/8ef8fd03d38ddcd5a3029221cfebba5ee71525fe))
+* **kiro:** emit doctor migration advisories for retired globals ([1da3507](https://github.com/ScriptedAlchemy/tracedecay/commit/1da35073d9855d269cff949c5eca8b1cd552f47d))
+* **knowledge:** keep the ledger in view and inspect on pointer movement ([710eca8](https://github.com/ScriptedAlchemy/tracedecay/commit/710eca8baef722373c366314b25c189051174bce))
+* **knowledge:** let inspector provenance terms wrap in the bay ([216d450](https://github.com/ScriptedAlchemy/tracedecay/commit/216d4503ceb9f2e478c057409381d4da2d995a86))
+* **loom:** meet the touch-target floor on dense rows ([573a27a](https://github.com/ScriptedAlchemy/tracedecay/commit/573a27ad8d58ae05a7821607478562a7b15c34ee))
+* **loom:** reveal nothing past a dated playback cursor ([00e5f6e](https://github.com/ScriptedAlchemy/tracedecay/commit/00e5f6e8d206eb3dd03027f1b4f08c5c47348f69))
+* **lsp:** bound rustup probes and gate them on rustup &gt;= 1.28.1 ([b919b06](https://github.com/ScriptedAlchemy/tracedecay/commit/b919b06f93d568bb04edf23725b6dc5899c9c3fb))
+* **lsp:** clear a recorded launch refusal on the next successful probe ([3f9f260](https://github.com/ScriptedAlchemy/tracedecay/commit/3f9f26072ef1491ee60b9992eb1ddaecfb05c733))
+* **lsp:** evict a retained launch its refresh could not start ([e4ab7c7](https://github.com/ScriptedAlchemy/tracedecay/commit/e4ab7c7f7a48c13deb8fd47c6a41f046fde11a15))
+* **lsp:** keep prewarm cargo and failed probes install-free ([16d16e4](https://github.com/ScriptedAlchemy/tracedecay/commit/16d16e4ba8c8a1e162309f35355de3777a8e0192))
+* **lsp:** record failed admission probes as unavailable ([f52e65a](https://github.com/ScriptedAlchemy/tracedecay/commit/f52e65a734da8636111718ae8ef3a5ab792c8178))
+* **lsp:** resolve the analyzer launch per workspace root ([8d851bc](https://github.com/ScriptedAlchemy/tracedecay/commit/8d851bc800fe6958de1dac75458e29c8b7eb784a))
+* **lsp:** run compile-diagnostics cargo with RUSTUP_AUTO_INSTALL=0 ([b4e912d](https://github.com/ScriptedAlchemy/tracedecay/commit/b4e912d1417f8802ffb19c9eb2b52ddc833fbfca))
+* **mcp:** assert retired clone-lane opaque reasons gone ([2961427](https://github.com/ScriptedAlchemy/tracedecay/commit/2961427c968102d0ed34c0fda15865d9039a35da))
+* **mcp:** backtick proximity kinds in delivery adapter doc ([f3b1d77](https://github.com/ScriptedAlchemy/tracedecay/commit/f3b1d7781c7244f52727f86671ba5386e8b3ca09))
+* **mcp:** bound initialize discovery on one parent deadline ([49d7f64](https://github.com/ScriptedAlchemy/tracedecay/commit/49d7f6460b287f6e4fc4211420827b703885f0b3))
+* **mcp:** bound initialize discovery on one parent deadline ([20cc517](https://github.com/ScriptedAlchemy/tracedecay/commit/20cc517a0f0b78ebf6ab06e085f9229c9f6a5223))
+* **mcp:** fail Hermes hook captures on skipped sources ([f27f919](https://github.com/ScriptedAlchemy/tracedecay/commit/f27f919e6fc0ef170aaf1da6e9b5de7057b36958))
+* **mcp:** keep injected agent context on summaries ([a7a3a7e](https://github.com/ScriptedAlchemy/tracedecay/commit/a7a3a7ec9e28580899f2c94566bc6930e9f85151))
+* **mcp:** pin demand unavailable causes at host wire ([9e711e4](https://github.com/ScriptedAlchemy/tracedecay/commit/9e711e4b4f0f471496e9c0a233649987f7959962))
+* **mcp:** render schema resource from admitted DDL ([cb2b432](https://github.com/ScriptedAlchemy/tracedecay/commit/cb2b4321b6606bd317b9e5f572dac598ff9b382e))
+* **mcp:** restore status ingest and schema catalog contracts ([e9e186a](https://github.com/ScriptedAlchemy/tracedecay/commit/e9e186ade069f5f6dbe2e800a9c6d5bfc319a730))
+* **mcp:** route missing clone lanes through the reason enum ([b67c0bc](https://github.com/ScriptedAlchemy/tracedecay/commit/b67c0bc3966bad56f00fd5fdbb890123e62a4f13))
+* **mcp:** unify clone lane unavailable wire protocol ([0872941](https://github.com/ScriptedAlchemy/tracedecay/commit/0872941abf21c64c6b40fc5c56fd39fdef2b2e8b))
+* **memory:** mark transport barrier content as feature-bound ([417831a](https://github.com/ScriptedAlchemy/tracedecay/commit/417831a1742f85d63d22892ca543094c3c611757))
+* **observatory:** cluster crowded timeline reads and pin the inspector ([68d480b](https://github.com/ScriptedAlchemy/tracedecay/commit/68d480b61e4e6419890c9694d0b93c05a0b144b7))
+* **private-fs:** match rename contract to null-root payload ([30f07e8](https://github.com/ScriptedAlchemy/tracedecay/commit/30f07e874b0b08876c1d88cc6fe10b851f074b7c))
+* **query:** cancel candidate work at bounded batch checkpoints ([e221b91](https://github.com/ScriptedAlchemy/tracedecay/commit/e221b911d32e725f94915d2f4f5f958decd84012))
+* **query:** preserve callable and rebuild cancellation ([2aff0f6](https://github.com/ScriptedAlchemy/tracedecay/commit/2aff0f6f6f702497bc4e5b073fe153b246632234))
+* **query:** stamp serving gen on in-memory projection rows ([a5b06f4](https://github.com/ScriptedAlchemy/tracedecay/commit/a5b06f47540aff778d1cff844eb8f32470e24b68))
+* **query:** stamp serving gen on in-memory projection rows ([207d6ad](https://github.com/ScriptedAlchemy/tracedecay/commit/207d6ad0c1c92eefad59615c7cd68084af183f47))
+* **redesign:** clear integrated compile errors ([7cbbe7d](https://github.com/ScriptedAlchemy/tracedecay/commit/7cbbe7d47748d0c9a1ac0ab4dfb1519d7e5b5a2a))
+* **redesign:** close outstanding review findings ([878ae3e](https://github.com/ScriptedAlchemy/tracedecay/commit/878ae3ee5524955ba37e8500b69c1c1b10bc23d1))
+* **release:** stop beta releases bumping the SDK ([46d9e1e](https://github.com/ScriptedAlchemy/tracedecay/commit/46d9e1e80f726ed43db37c99f90949d19d09714a))
+* **review:** close remaining scheduler and dashboard findings ([d4faefb](https://github.com/ScriptedAlchemy/tracedecay/commit/d4faefbfa7e5716a1d255b15172c0d90a87605d3))
+* **review:** close remaining scheduler and dashboard findings ([2b166c5](https://github.com/ScriptedAlchemy/tracedecay/commit/2b166c5715fa8600b849282be37f92925ef121da))
+* **review:** close remaining scheduler and dashboard findings ([8467dbc](https://github.com/ScriptedAlchemy/tracedecay/commit/8467dbc0c0aba40ab7107051c810bb5eed11d9a9))
+* **sdk:** regenerate TS ops for similar wire aliases ([0c45808](https://github.com/ScriptedAlchemy/tracedecay/commit/0c4580867bc7b8b13e5a8f5fd61e21c228851f39))
+* **sdk:** regenerate TS ops for similar wire aliases ([60f535a](https://github.com/ScriptedAlchemy/tracedecay/commit/60f535a36db971aa089726df4c24ef3ccf44c495))
+* **search-quality:** derive offline from run evidence ([cf086d0](https://github.com/ScriptedAlchemy/tracedecay/commit/cf086d0315d93dec5a084495f78096a5373e1ee3))
+* **session-runtime:** pass profile refresh status into retrieval ([e26fa0c](https://github.com/ScriptedAlchemy/tracedecay/commit/e26fa0c8d8be1624264d529f8152c0466eb24dd6))
+* **session-runtime:** refuse RequireFresh without a refresh worker ([630702a](https://github.com/ScriptedAlchemy/tracedecay/commit/630702adb4cfd27890f39c07f3cefdb893fa15a5))
+* **session-runtime:** refuse RequireFresh without a refresh worker ([c6a217a](https://github.com/ScriptedAlchemy/tracedecay/commit/c6a217aff8b77e29a8883821ec1d6f032e3b166b))
+* **sessions:** do not treat a missing refresh worker as catch-up ([5d6929a](https://github.com/ScriptedAlchemy/tracedecay/commit/5d6929a690502ebd67308e4464a88d205e1dd5ea))
+* **sessions:** do not treat a missing refresh worker as catch-up ([c54b94b](https://github.com/ScriptedAlchemy/tracedecay/commit/c54b94b0f280ec42f09c161d4a1e0479803d780c))
+* **sessions:** preserve health reads during writes ([5e5453c](https://github.com/ScriptedAlchemy/tracedecay/commit/5e5453ca11ef200d5d6817092100e38269afe97c))
+* **sessions:** preserve health reads during writes ([8c1553e](https://github.com/ScriptedAlchemy/tracedecay/commit/8c1553eb3e5d17dcb4423d03a6e4072601e540cb))
+* **settings:** guard in-flight writes and keep focus in the edited input ([de613c1](https://github.com/ScriptedAlchemy/tracedecay/commit/de613c19a532b666d2204b4be60f4d24ea534e6a))
+* **settings:** keep held reviews visible after their panel closes ([33790c3](https://github.com/ScriptedAlchemy/tracedecay/commit/33790c36cb9143b6ae371a7caa208046d3926388))
+* **shell:** let register qualifiers yield below 2xl ([2708dca](https://github.com/ScriptedAlchemy/tracedecay/commit/2708dca37671d391b4857dbbaf718955980e403a))
+* **skills:** preserve executable mirror modes ([b55062b](https://github.com/ScriptedAlchemy/tracedecay/commit/b55062b8a1d7ccd9aa42accbadc27972febb4772))
+* **sqlite:** bound busy begin below idle lease ([68dd9df](https://github.com/ScriptedAlchemy/tracedecay/commit/68dd9df6cf89d62022fbf5c056246ccc21966eb2))
+* **sqlite:** wait on idle deadline for busy begin retries ([e317e78](https://github.com/ScriptedAlchemy/tracedecay/commit/e317e787de3a75e38e1d892fa6ca6d933e0b08ba))
+* **sqlite:** wait on idle deadline for busy begin retries ([1fa09a7](https://github.com/ScriptedAlchemy/tracedecay/commit/1fa09a72d2b3afb4f2d7de69660445ab3bc02b91))
+* **storage:** admit the live dogfood staging shape ([f6b85a8](https://github.com/ScriptedAlchemy/tracedecay/commit/f6b85a89c0e5041cf179e5e599af52fee7a18623))
+* **storage:** preserve released project stores without reset ([6948293](https://github.com/ScriptedAlchemy/tracedecay/commit/69482932bade4faae8f3567069ebe0ce8ee735e8))
+* **storage:** preserve released project stores without reset ([3c56c62](https://github.com/ScriptedAlchemy/tracedecay/commit/3c56c62063b3984db9d2a340c9fef433404d810d))
+* **storage:** time migration chunk headroom on the statement ([d72898b](https://github.com/ScriptedAlchemy/tracedecay/commit/d72898b6ce955e70d761aca120a335b646837b97))
+* **test:** gate skip-reason import on test-transport ([045a725](https://github.com/ScriptedAlchemy/tracedecay/commit/045a725479ea89c3b8765cfde8559cd91fcafbba))
+* **text-artifact:** charge successor batches from reservation ledger ([5d0874c](https://github.com/ScriptedAlchemy/tracedecay/commit/5d0874c934745b433c04f30d28118dca4b17b74c))
+* **tool-sweep:** reject unavailable plain-text resources ([cd99e40](https://github.com/ScriptedAlchemy/tracedecay/commit/cd99e40fea14ab7e02e1ea8edbc8384cf063a586))
+* **tool-sweep:** reject unavailable plain-text resources ([ef28e96](https://github.com/ScriptedAlchemy/tracedecay/commit/ef28e969bd63765d0d165a0051836e7da0374776))
+* **transport:** clear LCM, proxy, codex, partial, rebuild reds ([7bdc33d](https://github.com/ScriptedAlchemy/tracedecay/commit/7bdc33d3cb1646cc3fc96809485a80398ef5db38))
+* **types:** close skip-reason and park identity drift ([11ff972](https://github.com/ScriptedAlchemy/tracedecay/commit/11ff9729af3eebd874f0106ff2fd244080099923))
+* **ui-code:** commit cortex contours to coupling ratio ([21e7abc](https://github.com/ScriptedAlchemy/tracedecay/commit/21e7abce249490e4c5ed764565889c91e6349d28))
+* **ui-code:** poll real builds and fold crowded cortex ([4c43f3a](https://github.com/ScriptedAlchemy/tracedecay/commit/4c43f3ab2734eed89d5ab447a7479a06b10c6626))
+* **ui-code:** poll real builds and fold crowded cortex ([7f7d45c](https://github.com/ScriptedAlchemy/tracedecay/commit/7f7d45cb0942dce77d0ebff686b3a0216b2ecfc2))
+* **ui-code:** poll while source verification is active ([e0da20c](https://github.com/ScriptedAlchemy/tracedecay/commit/e0da20c39fba3fd91b30874fb34e3239fe53a77b))
+* **ui-code:** refresh all-scope freshness and keep stratum population ([7b50e6a](https://github.com/ScriptedAlchemy/tracedecay/commit/7b50e6a9ce34377a5761737d2bec7c4ada68e6a9))
+* **ui-code:** restore space-driven cortex radius ([08d61ae](https://github.com/ScriptedAlchemy/tracedecay/commit/08d61ae6ab22aa1c0cfa60a70d372a9968cb3ce4))
+* **work:** fit wide graphs to the field and wrap grade chips ([feb2eb7](https://github.com/ScriptedAlchemy/tracedecay/commit/feb2eb719529cc0e28f5fa5645e456e840de2c0c))
+* **workflows:** fit ledger tables inside their bays ([0f11370](https://github.com/ScriptedAlchemy/tracedecay/commit/0f11370344cc3147359db70bab898204836d70a5))
+* **workflows:** keep definition facts unclipped in the centre bay ([863e57a](https://github.com/ScriptedAlchemy/tracedecay/commit/863e57aefad6295546136ac414ea7eb0845fb012))
+* **work:** replay synthesis before hydrating source context ([5fa23f7](https://github.com/ScriptedAlchemy/tracedecay/commit/5fa23f733795fef98d7a733114b9ef6a36fd3d07))
+* **work:** replay synthesis before hydrating source context ([7a39c70](https://github.com/ScriptedAlchemy/tracedecay/commit/7a39c7010c7527ee4c554084aa85de02ff951efd))
+
+
+### Performance Improvements
+
+* **ci:** avoid process imports for monotonic clock probes ([2a503be](https://github.com/ScriptedAlchemy/tracedecay/commit/2a503be870e73527b533b3ec60acb58815b48e8a))
+* **clones:** land parent-delta Arc-share envelope stack ([d9dfca5](https://github.com/ScriptedAlchemy/tracedecay/commit/d9dfca5e0b664bdb889b440811d63db2ae724443))
+* **clones:** land parent-delta Arc-share envelope stack ([5fef3cc](https://github.com/ScriptedAlchemy/tracedecay/commit/5fef3cc809bff6a7fd86eac8ba2112056797a75c))
+* **clones:** seal reused complement without storing rows ([4d95906](https://github.com/ScriptedAlchemy/tracedecay/commit/4d95906c846c6c73520be24b1020f1b2895d9ae3))
+* **code-index:** Arc-share unchanged file pages on carry ([fa64253](https://github.com/ScriptedAlchemy/tracedecay/commit/fa64253948c6db107f39b083a9f6f62a4ee7a3f2))
+* **code-index:** Arc-share unchanged file pages on carry ([734cc0d](https://github.com/ScriptedAlchemy/tracedecay/commit/734cc0d2436d9ed47f6b1404eba7b079f8855ab7))
+* **code-index:** flat published-generation Arc-share assemble ([fbf0d98](https://github.com/ScriptedAlchemy/tracedecay/commit/fbf0d98a7e7861975d58822a70e27e1bc5859f87))
+* **code-index:** flat published-generation Arc-share assemble ([4a1c0e7](https://github.com/ScriptedAlchemy/tracedecay/commit/4a1c0e793926faf2df1ec50f6640192c2b142a6a))
+* **code-index:** merge parent deltas in one pass ([8608232](https://github.com/ScriptedAlchemy/tracedecay/commit/8608232f579d155ed15a6a2c6513c793eb584648))
+* **code-index:** parent-sealed Arc-share reuse under envelope ([bcae388](https://github.com/ScriptedAlchemy/tracedecay/commit/bcae388243508d99539edb1ad355a1f3ce196509))
+* **code-index:** parent-sealed Arc-share reuse under envelope ([6c7d3f3](https://github.com/ScriptedAlchemy/tracedecay/commit/6c7d3f3bd739cc2388fe1b30171915321f4c1ff0))
+* **code-index:** seal full_replay as parent-delta digest ([989a5d7](https://github.com/ScriptedAlchemy/tracedecay/commit/989a5d77fa9b586f82b1cf58d51999f0df7ec57b))
+* **code-index:** seal full_replay as parent-delta digest ([16ca243](https://github.com/ScriptedAlchemy/tracedecay/commit/16ca2434d1c74644a79cdc7068bb9903c0eadda6))
+* **code-index:** seal reused complement without storing rows ([2415b9d](https://github.com/ScriptedAlchemy/tracedecay/commit/2415b9dd9669557068723137403ec47f6a6bbc2e))
+* **code-index:** seal reused complement without storing rows ([c6a118c](https://github.com/ScriptedAlchemy/tracedecay/commit/c6a118c6d8e6ca1bf5c3b4af3a9fcb9ee3e686c9))
+* **dashboard:** overlap delivery inbox project reads ([672132e](https://github.com/ScriptedAlchemy/tracedecay/commit/672132e566de37b604806b3b96c2c32fbc114bbf))
+* **query:** avoid cloning admitted lexical scores twice ([22cd13b](https://github.com/ScriptedAlchemy/tracedecay/commit/22cd13b6fcc8d0ce8d5ea4a326c7c19b4728320b))
+* **query:** avoid cloning admitted lexical scores twice ([f78da6b](https://github.com/ScriptedAlchemy/tracedecay/commit/f78da6bc6bdadbd035e55d3a53d1de025ece4dd9))
+* **text-artifact:** commit clone-successor pages in batches ([fd500ec](https://github.com/ScriptedAlchemy/tracedecay/commit/fd500ece0292e09fde486980dfe0d1c3a4380b94))
+
+
+### Reverts
+
+* **sqlite:** drop busy-begin idle-deadline change from lsp lane ([fae97ca](https://github.com/ScriptedAlchemy/tracedecay/commit/fae97ca4429eccec2aa006bbbe0d77377a55feea))
+
 ## [0.1.0-beta.39](https://github.com/ScriptedAlchemy/tracedecay/compare/v0.1.0-beta.38...v0.1.0-beta.39) (2026-09-17)
 
 
diff --git a/CLAUDE.md b/CLAUDE.md
index 99b5abbc08..eb687d5aa6 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,7 +1,3 @@
 # Claude Notes
 
 See [AGENTS.md](AGENTS.md) for repository guidance.
-
-Run plain `cargo <subcommand>` through the configured build broker. Do not prefix
-with `kache` or set `CARGO_TARGET_DIR`; use the installed cargo-hauler guidance
-when submitting or waiting on builds.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7d8c7cf73a..8343ccf630 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,11 +7,17 @@ Thanks for your interest in contributing! This guide covers everything you need
 ```bash
 git clone https://github.com/ScriptedAlchemy/tracedecay.git
 cd tracedecay
-cargo build
-cargo nextest run --workspace --all-features --no-fail-fast
+cargo build -p tracedecay-cli
+cargo test-ci
 ```
 
-Requires **Rust 1.85+** (edition 2024) and **Node.js 22+ with npm**.
+Use the Rust toolchain pinned in `rust-toolchain.toml` (edition 2024) and
+**Node.js 22+ with npm**. Install `cargo-nextest` to run the `test-ci` and
+`test-all` aliases defined in `.cargo/config.toml`. Commands below run from the
+repository root unless noted.
+
+Use your current checkout; no particular absolute path or historical PR branch
+is required. See [AGENTS.md](AGENTS.md) for checkout safety and shared-work rules.
 
 The dashboard bundle at `dashboard/app-dist/` is generated output and is
 git-ignored, so a fresh clone has none. The CLI build script
@@ -52,46 +58,52 @@ This tree map is for source orientation only. The
 precedence and acceptance.
 
 ```
-src/             Main tracedecay crate (daemon, MCP tools, sessions, application)
-crates/          Workspace members (code-extraction, graph-db, domain, hosts, …)
-dashboard/       Embedded React dashboard
-plugin/          Host bundles (Claude, Codex, Cursor, Kimi, OpenCode)
-tests/           Integration suites
-docs/            Design docs and the V2 roadmap
+crates/tracedecay/     Composition-root library and its integration suites
+crates/tracedecay-cli/ Shipped tracedecay binary and CLI integration suites
+crates/               Workspace members (code-extraction, graph-db, domain, hosts, …)
+dashboard/            Embedded React dashboard
+plugin/               Host bundles (Claude, Codex, Cursor, Kimi, OpenCode)
+tests/                Shared fixtures, distribution suites, and cross-crate gates
+docs/                 Design docs and the V2 roadmap
 ```
 
 ## Feature Flags
 
-tracedecay supports more than 50 languages. `Cargo.toml` is the source of truth
-for the exact feature membership:
+tracedecay supports more than 50 languages. The root `Cargo.toml` is a virtual
+workspace, not a package. `crates/tracedecay-cli/Cargo.toml` and
+`crates/tracedecay/Cargo.toml` expose the language tiers;
+`crates/tracedecay-code-extraction/Cargo.toml` owns grammar feature membership:
 
 | Feature | Coverage |
 |---------|----------|
 | `lite` | Core extractors such as Rust, Go, Java, TypeScript/JS, Python, C/C++, Kotlin, C#, and Swift |
 | `medium` | `lite` plus Dart, Pascal, PHP, Ruby, Bash, Protobuf, PowerShell, Nix, and VB.NET |
-| `full` (default) | `medium` plus all remaining `lang-*` features listed in `Cargo.toml` |
+| `full` (default) | `medium` plus the remaining grammars selected by the extractor crate's `full` feature |
 
 Build with fewer languages for faster compile times during development:
 
 ```bash
-cargo build --no-default-features --features lite
-cargo nextest run --no-default-features --features lite
+cargo build -p tracedecay-cli --no-default-features --features lite
+cargo nextest run -p tracedecay-code-extraction --no-default-features --features lite
 ```
 
 ## Making Changes
 
-1. **Fork and branch** from `master` for stable changes, `beta` for experimental features.
-2. **Write tests.** Every extraction change should have a corresponding test in `tests/`. Follow the existing pattern: create a fixture in `tests/fixtures/` and assert on extracted nodes/edges.
-3. **Run the full test suite** before submitting:
+1. **Use the task's branch**, or branch from `master` for a new contribution. Confirm the target before working on a release-channel branch.
+2. **Write tests in the owning crate.** Extraction changes belong with `crates/tracedecay-code-extraction/`; follow nearby inline tests or crate-local integration suites and assert on extracted nodes/edges.
+3. **Run focused tests** for the affected behavior, then broaden for unresolved risk. Documentation-only edits do not require application builds. For the hosted acceptance selection:
    ```bash
-   cargo nextest run --workspace --all-features --no-fail-fast
+   cargo test-ci
    ```
    Cargo-launched test processes are isolated from your real `~/.tracedecay`
    profile: `.cargo/config.toml` pins `TRACEDECAY_DATA_DIR` to
    `target/test-profile/.tracedecay` (enforced by
-   `tests/core_cli_suite/test_profile_isolation_test.rs`). Tests that need a private profile
+   `crates/tracedecay-cli/tests/core_cli_suite/test_profile_isolation_test.rs`). Tests that need a private profile
    should still override it per-test, e.g. via
    `common::TraceDecayStorageEnvGuard` or `common::apply_tracedecay_home_env`.
+   `cargo test-all` additionally enables every optional feature; it is broader
+   than the hosted selection. Check each suite's `required-features` before
+   selecting it and confirm that the run executed tests rather than matching zero.
 4. **Format your code** with the standard Rust toolchain:
    ```bash
    cargo fmt
@@ -115,8 +127,8 @@ cargo clippy --workspace --all-targets
 ```
 
 This check is blocking in CI: the workflow fails if `cargo clippy --workspace
---all-targets` exits non-zero. The crate-level lint policy in `src/lib.rs`
-currently denies `clippy::all`, `clippy::unwrap_used`, and
+--all-targets` exits non-zero. The composition-root lint policy in
+`crates/tracedecay/src/lib.rs` currently denies `clippy::all`, `clippy::unwrap_used`, and
 `clippy::expect_used`; new violations of those lints must be fixed or justified
 with the narrowest practical `#[allow(...)]` at the affected item. Do not add a
 broad allow or weaken the crate policy just to get CI green.
@@ -127,8 +139,8 @@ but they do not block CI unless a future policy change promotes a specific lint
 to `deny`.
 
 There is no separate Clippy baseline file today. If a policy change intentionally
-promotes additional advisory lints to blocking, update `src/lib.rs`, fix or
-narrowly allow the existing violations in the same change, and update this
+promotes additional advisory lints to blocking, update the owning crate's lint
+policy, fix or narrowly allow the existing violations in the same change, and update this
 section so the contributor command and blocking/advisory split still match CI.
 
 ## Adding a New Language Extractor
@@ -136,9 +148,14 @@ section so the contributor command and blocking/advisory split still match CI.
 1. Add a tree-sitter grammar dependency (or vendor it under `vendor/`).
 2. Create `crates/tracedecay-code-extraction/src/{lang}_extractor.rs` implementing the `LanguageExtractor` trait.
 3. Register it in `LanguageRegistry` with a feature flag (e.g., `lang-{name}`) in that crate's `lib.rs` and `Cargo.toml`.
-4. Add a test module `crates/tracedecay-code-extraction/tests/{lang}.rs` (inline source or a fixture under `crates/tracedecay-code-extraction/fixtures/`).
+4. Add a test module under `crates/tracedecay-code-extraction/tests/main/` and register it in that directory's `main.rs`; follow nearby source and fixture patterns.
 5. Update the feature flag tables in that crate's `Cargo.toml` and this document.
 
+When sharing traversal helpers, preserve child ordering, named versus anonymous
+node handling, and direct-child versus descendant semantics. Compare against
+`crates/tracedecay-code-extraction/src/traversal.rs` and keep language-specific
+behavior local; cover the consuming extractor before and after consolidation.
+
 ## Validating Plugins and Skills
 
 Changes under `plugin/` or `crates/tracedecay-agent-hosts/` are covered
@@ -148,7 +165,7 @@ schema-validation workflow. `plugin/skills/` is the shared source of truth for
 bundled skills — do not fork host-specific copies. Before submitting, run:
 
 ```bash
-cargo nextest run -E 'binary(=agent_suite)'
+cargo nextest run -p tracedecay --features test-helpers --test agent_suite
 ```
 
 See [`docs/PLUGIN-VALIDATION.md`](docs/PLUGIN-VALIDATION.md) for the full
@@ -160,9 +177,9 @@ ecosystem bundle correctly.
 `dashboard/src/contracts/generated.ts`, `dashboard/src/contracts/index.ts`, and
 `dashboard/codegen/schemas/dashboard-contracts.schema.json` are generated, not
 hand-written. The Rust `schemars` output is authoritative: the codegen CLI
-shells out to `cargo test --test dashboard_contract_schema_export -- --ignored
-writes_dashboard_contract_schema`, regenerates all three files, and compares
-them byte-for-byte with what is committed.
+exports the schema through the `tracedecay-dashboard-api` library's ignored
+`contract_schema::tests::writes_dashboard_contract_schema` test, regenerates all
+three files, and compares them byte-for-byte with what is committed.
 
 After changing any Rust type that crosses the dashboard API boundary:
 
@@ -184,14 +201,14 @@ contract change instead.
 ## Running Specific Tests
 
 ```bash
-# All extractor tests for a specific language (a module of the `main` test binary)
+# All extractor tests for a specific language
 cargo nextest run -p tracedecay-code-extraction --test main -E 'test(/^rust::/)'
 
 # A single test by name
-cargo nextest run test_find_stale_files
+cargo nextest run -p tracedecay-code-extraction --test main test_rust_file_node_is_root
 
 # Only sync-related tests
-cargo nextest run sync
+cargo nextest run -p tracedecay --features test-helpers sync
 ```
 
 ## Commit Messages
@@ -225,7 +242,8 @@ behavior.
 ## Pull Requests
 
 - Target `master` for bug fixes and stable features.
-- Target `beta` for experimental or breaking changes.
+- Confirm the target branch with the maintainer for release-channel work; do not
+  infer it from an archived plan or PR number.
 - Keep PRs focused — one logical change per PR.
 - Include test coverage for new behavior.
 - Do not hand-edit `CHANGELOG.md`; release automation generates it from
diff --git a/Cargo.lock b/Cargo.lock
index 889e0e66fa..5494c5a697 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5323,7 +5323,7 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracedecay"
-version = "0.1.0-beta.39"
+version = "0.1.0-beta.40"
 dependencies = [
  "axum",
  "constant_time_eq",
@@ -5601,7 +5601,7 @@ dependencies = [
 
 [[package]]
 name = "tracedecay-cli"
-version = "0.1.0-beta.39"
+version = "0.1.0-beta.40"
 dependencies = [
  "axum",
  "clap",
@@ -6345,7 +6345,7 @@ dependencies = [
 
 [[package]]
 name = "tracedecay-project"
-version = "0.1.0-beta.39"
+version = "0.1.0-beta.40"
 dependencies = [
  "hotpath",
  "rusqlite",
diff --git a/Cargo.toml b/Cargo.toml
index 5d05d33eb1..3770303407 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -63,7 +63,7 @@ resolver = "3"
 # inheritance table is the sanctioned single source of truth.
 [workspace.package]
 edition = "2024"
-version = "0.1.0-beta.39"
+version = "0.1.0-beta.40"
 
 [workspace.dependencies]
 # Opt-in profiler, pinned once for the whole workspace. Non-optional on purpose:
diff --git a/NOTES.md b/NOTES.md
deleted file mode 100644
index f7db595f87..0000000000
--- a/NOTES.md
+++ /dev/null
@@ -1,608 +0,0 @@
-# Lane notes — fable/test-prune
-
-## Lane status 2026-09-12
-
-Branch `fable/test-prune` (40 prune/style commits on top of the
-`fable/test-slop` floor 13452d3ea; `origin/fable/test-slop` is that floor
-itself, with no prune commits, and no prune commit had landed on the
-integration branch) was merged forward onto
-`origin/codex/tracedecay-total-redesign-plan-reopened` in three merge
-commits: 03427d2b48 (tip 84f29ec656, 117 conflicted files / 157 hunks),
-6fd74ec325 (tip 23dde7695d, 11 files / 14 hunks) and e8c8fa36b2 (tip
-0ebeedf7dc after #1241, 3 files / 3 hunks). Pushed as PR #1242.
-
-Rule applied to every conflict, per test item: a lane deletion stays only
-when the item is identical between the lane floor (95893a92a) and the tip,
-or the tip's only change was mechanical (rename, extra argument, import
-path, constant/prose update, rustfmt). Tests the tip changed to cover new
-behaviour keep the tip's version; tests the tip added stay untouched.
-
-### Kept the tip's version (lane deletion dropped)
-
-| crate / area | test | why |
-| --- | --- | --- |
-| tracedecay-code-index | `languages.rs::descriptor_lookups_are_canonical_and_deterministic` | tip pins the extractor revision |
-| tracedecay-mcp | `application_output/markdown.rs::canonical_markdown_golden_formats_only_the_supplied_view`, `application_output/view.rs::partial_evidence_extracts_the_typed_coverage_fields` | tip covers the new `Block` payload rendering |
-| tracedecay-private-fs | `sharing_violation_is_not_lock_contention` | new `windows()` assertion |
-| tracedecay-query | `lexical/tests.rs::candidate_sources_admit_rarest_first_within_the_document_budget` | tip adds the typed `CandidateSourcesPruned` partial outcome |
-| tracedecay-runtime-core | `branch_meta.rs::add_and_remove_branch` | new `is_query_eligible` assertions |
-| tracedecay-domain | `research/id.rs::integrity_digest_types_accept_supported_algorithms` | tip adds `hex_suffix` assertions |
-| tracedecay (mcp_suite) | `memory_facts_test::fact_store_reason_requires_an_entity_selection` | tip adds duplicate-entity denial |
-| tracedecay-agent-hosts | `kimi.rs::rendered_plugin_uses_kimi_supported_mcp_command` | tip-new test inside a module the lane had emptied |
-| scripts | `test-check-pr-dogfood-output.py::test_strict_accepts_graph_ready_bounded_prefix_with_more_symbols`, `test-linux-test-partitions.py::test_complete_disjoint_partition_passes` | tip refactored / extended them for config summaries and macOS groups |
-
-### Pruning re-applied at a moved location
-
-- `daemon/broker_stream_transport.rs` → `daemon/broker_stream_transport_tests.rs`:
-  `full_close_wait_ignores_request_half_close` (identical; duplicate of the
-  rmcp receive test).
-- `doctor/registry_drift.rs` → `tracedecay-maintenance/src/retention/diagnostics.rs`:
-  `orphan_finding` + three disposition→kind mapping tests (identical).
-- `src/mcp/tools/plugin_conformance_tests.rs` → `tests/product_surface_suite/plugin_conformance.rs`:
-  tip only renamed it; stays deleted.
-
-### Pruning dropped because the tip deleted the target itself
-
-`crates/tracedecay-cli/tests/core_cli_suite/host_cli_fixture.rs` (tip
-commit 16e2305a6) and 77 individual items the tip had already removed
-(`config/tests.rs`, `store_maintenance/mod.rs`, `handlers/info/status.rs`,
-`lifecycle/registry.rs`, … blocks).
-
-### Measured lib test counts (`cargo test --workspace --lib`, tip 8df152a7b vs merged)
-
-Crates with no change (capture, host-admission, privacy, sdk,
-semantic-contracts, tool-catalog) omitted.
-
-| crate | tip | merged | pruned |
-| --- | ---: | ---: | ---: |
-| tracedecay | 1082 | 994 | 88 |
-| tracedecay-agent-hosts | 649 | 490 | 159 |
-| tracedecay-api | 63 | 51 | 12 |
-| tracedecay-application | 649 | 596 | 53 |
-| tracedecay-automation | 64 | 42 | 22 |
-| tracedecay-automation-runtime | 507 | 442 | 65 |
-| tracedecay-code-extraction | 58 | 52 | 6 |
-| tracedecay-code-index | 260 | 176 | 84 |
-| tracedecay-code-index-retention | 93 | 92 | 1 |
-| tracedecay-code-index-runtime | 494 | 468 | 26 |
-| tracedecay-configuration | 70 | 63 | 7 |
-| tracedecay-contracts | 442 | 379 | 63 |
-| tracedecay-daemon-control | 118 | 86 | 32 |
-| tracedecay-daemon-identity | 25 | 24 | 1 |
-| tracedecay-daemon-protocol | 69 | 61 | 8 |
-| tracedecay-daemon-service | 280 | 260 | 20 |
-| tracedecay-dashboard-api | 236 | 169 | 67 |
-| tracedecay-domain | 238 | 215 | 23 |
-| tracedecay-framing | 9 | 6 | 3 |
-| tracedecay-global-db | 395 | 365 | 30 |
-| tracedecay-graph-db | 187 | 160 | 27 |
-| tracedecay-graph-query | 59 | 45 | 14 |
-| tracedecay-hooks | 83 | 82 | 1 |
-| tracedecay-host-integration | 8 | 7 | 1 |
-| tracedecay-lcm | 180 | 158 | 22 |
-| tracedecay-lsp | 217 | 183 | 34 |
-| tracedecay-maintenance | 161 | 130 | 31 |
-| tracedecay-mcp | 372 | 290 | 82 |
-| tracedecay-policy | 16 | 14 | 2 |
-| tracedecay-private-fs | 20 | 18 | 2 |
-| tracedecay-query | 341 | 310 | 31 |
-| tracedecay-runtime-core | 480 | 413 | 67 |
-| tracedecay-rusqlite-runtime | 374 | 353 | 21 |
-| tracedecay-search-eval | 44 | 43 | 1 |
-| tracedecay-semantic | 260 | 224 | 36 |
-| tracedecay-session-memory | 361 | 296 | 65 |
-| tracedecay-session-runtime | 115 | 107 | 8 |
-| tracedecay-session-temporal-store | 150 | 137 | 13 |
-| tracedecay-sessions | 701 | 563 | 138 |
-| tracedecay-source-edit | 93 | 85 | 8 |
-| tracedecay-store | 103 | 83 | 20 |
-| tracedecay-store-runtime | 149 | 139 | 10 |
-| tracedecay-temporal-query | 224 | 177 | 47 |
-| **total** | **10744** | **9293** | **1451** |
-
-Other suites: dashboard vitest 1774 → 1418 (157 files green,
-`tsc --noEmit` clean), `sdks/typescript` vitest 36 → 29 green,
-`scripts/test-*.py` 117 → 106 green. Integration test binaries
-(`crates/*/tests`) were compiled by `cargo check --workspace --all-targets`
-but not run or counted here.
-
-### Verification tickets (hauler)
-
-- cc-16731 / cc-16946 — `cargo check --workspace --all-targets`: 0 errors, 0 warnings.
-- cc-16734 (tip) / cc-16735 (merged) — `cargo test --workspace --lib --no-fail-fast`.
-  Both ran under load 67–103 on 96 cores and both were red; every
-  merged-only failure re-ran green in cc-16824, cc-16825, cc-16826,
-  cc-16827, cc-16828. Failures shared with the tip run
-  (`code_index_scheduler::*` deadline tests, `extract::tests::canonical_rows_digest_matches_pinned_identity`,
-  `partitioned_codec::tests::streamed_segment_projection_refuses_an_incomplete_descriptor_set`,
-  search-eval `report_tests::*`, `accepted_profile_authority::tests::portable_report_requires_the_current_workload_digest`,
-  `lsp_runtime::advisory_source_tests::incomplete_publication_remains_readable_without_consuming_completed_dedupe`,
-  `orphan_stores::tests::unregistered_store_sweep_reconciles_interrupted_quarantine`)
-  are tip-red, not introduced here.
-- cc-16947 — `cargo test --lib` agent-hosts / query / semantic / domain after the second merge: green.
-- cc-16952 — `cargo test -p tracedecay --lib daemon::core_doctor daemon::maintenance`: 40 passed.
-
-### Third merge (e8c8fa36b2, tip 0ebeedf7dc)
-
-Three conflicted files. `orphan_stores/tests.rs`: the lane deletion of
-`sweep_unregistered_stores_collects_an_exactly_empty_old_directory` stays
-(identical on tip); the tip-added
-`unregistered_store_with_a_vanished_manifest_root_is_collected_at_once`
-is kept. `host_bundle_acceptance.rs`: use-group only, the lane's trimmed
-`agents` import group stays because the two tests it served are unchanged
-on tip and remain deleted. `NOTES.md` (both added): this section stays on
-top, the #1103 text-build lane notes from tip follow.
-
-- cc-17119 — `cargo check --workspace --all-targets`: 0 errors, 0 warnings.
-- cc-17125 — `product_surface_suite host_bundle_acceptance`: 17 passed.
-- cc-17124 — `cargo test -p tracedecay-maintenance --lib`: 128 passed,
-  3 failed (`portable_inventory_*` timeouts under load 30–50; two of the
-  three were already red in the unmodified tip run cc-16734). cc-17153
-  re-ran the 6 `portable_inventory` tests single-threaded: 6 passed.
-
-### Undone
-
-- Integration suites (`--tests`) were type-checked only; their pruned
-  counts are not measured.
-
-# #1103 text-build lane — Fable lane notes
-
-Worktree: `/fast/tmp/td-text-build-1103` (branch `fable/text-build-1103`).
-Target: PR #707 branch `codex/tracedecay-total-redesign-plan-reopened`, merged at `8df152a7b` (measurements) and
-again at `9e07045ba0` (clean merge; gate/park/freshness tests, the query freeze test, and clippy re-verified there).
-Env: `TRACEDECAY_SKIP_DASHBOARD_BUILD=1 TRACEDECAY_DASHBOARD_BUNDLE_SHA256=806f5649351425b7f80dbb3e088d9032d747dc524922ddc3b823c4ba821f8a1f`.
-Not pushed; no PR.
-
-## Lane status 2026-09-12
-
-Journey: `daemon_suite indexing_lifecycle_test::mounted_incremental_lifecycle_preserves_only_complete_compatible_generations`
-(`cargo test -p tracedecay --features test-transport --test daemon_suite <name> -- --exact --test-threads=1`),
-45 s restart bound untouched. Machine load 40–70 on 96 cores throughout; every number below is under that load
-and the before/after pairs are the only fair comparison.
-
-**Before (merged tip `8df152a7b` + `8cb846989`, hauler cc-16667):** red. At the bound: text 417/772 files,
-`phase=bulk_commit`, 26.9 files/s, `last_commit_latency` 0.92 s/64-page batch, `code_graph_serving=pending`.
-
-**After (`b564e6e3e3`, cc-16936):** still red, but the owner moved. At the bound: text **772/772**, 196,622 chunks,
-`phase=index_build` (finalization), `code_graph_serving=ready`. The graph is no longer on the critical path; the
-text build (bulk 29 s + finalization ≈ 8 s + verification ≈ 2 s under this load) after a 13–19 s restart reconcile
-is what remains.
-
-Decomposition (Hotpath daemon `target/hotpath/debug/tracedecay` with `test-transport,hotpath`, cold index of the
-same 772-file tree = the post-restart phases; report json in `/tmp/td1103/run-hp{2,3}/hotpath.json`):
-
-| phase | before (hp2, load ~70) | after (hp3, load ~50) |
-| --- | --- | --- |
-| `code_index.reconcile.pass` (extract + assemble 5.9 s serial + publish) | 17.5 s | 20.6 s |
-| text build: `query.artifact.batch.scheduler_wake` ×24 | 64.5 s | 34.6 s |
-|  of which `batch.sqlite` / `batch.commit` | 27.7 s / 15.3 s | 15.4 s / 4.5 s |
-|  finalization `advance_wake` (index build; `term_postings_by_term` 3.6–5.6 s) | 18.4 s | 8.1 s |
-| `code_graph.activation.total` (`graph_db.sealed_store.build` 17 s, verify 7 s, catalog 3 s) | 40.1 s, **after** text | 29.9 s, **overlapped** |
-| wall to `current/complete/fresh` | text ready 85 s → graph ready 123 s | 83 s, graph ready before text |
-
-Artifacts for the fixture (9.1 MB source, 98,304 one-line fns, 196,620 lexical documents — the `"\n"` window
-chunks are already gone): sealed segments 328 MB (772 × 313 KB + 87 MB evidence), lexical artifact **394 MB**
-(`term_postings` 91 + `_by_term` 80, `rows` 48, `ngram_postings` 47, dictionary 19, `rows_by_chunk` 17, vocabulary 13+13
-MB via `dbstat`), grafeo 262 MB, interactive catalog read-bundle 117 MB; profile total 1.1 GB. The 2.4 GB of the
-issue title does not reproduce; the volume is a data-model question across three stores, not lane-sized.
-
-Fix in this lane (`b564e6e3e3`): the publication worker drove the whole text projection inline and only then gated
-graph prepare/activation on a *ready* text owner, serialising two builds that both consume only the sealed
-generation. The projection now runs on its own task, the gate prepares once the owner has *reopened*, and the seat
-joins the projection (an unfinished or latched-failed owner still seats nothing; activation is idempotent). Pinned by
-`convergence_park_tests::graph_activation_starts_while_the_published_text_owner_is_parked` (times out on the old
-ordering — verified by flipping the gate back). `tracedecay-code-index-runtime --lib`: 492 passed, 1 failed —
-`verified_empty_source_remains_observable_while_scheduler_is_busy` fails identically on the unmodified tip
-(`Elapsed` waiting for `reconciled_without_generation`), not this lane's. Clippy `-D warnings` clean.
-
-WIP disposition: the four dirty edits were a duplicate of `eda2011eb` (running field-length totals, named
-`field_stats_staging` on tip), the parallel-decode test adjustment `683d87d5d` already carries, a tightened
-`disk_artifact_defers_statistics_and_serving_indexes_until_freeze` (kept, `8cb846989`, staging-table name fixed), and a
-println measurement probe example (checkpointed in `420d7ca9d`, removed in `f2c8d6e597`; `code_lexical_catchup` is
-the maintained bench).
-
-### What remains for #1103 item 4
-1. Text build rate is the wall: 25 batches at 0.6–0.9 s of `batch.sqlite` each (single-row `INSERT` CPU on
-   `term_postings`/`ngram_postings`, `journal_mode=DELETE synchronous=NORMAL` commit 0.18–0.6 s per batch under load),
-   plus ~10 s of per-wake sealed-source decode (`restore.file_admit` 6.5 s, `segment_decode` 5.7 s aggregate) that
-   is not pipelined with the SQLite append, plus 8 s finalization. Under an idle machine the earlier lane measured
-   27 s; the restart bound leaves ~25 s for it after a 16–19 s reconcile.
-2. Restart reconcile re-seals the recovered batch from scratch: `build.assemble` 5.9 s serial and
-   `sealed_encode.evidence` 4.4 s serial are the two remaining serial phases in `build.and_publish`.
-3. The interactive-catalog read bundle (117 MB) and `graph_db.sealed_store.build` (17 s) are off the critical path now
-   but still define the graph-ready time when the text build gets faster.
-4. Item 5 (hooked saves reconcile only at the 30 s window, `hook_hint_count: 0`) is untouched by this lane.
-5. CI: the validated `root-daemon-suite` partition from the issue thread should land with the item-4 fix.
-
-## Lane status 2026-09-12 — fable/wave2-root (root crate cleanup, ponytail wave 2)
-
-Worktree `/fast/tmp/td-wave2-root-fable`, base `5292a39d2c` (tip after #1245), target dir
-`/fast/tmp/td-target-wave2-root`. Five commits, one per audit item; each compiles under
-`cargo check -p tracedecay --lib --tests --features test-helpers` and
-`cargo check --workspace --all-targets` (cc-18039) at the branch head.
-
-| item | outcome |
-| --- | --- |
-| 1 alias re-exports | `tracedecay::query` had zero consumers; `tracedecay::code_index` had four (workflow handler digest, CLI blocking-thread sizing, one product-surface test, and the scheduler flight test the root compiled via `#[path]`). All retargeted to the sibling crate; CLI gains the edge with `default-features = false`. Both aliases deleted. |
-| 2 dispatch table | Forwarding arms for graph (18), info (10), analysis (18), git (8), health (7) moved beside their handlers as one `dispatch_tool` per family in `tracedecay-mcp`; the root lends its admission funnel as `VerifiedGraphOpen`. Root `dispatch_groups.rs` 1478→1104 lines. `LegacyToolCompatibilityOwner` kept (see below); its dead `OWNER` label deleted. |
-| 3 in-src tests | 73 `#[cfg(test)]` roots probed by compiling them as an integration target: 66 use private items or sit under private modules, 6 import private `super::` items, 1 (`remote_protocol_tests`, 289 lines) is clean but is the fixture for two blocked siblings. **0 lines movable as pure moves.** Two files the root compiled out of `tracedecay-code-index-runtime/src` via `#[path]` were relocated: the scheduler journeys (2,110 lines) into `tests/daemon_suite/code_index_ignored_dependencies_test`, the census journey (144) into `src/daemon/`. `production_harness` gate moved to the `mod` declaration, deleting 36 per-item repeats and narrowing 3 to `cfg(unix)`. |
-| 4 hook runtime | **False claim.** Root `hook_runtime/` (4.9k, 1.4k tests) is the `tracedecay_hook_runtime` action handler composing `tracedecay-hooks` (ledger, config snapshot, envelope types), host-admission, sessions, and `TraceDecay`; `tracedecay-mcp::hook_runtime` is 62 lines of error mapping the root already calls. Zero shared function names; ripwire clone scan across the three trees found no production clone (one 0.82 near-miss: `hook_v2_family_label` vs `HookEventKind::as_key`, different enums). Nothing folded. |
-| 5 serve stubs, module name | `ensure_initialized*` had no caller beyond three tombstone assertions: stubs, in-src test, and the two integration assertions deleted; `serve` is now crate-private around the URI decoder. `src/tracedecay.rs` → `src/project.rs`; 236 `crate::tracedecay::` and 71 `tracedecay::tracedecay::` paths retargeted (root, suites, benches, CLI). |
-
-### Tip-side reds observed (not this lane's)
-
-- Clippy `-D warnings`: four `clippy::large_futures` errors in `daemon/hook_v2_replay_consumer.rs`
-  (147, 197, 311) and `project_open_owners/advisory_runtime.rs:1520`; identical bytes in the tip's
-  CI Clippy job (run 34696973432). Verified this lane with `-A clippy::large_futures`.
-- Root lib: `mcp::tools::handlers::search_graph_independence_tests::{tracedecay_search_preserves_lexical_results_when_graph_admission_is_missing, tracedecay_search_refuses_foreign_generation_graph_evidence_without_erasing_results}`
-  (`node_id` not null) — FAILED in the tip's `Test Linux root-lib` job.
-- `code_index_ignored_dependencies_test::flight_tests::aborted_flight_owner_wakes_follower_and_allows_a_fresh_owner`
-  is a pre-existing intra-test race (fails alone 1/6, module 3/4 in the tip-equivalent in-lib binary of
-  `/fast/projects/tracedecay` at 5be9a952e7; FAILED in the tip's root-lib CI). Mechanism: after
-  `owner.abort()` + `hold.release()` the orphaned blocking build still publishes, so the fresh owner's
-  `expected_generation` is stale (`IgnoredDependency(StaleGeneration)`). Moving the file did not change it.
-- `daemon::production_harness::lcm_preserved_profile_journey_test::preserved_profile_lcm_discovery_converges_without_blocking_retrieval`
-  went `outcome=stale` once under load 43 alongside 25 harness journeys; passes alone 2/2 (46 s each).
-
-### `LegacyToolCompatibilityOwner` — why it stays
-
-`admits(name)` is advertised-name membership (`get_tool_definitions()`), consulted after the typed
-daemon-surface groups return and before group dispatch. It is not redundant with the binding table:
-`MCP_TOOL_BINDING_SPECS` is a static list, so a bound-but-unadvertised name (host-gated
-`tracedecay_ast_grep_search`/`_rewrite` when ast-grep is absent) is rejected as unknown only by this
-gate. Tools it guards that the root still serves (P0-1 leftovers): `tracedecay_retrieve`,
-`tracedecay_remote_status`, `tracedecay_status`, `tracedecay_active_project`,
-`tracedecay_project_{list,search,context}`, `tracedecay_admin_sync`, `tracedecay_runtime`, admin
-(`hook_runtime`, `admin_cli`, `admin_project`), edit (10 `tracedecay_*_replace/insert/move/rename/rollback/reconcile`),
-memory (`automation_run_*`, `analytics`, `skill_*`, `hermes_skill_bridge`), session-workflow
-(`diagnose`, `run_affected_tests`, `dashboard`), and every retained-application operation.
-
-## Lane status 2026-09-12 — fable/wave2-root-collapse (P0-1/P0-2 execution)
-
-Worktree `/fast/tmp/td-wave2-collapse-fable`, base `14de498296` (tip after #1252), target dir
-`/fast/tmp/td-target-wave2-collapse`. One PR per slice; the maintainer merges between slices.
-
-### Slice 1 — `src/mcp/` → `tracedecay-mcp` (three commits)
-
-Root `src/mcp/` 42,321 → 30,725 lines (−11,596); `tracedecay-mcp` 36,751 → 48,170. Test attributes
-conserved: root 951 → 862, mcp 232 → 320 (89 moved, 1 duplicate test deleted).
-
-1. **Pure moves** (`git mv`, `pub(crate)`→`pub` on the items the root reads, explicit exports):
-
-| root module | lines | new home |
-| --- | ---: | --- |
-| `tools/binding.rs` + `binding/{work,workflow}.rs` | 1,629 | `tracedecay_mcp::tools::binding` |
-| `tools/dispatch.rs`, `tools/catalog_discovery.rs` | 928 | `tracedecay_mcp::tools::{dispatch, catalog_discovery}` |
-| `tools/handlers/{session_authorities,dashboard_lcm,dashboard_delivery,dashboard_git_correlation}.rs` | 1,787 | `tracedecay_mcp::handlers::*` |
-| `tool_analytics.rs`, `scope.rs` | 1,006 | `tracedecay_mcp::{tool_analytics, scope}` |
-| `server/{session_refresh,project_host_admission_replay}.rs` | 705 | `tracedecay_mcp::server::*` |
-| `dispatch_groups.rs` ceiling block (`TOOL_DISPATCH_CEILING`, `tool_dispatch_{ceiling,budget,deadline_error}`) | 92 | `tracedecay_mcp::tools::dispatch_ceiling` (item cut, needed by the binding table) |
-| `project_route.rs::{ProjectRouteFailure, ProjectRouteFailureKind}` | 72 | `tracedecay_mcp::project_route` (item cut, needed by `scope.rs`; the `McpServer`-holding cache stays) |
-| `tool_call_support.rs::INTERNAL_DAEMON_TOOL_NAMES` | 7 | beside the binding table |
-
-2. **Duplicates deleted** (bodies diffed identical before deletion): `binding.rs::multi_root_operation_for_tool`
-   (ripwire type-2 clone of `handlers::multi_root::operation_for_tool`, 45 tokens — the binding table now
-   reads the handler-owned lookup like it does for work/workflow), and nine result-shaping helpers plus
-   `CONTEXT_MEMORY_ANALYTICS_KEY` and one unit test in root `handlers/support.rs` that re-implemented
-   `tracedecay_mcp::handlers::support` byte-for-byte. Root `support.rs` 243 → 77 lines (selector validation only).
-
-3. **Handler families whose only root dependency was `TraceDecay`** (`edit`, `workflow` + `workflow/`,
-   `admin_cli`, `automation_runs`, `skills`; 5,156 lines, 35 tests) → `tracedecay_mcp::handlers::*`. The
-   root dispatch arms (still bound to `ToolCallRegistryOptions`) call them by path. `json_result` joined
-   the shared support helpers. Five helpers now borrow an argument they never consumed
-   (`needless_pass_by_value`; the root allows it, `tracedecay-mcp` does not).
-
-Edges added to `tracedecay-mcp` (each checked with `cargo tree -p <crate> -e normal | rg tracedecay-mcp`
-→ empty before adding): agent-hosts, automation, automation-runtime, daemon-service, host-admission,
-lcm, maintenance, project, session-runtime; `futures-util`, `hex`, `sha2`, `url`. Dev: dashboard-api
-`test-transport`, graph-db, project `test-helpers`. Root re-exports of moved items: none — every root,
-CLI, bench, and suite caller retargets to `tracedecay_mcp::…`.
-
-**Reclassified from the plan's (b) rows — not movable yet:** `server/routing.rs` (holds
-`Arc<McpServer>`, `RetainedProjectServerResolver`, and the `WorkspaceProjectRoute` cache),
-`server/status_resource.rs` (`impl McpServer`), `hook_runtime/envelope.rs` (calls
-`tracedecay_agent_hosts::hooks::protected_native_session_id`; agent-hosts depends on hooks, so a
-hooks-crate home would be a cycle — it moves with `hook_runtime/` once `context_scout_lifecycle`
-is in daemon-service). `admin_project.rs` waits on the root `bench` runner (used by the CLI too).
-
-**`LegacyToolCompatibilityOwner` still guards root-only arms:** `tracedecay_retrieve`
-(`tool_call_support.rs`, project-route resolver → `McpServer`), `tracedecay_status`/`remote_status`/
-`active_project`/`project_*`/`admin_sync`/`runtime` (`info/`, `CodeIndexReconcileSink` and the other
-`crate::mcp::server` port aliases), `tracedecay_hook_runtime` (`crate::daemon::context_scout_lifecycle`
-→ slice 2), `tracedecay_admin_project` (`bench`), `tracedecay_analytics`
-(`crate::daemon::retained_owner::open_project_retained_memory_target` → slice 2/3),
-`tracedecay_dashboard` (`crate::daemon::dashboard_automation`, root `dashboard`/`hooks`, server ports),
-and the retained-application family (`retained_catalog.rs`, `ToolCallRegistryOptions`). The owner
-itself goes with `handlers/mod.rs` in slice 3.
-
-### Slice 2 — `src/daemon/` → `tracedecay-daemon-service` (one commit, stacked on slice 1)
-
-Root `src/daemon/` + `daemon.rs` 98,867 → 92,352 lines (−6,515); `tracedecay-daemon-service` 54,177 → 60,737.
-Test attributes conserved: root 862 → 800, daemon-service 262 → 324 (62 moved).
-
-| root module | lines | new home |
-| --- | ---: | --- |
-| `shutdown_coordination.rs` (owners, receipts, `ShutdownStatus`) | 588 | `tracedecay_daemon_service::shutdown::owners` (renamed: the crate already has `shutdown_coordination` for `ShutdownCoordinatorV1`) |
-| `shutdown_orchestration.rs`, `shutdown_watchdog.rs` | 1,700 | `shutdown::{orchestration, watchdog}` |
-| `core_lifecycle.rs` (`DaemonLifecycle`, `DaemonActivity`, drain deadlines) | 399 | `shutdown::lifecycle`; its `McpConnectionLifecyclePort` impl moved beside the port in `tracedecay_mcp::lifecycle` (local trait, foreign type — daemon-service sits below mcp) |
-| `context_scout_lifecycle.rs` + `tests.rs` | 1,227 | `tracedecay_daemon_service::context_scout_lifecycle` |
-| `doctor_kernel.rs` + `tests.rs` | 1,340 | `tracedecay_daemon_service::doctor_kernel` |
-| `core_logging.rs` | 511 | `tracedecay_daemon_service::logging` (CLI retargets `install_stderr_tracing`, `StderrTracingDefault`, `unavailable_error`) |
-| `adoption_observation.rs`, `automation_observation.rs` | 345 | same names |
-
-Edges added to `tracedecay-daemon-service` (each `cargo tree -p <crate> -e normal | rg daemon-service` → empty
-first): project, automation-runtime, code-index-retention, maintenance, session-runtime, `tracing-subscriber`;
-dev: project `test-helpers`. The two `cfg(test)` shutdown join helpers are regated `test-helpers` for the
-root's unit tests. `daemon.rs` keeps `pub(crate)` re-exports only for the names its `use super::*`
-modules (engine, bootstrap, connection serving, projectless, …) still read; the CLI has no root path left.
-The stderr-receipt test now derives its libtest name from `module_path!()` (the hard-coded root path
-made the child run vacuous and the assertion falsified it). ripwire `--clones` over daemon-service after the
-move: no type-1/2 group touches a moved module (only ≤0.90 type-3 label-map near-misses).
-
-**The daemon wall (precise).** Every other (b) row of the plan names one of three root authorities:
-`DaemonInvocationState` (`invocation_state.rs`, 1,446 lines) holds `StoreAdministration`;
-`StoreAdministration` (`branch_admin.rs`, 2,559) holds `Arc<McpServer>`, `SharedHookProjectRouteCache`
-and `tracedecay_mcp::{JsonRpcRequest, JsonRpcResponse, McpTransport, ErrorCode}`; `DaemonEngine`
-(`engine.rs`) holds both. Because slice 1 made `tracedecay-mcp` depend on `tracedecay-daemon-service`,
-nothing that names a `tracedecay-mcp` type can ever live in daemon-service. So `invocation_executor.rs`
-(801), `invocation_dispatch.rs` (931), `remote_deletion.rs` (341), `lsp_sessions.rs` (208),
-`github_credential_lifecycle.rs` (237), `project_delivery_mount.rs` (46), `http_application_router.rs`
-(125), `bootstrap_route.rs` (175), `database_owner_registry.rs` (370, `McpServer`) wait on
-`McpServer`/`StoreAdministration`; `wire_io.rs` (448), `core_client.rs` (642), `core_hooks.rs` (137)
-write/read MCP JSON-RPC frames and are the *client* seam with `core_handshake.rs` (49) — they stay in the
-root (or a client crate), never daemon-service. `core_doctor_schema.rs` is a `#[path]` child of
-`core_doctor.rs` (`McpServer`-bound). The plan's "(c) rows as `tracedecay-daemon-service::composition`"
-is therefore not reachable: the daemon composition that builds `McpServer` is the root's job (slice 3).
-
-### Slice 3 — composition (one commit, stacked on slice 2)
-
-Moves the modules slices 1–2 unblocked, then reclassifies every remaining root module. Root `src/`
-144,714 → 116,396 lines over the three slices (−28,318); `src/mcp/` 42,321 → 24,373 (−42%, 14,457 of
-what remains is production code); `src/daemon/` + `daemon.rs` 98,867 → 88,735 (−10%).
-`tracedecay-mcp` 36,751 → 54,380; `tracedecay-daemon-service` 54,177 → 64,757. Test attributes
-conserved in this slice: root 800 → 739, mcp 320 → 360, daemon-service 324 → 345.
-
-| root module | lines | new home |
-| --- | ---: | --- |
-| `mcp/tools/handlers/hook_runtime/` (tree) | 4,875 | `tracedecay_mcp::handlers::hook_runtime` (context-scout lifecycle is in daemon-service since slice 2) |
-| `mcp/tools/handlers/{analytics,admin_project}.rs`, root `bench.rs` | 1,653 | `tracedecay_mcp::{handlers::analytics, handlers::admin_project, bench}` |
-| `daemon/retained_owner.rs` + tests, `dashboard_automation/retained_curator.rs`, `daemon/automation_effect/` (+ journal tests) | 3,637 | `tracedecay_daemon_service::{retained_owner, automation_effect}`; `automation_run_observer` and `scheduler_automation_request_id` (pure identity minting) follow as item cuts |
-| `tracedecay_mcp::server::session_refresh` (placed by slice 1) | 393 | `tracedecay_daemon_service::session_refresh` — no MCP coupling, and `StoreAdministration`/`retained_owner` hold it |
-| `test_support::host_admission::mcp_session_authorities` | 6 | `tracedecay_mcp::handlers::mcp_session_authorities` behind the new `tracedecay-mcp/test-helpers` feature |
-
-**Reclassification of what stays (116,396 lines) and why.** Markers: a file is pinned by the first
-authority it names.
-
-| reason | production lines | test lines | files |
-| --- | ---: | ---: | --- |
-| names `McpServer` (the root server: `mcp/server.rs` + `server/{requests,connection,construction,ledger,rmcp,lifecycle,routing,hook_dispatch,status_resource,project_open_access}`, `mcp/project_route.rs`; and the daemon modules that hold `Arc<McpServer>`: `branch_admin.rs` + `project_retirement.rs`, `project_composition.rs`, `connection_serving.rs`, `engine.rs`, `core_doctor.rs`, `project_open_owners/**`, `project_open_orchestration.rs`, `project_server_lifecycle.rs`, `project_routing.rs`, `database_owner_registry.rs`, `graph_resolution.rs`, `wire_io.rs`, `production_harness.rs`) | 28,728 | 10,819 | 47 |
-| names `StoreAdministration` (`scheduler.rs`, `maintenance.rs`, `pr_autotrack.rs` + `runtime.rs`, `branch_admin/remote_deletion_lifecycle*`, `branch_admin/session_runtime_shutdown.rs`, `projectless.rs`, `core_admission.rs`, `project_open_handshake.rs`, `branch_add.rs`, `project_composition/runtime.rs`, `bootstrap_route.rs`, `store_maintenance/`) | 9,894 | 2,619 | 18 |
-| names `DaemonInvocationState` (`invocation_state.rs` + `project_invocation.rs`, `bootstrap.rs`, `invocation_dispatch.rs`, `invocation_executor.rs`, `branch_admin/remote_recovery_lifecycle.rs`, `project_composition/code_index_activation.rs`, `daemon.rs`, `remote_deletion.rs`, `github_credential_lifecycle.rs`, `lsp_sessions.rs`, `http_application_router.rs`, `project_delivery_mount.rs`) | 7,236 | 7,080 | 18 |
-| names `DaemonEngine` (`scheduler/{combined_effect,effect_admission,host_receipt_review,automation_observation}.rs`, `engine/shutdown.rs`) | 3,047 | 1,323 | 7 |
-| MCP JSON-RPC frames (`tracedecay_mcp::{JsonRpcRequest, JsonRpcResponse, McpTransport, BrokerStreamTransport}`): `project_open_admission.rs`, `core_proxy.rs`, `core_client.rs`, `core_hooks.rs`, `tool_call_support.rs` | 3,360 | 5,757 | 10 |
-| `ToolCallRegistryOptions` (root dispatch: `handlers/mod.rs`, `dispatch_groups.rs` + `health_dispatch.rs`, `retained_catalog.rs`, `dispatch_controls.rs`, `tools/mod.rs`) and the root server port aliases (`dashboard.rs` handler, `application_surface.rs`, `hook_writes.rs`, `info/`, `support.rs`, `dashboard_automation.rs`, `advisory_runtime/model.rs`) | 4,820 | 3,714 | 24 |
-| composition root proper (`lib.rs`, `runtime_ports.rs`, `serve.rs`, `hooks.rs`, `dashboard.rs` + `dashboard/`, `doctor.rs` + `doctor/`, `core_handshake.rs`, `http_application.rs`, `hook_v2_replay_consumer.rs`, `test_support/`, harness/test-only files) | 5,988 | 22,011 | 63 |
-
-Three authorities pin everything: `McpServer` (root `mcp/server.rs`), `StoreAdministration`
-(`branch_admin.rs`, which holds `Arc<McpServer>`, the hook route cache, and MCP frames) and
-`DaemonInvocationState` (which holds `StoreAdministration`). They form one strongly connected cluster
-with `DaemonEngine`, `project_composition`, and `connection_serving`: the daemon *is* the composition
-that builds and serves `McpServer`. With `tracedecay-mcp → tracedecay-daemon-service` fixed, none of it
-can enter daemon-service, and moving `McpServer` alone into `tracedecay-mcp` drags the cluster's
-daemon half (`branch_admin`, `core_admission`, `dashboard_automation`, the root `dashboard`/`hooks`
-composition) along — a ~40k-line move that would make `tracedecay-mcp` the daemon. The honest end
-state is therefore not the plan's step 5 ("delete `src/mcp/` and `src/daemon/`") but: the root
-`tracedecay` crate **is** the daemon composition crate (engine, connection serving, project
-composition, store administration, the root MCP server, the client seam) plus the product
-features it composes (`doctor`, `dashboard`, `runtime_ports`, `test_support`). If a smaller
-"composition wiring only" root is still wanted, the remaining lever is a `tracedecay-daemon` crate
-above mcp and daemon-service that receives the cluster wholesale — a rename of the same lines, not a
-reduction — which is a maintainer decision, not a slice.
-
-Still-movable leftovers not taken here (small, each would need its own edge or a test-fixture
-relocation): `serve.rs` (59, `tracedecay-lsp` percent decoding; only `routing.rs` reads it),
-`mcp/tools/handlers/info/mod.rs` (43, `TraceDecay` only but `info/status.rs` needs the server ports),
-`core_doctor_schema.rs` (22, `#[path]` child of `core_doctor.rs`).
-
-### Tip-side / environment reds observed (not this lane's)
-
-- `hooks_lsp_suite::hooks_test::test_codex_{workspace_status_distinguishes_generic_and_project_like_dirs,
-  user_prompt_submit_records_workspace_status_and_missing_session_hint}` fail on this machine because a
-  stray `/tmp/package.json` makes every `tempdir()` "project-like"; both pass with
-  `TMPDIR=/fast/tmp/td-wave2-clean-tmp` (cc-19166).
-- Clippy with `--features tracedecay/test-transport` (not CI's shape) hits `clippy::too_many_lines`
-  on `McpServer::new_with_registered_test_context` (104/100 lines, untouched here); CI's
-  `cargo clippy --workspace --all-targets -- -D warnings` shape is green.
-- `tracedecay-mcp::workflow::test_runner::tests::cargo_runner_*` ×3 fail when the nested cargo they
-  spawn contends for the target-dir lock with other test binaries (#1251 saw the same); green alone.
-- Root lib `daemon::tests::ownership::unborn_git_project_open_retains_lsp_and_starts_hook_replay` fails
-  alone on any tree since #1252 (`initialize_test_project` opens through the production path, which now
-  refuses without registered runtime ports); in a full `--lib` run it passes only when another test
-  registered the process-global ports first. Untouched here (`git diff 14de498296 -- daemon/tests.rs
-  daemon/tests/ownership.rs tracedecay-project/src` is empty).
-
-## P0-1/P0-2 collapse plan
-
-### Dependency direction (cargo tree, normal edges)
-
-`tracedecay-mcp` ← `tracedecay-agent-hosts` ← `tracedecay-daemon-service` ← `tracedecay` ← `tracedecay-cli`.
-`tracedecay-mcp` depends on 25 crates and on none of agent-hosts, daemon-service, daemon-control,
-daemon-identity, host-admission, lsp, automation-runtime. The only agent-hosts → mcp edge is
-`ports/mcp_tools.rs` (`get_tool_definitions`, `format_capable_tool_names`).
-
-Two facts block every "move the rest into tracedecay-mcp":
-
-1. **`TraceDecay` lives in the root** (`src/project/`, 2.8k lines) and is read at 161 sites in
-   `src/mcp/tools`, 52 in `src/mcp/server`, and throughout `src/daemon`. It depends on agent-hosts
-   (context-scout owner lookup), configuration, store-runtime, application, graph-query, and the root's
-   `config`, `runtime_ports`, `project_store_runtime`, `test_support`.
-2. **Cycle** if `tracedecay-mcp` took daemon-service or agent-hosts:
-   `tracedecay-mcp → tracedecay-daemon-service → tracedecay-agent-hosts → tracedecay-mcp`.
-
-Break it first: replace the two `tracedecay_mcp::` calls in `tracedecay-agent-hosts/src/ports/mcp_tools.rs`
-with a tool-name list passed in by the composition root (or sourced from `tracedecay-tool-catalog`). That
-removes agent-hosts → mcp and lets `tracedecay-mcp` depend on agent-hosts and host-admission. Then give
-`TraceDecay` a home below both consumers: new crate `tracedecay-project` = root `project/` + `config.rs`
-+ `project_store_runtime.rs` + `runtime_ports.rs` (test fixtures behind `test-helpers`), depending on
-agent-hosts for the scout owner. After that every (c) row below is movable.
-
-### `tracedecay-project` — done (fable/wave2-project-crate)
-
-`crates/tracedecay-project` (10,443 lines, all `git mv` from the root; workspace-versioned because it
-owns `version::PACKAGE_VERSION`):
-
-| module | lines | note |
-| --- | ---: | --- |
-| `project.rs` + `project/**` | 2,865 | `pub(crate)` → `pub` for the items the root reads (`configuration_runtime`, `profile_database`, `project_memory_*`, `context_scout_*`, `init/open*_with_registered_configuration`, `resolve_*_configuration_layout*`, …); `ContextScoutOwnerLookupV1` public |
-| `config.rs` + `config/tests.rs` | 2,023 | `PinnedUserDataDir`, `lock_user_data_dir_test_env`, `ensure_runtime_configuration_for_registered_database` regated `cfg(any(test, feature = "test-helpers"))` (root tests reach them through the feature, not `cfg(test)`) |
-| `runtime_ports.rs` | 339 | see the seam below |
-| `project_store_runtime.rs` | 35 | `join_standalone_session_registry` now *requires* registered ports (typed `Config` refusal) instead of registering them — the project crate cannot build the daemon client |
-| `product_runtime.rs` + `version.rs` | 511 | moved because `HostAdmissionTestRuntimeV1::open` registers the fixture product runtime; the root re-exports both at their old paths |
-| `test_support/host_admission.rs` + 7 submodules | 4,609 | the registered test runtime; root `test_support::host_admission` re-exports it explicitly (no glob) and keeps the MCP composition |
-
-Root re-exports: `pub use tracedecay_project::{config, product_runtime, project, version}` plus the item
-re-exports `lib.rs` already had, so `tracedecay::project::TraceDecay`, `tracedecay::config::…`,
-`tracedecay::hook_runtime()`, `tracedecay::register_runtime_ports()` are unchanged for the CLI, suites and
-benches. Root test inventory is byte-identical (983 = 946 root + 37 project; one test renamed).
-
-**The one production seam** (`runtime_ports`): `HookRuntimeV1` needs the daemon client (`daemon_tool`,
-`event_notifier` → `crate::daemon::{handshake_for_current_client, call_default_tool, tool_json_payload,
-notify_hook_event}`, i.e. `core_client.rs`/`core_hooks.rs`/`core_handshake.rs` → product runtime and the
-wire types), and project open publishes hook bindings through that handle. The project crate therefore
-owns `register_runtime_ports(DaemonClientPortsV1)` (sibling ports + one set-once slot for the client),
-a fallible `hook_runtime()` (typed refusal when no composition root registered) used only by
-`init/open*_with_registered_configuration`, and `hook_runtime_with(client)` for explicit handles. The root
-keeps `runtime_ports.rs` (127 lines): the two daemon-client adapters, the no-arg `register_runtime_ports()`
-wrapper, the infallible `hook_runtime()` the CLI passes to hook entry points, `session_review_port()`, and
-`compose_application_catalog_snapshot()`. The `test-helpers` fixture registers a fixture client (typed
-unavailable tool, no-delivery notifier) exactly as it registers the fixture product runtime; the only
-in-crate reader of the slot is `publish_hook_bindings`, which consults `scope_resolver` alone.
-
-**Test dispatch is now explicit for root unit tests.** `TraceDecay::init/open/open_read_only/open_branch
-(_with_options)` still route to the registered test runtime under the project crate's
-`cfg(any(test, feature = "test-transport"))`, which the root's `test-transport` forwards. Root `cfg(test)`
-no longer reaches that gate, and enabling the project crate's `test-transport` from the root's
-dev-dependency would flip every `test-helpers`-only suite (`runtime_acceptance_suite`'s "direct
-production init", `daemon_runtime_acceptance`) onto the fixture path silently. So the fixture path is also
-a named API — `TraceDecay::{init,open,open_read_only,open_branch}_with_options_for_test` under
-`test-helpers` — and the 25 root lib-test call sites use it. `test-helpers`-only suites take the production
-standalone path, which now needs the suite binary to register the composition root's ports:
-`tests/common::register_process_runtime_ports()` runs from `IsolatedEnv::build` (the same choke point as
-the product-runtime registration) and from the three fixtures that bypass it.
-
-**Residual root-only edges** (all composition, none inside the moved code):
-- root `runtime_ports.rs::{daemon_tool_json, notify_hook_event}` → `crate::daemon` client (4 fns).
-- root `test_support::host_admission::{mcp_session_authorities, call_mcp_tool_for_test,
-  mcp_server_context_for_test}` → `crate::mcp::tools::{SessionAuthorities, ToolCallRegistryOptions,
-  handle_tool_call_with_registry_options}`, `crate::mcp::server::McpServerConstructionContext`,
-  `tracedecay_daemon_service::DaemonProjectRegistryReadService` (11 call sites retargeted to these free
-  functions).
-- With #1251 (agent-hosts cycle break, `tracedecay-mcp-catalog`) merged, `cargo tree -p tracedecay-project
-  -e normal -i tracedecay-mcp` and `-i tracedecay-daemon-service` both resolve to nothing: the crate reaches
-  neither consumer. Its only catalog edge is `agent-hosts → tracedecay-mcp-catalog`.
-
-**Now movable** (`TraceDecay` is below both consumers and the agent-hosts cycle is broken): every (c) row in `src/mcp/` that was blocked only by `TraceDecay` —
-`dispatch_groups.rs` (27 `TraceDecay` reads), `handlers/edit.rs` (17), `handlers/hook_runtime/` (38),
-`handlers/mod.rs` (7), `construction.rs` (8), `dashboard.rs` (4) — plus the `src/daemon/` (c) rows that
-named only `TraceDecay` or root `config`: `scheduler/` (44 reads), `project_open_owners/`,
-`project_open_admission/`, `branch_admin/` (12, after its 11 `crate::mcp` uses move), `invocation_state.rs`
-and `doctor_kernel/` (root `config` ×2 each, now `tracedecay_project::config`). The two rows that build the
-root `McpServer` (`project_composition/`, `connection_serving.rs`) stay until P0-1. Next PR: the (b) rows
-of `src/mcp/` (`tools/binding.rs`, `dashboard_lcm.rs`, `catalog_discovery.rs`, `server/routing.rs`,
-`tool_analytics.rs`, `scope.rs`, `session_refresh.rs`, …, ≈6.5k lines) into `tracedecay-mcp`, one commit per
-target crate, with `TraceDecay` imported from `tracedecay_project`.
-
-### Root `src/mcp/` — 42,256 lines, 12,390 in test files
-
-(a) duplicate of an extracted owner → delete: none remain (this lane removed `effective_path`, four
-`unknown_tool_error` copies, and the forwarding tables). Checked by name overlap and ripwire `--clones`.
-
-(b) movable as-is (target crate):
-
-| module | lines | target | note |
-| --- | ---: | --- | --- |
-| `tools/binding.rs` + `binding/` | 1,630 | tracedecay-mcp | catalog: contracts + tool-catalog; one `resolve_catalog_tool_binding` call to relocate |
-| `tools/handlers/dashboard_lcm.rs` | 1,067 | tracedecay-mcp | needs `tracedecay-lcm`, `tracedecay-session-runtime` edges |
-| `tools/catalog_discovery.rs` | 673 | tracedecay-mcp | two daemon-service calls to lift |
-| `server/routing.rs` + `serve.rs` | 612+59 | tracedecay-mcp | root-URI decoding + scope routing |
-| `tools/handlers/dashboard_delivery.rs` | 564 | tracedecay-daemon-service | already daemon-service shaped |
-| `tool_analytics.rs` | 563 | tracedecay-mcp | one agent-hosts type to check |
-| `scope.rs` | 443 | tracedecay-mcp | memory/storage scope selection |
-| `server/session_refresh.rs` | 393 | tracedecay-mcp | |
-| `server/project_host_admission_replay.rs` | 312 | tracedecay-daemon-service | host-admission + sessions |
-| `tools/dispatch.rs` | 255 | tracedecay-daemon-service | daemon-protocol + daemon-service |
-| `tools/handlers/hook_runtime/envelope.rs` | 222 | tracedecay-hooks | identity minting policy; swap `config_error` for a hooks error |
-| `tools/handlers/session_authorities.rs` | 99 | tracedecay-mcp | |
-| `tools/handlers/dashboard_git_correlation.rs`, `server/status_resource.rs` | 99 | tracedecay-mcp | |
-
-(c) composition-root wiring, stays until `TraceDecay` moves (then → tracedecay-mcp, or a new
-`tracedecay-mcp-daemon` if daemon-service must stay below mcp): `server.rs` (1,546),
-`server/{requests,connection,construction,ledger,rmcp,lifecycle,hook_dispatch,hook_writes}.rs` (6,569),
-`tools/handlers/mod.rs` (`ToolCallRegistryOptions`, 50 daemon-owned authorities), `dispatch_groups.rs`
-(admission funnel, `McpToolContext` binding, retained protocol), `handlers/{edit,workflow,admin_cli,
-admin_project,analytics,skills,automation_runs,dashboard,application_surface,retained_catalog,
-tool_call_support,dispatch_controls}.rs`, `handlers/hook_runtime/` minus `envelope.rs`,
-`handlers/info/` (admin sync), `project_route.rs` (975).
-
-(d) blocked by dependency direction: every (c) module that names `TraceDecay` or `tracedecay_daemon_service`
-(`dispatch_groups.rs` 27/3, `dashboard.rs` 4/11, `mod.rs` 7/4, `construction.rs` 8/2, `edit.rs` 17,
-`hook_runtime/` 38/5) — the cycle above.
-
-### Root `src/daemon/` — 97,528 lines, 46,370 in test files (51,158 production)
-
-(a) duplicate → delete: none at module level. Name overlap with daemon-service is zero for all 23
-production modules checked; ripwire `--clones` over both trees (481 groups) finds 27 cross-tree type-3
-near-misses, all ≤160-token observability/receipt helpers (`observe_remote_deletion_receipt` ~
-`record_query_admission_refusal`, `admission_state` ~ `workflow_topology_problem`) — a shared receipt
-helper in daemon-service, not deletions.
-
-(b) movable as-is → tracedecay-daemon-service (no `TraceDecay`, no `crate::mcp`, no root `config`):
-`shutdown_orchestration.rs` (1,362), `shutdown_coordination.rs` (588), `shutdown_watchdog.rs` (338),
-`invocation_executor.rs` (800; daemon-protocol), `invocation_dispatch.rs` (931), `context_scout_lifecycle/`
-(566 + tests), `remote_deletion.rs` (341), `database_owner_registry.rs` (370), `lsp_sessions.rs` (208),
-`github_credential_lifecycle.rs` (237), `bootstrap_route.rs` (175), `automation_observation.rs` (66),
-`project_delivery_mount.rs` (46), `core_doctor_schema.rs` (22), `http_application_router.rs` (125) —
-≈6.2k lines. `core_lifecycle.rs` (399) and `wire_io.rs` (448) go to daemon-protocol/daemon-control once
-their two `crate::mcp` uses are typed.
-
-(c) composition wiring (stays until `TraceDecay` moves): `branch_admin/` (5,571; TraceDecay 12, mcp 11),
-`scheduler/` (5,016; TraceDecay 44), `project_open_owners/` (4,441), `project_composition/` (3,458;
-`crate::mcp` 64 — it constructs the MCP server), `connection_serving.rs` (2,211), `maintenance.rs`
-(2,040), `engine.rs` (1,480), `pr_autotrack/` (1,379), `project_open_admission/` (1,294),
-`core_{doctor,proxy,admission,client,logging,hooks,handshake}.rs`, `bootstrap.rs`, `dashboard_automation/`,
-`http_application.rs`, `retained_owner/`, `projectless.rs`, `project_open_{orchestration,handshake}.rs`,
-`project_server_lifecycle.rs`, `project_routing.rs`, `branch_add.rs`, `hook_v2_replay_consumer.rs`,
-`graph_resolution.rs`, `automation_effect/`, `adoption_observation.rs`, `store_maintenance/`,
-`invocation_state.rs` (1,662; root `config` ×2), `doctor_kernel/` (1,341; root `config` ×2).
-
-(d) blocked by dependency direction: `project_composition/` and `connection_serving.rs` build the root
-`McpServer`, so they can only move after P0-1; everything naming `TraceDecay` waits on `tracedecay-project`;
-`invocation_state.rs`, `doctor_kernel/`, `core_logging.rs`, `bootstrap.rs` wait on root `config.rs`
-(786 lines: `PinnedUserDataDir`, `user_data_dir`, `DaemonRuntimeConfiguration`) moving with it.
-
-### Order
-
-1. ~~`tracedecay-agent-hosts/src/ports/mcp_tools.rs`: drop the two `tracedecay_mcp::` calls~~ — done in #1251
-   (`tracedecay-mcp-catalog`).
-2. ~~New `tracedecay-project`~~ — done, see above (also took `product_runtime.rs`, `version.rs`, and the
-   host-admission test runtime).
-3. ~~`src/mcp` (b) rows~~ and the `TraceDecay`-only handler families — done in slice 1 of
-   fable/wave2-root-collapse (see above); the remaining (c) rows wait on `McpServer` /
-   `ToolCallRegistryOptions` and move in slice 3.
-4. ~~`src/daemon` (b) rows into daemon-service~~ — the `TraceDecay`/`config`-only rows landed in slice 2;
-   the rest names `McpServer`/`StoreAdministration`/`tracedecay-mcp` frames and cannot enter
-   daemon-service (see the daemon wall above), so the daemon composition stays in the root.
-5. ~~Delete `src/mcp/` and `src/daemon/`~~ — not reachable as written: the daemon composition that builds
-   and serves `McpServer` cannot live below `tracedecay-mcp` (see slice 3's reclassification). The root
-   is the daemon composition crate; a `tracedecay-daemon` crate above mcp and daemon-service would only
-   rename it.
-
-### Test placement facts (item 3 probe)
-
-`crates/tracedecay/tests/zz_relocation_probe.rs` (temporary, deleted) mounted each of the 73 `#[cfg(test)]`
-module roots under a `pub use tracedecay::<parent>::*` shim and compiled with `test-helpers,test-transport`:
-507 errors — private modules (`daemon::{automation_effect,context_scout_lifecycle,core_doctor,doctor_kernel,
-invocation_executor,production_harness,project_composition,…}` are `pub(crate)`/private), private fields
-(`ToolCallRegistryOptions`, server internals), private fns, and `cfg(test)`-only fixtures
-(`TraceDecay::init_test_fixture_with_registered_runtime`). A test that reaches those must stay in-src; the
-sanctioned fixture surface is `test_support` behind `test-helpers`.
diff --git a/crates/tracedecay-agent-hosts/src/agents/codex.rs b/crates/tracedecay-agent-hosts/src/agents/codex.rs
index 5a3740c85d..6d29c4388e 100644
--- a/crates/tracedecay-agent-hosts/src/agents/codex.rs
+++ b/crates/tracedecay-agent-hosts/src/agents/codex.rs
@@ -89,6 +89,23 @@ impl AgentIntegration for CodexIntegration {
         ctx: &InstallContext,
     ) -> Result<NonInteractiveInstallOutcome> {
         install_codex_plugin(&ctx.home, &ctx.tracedecay_bin)?;
+        // Core apply drives `codex plugin add` when the host CLI is present.
+        // When it is not, stop with the same backtick remediation preflight
+        // uses so operators (and lifecycle tests) can activate natively.
+        if plugin_registry::require_codex_plugin_cli().is_err() {
+            let marketplace_name = codex_exact_personal_marketplace_name(&ctx.home)
+                .ok()
+                .flatten()
+                .unwrap_or_else(|| codex_cached_marketplace_name(&ctx.home));
+            return Ok(NonInteractiveInstallOutcome::DeferredUserAction(
+                DeferredUserAction {
+                    remediation: format!(
+                        "Codex activates plugins through its native cache. Run `codex plugin add tracedecay@{marketplace_name}` after TraceDecay stages the source package."
+                    ),
+                    staged_paths: Vec::new(),
+                },
+            ));
+        }
         Ok(NonInteractiveInstallOutcome::Ready)
     }
 
diff --git a/crates/tracedecay-cli/src/agent_cmd.rs b/crates/tracedecay-cli/src/agent_cmd.rs
index e8107c66f1..082805f642 100644
--- a/crates/tracedecay-cli/src/agent_cmd.rs
+++ b/crates/tracedecay-cli/src/agent_cmd.rs
@@ -1175,9 +1175,22 @@ fn host_bundle_error_for_agent(
             == tracedecay_agent_hosts::agents::host_bundle::HostBundleError::UnsupportedCapability
     {
         return tracedecay_domain::errors::TraceDecayError::Config {
-            message: "Codex plugin activation could not be completed through `codex plugin add`. \
-                      Confirm the `codex` CLI is on PATH and retry; hook trust still requires \
-                      `/hooks` inside Codex after a successful add."
+            message: "Codex activates plugins through its native cache. Run `codex plugin add \
+                      tracedecay@personal` after TraceDecay stages the source package. Confirm \
+                      the `codex` CLI is on PATH and retry; hook trust still requires `/hooks` \
+                      inside Codex after a successful add."
+                .to_string(),
+        };
+    }
+    if matches!(
+        &error,
+        tracedecay_agent_hosts::agents::host_bundle::HostBundleError::HostCliUnavailable { .. }
+    ) && agent_id == "codex"
+    {
+        return tracedecay_domain::errors::TraceDecayError::Config {
+            message: "Codex activates plugins through its native cache. Run `codex plugin add \
+                      tracedecay@personal` after TraceDecay stages the source package. Install \
+                      the `codex` CLI or add it to PATH, then retry."
                 .to_string(),
         };
     }
diff --git a/crates/tracedecay-code-index-runtime/src/code_index_executor.rs b/crates/tracedecay-code-index-runtime/src/code_index_executor.rs
index b271bf04d5..d1139e4b4e 100644
--- a/crates/tracedecay-code-index-runtime/src/code_index_executor.rs
+++ b/crates/tracedecay-code-index-runtime/src/code_index_executor.rs
@@ -1515,11 +1515,15 @@ where
                     );
                 }
             };
+            let read_control = Arc::clone(&control);
             let read = tokio::task::spawn_blocking(move || {
                 let _permit = permit;
-                owners.similar(&request, control.as_ref())
+                owners.similar(&request, read_control.as_ref())
             })
             .await;
+            if let Some(reason) = control.request_termination() {
+                return unavailable(reason);
+            }
             match read {
                 Ok(Ok(Some(result))) => {
                     code_search::CodeIndexSimilarOutcomeV1::Complete(Box::new(result))
@@ -1707,11 +1711,15 @@ where
                     );
                 }
             };
+            let read_control = Arc::clone(&control);
             let read = tokio::task::spawn_blocking(move || {
                 let _permit = permit;
-                owners.redundancy(&request, control.as_ref())
+                owners.redundancy(&request, read_control.as_ref())
             })
             .await;
+            if let Some(reason) = control.request_termination() {
+                return unavailable(reason);
+            }
             match read {
                 Ok(Ok(outcome)) => Ok(outcome),
                 Ok(Err(
diff --git a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/queries.rs b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/queries.rs
index 25cabb4f5f..be5c9e3f54 100644
--- a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/queries.rs
+++ b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/queries.rs
@@ -61,7 +61,7 @@ use tracedecay_query::retrieval::lexical::{
     LexicalFieldFilterV1, LexicalFieldV1, LexicalLaneRequest, lexical_query_parts,
 };
 use tracedecay_query::retrieval::ports::{
-    CodeCandidateBindingV1, CodeOccurrenceRefV1, RetrievalExecutionControl,
+    CodeCandidateBindingV1, CodeOccurrenceRefV1, RetrievalExecutionControl, RetrievalPortError,
 };
 use tracedecay_query::retrieval::{
     AdmittedGenerationContextV1, NativeCodeOccurrenceV1, NativeExactRecordV1, NativeGraphRecordV1,
@@ -2597,6 +2597,73 @@ fn application_budget_usage(usage: RetrievalBudgetUsage) -> OperationBudgetUsage
 type PortFuture<'a, T> =
     Pin<Box<dyn Future<Output = RetrievalPortOutcome<CodeQueryPage<T>>> + Send + 'a>>;
 
+fn execute_prepared_exact_query(
+    prepared: &PreparedTextCallableQueryV1,
+    context: &RetrievalPortContext<'_>,
+    request: &ExactOccurrenceRequest,
+    query_binding_digest: ManifestDigest,
+) -> RetrievalPortOutcome<CodeQueryPage<ExactOccurrenceRecord>> {
+    let latest = &prepared.latest;
+    let served_generation = latest.metadata().manifest().generation_id.clone();
+    let finished_at = query_finished_at();
+    let base = prepared.query.request();
+    let Ok(query_view) = tracedecay_domain::EphemeralSanitizedQueryViewV1::sanitize(
+        request.literal.clone(),
+        callable_query_sanitizer_revision(),
+        callable_query_normalization_revision(),
+    ) else {
+        return unavailable(finished_at);
+    };
+    let authority = CentralExactAdmissionAuthorityV1::new(
+        ExactAdmissionRuleRevision::new(tracedecay_query::retrieval::QUERY_EXACT_RULE_REVISION_V1)
+            .unwrap_or_else(|_| panic!("static exact rule revision")),
+    );
+    let exact_control = CallableRetrievalExecutionControl::for_request(context.request);
+    let lane_request = ExactLaneRequest {
+        literals: authority.parse_literals(&query_view, base),
+        generation: served_generation.clone(),
+        budget: base.budget,
+        base: base.clone(),
+        query_view: &query_view,
+        control: exact_control.as_ref(),
+    };
+    let Ok(owners) = latest.production_query_owners_with_budget(&base.budget) else {
+        return unavailable(finished_at);
+    };
+    let records = TextArtifactNativeRecordReadPortV1 {
+        generation: served_generation.clone(),
+        owners: std::sync::Arc::clone(&owners),
+    };
+    let Ok(native_context) =
+        AdmittedGenerationContextV1::admit(served_generation.clone(), &records)
+    else {
+        return unavailable_for_generation(finished_at, served_generation);
+    };
+    let outcome = match owners.retrieve_exact(&lane_request) {
+        Ok(outcome) => {
+            let Ok(outcome) =
+                native_context.exact(outcome, &request.literal, request.kind, |path| {
+                    path_is_in_code_query_scope(path, &request.scope)
+                })
+            else {
+                return unavailable(finished_at);
+            };
+            outcome
+        }
+        Err(RetrievalPortError::Cancelled) => NativeLaneOutcomeV1::Cancelled,
+        Err(_) => return unavailable(finished_at),
+    };
+    finish_native_lane_query(
+        prepared,
+        context,
+        "code_exact_occurrence",
+        query_binding_digest,
+        &request.meta.page,
+        outcome,
+        application_exact_record,
+    )
+}
+
 impl CallableCodeQueryPort for CodeIndexSchedulerRegistryV1 {
     fn exact_occurrence<'a>(
         &'a self,
@@ -2618,64 +2685,7 @@ impl CallableCodeQueryPort for CodeIndexSchedulerRegistryV1 {
                     &request.meta.order,
                 )
             );
-            let latest = &prepared.latest;
-            let served_generation = latest.metadata().manifest().generation_id.clone();
-            let finished_at = query_finished_at();
-            let base = prepared.query.request();
-            let Ok(query_view) = tracedecay_domain::EphemeralSanitizedQueryViewV1::sanitize(
-                request.literal.clone(),
-                callable_query_sanitizer_revision(),
-                callable_query_normalization_revision(),
-            ) else {
-                return unavailable(finished_at);
-            };
-            let authority = CentralExactAdmissionAuthorityV1::new(
-                ExactAdmissionRuleRevision::new(
-                    tracedecay_query::retrieval::QUERY_EXACT_RULE_REVISION_V1,
-                )
-                .unwrap_or_else(|_| panic!("static exact rule revision")),
-            );
-            let lane_request = ExactLaneRequest {
-                literals: authority.parse_literals(&query_view, base),
-                generation: served_generation.clone(),
-                budget: base.budget,
-                base: base.clone(),
-                query_view: &query_view,
-            };
-            let Ok(owners) = latest.production_query_owners_with_budget(&base.budget) else {
-                return unavailable(finished_at);
-            };
-            let records = TextArtifactNativeRecordReadPortV1 {
-                generation: served_generation.clone(),
-                owners: std::sync::Arc::clone(&owners),
-            };
-            let Ok(native_context) =
-                AdmittedGenerationContextV1::admit(served_generation.clone(), &records)
-            else {
-                return unavailable_for_generation(finished_at, served_generation);
-            };
-            let outcome = owners.retrieve_exact(&lane_request);
-            match outcome {
-                Ok(outcome) => {
-                    let Ok(outcome) =
-                        native_context.exact(outcome, &request.literal, request.kind, |path| {
-                            path_is_in_code_query_scope(path, &request.scope)
-                        })
-                    else {
-                        return unavailable(finished_at);
-                    };
-                    finish_native_lane_query(
-                        &prepared,
-                        &context,
-                        "code_exact_occurrence",
-                        query_binding_digest,
-                        &request.meta.page,
-                        outcome,
-                        application_exact_record,
-                    )
-                }
-                Err(_) => unavailable(finished_at),
-            }
+            execute_prepared_exact_query(&prepared, &context, request, query_binding_digest)
         })
     }
 
@@ -2764,26 +2774,27 @@ impl CallableCodeQueryPort for CodeIndexSchedulerRegistryV1 {
             else {
                 return unavailable_for_generation(finished_at, served_generation);
             };
-            let outcome = owners.retrieve_lexical(&lane_request);
-            match outcome {
+            let outcome = match owners.retrieve_lexical(&lane_request) {
                 Ok(outcome) => {
                     let Ok(outcome) = native_context.lexical(outcome, |path| {
                         path_is_in_code_query_scope(path, &request.scope)
                     }) else {
                         return unavailable(finished_at);
                     };
-                    finish_native_lane_query(
-                        &prepared,
-                        &context,
-                        "code_phrase_search",
-                        query_binding_digest,
-                        &request.meta.page,
-                        outcome,
-                        application_lexical_record,
-                    )
+                    outcome
                 }
-                Err(_) => unavailable(finished_at),
-            }
+                Err(RetrievalPortError::Cancelled) => NativeLaneOutcomeV1::Cancelled,
+                Err(_) => return unavailable(finished_at),
+            };
+            finish_native_lane_query(
+                &prepared,
+                &context,
+                "code_phrase_search",
+                query_binding_digest,
+                &request.meta.page,
+                outcome,
+                application_lexical_record,
+            )
         })
     }
 
@@ -3900,6 +3911,94 @@ fn navigation_symbol_query<'a>(
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::code_index_scheduler::tests::{
+        GitFixture, application_context, mounted_core_query_worktree, query_meta,
+        wait_for_queryable_text_generation,
+    };
+    use tracedecay_contracts::{
+        CallableCodeOperationKind, CancellationContext, CodeQueryScope, callable_code_operation,
+    };
+
+    #[tokio::test]
+    async fn callable_exact_read_preserves_cancellation_after_generation_admission() {
+        let fixture = GitFixture::new(&[("src/lib.rs", "pub fn cancellation_target() {}\n")]);
+        let store = tempfile::tempdir().expect("isolated store");
+        let (registry, scope) = mounted_core_query_worktree(&fixture, &store).await;
+        let latest = wait_for_queryable_text_generation(&registry, fixture.path()).await;
+        let generation = latest.metadata().manifest().generation_id.clone();
+        let operation = callable_code_operation(CallableCodeOperationKind::ExactOccurrence)
+            .expect("exact operation");
+        let context = application_context(&operation, scope.repository_id, scope.worktree_id);
+        let request = ExactOccurrenceRequest::new(
+            "cancellation_target",
+            None,
+            CodeQueryScope::new(generation.clone(), None).expect("exact generation scope"),
+            query_meta(),
+        )
+        .expect("exact request");
+        let port_context = RetrievalPortContext {
+            request: &context,
+            operation: &operation,
+        };
+        let binding = canonical_sha256(&(
+            "code_exact_occurrence",
+            &request.literal,
+            &request.kind,
+            &request.scope,
+            &request.meta.projection,
+            &request.meta.order,
+        ))
+        .expect("request binding");
+        let prepared = registry
+            .prepare_text_callable_query(
+                &port_context,
+                &generation,
+                &request.meta.page,
+                request.meta.temporal,
+                "code_exact_occurrence",
+                binding.clone(),
+            )
+            .await
+            .expect("real mounted artifact admission");
+        let active = registry.exact_occurrence(port_context, &request).await;
+        assert!(
+            matches!(active, RetrievalPortOutcome::Completed(_)),
+            "{active:?}"
+        );
+
+        let cancelled = context.with_cancellation(
+            CancellationContext::cancelled("cancel.callable-exact", query_finished_at())
+                .expect("cancelled request context"),
+        );
+        let outcome = execute_prepared_exact_query(
+            &prepared,
+            &RetrievalPortContext {
+                request: &cancelled,
+                operation: &operation,
+            },
+            &request,
+            binding,
+        );
+        let RetrievalPortOutcome::Cancelled(evidence) = outcome else {
+            panic!("a cancelled exact read must retain its typed outcome: {outcome:?}");
+        };
+        assert_eq!(evidence.temporal.source_generation, Some(generation));
+        assert!(evidence.payload.is_none());
+        assert!(
+            evidence
+                .omissions
+                .iter()
+                .any(|omission| omission.reason == OmissionReason::Cancelled)
+        );
+        assert_eq!(
+            evidence
+                .cancellation
+                .expect("cancellation observation")
+                .stage,
+            CancellationStage::DuringRead
+        );
+        registry.shutdown().await;
+    }
 
     #[test]
     fn generation_resolution_wait_reserves_outer_settlement_margin() {
diff --git a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/query_runtime.rs b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/query_runtime.rs
index f804c3f2fe..25773ac116 100644
--- a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/query_runtime.rs
+++ b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/query_runtime.rs
@@ -743,6 +743,7 @@ where
             generation: generation.clone(),
             literals: parser.parse_literals(query_view, request),
             budget: request.budget,
+            control: graph_control.as_ref(),
         })
     })?;
     let route_plan = LexicalRoutePlanV1::plan(query_view.as_str(), &input.lexical_routing)?;
diff --git a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/reconcile.rs b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/reconcile.rs
index f6b29a1565..0c339b4b7e 100644
--- a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/reconcile.rs
+++ b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/reconcile.rs
@@ -1520,32 +1520,34 @@ impl CodeIndexWorktreeSchedulerV1 {
         };
         // Equal metadata is not currency. A quiet Noop is only honest when
         // this pass decoded the generation and re-derived every sealed digest.
-        // Otherwise return None so the caller runs the content proof now;
-        // a later wake is not a substitute, because this empty-slot seat is
-        // the first branch and would keep swallowing the pass.
+        // A dirty remount (hints, config drift, or a moved frontier) must still
+        // seat from the durable pointer without joining the publication decode
+        // barrier — activation may already own that flight.
+        let frontier_sweep = self.retained_frontier_stat_sweep(&pointer);
         let content_matches = decoded.as_ref().is_some_and(|generation| {
-            self.retained_frontier_stat_sweep(&pointer)
-                .is_some_and(|sweep| {
-                    sweep.content_matches(
-                        &self.project_root,
-                        &SourceContentManifestV1::for_snapshot(generation.snapshot()),
-                        &self.shutting_down,
-                    )
-                })
+            frontier_sweep.as_ref().is_some_and(|sweep| {
+                sweep.content_matches(
+                    &self.project_root,
+                    &SourceContentManifestV1::for_snapshot(generation.snapshot()),
+                    &self.shutting_down,
+                )
+            })
         });
-        if !retained_empty_seat_settles_source(decoded.is_some(), content_matches) {
-            return Ok(None);
-        }
-        let Some(generation) = decoded else {
-            return Ok(None);
-        };
         let dirty = {
             let hints = self
                 .hints
                 .lock()
                 .unwrap_or_else(std::sync::PoisonError::into_inner);
             hints.overflow || !hints.paths.is_empty()
-        } || configuration_changed;
+        } || configuration_changed
+            || frontier_sweep.is_none()
+            || (decoded.is_some() && !content_matches);
+        if !dirty && !retained_empty_seat_settles_source(decoded.is_some(), content_matches) {
+            // Quiet + undecoded (or unproven) must not settle: a later wake is
+            // not a substitute, because this empty-slot seat is the first
+            // branch and would keep swallowing the content-proof pass.
+            return Ok(None);
+        }
         if dirty {
             self.request_background_reconcile();
         }
@@ -1553,8 +1555,13 @@ impl CodeIndexWorktreeSchedulerV1 {
         // `load_active_shared` here parked remount on the publication
         // barrier while activation owned it, so the seated event never
         // published and the dirty successor extract never started.
-        self.adopt_ignored_source_roster(&generation);
-        let snapshot_content_identity = generation.snapshot().content_identity.clone();
+        let snapshot_content_identity = if let Some(generation) = decoded {
+            self.adopt_ignored_source_roster(&generation);
+            generation.snapshot().content_identity.clone()
+        } else {
+            ContentDigest::new(pointer.snapshot_content_identity.clone())
+                .map_err(|error| CodeIndexSchedulerErrorV1::Identity(error.to_string()))?
+        };
         self.latest_content_identity = Some(snapshot_content_identity.clone());
         Ok(Some(CodeIndexReconcileOutcomeV1::Noop(
             CodeIndexNoopEvidenceV1 {
@@ -3787,8 +3794,9 @@ fn changed_paths_between_trees(
 /// A quiet empty-slot seat may end the pass only when the generation was
 /// decoded and its sealed file digests still match the bytes on disk.
 ///
-/// Equal stat metadata with no decoded generation is not currency. Callers
-/// that treat `false` as a settled Noop will skip the content proof.
+/// Equal stat metadata with no decoded generation is not currency. Dirty
+/// remount seating bypasses this gate and may emit a Noop from the durable
+/// pointer without joining the publication decode barrier.
 pub(crate) fn retained_empty_seat_settles_source(
     generation_decoded: bool,
     content_matches: bool,
diff --git a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/registry/serving_reads.rs b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/registry/serving_reads.rs
index 1d41d5560e..a98a5f7613 100644
--- a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/registry/serving_reads.rs
+++ b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/registry/serving_reads.rs
@@ -277,7 +277,6 @@ impl CodeIndexSchedulerRegistryV1 {
             generation_recovery,
             build_progress,
             hints,
-            pending_wake,
             source_freshness,
             graph_activation_enabled,
         ) = {
@@ -295,7 +294,6 @@ impl CodeIndexSchedulerRegistryV1 {
                 Arc::clone(&worktree.generation_recovery),
                 Arc::clone(&worktree.build_progress),
                 Arc::clone(&worktree.hints),
-                Arc::clone(&worktree.pending_wake),
                 worktree.source_freshness.clone(),
                 worktree.graph_activation.policy().is_enabled(),
             )
@@ -318,13 +316,12 @@ impl CodeIndexSchedulerRegistryV1 {
                 }
                 progress
             });
-            let refresh_in_flight = reconcile_in_progress.load(Ordering::Acquire) != 0
-                || pending_wake
-                    .state
-                    .lock()
-                    .unwrap_or_else(std::sync::PoisonError::into_inner)
-                    .micros
-                    != 0;
+            // `Verifying` / `Refreshing` name an executing source proof or
+            // rebuild pass. A bare pending wake is only a scheduled follow-up;
+            // counting it here flipped Fresh→Verifying between consecutive
+            // status reads after a settled seat (registry publication feeds).
+            // The pass guard (`reconcile_in_progress`) is the durable signal.
+            let refresh_in_flight = reconcile_in_progress.load(Ordering::Acquire) != 0;
             let source_change_pending = source_freshness.source_change_pending();
             let parked = convergence_park
                 .read()
diff --git a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/serving.rs b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/serving.rs
index b266149250..0807fde8dd 100644
--- a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/serving.rs
+++ b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/serving.rs
@@ -84,7 +84,7 @@ use crate::{
             LexicalLaneEvidence, LexicalLaneRequest, LexicalLaneRetriever,
             code_lexical_artifact_build_memory_budget_for,
         },
-        ports::RetrievalPortError,
+        ports::{RETRIEVAL_CANDIDATE_BATCH_SIZE, RetrievalPortError},
     },
 };
 
@@ -92,7 +92,7 @@ use super::{DaemonCodeIndexPublicationStoreV1, ProfiledStdMutex, queries};
 
 /// Page bounds for streaming one sealed generation into the durable lexical
 /// text artifact. One page is one bounded unit of background build progress.
-pub(super) const TEXT_ARTIFACT_PAGE_CHUNKS_V1: usize = 128;
+pub(super) const TEXT_ARTIFACT_PAGE_CHUNKS_V1: usize = RETRIEVAL_CANDIDATE_BATCH_SIZE;
 const TEXT_ARTIFACT_PAGE_BYTES_V1: usize = 4 * 1024 * 1024;
 const CLONE_SUCCESSOR_MEMORY_BUDGET_BYTES_V1: usize = 128 * 1024 * 1024;
 const TEXT_ARTIFACT_BASE_BATCH_PAGES_V1: usize = 64;
@@ -659,6 +659,7 @@ impl ProductionCodeIndexQueryOwnersV1 {
         Option<tracedecay_query::code_search::CodeIndexSimilarCompletedV1>,
         RetrievalPortError,
     > {
+        checkpoint_text_artifact_control(control)?;
         let source = match &request.target {
             tracedecay_query::code_search::CodeIndexSimilarTargetV1::SymbolOccurrence(
                 occurrence,
@@ -667,7 +668,7 @@ impl ProductionCodeIndexQueryOwnersV1 {
                 self.hydration.clone_body_by_source_range(path, *span)
             }
         }
-        .map_err(|error| RetrievalPortError::AuthorityUnavailable(error.to_string()))?;
+        .map_err(family_report::clone_artifact_error)?;
         let Some(source) = source else {
             return Ok(None);
         };
@@ -682,7 +683,7 @@ impl ProductionCodeIndexQueryOwnersV1 {
             .into_iter()
             .filter(|key| request.match_classes.contains(&key.class))
         {
-            family_report::interrupt_family_batch(control)?;
+            checkpoint_text_artifact_control(control)?;
             if remaining_results == 0 || remaining_work == 0 {
                 break;
             }
@@ -710,6 +711,7 @@ impl ProductionCodeIndexQueryOwnersV1 {
                 );
             }
         }
+        checkpoint_text_artifact_control(control)?;
         Ok(Some(
             tracedecay_query::code_search::CodeIndexSimilarCompletedV1 {
                 source,
@@ -738,12 +740,15 @@ impl ProductionCodeIndexQueryOwnersV1 {
         let mut cursor = start_cursor.cloned();
         let mut complete = false;
         while members.len() < limit {
-            family_report::interrupt_family_batch(control)?;
+            checkpoint_text_artifact_control(control)?;
             let page = self
                 .hydration
                 .clone_exact_page(&source.occurrence, key, cursor.as_ref(), limit, control)
-                .map_err(|error| RetrievalPortError::AuthorityUnavailable(error.to_string()))?;
-            for member in page.members {
+                .map_err(family_report::clone_artifact_error)?;
+            for (ordinal, member) in page.members.into_iter().enumerate() {
+                if ordinal.is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE) {
+                    checkpoint_text_artifact_control(control)?;
+                }
                 if member.occurrence.symbol_occurrence_id == source.occurrence.symbol_occurrence_id
                 {
                     continue;
@@ -760,6 +765,7 @@ impl ProductionCodeIndexQueryOwnersV1 {
                     break;
                 }
             }
+            checkpoint_text_artifact_control(control)?;
             match page.next_cursor {
                 Some(next) if members.len() < limit => cursor = Some(next),
                 Some(next) => return Ok((members, false, Some(next))),
diff --git a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/serving/family_report.rs b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/serving/family_report.rs
index 8f71efa5aa..ebf6112a70 100644
--- a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/serving/family_report.rs
+++ b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/serving/family_report.rs
@@ -3,7 +3,7 @@ use std::path::{Component, Path};
 use tracedecay_code_index::clones::{
     CloneExactKeyV1, CloneNormalizationClassV1, CodeIndexCloneBodyV1,
 };
-use tracedecay_code_index::production::CodeIndexExecutionControlV1;
+use tracedecay_code_index::production::{CodeIndexExecutionControlV1, CodeIndexInterruptionV1};
 use tracedecay_contracts::retrieval::{
     RedundancyCoverageV1, RedundancyFamilyV1, RedundancyPartialReasonV1, RedundancyRankingV1,
     RedundancyResultV1, SimilarFamilyV1, SimilarMatchClassV1, SimilarOccurrenceV1,
@@ -14,8 +14,8 @@ use tracedecay_query::retrieval::lexical::{
     CloneArtifactCursorV1, CloneExactArtifactMemberV1, CodeLexicalArtifactErrorV1,
 };
 
-use super::ProductionCodeIndexQueryOwnersV1;
-use crate::query::retrieval::ports::RetrievalPortError;
+use super::{ProductionCodeIndexQueryOwnersV1, checkpoint_text_artifact_control};
+use crate::query::retrieval::ports::{RETRIEVAL_CANDIDATE_BATCH_SIZE, RetrievalPortError};
 
 impl ProductionCodeIndexQueryOwnersV1 {
     pub(crate) fn redundancy(
@@ -23,6 +23,7 @@ impl ProductionCodeIndexQueryOwnersV1 {
         request: &CodeIndexRedundancyQueryV1,
         control: &dyn CodeIndexExecutionControlV1,
     ) -> Result<RedundancyResultV1, RetrievalPortError> {
+        checkpoint_text_artifact_control(control)?;
         let family_page_limit = request.family_limit.min(request.work_limit / 3).max(1);
         let pull_request_scope_digest = match &request.scope {
             CodeIndexRedundancyScopeV1::PullRequest {
@@ -63,7 +64,7 @@ impl ProductionCodeIndexQueryOwnersV1 {
                 family_page_limit,
                 control,
             )
-            .map_err(redundancy_artifact_error)?;
+            .map_err(clone_artifact_error)?;
         let page_continuation = page.next_cursor.clone();
         let mut families = Vec::with_capacity(page.families.len());
         let mut examined_families = 0usize;
@@ -72,7 +73,7 @@ impl ProductionCodeIndexQueryOwnersV1 {
         let mut work_exhausted = false;
         let mut report_continuation = request.cursor.clone();
         for candidate in page.families {
-            interrupt_family_batch(control)?;
+            checkpoint_text_artifact_control(control)?;
             if work_spent.saturating_add(3) > request.work_limit {
                 work_exhausted = true;
                 break;
@@ -82,7 +83,7 @@ impl ProductionCodeIndexQueryOwnersV1 {
             let source = self
                 .hydration
                 .clone_body(&candidate.representative)
-                .map_err(|error| RetrievalPortError::AuthorityUnavailable(error.to_string()))?
+                .map_err(clone_artifact_error)?
                 .ok_or_else(|| {
                     RetrievalPortError::AuthorityUnavailable(
                         "clone family representative is unavailable".to_owned(),
@@ -153,6 +154,7 @@ impl ProductionCodeIndexQueryOwnersV1 {
                 break;
             }
         }
+        checkpoint_text_artifact_control(control)?;
         let source_generation = self.hydration.metadata().generation.clone();
         let (coverage, next_cursor) = redundancy_coverage(
             work_exhausted,
@@ -185,6 +187,7 @@ impl ProductionCodeIndexQueryOwnersV1 {
         let mut cursor = None;
         let mut work_spent = 0usize;
         loop {
+            checkpoint_text_artifact_control(control)?;
             if members.len() >= result_limit {
                 return Ok(RedundancyMemberReadV1 {
                     members,
@@ -215,9 +218,12 @@ impl ProductionCodeIndexQueryOwnersV1 {
                     page_limit,
                     control,
                 )
-                .map_err(|error| RetrievalPortError::AuthorityUnavailable(error.to_string()))?;
+                .map_err(clone_artifact_error)?;
             work_spent = work_spent.saturating_add(page.members.len());
-            for member in page.members {
+            for (ordinal, member) in page.members.into_iter().enumerate() {
+                if ordinal.is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE) {
+                    checkpoint_text_artifact_control(control)?;
+                }
                 if report_path_matches(&member.occurrence.path, path, include_generated_paths)
                     && tracedecay_code_index::clones::verify_exact_clone_payload(
                         &source.payload,
@@ -228,6 +234,7 @@ impl ProductionCodeIndexQueryOwnersV1 {
                     members.push(member);
                 }
             }
+            checkpoint_text_artifact_control(control)?;
             match page.next_cursor {
                 Some(next) => cursor = Some(next),
                 None => {
@@ -244,8 +251,14 @@ impl ProductionCodeIndexQueryOwnersV1 {
     }
 }
 
-fn redundancy_artifact_error(error: CodeLexicalArtifactErrorV1) -> RetrievalPortError {
+pub(super) fn clone_artifact_error(error: CodeLexicalArtifactErrorV1) -> RetrievalPortError {
     match error {
+        CodeLexicalArtifactErrorV1::Interrupted(CodeIndexInterruptionV1::Cancelled) => {
+            RetrievalPortError::Cancelled
+        }
+        CodeLexicalArtifactErrorV1::Interrupted(CodeIndexInterruptionV1::DeadlineExceeded) => {
+            RetrievalPortError::BudgetExceeded
+        }
         CodeLexicalArtifactErrorV1::Contract(message)
             if message == "clone family cursor does not match its artifact or request" =>
         {
@@ -268,18 +281,6 @@ fn report_path_matches(path: &str, scope: Option<&str>, include_generated_paths:
         && (include_generated_paths || !is_generated_path(path))
 }
 
-pub(super) fn interrupt_family_batch(
-    control: &dyn CodeIndexExecutionControlV1,
-) -> Result<(), RetrievalPortError> {
-    if control.is_cancelled() {
-        Err(RetrievalPortError::Cancelled)
-    } else if control.is_deadline_exceeded() {
-        Err(RetrievalPortError::BudgetExceeded)
-    } else {
-        Ok(())
-    }
-}
-
 fn is_generated_path(path: &str) -> bool {
     Path::new(path).components().any(|component| {
         matches!(
@@ -346,26 +347,17 @@ fn redundancy_coverage(
 
 #[cfg(test)]
 mod tests {
-    use super::{RetrievalPortError, interrupt_family_batch, is_generated_path};
-    use tracedecay_code_index::production::CodeIndexExecutionControlV1;
-
-    struct CancelledControl;
-
-    impl CodeIndexExecutionControlV1 for CancelledControl {
-        fn is_cancelled(&self) -> bool {
-            true
-        }
-
-        fn is_deadline_exceeded(&self) -> bool {
-            false
-        }
-    }
+    use super::{clone_artifact_error, is_generated_path};
+    use tracedecay_code_index::production::CodeIndexInterruptionV1;
+    use tracedecay_query::retrieval::{RetrievalPortError, lexical::CodeLexicalArtifactErrorV1};
 
     #[test]
-    fn a_cancelled_family_batch_stops_before_the_next_family() {
+    fn clone_page_interruption_preserves_cancellation() {
         assert_eq!(
-            interrupt_family_batch(&CancelledControl).unwrap_err(),
-            RetrievalPortError::Cancelled
+            clone_artifact_error(CodeLexicalArtifactErrorV1::Interrupted(
+                CodeIndexInterruptionV1::Cancelled,
+            )),
+            RetrievalPortError::Cancelled,
         );
     }
 
diff --git a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/tests/mod.rs b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/tests/mod.rs
index 845dfa9f10..abf3684028 100644
--- a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/tests/mod.rs
+++ b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/tests/mod.rs
@@ -69,7 +69,7 @@ fn canonical_temp_root() -> std::path::PathBuf {
     canonical_root_identity(&std::env::temp_dir())
 }
 
-struct GitFixture {
+pub(super) struct GitFixture {
     root: TempDir,
 }
 
@@ -81,7 +81,7 @@ const RETAINED_REVISION_0: &[(&str, &str)] =
     &[("src/lib.rs", "pub fn retained_revision() -> usize { 0 }\n")];
 
 impl GitFixture {
-    fn new(files: &[(&str, &str)]) -> Self {
+    pub(super) fn new(files: &[(&str, &str)]) -> Self {
         if files == ALPHA_LIB_V1 {
             return Self::from_template(alpha_lib_v1_template());
         }
@@ -130,7 +130,7 @@ impl GitFixture {
         Self { root }
     }
 
-    fn path(&self) -> &Path {
+    pub(super) fn path(&self) -> &Path {
         self.root.path()
     }
 
@@ -619,7 +619,7 @@ impl RetrievalExecutionControl for ReadyRetrievalControlV1 {
     }
 }
 
-fn application_context(
+pub(super) fn application_context(
     operation: &tracedecay_contracts::ApplicationOperation,
     repository: RepositoryId,
     worktree: WorktreeId,
@@ -655,7 +655,7 @@ fn application_context(
     .expect("request context")
 }
 
-fn query_meta() -> RetrievalRequestMeta {
+pub(super) fn query_meta() -> RetrievalRequestMeta {
     RetrievalRequestMeta::current(
         PageRequest::first(16).expect("page"),
         ResultProjection::Evidence,
@@ -1014,7 +1014,7 @@ fn core_search_request(query: &str) -> super::query_runtime::QuerySearchExecutio
 
 /// Mount one worktree, publish an initial generation, and mount the core
 /// query authority for its exact scope.
-async fn mounted_core_query_worktree(
+pub(super) async fn mounted_core_query_worktree(
     fixture: &GitFixture,
     store: &TempDir,
 ) -> (CodeIndexSchedulerRegistryV1, ResolvedScope) {
@@ -1509,7 +1509,25 @@ async fn wait_for_dashboard_ready(registry: &CodeIndexSchedulerRegistryV1, path:
                         && freshness.coverage == tracedecay_contracts::code_index_freshness::CodeIndexFreshnessCoverageV1::Complete
                 });
             if ready {
-                break;
+                // Fresh is projected whenever refresh_in_flight is briefly
+                // false between owner passes. Join the seating pass and
+                // re-sample so ready is not a trough before Verifying.
+                wait_for_quiescent_owner_pass(registry, path).await;
+                let still_ready = registry
+                    .dashboard_freshness(path)
+                    .await
+                    .is_some_and(|freshness| {
+                        freshness.staleness_state
+                            == Some(
+                                tracedecay_contracts::code_index_freshness::CodeIndexStalenessStateV1::Fresh,
+                            )
+                            && freshness.coverage
+                                == tracedecay_contracts::code_index_freshness::CodeIndexFreshnessCoverageV1::Complete
+                    });
+                if still_ready && !registry.reconcile_in_progress_for_test(path).await {
+                    break;
+                }
+                continue;
             }
             tokio::time::sleep(Duration::from_millis(2)).await;
         }
@@ -1525,7 +1543,7 @@ async fn wait_for_dashboard_ready(registry: &CodeIndexSchedulerRegistryV1, path:
 /// through the text owner, so that slot is the typed receipt this wait joins.
 /// The text lane publishes the per-worktree serving-generation watch, so
 /// [`wait_until_serving_seat`] blocks on that signal rather than sampling.
-async fn wait_for_queryable_text_generation(
+pub(super) async fn wait_for_queryable_text_generation(
     registry: &CodeIndexSchedulerRegistryV1,
     path: &Path,
 ) -> super::LatestCodeTextGenerationV1 {
diff --git a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/tests/search_permit_release.rs b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/tests/search_permit_release.rs
index 8efc139f08..da81470c0f 100644
--- a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/tests/search_permit_release.rs
+++ b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/tests/search_permit_release.rs
@@ -2,7 +2,7 @@
 //! not the blocking worker's natural completion.
 //!
 //! `MAX_CONCURRENT_CODE_INDEX_SEARCHES` is one, so a request that its caller
-//! has already abandoned must release the permit as soon as its lexical scan
+//! has already abandoned must release the permit as soon as its candidate scan
 //! observes the request control — otherwise every following search fails
 //! `search_capacity_unavailable` until the abandoned scan hydrates the rest of
 //! its candidate corpus.
@@ -60,9 +60,9 @@ impl CodeIndexMcpReadGrantV1 for FixtureGrant {
 ///
 /// The executor's request control consults `route_is_registered` on every
 /// `is_cancelled` check. Calls from the test's runtime thread (the pre-permit
-/// check and the executor's settlement poll) answer immediately; the first
-/// call from any other thread is the scan itself, running under
-/// `spawn_blocking` with the execution permit already held. That call reports
+/// check and the executor's settlement poll) answer immediately; calls from
+/// other threads are the scan itself, running under
+/// `spawn_blocking` with the execution permit already held. The selected checkpoint reports
 /// the pause to the test and blocks until the test resumes it, so the test
 /// can observe the permit-held state and cancel the request at a point that
 /// is deterministic rather than timing-dependent.
@@ -71,6 +71,7 @@ struct PausingAdmission {
     authority: CodeIndexSearchAuthorityV1,
     runtime_thread: ThreadId,
     scan_checkpoints: Arc<AtomicUsize>,
+    pause_at: usize,
     scan_paused: Arc<tokio::sync::Notify>,
     resume: Arc<StdMutex<mpsc::Receiver<()>>>,
 }
@@ -82,7 +83,7 @@ impl CodeIndexMcpReadAdmissionV1 for PausingAdmission {
         if std::thread::current().id() == self.runtime_thread {
             return true;
         }
-        if self.scan_checkpoints.fetch_add(1, Ordering::SeqCst) == 0 {
+        if self.scan_checkpoints.fetch_add(1, Ordering::SeqCst) == self.pause_at {
             self.scan_paused.notify_one();
             self.resume
                 .lock()
@@ -171,19 +172,30 @@ fn unavailable_reason(
     }
 }
 
-/// Pause a lexical scan at its first control checkpoint after the permit is
+/// Pause a candidate scan at its first control checkpoint after the permit is
 /// acquired, prove the permit is held (a concurrent search is refused with
 /// `search_capacity_unavailable`), cancel the paused request, and prove that
 /// resuming it unwinds with the typed cancellation reason, performs no further
 /// row checkpoints, and hands the permit to the next request, which is
 /// admitted and completes normally.
 #[tokio::test]
-async fn cancelled_lexical_scan_releases_the_search_permit_to_the_next_request() {
-    let sources = (0..16)
+async fn cancelled_scan_releases_the_search_permit_to_the_next_request() {
+    cancelled_scan_releases_permit("alpha", 0, 16).await;
+}
+
+#[tokio::test]
+async fn cancelled_exact_batch_releases_the_search_permit_to_the_next_request() {
+    // Entry into the exact lane and artifact reader, then the first batch.
+    // The fourth observation is the next batch boundary, after 128 candidates.
+    cancelled_scan_releases_permit(r#""return value""#, 3, 384).await;
+}
+
+async fn cancelled_scan_releases_permit(query: &str, pause_at: usize, source_count: usize) {
+    let sources = (0..source_count)
         .map(|ordinal| {
             (
-                format!("src/alpha_{ordinal:02}.rs"),
-                format!("pub fn alpha_{ordinal:02}() -> u32 {{ {ordinal} }}\n"),
+                format!("src/alpha_{ordinal:03}.rs"),
+                format!("pub fn alpha_{ordinal:03}() -> u32 {{ let value = {ordinal}; return value; }}\n"),
             )
         })
         .collect::<Vec<_>>();
@@ -206,6 +218,7 @@ async fn cancelled_lexical_scan_releases_the_search_permit_to_the_next_request()
         },
         runtime_thread: std::thread::current().id(),
         scan_checkpoints: Arc::new(AtomicUsize::new(0)),
+        pause_at,
         scan_paused: Arc::new(tokio::sync::Notify::new()),
         resume: Arc::new(StdMutex::new(resume_rx)),
     };
@@ -218,16 +231,15 @@ async fn cancelled_lexical_scan_releases_the_search_permit_to_the_next_request()
     let cancellation =
         CancellationSignal::active("cancellation.search-permit.fixture").expect("cancellation");
 
-    let abandoned = tokio::spawn(executor(search_request(
-        fixture.path(),
-        Some(cancellation.clone()),
-    )));
+    let mut request = search_request(fixture.path(), Some(cancellation.clone()));
+    request.query = query.to_owned();
+    let abandoned = tokio::spawn(executor(request));
     // Deterministic rendezvous: the scan itself reports when it reaches its
-    // first checkpoint holding the permit. The timeout only bounds a failure
+    // selected checkpoint holding the permit. The timeout only bounds a failure
     // in which the scan never consults the control while it holds the permit.
     tokio::time::timeout(Duration::from_mins(1), admission.scan_paused.notified())
         .await
-        .expect("the lexical scan must consult the request control while holding the permit");
+        .expect("the candidate scan must consult the request control while holding the permit");
 
     let refused = executor(search_request(fixture.path(), None)).await;
     assert_eq!(
@@ -251,7 +263,8 @@ async fn cancelled_lexical_scan_releases_the_search_permit_to_the_next_request()
     );
     let checkpoints = admission.scan_checkpoints.load(Ordering::SeqCst);
     assert_eq!(
-        checkpoints, 1,
+        checkpoints,
+        pause_at + 1,
         "the resumed scan observes cancellation at the checkpoint it paused in and \
          hydrates nothing further"
     );
diff --git a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/tests/serving.rs b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/tests/serving.rs
index b208dafd74..1efb57f459 100644
--- a/crates/tracedecay-code-index-runtime/src/code_index_scheduler/tests/serving.rs
+++ b/crates/tracedecay-code-index-runtime/src/code_index_scheduler/tests/serving.rs
@@ -400,6 +400,7 @@ fn production_text_serving_builds_publishes_and_reopens_the_artifact_head() {
     );
     let exact = owners
         .retrieve_exact(&ExactLaneRequest {
+            control: &ReadyRetrievalControlV1,
             literals: authority.parse_literals(&query_view, &base),
             generation: generation.clone(),
             budget: base.budget,
diff --git a/crates/tracedecay-code-index/src/parallelism.rs b/crates/tracedecay-code-index/src/parallelism.rs
index 5bd3604e27..8f8c51698e 100644
--- a/crates/tracedecay-code-index/src/parallelism.rs
+++ b/crates/tracedecay-code-index/src/parallelism.rs
@@ -685,8 +685,8 @@ mod tests {
 
     #[test]
     fn install_runs_the_caller_on_an_admitted_rayon_worker() {
-        let on_worker = install(|| rayon::current_thread_index().is_some())
-            .expect("code-index worker pool");
+        let on_worker =
+            install(|| rayon::current_thread_index().is_some()).expect("code-index worker pool");
         assert!(
             on_worker,
             "direct-seal encode only parallelizes when the caller is already a rayon worker"
diff --git a/crates/tracedecay-query/src/bin/tracedecay_search_bench.rs b/crates/tracedecay-query/src/bin/tracedecay_search_bench.rs
index be34e3450e..74a7f91665 100644
--- a/crates/tracedecay-query/src/bin/tracedecay_search_bench.rs
+++ b/crates/tracedecay-query/src/bin/tracedecay_search_bench.rs
@@ -940,6 +940,7 @@ where
         let exact_started = Instant::now();
         let exact_outcome = exact_lane
             .retrieve_exact(&ExactLaneRequest {
+                control: &ActiveControl,
                 base: request.clone(),
                 query_view,
                 generation: generation.clone(),
diff --git a/crates/tracedecay-query/src/retrieval/exact.rs b/crates/tracedecay-query/src/retrieval/exact.rs
index 14ab326e79..1b0e3309be 100644
--- a/crates/tracedecay-query/src/retrieval/exact.rs
+++ b/crates/tracedecay-query/src/retrieval/exact.rs
@@ -22,8 +22,9 @@ use tracedecay_domain::{
 
 use super::ports::{
     CodeCandidateBindingV1, ExactTermPostingReadPort, LaneBoundEvidence, LaneEvidenceRejections,
-    RetrievalPortError, candidate_checkpoint_prefix, checkpoint_digest, contract_error,
-    lane_bound_evidence, lane_candidate_cap,
+    RETRIEVAL_CANDIDATE_BATCH_SIZE, RetrievalExecutionControl, RetrievalPortError,
+    candidate_checkpoint_prefix, checkpoint_digest, contract_error, lane_bound_evidence,
+    lane_candidate_cap, retrieval_checkpoint,
 };
 
 /// Wording the exact lane uses when a port-emitted batch fails the shared
@@ -36,7 +37,6 @@ const EXACT_REJECTIONS: LaneEvidenceRejections = LaneEvidenceRejections {
 
 /// Exact technical literals are parsed under a versioned exact-admission
 /// specification before any lane executes.
-#[derive(Debug, PartialEq, Eq)]
 pub struct ExactLaneRequest<'a> {
     pub base: RetrievalRequest,
     pub query_view: &'a EphemeralSanitizedQueryViewV1,
@@ -45,6 +45,8 @@ pub struct ExactLaneRequest<'a> {
     /// admission validator. The lane never re-derives exact status.
     pub literals: Vec<ExactLiteralV1>,
     pub budget: RetrievalBudget,
+    /// The same live request authority used by the other retrieval lanes.
+    pub control: &'a dyn RetrievalExecutionControl,
 }
 
 impl ExactLaneRequest<'_> {
@@ -631,7 +633,10 @@ where
         // every candidate still compares against the verified minted proof.
         let mut verified_proofs: BTreeMap<(ExactFieldV1, Vec<u8>, Vec<u8>), ExactAdmissionProof> =
             BTreeMap::new();
-        for candidate in &batch.candidates {
+        for (ordinal, candidate) in batch.candidates.iter().enumerate() {
+            if ordinal.is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE) {
+                retrieval_checkpoint(request.control)?;
+            }
             let evidence = lane_bound_evidence(
                 batch,
                 candidate,
@@ -742,6 +747,9 @@ where
         let mut candidates = Vec::with_capacity(admitted.len());
         let mut evidence_by_occurrence = BTreeMap::new();
         for (ordinal, (mut candidate, evidence)) in admitted.into_iter().enumerate() {
+            if ordinal.is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE) {
+                retrieval_checkpoint(request.control)?;
+            }
             candidate.ordinal_rank = ordinal as u32;
             candidate.raw_score = FixedPointScore(
                 (evidence.matched_literals.len() as u64)
@@ -750,6 +758,7 @@ where
             evidence_by_occurrence.insert(candidate.source_occurrence_id.clone(), evidence);
             candidates.push(candidate);
         }
+        retrieval_checkpoint(request.control)?;
         let checkpoint_digest = exact_checkpoint_digest(&request.generation, &candidates)?;
         let rebuilt = RetrieverBatch {
             candidates,
@@ -783,6 +792,7 @@ where
         request: &ExactLaneRequest<'_>,
     ) -> Result<RetrieverOutcome<RetrieverBatch<ExactLaneEvidence>>, RetrievalPortError> {
         request.validate()?;
+        retrieval_checkpoint(request.control)?;
         self.enforce_request_literals(request)?;
         let outcome = match self.postings.read_exact_postings(request) {
             Ok(outcome) => outcome,
diff --git a/crates/tracedecay-query/src/retrieval/exact/tests.rs b/crates/tracedecay-query/src/retrieval/exact/tests.rs
index 580cac7aca..230fca18d8 100644
--- a/crates/tracedecay-query/src/retrieval/exact/tests.rs
+++ b/crates/tracedecay-query/src/retrieval/exact/tests.rs
@@ -21,9 +21,21 @@ use super::{
     ExactLaneRequest, ExactLaneRetriever, ExactLiteralV1,
 };
 use crate::retrieval::ports::{
-    CodeCandidateBindingV1, CodeOccurrenceRefV1, ExactTermPostingReadPort, RetrievalPortError,
+    CodeCandidateBindingV1, CodeOccurrenceRefV1, ExactTermPostingReadPort,
+    RetrievalExecutionControl, RetrievalPortError,
 };
 
+struct ActiveControl;
+
+impl RetrievalExecutionControl for ActiveControl {
+    fn is_cancelled(&self) -> bool {
+        false
+    }
+    fn elapsed_micros(&self) -> u64 {
+        0
+    }
+}
+
 fn id<T>(value: &str) -> T
 where
     T: TryFrom<String>,
@@ -179,6 +191,7 @@ fn exact_request(
         .expect("query sanitizes"),
     ));
     ExactLaneRequest {
+        control: &ActiveControl,
         literals: authority.parse_literals(query_view, &base),
         base,
         query_view,
diff --git a/crates/tracedecay-query/src/retrieval/lexical.rs b/crates/tracedecay-query/src/retrieval/lexical.rs
index 7c3be3e56e..133282f3e0 100644
--- a/crates/tracedecay-query/src/retrieval/lexical.rs
+++ b/crates/tracedecay-query/src/retrieval/lexical.rs
@@ -20,8 +20,9 @@ use tracedecay_domain::{
 
 use super::ports::{
     CodeCandidateBindingV1, LaneBoundEvidence, LaneEvidenceRejections, LexicalPostingReadPort,
-    RetrievalExecutionControl, RetrievalPortError, candidate_checkpoint_prefix, checkpoint_digest,
-    contract_error, lane_bound_evidence, lane_candidate_cap,
+    RETRIEVAL_CANDIDATE_BATCH_SIZE, RetrievalExecutionControl, RetrievalPortError,
+    candidate_checkpoint_prefix, checkpoint_digest, contract_error, lane_bound_evidence,
+    lane_candidate_cap, retrieval_checkpoint,
 };
 
 mod projection;
@@ -328,7 +329,7 @@ pub struct LexicalLaneRequest<'a> {
     pub score_domain: ScoreDomainId,
     pub budget: RetrievalBudget,
     /// The live request authority the lane consults between bounded units of
-    /// row work ([`lexical_checkpoint`]). The candidate-source bound keeps one
+    /// row work. The candidate-source bound keeps one
     /// request's hydration finite, but a caller that has already settled —
     /// cancelled, past its deadline, or revoked — must not keep the shared
     /// search execution permit occupied while the remaining rows decode and
@@ -337,21 +338,6 @@ pub struct LexicalLaneRequest<'a> {
     pub control: &'a dyn RetrievalExecutionControl,
 }
 
-/// The lexical lane's cooperative cancellation checkpoint.
-///
-/// Called before each candidate row is decoded and scored, and between the
-/// scan's phases, so cancellation performs at most one further row visit
-/// after the signal. An uncancelled request never observes it, which keeps
-/// candidate order, evidence, and coverage identical to an unchecked scan.
-pub(crate) fn lexical_checkpoint(
-    control: &dyn RetrievalExecutionControl,
-) -> Result<(), RetrievalPortError> {
-    if control.is_cancelled() {
-        return Err(RetrievalPortError::Cancelled);
-    }
-    Ok(())
-}
-
 /// Per-occurrence lexical-lane evidence with its field score breakdown.
 ///
 /// Each channel reports its raw score, rank, normalized feature, and fusion
@@ -587,7 +573,10 @@ where
         let mut admitted: Vec<(CompactCandidate, LexicalLaneEvidence, FixedPointScore)> =
             Vec::with_capacity(batch.candidates.len());
         let mut excluded = 0_u64;
-        for candidate in &batch.candidates {
+        for (ordinal, candidate) in batch.candidates.iter().enumerate() {
+            if ordinal.is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE) {
+                retrieval_checkpoint(request.control)?;
+            }
             let evidence = lane_bound_evidence(
                 batch,
                 candidate,
@@ -642,6 +631,9 @@ where
         let mut candidates = Vec::with_capacity(admitted.len());
         let mut evidence_by_occurrence = BTreeMap::new();
         for (ordinal, (mut candidate, evidence, raw_score)) in admitted.into_iter().enumerate() {
+            if ordinal.is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE) {
+                retrieval_checkpoint(request.control)?;
+            }
             candidate.ordinal_rank = ordinal as u32;
             candidate.raw_score = raw_score;
             evidence_by_occurrence.insert(candidate.source_occurrence_id.clone(), evidence);
@@ -655,6 +647,7 @@ where
         let eligible = batch.coverage.eligible.max(seen).saturating_sub(excluded);
         let capped = batch.coverage.capped.saturating_add(truncated as u64);
         let exhausted = truncated == 0 && batch.coverage.capped == 0;
+        retrieval_checkpoint(request.control)?;
         let checkpoint_digest = lexical_checkpoint_digest(&request.generation, &candidates)?;
         let rebuilt = RetrieverBatch {
             candidates,
@@ -687,7 +680,7 @@ where
         request: &LexicalLaneRequest<'_>,
     ) -> Result<RetrieverOutcome<RetrieverBatch<LexicalLaneEvidence>>, RetrievalPortError> {
         request.validate()?;
-        lexical_checkpoint(request.control)?;
+        retrieval_checkpoint(request.control)?;
         let outcome = match self.postings.read_lexical_postings(request) {
             Ok(outcome) => outcome,
             // A missing lexical authority rejects the request as a typed
diff --git a/crates/tracedecay-query/src/retrieval/lexical/projection/artifact/reader.rs b/crates/tracedecay-query/src/retrieval/lexical/projection/artifact/reader.rs
index 197e103a08..cfc1aadd0e 100644
--- a/crates/tracedecay-query/src/retrieval/lexical/projection/artifact/reader.rs
+++ b/crates/tracedecay-query/src/retrieval/lexical/projection/artifact/reader.rs
@@ -59,7 +59,8 @@ use crate::retrieval::exact::{ExactAdmissionAuthority, ExactLaneEvidence, ExactL
 use crate::retrieval::ports::RetrievalExecutionControl;
 use crate::retrieval::ports::{
     CodeCandidateBindingV1, CodeOccurrenceRefV1, ExactTermPostingReadPort, LexicalPostingReadPort,
-    RetrievalPortError, contract_error, lane_candidate_cap,
+    RETRIEVAL_CANDIDATE_BATCH_SIZE, RetrievalPortError, contract_error, lane_candidate_cap,
+    retrieval_checkpoint,
 };
 
 use super::super::{
@@ -72,7 +73,7 @@ use super::super::{
 use crate::retrieval::lexical::{
     LexicalFieldFilterV1, LexicalFieldV1, LexicalLaneEvidence, LexicalLaneRequest,
     LexicalSpellingVariantV1, MAX_FUZZY_TERM_EXPANSIONS_V1, MAX_LEXICAL_QUERY_TERM_BYTES_V1,
-    admit_candidate_sources, candidate_admission_outcome, field_admitted, lexical_checkpoint,
+    admit_candidate_sources, candidate_admission_outcome, field_admitted,
 };
 
 impl LexicalFieldTextV1 for ArtifactRowV1 {
@@ -777,9 +778,12 @@ impl CodeLexicalArtifactReaderV1 {
             .map_err(sqlite_error)?;
         let mut members = Vec::with_capacity(fetch);
         while let Some(row) = rows.next().map_err(sqlite_error)? {
-            checkpoint(control)?;
+            if members.len().is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE) {
+                checkpoint(control)?;
+            }
             members.push(self.verified_clone_member(authority, key, row)?);
         }
+        checkpoint(control)?;
         let next_cursor = (members.len() > limit)
             .then(|| {
                 members.get(limit - 1).map(|member| CloneArtifactCursorV1 {
@@ -1475,6 +1479,7 @@ fn rewrite_union_query_parameters(
 fn visit_document_ids(
     connection: &Connection,
     query: &DocumentQueryV1,
+    control: &dyn RetrievalExecutionControl,
     mut visitor: impl FnMut(u32) -> Result<(), RetrievalPortError>,
 ) -> Result<(), RetrievalPortError> {
     hotpath::measure_block!("query.stream.visit_documents", {
@@ -1493,10 +1498,14 @@ fn visit_document_ids(
             .map_err(map_query_sql_error)?;
         let mut visited = 0u64;
         while let Some(row) = rows.next().map_err(map_query_sql_error)? {
+            if visited.is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE as u64) {
+                retrieval_checkpoint(control)?;
+            }
             let document = row.get::<_, i64>(0).map_err(map_query_sql_error)?;
             visitor(u32::try_from(document).map_err(contract_error)?)?;
             visited += 1;
         }
+        retrieval_checkpoint(control)?;
         hotpath::gauge!("query.stream.rows_total").inc(visited);
         Ok(())
     })
@@ -1506,9 +1515,8 @@ fn visit_document_ids(
 /// one SQLite statement. The correlated posting lookup seeks the maintained
 /// document index; it never emits the row BLOB once per matching term.
 ///
-/// `control` is consulted before every row leaves SQLite, so a cancelled or
-/// expired request stops after the row already stepped instead of decoding
-/// and scoring the rest of its admitted candidate set.
+/// Request authority is consulted before each page-sized batch and at stream
+/// completion, bounding abandoned work without a route lookup per candidate.
 fn visit_lexical_rows(
     connection: &Connection,
     documents: &DocumentQueryV1,
@@ -1623,7 +1631,9 @@ fn visit_lexical_rows(
             .map_err(map_query_sql_error)?;
         let mut visited = 0u64;
         while let Some(row) = rows.next().map_err(map_query_sql_error)? {
-            lexical_checkpoint(control)?;
+            if visited.is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE as u64) {
+                retrieval_checkpoint(control)?;
+            }
             let document = u32::try_from(row.get::<_, i64>(0).map_err(map_query_sql_error)?)
                 .map_err(contract_error)?;
             let chunk_id: String = row.get(1).map_err(map_query_sql_error)?;
@@ -1665,6 +1675,7 @@ fn visit_lexical_rows(
             visited = visited.saturating_add(1);
         }
         drop(rows);
+        retrieval_checkpoint(control)?;
         metrics.observe_statement(&statement)?;
         metrics.rows(visited);
         Ok(())
@@ -2090,7 +2101,7 @@ impl<'a> ArtifactQueryV1<'a> {
         let prepared = PreparedLexicalQueryV1::new(request);
         let terms = lexical_terms(&prepared, &fuzzy);
         let stats = self.lexical_stats(&terms)?;
-        lexical_checkpoint(control)?;
+        retrieval_checkpoint(control)?;
         let mut phrase_queries = BTreeMap::new();
         for (_, normalized) in &prepared.phrases {
             let query = ngram_document_query(
@@ -2178,6 +2189,9 @@ impl<'a> ArtifactQueryV1<'a> {
         let mut candidates = Vec::with_capacity(selected.len());
         let mut evidence_by_occurrence = BTreeMap::new();
         for (ordinal, entry) in selected.into_iter().enumerate() {
+            if ordinal.is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE) {
+                retrieval_checkpoint(control)?;
+            }
             let RankedLexicalEntryV1 {
                 key: (_, _, _),
                 score,
@@ -2206,6 +2220,7 @@ impl<'a> ArtifactQueryV1<'a> {
             evidence_by_occurrence.insert(candidate.source_occurrence_id.clone(), evidence);
             candidates.push(candidate);
         }
+        retrieval_checkpoint(control)?;
         Ok(candidate_admission_outcome(
             capped_batch(
                 self.document_count,
@@ -2224,6 +2239,7 @@ impl<'a> ArtifactQueryV1<'a> {
         request: &ExactLaneRequest,
         authority: &A,
     ) -> Result<RetrieverOutcome<RetrieverBatch<ExactLaneEvidence>>, RetrievalPortError> {
+        retrieval_checkpoint(request.control)?;
         let documents = self.exact_documents(request)?;
         // Same bounded selection as the lexical lane: keys mirror the exact
         // lane's canonical order (admitted literal count, then occurrence),
@@ -2239,7 +2255,7 @@ impl<'a> ArtifactQueryV1<'a> {
         let mut eligible = 0u64;
         let mut ranked = BinaryHeap::new();
         let mut proofs = LiteralProofCacheV1::new(request.literals.len());
-        self.visit_documents(&documents, |document| {
+        self.visit_documents(&documents, request.control, |document| {
             let row = self.row(document)?;
             let (matched_literals, matched_kinds) = exact_matches_artifact(&row, request);
             if matched_literals.is_empty() {
@@ -2268,11 +2284,15 @@ impl<'a> ArtifactQueryV1<'a> {
             );
             Ok(())
         })?;
+        retrieval_checkpoint(request.control)?;
         let selected = ranked.into_sorted_vec();
         let truncated = eligible - selected.len() as u64;
         let mut candidates = Vec::with_capacity(selected.len());
         let mut evidence_by_occurrence = BTreeMap::new();
         for (ordinal, entry) in selected.into_iter().enumerate() {
+            if ordinal.is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE) {
+                retrieval_checkpoint(request.control)?;
+            }
             let RankedExactEntryV1 {
                 key: (_, _, document),
                 admitted_ordinal,
@@ -2302,6 +2322,7 @@ impl<'a> ArtifactQueryV1<'a> {
             evidence_by_occurrence.insert(candidate.source_occurrence_id.clone(), evidence);
             candidates.push(candidate);
         }
+        retrieval_checkpoint(request.control)?;
         Ok(RetrieverOutcome::Complete(capped_batch(
             self.document_count,
             eligible,
@@ -2492,10 +2513,11 @@ impl<'a> ArtifactQueryV1<'a> {
     fn visit_documents(
         &self,
         query: &DocumentQueryV1,
+        control: &dyn RetrievalExecutionControl,
         visitor: impl FnMut(u32) -> Result<(), RetrievalPortError>,
     ) -> Result<(), RetrievalPortError> {
         self.metrics.probe();
-        visit_document_ids(self.connection, query, visitor)
+        visit_document_ids(self.connection, query, control, visitor)
     }
 
     #[hotpath::measure(label = "query.lane.fuzzy.expand")]
@@ -3778,7 +3800,7 @@ mod tests {
 
     fn streamed_documents(connection: &Connection, query: &DocumentQueryV1) -> Vec<u32> {
         let mut documents = Vec::new();
-        visit_document_ids(connection, query, |document| {
+        visit_document_ids(connection, query, &AlwaysActiveControl, |document| {
             documents.push(document);
             Ok(())
         })
@@ -4386,18 +4408,45 @@ mod tests {
         (connection, field)
     }
 
-    /// Cancellation reaches the row stream between rows: a request cancelled
-    /// after `k` consultations decodes exactly `k - 1` rows, unwinds with the
-    /// typed cancellation error, and never visits the remaining candidates.
+    #[test]
+    fn lexical_candidate_batches_bound_cancellation_probes() {
+        let (connection, field) = lexical_row_stream_fixture(256);
+        let documents = DocumentQueryV1::term(field, "alpha".to_owned());
+        let terms = BTreeSet::from(["alpha".to_owned()]);
+        let control = CancelAtObservation::new(usize::MAX);
+        let mut visited = 0;
+        visit_lexical_rows(
+            &connection,
+            &documents,
+            &terms,
+            &ArtifactQueryMetricsV1::default(),
+            LexicalArtifactLayoutV1::V10,
+            &control,
+            |_, _, _, _| {
+                visited += 1;
+                Ok(())
+            },
+        )
+        .expect("active request visits its candidates");
+        assert_eq!(visited, 256);
+        assert!(
+            control.observations() <= 5,
+            "request authority must be consulted per batch, not per candidate: {} probes",
+            control.observations()
+        );
+    }
+
+    /// A request cancelled between batches unwinds before decoding the next
+    /// page's candidates, with a typed error rather than partial success.
     /// The same stream under an active control visits every row, so the
     /// checkpoint changes nothing for an uncancelled request.
     #[test]
     fn lexical_row_stream_unwinds_at_the_first_checkpoint_after_cancellation() {
-        let (connection, field) = lexical_row_stream_fixture(256);
+        let (connection, field) = lexical_row_stream_fixture(512);
         let documents = DocumentQueryV1::term(field, "alpha".to_owned());
         let terms = BTreeSet::from(["alpha".to_owned()]);
 
-        let control = CancelAtObservation::new(8);
+        let control = CancelAtObservation::new(2);
         let mut visited = 0usize;
         let error = visit_lexical_rows(
             &connection,
@@ -4414,12 +4463,12 @@ mod tests {
         .expect_err("a cancelled request must not stream to completion");
         assert_eq!(error, RetrievalPortError::Cancelled);
         assert_eq!(
-            visited, 7,
+            visited, 128,
             "every row before the cancelling checkpoint is visited and none after it"
         );
         assert_eq!(
             control.observations(),
-            8,
+            2,
             "the stream stops consulting the control once it reports cancellation"
         );
 
@@ -4437,7 +4486,23 @@ mod tests {
             },
         )
         .expect("an uncancelled request streams every candidate row");
-        assert_eq!(complete, 256);
+        assert_eq!(complete, 512);
+    }
+
+    #[test]
+    fn exact_document_stream_cancels_before_the_next_candidate_batch() {
+        let (connection, field) = lexical_row_stream_fixture(512);
+        let documents = DocumentQueryV1::term(field, "alpha".to_owned());
+        let control = CancelAtObservation::new(2);
+        let mut visited = Vec::new();
+        let error = visit_document_ids(&connection, &documents, &control, |document| {
+            visited.push(document);
+            Ok(())
+        })
+        .expect_err("the next candidate batch must not start");
+        assert_eq!(error, RetrievalPortError::Cancelled);
+        assert_eq!(visited, (0..128).collect::<Vec<_>>());
+        assert_eq!(control.observations(), 2);
     }
 
     #[test]
diff --git a/crates/tracedecay-query/src/retrieval/lexical/projection/artifact/reader/family_report.rs b/crates/tracedecay-query/src/retrieval/lexical/projection/artifact/reader/family_report.rs
index f534af3a23..8ce8024331 100644
--- a/crates/tracedecay-query/src/retrieval/lexical/projection/artifact/reader/family_report.rs
+++ b/crates/tracedecay-query/src/retrieval/lexical/projection/artifact/reader/family_report.rs
@@ -12,6 +12,7 @@ use super::{CodeLexicalArtifactReaderV1, MAX_CLONE_EXACT_PAGE_MEMBERS_V1};
 use crate::retrieval::lexical::projection::artifact::{
     CodeLexicalArtifactErrorV1, checkpoint, sqlite_error,
 };
+use crate::retrieval::ports::RETRIEVAL_CANDIDATE_BATCH_SIZE;
 
 #[derive(Clone, Debug, PartialEq, Eq, serde::Deserialize, serde::Serialize)]
 struct CloneFamilyCursorV1 {
@@ -199,7 +200,12 @@ impl CodeLexicalArtifactReaderV1 {
             .map_err(sqlite_error)?;
         let mut families = Vec::with_capacity(fetch);
         while let Some(row) = rows.next().map_err(sqlite_error)? {
-            checkpoint(control)?;
+            if families
+                .len()
+                .is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE)
+            {
+                checkpoint(control)?;
+            }
             let class = match row.get::<_, i64>(0).map_err(sqlite_error)? {
                 1 => CloneNormalizationClassV1::Conservative,
                 2 => CloneNormalizationClassV1::Rename,
@@ -246,6 +252,7 @@ impl CodeLexicalArtifactReaderV1 {
                 continuation,
             });
         }
+        checkpoint(control)?;
         let next_cursor = (families.len() > limit)
             .then(|| {
                 families
diff --git a/crates/tracedecay-query/src/retrieval/lexical/projection/in_memory.rs b/crates/tracedecay-query/src/retrieval/lexical/projection/in_memory.rs
index 16d58ece5f..cdb752f968 100644
--- a/crates/tracedecay-query/src/retrieval/lexical/projection/in_memory.rs
+++ b/crates/tracedecay-query/src/retrieval/lexical/projection/in_memory.rs
@@ -21,7 +21,6 @@ use tracedecay_domain::{
 use super::super::{
     LexicalFieldV1, LexicalLaneEvidence, LexicalLaneRequest, LexicalSpellingVariantV1,
     MAX_FUZZY_TERM_EXPANSIONS_V1, admit_candidate_sources, candidate_admission_outcome,
-    lexical_checkpoint,
 };
 use super::{
     CodeLexicalProjectionMetadataV1, ECHO_SCORE_MILLIS, ExactMatchRowViewV1, FUZZY_SCORE_MILLIS,
@@ -35,7 +34,7 @@ use super::{
 use crate::retrieval::exact::{ExactAdmissionAuthority, ExactLaneEvidence, ExactLaneRequest};
 use crate::retrieval::ports::{
     CodeCandidateBindingV1, CodeOccurrenceRefV1, ExactTermPostingReadPort, LexicalPostingReadPort,
-    RetrievalPortError, contract_error,
+    RETRIEVAL_CANDIDATE_BATCH_SIZE, RetrievalPortError, contract_error, retrieval_checkpoint,
 };
 
 mod postings;
@@ -850,8 +849,10 @@ impl CodeLexicalProjectionAdapterV1 {
                 .lexical_documents(request, &fuzzy, &phrase_candidates, &mut pruned);
         let mut pairs = Vec::new();
         let mut excluded = self.rows.len() as u64 - documents.len();
-        for document in documents {
-            lexical_checkpoint(request.control)?;
+        for (ordinal, document) in documents.into_iter().enumerate() {
+            if ordinal.is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE) {
+                retrieval_checkpoint(request.control)?;
+            }
             let row = &self.rows[document as usize];
             let score = self.score_row(
                 document,
@@ -884,6 +885,7 @@ impl CodeLexicalProjectionAdapterV1 {
             };
             pairs.push((candidate, evidence));
         }
+        retrieval_checkpoint(request.control)?;
         pairs.sort_by(|left, right| {
             left.0
                 .source_occurrence_id
@@ -892,10 +894,14 @@ impl CodeLexicalProjectionAdapterV1 {
         let mut candidates = Vec::with_capacity(pairs.len());
         let mut evidence_by_occurrence = BTreeMap::new();
         for (ordinal, (mut candidate, evidence)) in pairs.into_iter().enumerate() {
+            if ordinal.is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE) {
+                retrieval_checkpoint(request.control)?;
+            }
             candidate.ordinal_rank = ordinal as u32;
             evidence_by_occurrence.insert(candidate.source_occurrence_id.clone(), evidence);
             candidates.push(candidate);
         }
+        retrieval_checkpoint(request.control)?;
         hotpath::gauge!("query.lane.lexical.candidates").set(candidates.len());
         hotpath::gauge!("query.lane.lexical.examined").set(self.rows.len());
         Ok(candidate_admission_outcome(
@@ -1258,6 +1264,7 @@ where
         &self,
         request: &ExactLaneRequest,
     ) -> Result<RetrieverOutcome<RetrieverBatch<ExactLaneEvidence>>, RetrievalPortError> {
+        retrieval_checkpoint(request.control)?;
         self.projection.validate_generation(&request.generation)?;
         if let Some(outcome) = self.projection.stale_outcome() {
             return Ok(outcome);
@@ -1266,7 +1273,10 @@ where
         let mut pairs = Vec::new();
         let mut excluded = self.projection.rows.len() as u64 - documents.len();
         let mut proofs = LiteralProofCacheV1::new(request.literals.len());
-        for document in documents {
+        for (ordinal, document) in documents.into_iter().enumerate() {
+            if ordinal.is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE) {
+                retrieval_checkpoint(request.control)?;
+            }
             let row = &self.projection.rows[document as usize];
             let (matched_literals, matched_kinds) = exact_matches(row.exact_match_view(), request);
             if matched_literals.is_empty() {
@@ -1298,6 +1308,7 @@ where
             };
             pairs.push((candidate, evidence));
         }
+        retrieval_checkpoint(request.control)?;
         pairs.sort_by(|left, right| {
             left.0
                 .source_occurrence_id
@@ -1306,10 +1317,14 @@ where
         let mut candidates = Vec::with_capacity(pairs.len());
         let mut evidence_by_occurrence = BTreeMap::new();
         for (ordinal, (mut candidate, evidence)) in pairs.into_iter().enumerate() {
+            if ordinal.is_multiple_of(RETRIEVAL_CANDIDATE_BATCH_SIZE) {
+                retrieval_checkpoint(request.control)?;
+            }
             candidate.ordinal_rank = ordinal as u32;
             evidence_by_occurrence.insert(candidate.source_occurrence_id.clone(), evidence);
             candidates.push(candidate);
         }
+        retrieval_checkpoint(request.control)?;
         Ok(RetrieverOutcome::Complete(RetrieverBatch {
             coverage: RetrieverCoverage {
                 examined: self.projection.rows.len() as u64,
diff --git a/crates/tracedecay-query/src/retrieval/ports.rs b/crates/tracedecay-query/src/retrieval/ports.rs
index d9e2129e86..2bebe71960 100644
--- a/crates/tracedecay-query/src/retrieval/ports.rs
+++ b/crates/tracedecay-query/src/retrieval/ports.rs
@@ -29,6 +29,20 @@ pub trait RetrievalExecutionControl: Send + Sync {
     fn elapsed_micros(&self) -> u64;
 }
 
+/// One sealed lexical artifact page's worth of candidate work. Readers keep
+/// streaming rows, but consult request authority before starting the next page.
+pub const RETRIEVAL_CANDIDATE_BATCH_SIZE: usize = 128;
+
+pub(crate) fn retrieval_checkpoint(
+    control: &dyn RetrievalExecutionControl,
+) -> Result<(), RetrievalPortError> {
+    if control.is_cancelled() {
+        Err(RetrievalPortError::Cancelled)
+    } else {
+        Ok(())
+    }
+}
+
 /// Incompatible indexes or models never trigger silent fallback.
 #[derive(Clone, Debug, Error, PartialEq, Eq)]
 pub enum RetrievalPortError {
diff --git a/crates/tracedecay-query/tests/retrieval_contract_spine.rs b/crates/tracedecay-query/tests/retrieval_contract_spine.rs
index 30724bee0b..9774e25bb9 100644
--- a/crates/tracedecay-query/tests/retrieval_contract_spine.rs
+++ b/crates/tracedecay-query/tests/retrieval_contract_spine.rs
@@ -11,9 +11,20 @@ use tracedecay_domain::{
 };
 use tracedecay_query::retrieval::exact::{ExactLaneEvidence, ExactLaneRequest, ExactLiteralV1};
 use tracedecay_query::retrieval::ports::{
-    CodeCandidateBindingV1, CodeOccurrenceRefV1, RetrievalPortError,
+    CodeCandidateBindingV1, CodeOccurrenceRefV1, RetrievalExecutionControl, RetrievalPortError,
 };
 
+struct ActiveControl;
+
+impl RetrievalExecutionControl for ActiveControl {
+    fn is_cancelled(&self) -> bool {
+        false
+    }
+    fn elapsed_micros(&self) -> u64 {
+        0
+    }
+}
+
 fn id<T>(value: &str) -> T
 where
     T: TryFrom<String>,
@@ -85,6 +96,7 @@ fn request_and_proof() -> (ExactLaneRequest<'static>, ExactAdmissionProof) {
     ));
     (
         ExactLaneRequest {
+            control: &ActiveControl,
             base,
             query_view,
             generation: CodeGenerationId::new("generation.contract").unwrap(),
diff --git a/crates/tracedecay-query/tests/search_quality_suite/candidate_producers.rs b/crates/tracedecay-query/tests/search_quality_suite/candidate_producers.rs
index f2de165799..f41e9056e6 100644
--- a/crates/tracedecay-query/tests/search_quality_suite/candidate_producers.rs
+++ b/crates/tracedecay-query/tests/search_quality_suite/candidate_producers.rs
@@ -464,7 +464,7 @@ fn generation_backed_projection(
 fn real_lexical_source_fixture_with_files(file_count: usize) -> RealLexicalSourceFixture {
     assert!(file_count >= 1, "fixture needs at least one file");
     let identity_source = b"import type { Widget } from \"widget-kit\";\nexport function render(value: Widget) { return value; }\n";
-    let sources = (0..file_count)
+    let mut sources = (0..file_count)
         .map(|ordinal| {
             if ordinal == 0 {
                 (
@@ -473,8 +473,7 @@ fn real_lexical_source_fixture_with_files(file_count: usize) -> RealLexicalSourc
                     identity_source.to_vec(),
                 )
             } else {
-                // Zero-padded ordinals keep lexicographic file order equal to
-                // generation order, which snapshot intake requires.
+                // Keep the original small-fixture identities stable.
                 (
                     format!("file.artifact.{ordinal:02}"),
                     format!("src/artifact_{ordinal:02}.ts"),
@@ -485,7 +484,8 @@ fn real_lexical_source_fixture_with_files(file_count: usize) -> RealLexicalSourc
                 )
             }
         })
-        .collect();
+        .collect::<Vec<_>>();
+    sources.sort_by(|left, right| left.1.cmp(&right.1));
     real_lexical_source_fixture_from_sources(sources)
 }
 
@@ -5759,6 +5759,7 @@ fn artifact_exact_reader_prefers_admitted_matches_over_denied_best() {
     let base = base_request(exact_query, 1);
     let exact_query_view = query_view(exact_query);
     let exact_request = ExactLaneRequest {
+        control: &ACTIVE_CONTROL,
         literals: authority.parse_literals(&exact_query_view, &base),
         base,
         query_view: &exact_query_view,
@@ -5788,6 +5789,146 @@ fn artifact_exact_reader_prefers_admitted_matches_over_denied_best() {
     );
 }
 
+#[test]
+fn exact_candidate_scan_stops_before_the_next_batch_after_cancellation() {
+    struct CancelDuringScan {
+        checks: AtomicUsize,
+    }
+    impl RetrievalExecutionControl for CancelDuringScan {
+        fn is_cancelled(&self) -> bool {
+            self.checks.fetch_add(1, Ordering::SeqCst) >= 2
+        }
+        fn elapsed_micros(&self) -> u64 {
+            0
+        }
+    }
+
+    let fixture = real_lexical_source_fixture_with_files(256);
+    let metadata = fixture.metadata.clone();
+    let generation = metadata.generation.clone();
+    let build_control = ArtifactControl { cancelled: false };
+    let (pages, _) = drain_verified_pages(&fixture, 128);
+    let directory = tempfile::tempdir().expect("artifact tempdir");
+    let path = directory.path().join("cancel-exact.sqlite");
+    let mut builder =
+        CodeLexicalArtifactBuilderV1::create(&path, metadata).expect("create real artifact");
+    for page in &pages {
+        builder
+            .append_page(page, &build_control)
+            .expect("append page");
+    }
+    let mut source = fixture.open_source(128);
+    let verified = builder
+        .rebuild_and_finalize(&mut source, &build_control)
+        .expect("finalize artifact");
+    let reader = CodeLexicalArtifactReaderV1::open_with_control(
+        &path,
+        &verified,
+        CODE_LEXICAL_ARTIFACT_QUERY_CACHE_BUDGET_BYTES_V1,
+        &build_control,
+    )
+    .expect("open artifact");
+    let authority = CentralExactAdmissionAuthorityV1::new(id("exact-rules.v1"));
+    let query = r#""return value""#;
+    let base = base_request(query, 8);
+    let view = query_view(query);
+    let control = CancelDuringScan {
+        checks: AtomicUsize::new(0),
+    };
+    let mut request = ExactLaneRequest {
+        literals: authority.parse_literals(&view, &base),
+        base,
+        query_view: &view,
+        generation,
+        budget: budget(8),
+        control: &control,
+    };
+    let exact = reader.exact_adapter(authority);
+    assert_eq!(
+        exact.read_exact_postings(&request),
+        Err(RetrievalPortError::Cancelled),
+        "the exact artifact scan must consult the carried request control between candidate batches",
+    );
+    request.control = &ACTIVE_CONTROL;
+    let first = complete(exact.read_exact_postings(&request).expect("active read"));
+    assert!(
+        first.coverage.eligible > 128,
+        "fixture must span candidate batches"
+    );
+    assert_eq!(first.candidates.len(), 8);
+    assert_eq!(
+        first,
+        complete(exact.read_exact_postings(&request).expect("repeat read"))
+    );
+}
+
+#[test]
+fn in_memory_rebuilds_observe_cancellation_at_phase_and_batch_boundaries() {
+    let fixture = real_lexical_source_fixture_with_files(256);
+    let (pages, _) = drain_verified_pages(&fixture, 128);
+    let projection = CodeLexicalProjectionAdapterV1::new_admitted(
+        fixture.metadata.clone(),
+        pages
+            .iter()
+            .flat_map(|page| page.chunks().iter().cloned())
+            .collect::<Vec<_>>(),
+        page_symbol_displays(&pages),
+    )
+    .expect("real admitted in-memory projection");
+
+    // Empty rebuilds must still consult the phase boundary. For the wide
+    // fixture, cancellation occurs after enough observations to enter a later
+    // rebuild batch; entry and final checks alone cannot trigger it.
+    for (term, cancel_at, has_matches) in [("absentzzxyz", 2, false), ("widget", 10, true)] {
+        let control = CancelAtObservation::new(cancel_at);
+        let mut request = lexical_request(term, &[term], &[], &[], 0, 1024);
+        request.generation = fixture.metadata.generation.clone();
+        let baseline = complete(
+            projection
+                .read_lexical_postings(&request)
+                .expect("active lexical read"),
+        );
+        assert_eq!(baseline.candidates.len() > 128, has_matches);
+        request.control = &control;
+        assert_eq!(
+            projection.read_lexical_postings(&request),
+            Err(RetrievalPortError::Cancelled)
+        );
+        assert_eq!(control.observations(), cancel_at);
+    }
+
+    let authority = CentralExactAdmissionAuthorityV1::new(id("exact-rules.v1"));
+    let exact = projection.exact_adapter(authority.clone());
+    for (query, cancel_at, has_matches) in [
+        (r#""absentzzxyz""#, 3, false),
+        (r#""return value""#, 9, true),
+    ] {
+        let control = CancelAtObservation::new(cancel_at);
+        let view = query_view(query);
+        let base = base_request(query, 1024);
+        let mut request = ExactLaneRequest {
+            literals: authority.parse_literals(&view, &base),
+            base,
+            query_view: &view,
+            generation: fixture.metadata.generation.clone(),
+            budget: budget(1024),
+            control: &ACTIVE_CONTROL,
+        };
+        let baseline = complete(
+            exact
+                .read_exact_postings(&request)
+                .expect("active exact read"),
+        );
+        assert_eq!(baseline.candidates.len() > 128, has_matches);
+        request.control = &control;
+        assert_eq!(
+            exact.read_exact_postings(&request),
+            Err(RetrievalPortError::Cancelled)
+        );
+        assert_eq!(control.observations(), cancel_at);
+    }
+}
+
 #[test]
 fn disk_artifact_ledger_charges_stay_page_local_across_corpus_scaling() {
     let control = ArtifactControl { cancelled: false };
@@ -5955,6 +6096,7 @@ fn disk_artifact_reader_selects_bounded_top_k_with_lane_tie_order_and_coverage()
     let base = base_request(exact_query, 7);
     let exact_query_view = query_view(exact_query);
     let exact_request = ExactLaneRequest {
+        control: &ACTIVE_CONTROL,
         literals: authority.parse_literals(&exact_query_view, &base),
         base,
         query_view: &exact_query_view,
@@ -6214,6 +6356,7 @@ fn exact_projection_emits_only_authority_minted_proofs() {
     let base = base_request(query, 16);
     let query_view = query_view(query);
     let request = ExactLaneRequest {
+        control: &ACTIVE_CONTROL,
         literals: authority.parse_literals(&query_view, &base),
         base,
         query_view: &query_view,
diff --git a/crates/tracedecay-query/tests/search_quality_suite/single_root.rs b/crates/tracedecay-query/tests/search_quality_suite/single_root.rs
index 1df60b937d..9e87387a20 100644
--- a/crates/tracedecay-query/tests/search_quality_suite/single_root.rs
+++ b/crates/tracedecay-query/tests/search_quality_suite/single_root.rs
@@ -323,6 +323,7 @@ fn fixture(disposition: GraphDisposition) -> SingleRootFixture {
         CentralExactAdmissionAuthorityV1::new(id::<ExactAdmissionRuleRevision>("exact-rules.v1"));
     let exact_query_view = query_view("--release");
     let exact_request = ExactLaneRequest {
+        control: &FixtureRetrievalExecutionControl,
         literals: authority.parse_literals(&exact_query_view, &request),
         base: request.clone(),
         query_view: &exact_query_view,
diff --git a/crates/tracedecay-search-eval/src/candidate_output.rs b/crates/tracedecay-search-eval/src/candidate_output.rs
index a389cca978..ba0fccd162 100644
--- a/crates/tracedecay-search-eval/src/candidate_output.rs
+++ b/crates/tracedecay-search-eval/src/candidate_output.rs
@@ -748,6 +748,7 @@ fn compose_production_query(
 
     let budget = retrieval_budget();
     let exact_request = ExactLaneRequest {
+        control: &ActiveControl,
         base: request.clone(),
         query_view: &query_view,
         generation: generation_id.clone(),
diff --git a/crates/tracedecay-session-memory/src/fact_store/commit_barrier.rs b/crates/tracedecay-session-memory/src/fact_store/commit_barrier.rs
index 9a660a7c7a..b15cde24ad 100644
--- a/crates/tracedecay-session-memory/src/fact_store/commit_barrier.rs
+++ b/crates/tracedecay-session-memory/src/fact_store/commit_barrier.rs
@@ -34,12 +34,15 @@ const RELEASE_POLL: Duration = Duration::from_millis(10);
 /// Parks after a durable fact commit when the harness armed the barrier.
 ///
 /// A no-op unless [`BARRIER_DIR_ENV`] names a directory holding an `armed`
-/// file. Renaming `armed` to `claimed` is the claim: a concurrent fact commit
-/// cannot also consume this one-shot barrier, so exactly the mutation the test
-/// is watching is the one that parks. Arrival is published as `arrived`; the
-/// park ends when `release` appears, or when the bounded wait expires so a
-/// failed test cannot strand a live daemon.
-pub(super) async fn wait_after_durable_fact_commit() {
+/// file. When that directory also holds `expect_content`, only a commit whose
+/// `committed_content` matches that file byte-for-byte (trimmed) may claim the
+/// barrier — so a foreign project-open or curator write cannot steal the park
+/// from the mutation the journey is watching. Renaming `armed` to `claimed` is
+/// the claim: a concurrent matching fact commit cannot also consume this
+/// one-shot barrier. Arrival is published as `arrived`; the park ends when
+/// `release` appears, or when the bounded wait expires so a failed test cannot
+/// strand a live daemon.
+pub(super) async fn wait_after_durable_fact_commit(committed_content: Option<&str>) {
     let Some(root) = std::env::var_os(BARRIER_DIR_ENV) else {
         return;
     };
@@ -48,6 +51,21 @@ pub(super) async fn wait_after_durable_fact_commit() {
     if !matches!(armed.try_exists(), Ok(true)) {
         return;
     }
+    let expect = root.join("expect_content");
+    if matches!(expect.try_exists(), Ok(true)) {
+        let expected = match std::fs::read_to_string(&expect) {
+            Ok(value) => value,
+            Err(_) => return,
+        };
+        let expected = expected.trim();
+        if expected.is_empty() {
+            return;
+        }
+        match committed_content {
+            Some(actual) if actual.trim() == expected => {}
+            _ => return,
+        }
+    }
     if std::fs::rename(&armed, root.join("claimed")).is_err() {
         return;
     }
diff --git a/crates/tracedecay-session-memory/src/fact_store/crud/queries.rs b/crates/tracedecay-session-memory/src/fact_store/crud/queries.rs
index 4ddd07de40..73afbc2b7e 100644
--- a/crates/tracedecay-session-memory/src/fact_store/crud/queries.rs
+++ b/crates/tracedecay-session-memory/src/fact_store/crud/queries.rs
@@ -1025,7 +1025,15 @@ impl DatabaseFactStore<'_> {
                 // settled yet. Acceptance harnesses park exactly here to make a
                 // budget that expires after the commit point reproducible.
                 #[cfg(feature = "test-transport")]
-                crate::fact_store::commit_barrier::wait_after_durable_fact_commit().await;
+                {
+                    let barrier_content = batch
+                        .assertion()
+                        .map(|assertion| assertion.payload().content().to_owned());
+                    crate::fact_store::commit_barrier::wait_after_durable_fact_commit(
+                        barrier_content.as_deref(),
+                    )
+                    .await;
+                }
             } else {
                 transaction
                     .rollback()
diff --git a/crates/tracedecay-session-memory/src/fact_store/envelope.rs b/crates/tracedecay-session-memory/src/fact_store/envelope.rs
index 08377b9dd7..507178cc03 100644
--- a/crates/tracedecay-session-memory/src/fact_store/envelope.rs
+++ b/crates/tracedecay-session-memory/src/fact_store/envelope.rs
@@ -212,6 +212,30 @@ impl DatabaseFactStore<'_> {
             -> Pin<Box<dyn Future<Output = FactStoreResult<T>> + Send + 'tx>>
         + Send
         + 'static,
+    ) -> FactStoreResult<T> {
+        self.project_memory_write_with_barrier_content(
+            write_control,
+            None,
+            graph_source_changed,
+            work,
+        )
+        .await
+    }
+
+    /// Like [`Self::project_memory_write`], but names the fact content the
+    /// test-transport commit barrier may match against `expect_content`.
+    #[hotpath::skip]
+    pub(super) async fn project_memory_write_with_barrier_content<T: Send + 'static>(
+        &self,
+        write_control: &FactWriteControl,
+        barrier_content: Option<String>,
+        graph_source_changed: impl FnOnce(&T) -> bool + Send + 'static,
+        work: impl for<'tx> FnOnce(
+            &'tx Transaction<'_>,
+        )
+            -> Pin<Box<dyn Future<Output = FactStoreResult<T>> + Send + 'tx>>
+        + Send
+        + 'static,
     ) -> FactStoreResult<T> {
         let db = (*self.db).clone();
         let write_control = write_control.clone();
@@ -219,7 +243,9 @@ impl DatabaseFactStore<'_> {
         // can still deny the write before its commit-start transition; after
         // that transition the bounded transaction commit runs to completion.
         tokio::spawn(async move {
-            let result = execute_project_memory_write(db.clone(), write_control, work).await;
+            let result =
+                execute_project_memory_write(db.clone(), write_control, barrier_content, work)
+                    .await;
             if result.as_ref().is_ok_and(graph_source_changed) {
                 super::graph::publish_project_memory_graph_after_write(db).await;
             }
@@ -233,6 +259,7 @@ impl DatabaseFactStore<'_> {
 async fn execute_project_memory_write<T: Send + 'static>(
     db: Database,
     write_control: FactWriteControl,
+    _barrier_content: Option<String>,
     work: impl for<'tx> FnOnce(
         &'tx Transaction<'_>,
     ) -> Pin<Box<dyn Future<Output = FactStoreResult<T>> + Send + 'tx>>
@@ -274,7 +301,10 @@ async fn execute_project_memory_write<T: Send + 'static>(
             // yet. Acceptance harnesses park exactly here to make a budget that
             // expires after the commit point reproducible.
             #[cfg(feature = "test-transport")]
-            crate::fact_store::commit_barrier::wait_after_durable_fact_commit().await;
+            crate::fact_store::commit_barrier::wait_after_durable_fact_commit(
+                _barrier_content.as_deref(),
+            )
+            .await;
             Ok(value)
         }
         Err(error) => match transaction.rollback().await {
diff --git a/crates/tracedecay-session-memory/src/fact_store/mod.rs b/crates/tracedecay-session-memory/src/fact_store/mod.rs
index f724da87cd..2ce760ac8b 100644
--- a/crates/tracedecay-session-memory/src/fact_store/mod.rs
+++ b/crates/tracedecay-session-memory/src/fact_store/mod.rs
@@ -503,8 +503,10 @@ impl ProjectMemoryFactStore for DatabaseFactStore<'_> {
         request: ProjectMemoryFactAddCommandV1,
         write_control: &FactWriteControl,
     ) -> FactStoreResult<ProjectMemoryFactAddOutcomeV1> {
-        self.project_memory_write(
+        let barrier_content = Some(request.content().to_owned());
+        self.project_memory_write_with_barrier_content(
             write_control,
+            barrier_content,
             |outcome: &ProjectMemoryFactAddOutcomeV1| {
                 outcome.commit_receipt().is_some() && !outcome.commit_replayed()
             },
diff --git a/crates/tracedecay-session-runtime/src/session_retrieval/lcm.rs b/crates/tracedecay-session-runtime/src/session_retrieval/lcm.rs
index 63fc7ea9fc..53cb997df1 100644
--- a/crates/tracedecay-session-runtime/src/session_retrieval/lcm.rs
+++ b/crates/tracedecay-session-runtime/src/session_retrieval/lcm.rs
@@ -170,8 +170,8 @@ impl DaemonSessionRetrievalService {
     /// backlog and blocker, is the answer instead. Once the worker is current
     /// the temporal outcome stands: nothing is going to project the session.
     ///
-    /// A missing refresh worker is not convergence. Core and direct mounts
-    /// never attach one, and zero rows there are absence, not a pending
+    /// A missing refresh worker is not convergence: core/direct mounts never
+    /// attach one, and zero rows there are evidence of absence, not a pending
     /// catch-up. Only historical-convergence staleness remaps absence.
     fn historically_converging_unavailable(&self) -> Option<SessionRetrievalUnavailable> {
         let unavailable = self.refresh_not_current()?;
@@ -322,8 +322,11 @@ impl DaemonSessionRetrievalService {
                 };
                 (Some(result), retrieval)
             }
-            // Zero temporal rows for the session is absence unless history is
-            // still converging. A missing worker is not that catch-up.
+            // Zero temporal rows for the session is only evidence of absence
+            // once history is not still converging. A missing worker (core /
+            // direct mounts) is not convergence — treat CompleteZero as
+            // absence there. While historical catch-up is in flight, surface
+            // that state instead of a complete description at generation zero.
             SessionRetrievalOutcome::CompleteZero { .. }
                 if direct.is_none() && self.historically_converging_unavailable().is_some() =>
             {
diff --git a/crates/tracedecay-session-runtime/src/session_retrieval/tests.rs b/crates/tracedecay-session-runtime/src/session_retrieval/tests.rs
index e790cda7e6..421551c090 100644
--- a/crates/tracedecay-session-runtime/src/session_retrieval/tests.rs
+++ b/crates/tracedecay-session-runtime/src/session_retrieval/tests.rs
@@ -1188,8 +1188,9 @@ async fn describe_without_a_refresh_worker_does_not_pretend_history_is_convergin
         DaemonSessionRetrievalService::new_without_refresh_worker(harness.registered.clone(), root)
             .expect("registered retrieval service");
     let context = admitted_lookup_context(scope);
-    let cancellation = tracedecay_contracts::CancellationSignal::active("cancellation.session-lookup")
-        .expect("cancellation");
+    let cancellation =
+        tracedecay_contracts::CancellationSignal::active("cancellation.session-lookup")
+            .expect("cancellation");
     let command = LcmDescribeServiceCommand::new(
         "codex",
         SessionId::new("session.describe.worker-missing").expect("session identity"),
diff --git a/crates/tracedecay/src/daemon.rs b/crates/tracedecay/src/daemon.rs
index 26a0ad3801..2f2b84e7b3 100644
--- a/crates/tracedecay/src/daemon.rs
+++ b/crates/tracedecay/src/daemon.rs
@@ -55,7 +55,8 @@ use tracedecay_runtime_core::cancellation::CancellationToken;
 /// Human-facing detail fragment for a still-warming project/profile owner.
 ///
 /// Protocol control flow must key on [`PROJECT_WARMING_REASON_CODE`] (or the
-/// sibling deferred/revoked codes below), never on this English prose.
+/// sibling deferred, capacity, and revoked codes below), never on this English
+/// prose.
 pub(crate) const PROJECT_WARMING_RETRY_HINT: &str =
     "is warming in the background; retry the same tool shortly";
 /// Typed reason a project/profile/owner open has not finished yet.
@@ -64,6 +65,10 @@ pub const PROJECT_WARMING_REASON_CODE: &str = "project_warming";
 pub const REPOSITORY_DISCOVERY_DEFERRED_REASON_CODE: &str = "repository_discovery_deferred";
 /// Typed reason a retained project server was retired mid-response.
 pub const PROJECT_SERVER_RESPONSE_REVOKED_REASON_CODE: &str = "project_server_response_revoked";
+/// Typed reason the in-flight project-open task table is full.
+pub const PROJECT_OPEN_TASK_CAPACITY_REASON_CODE: &str = "project_open_task_capacity_reached";
+/// Typed reason the cached project-server table is full.
+pub const PROJECT_SERVER_CAPACITY_REASON_CODE: &str = "project_server_capacity_reached";
 #[cfg(unix)]
 const TOOL_LIST_CHANGED_METHOD: &str = "notifications/tools/list_changed";
 #[cfg(unix)]
@@ -128,25 +133,6 @@ impl AuthenticatedFirstRequest {
 pub(crate) const PROJECT_OPEN_RETRY_GRACE: Duration = Duration::from_secs(15);
 pub(crate) const PROJECT_OPEN_RETRY_INTERVAL: Duration = Duration::from_millis(50);
 
-/// Daemon error messages for a saturated project-open queue. Both clear on
-/// their own as in-flight opens finish, so they are retryable for the same
-/// reason [`PROJECT_WARMING_REASON_CODE`] is.
-const PROJECT_OPEN_CAPACITY_MESSAGES: [&str; 2] = [
-    "daemon project open task capacity reached",
-    "daemon project server capacity reached",
-];
-/// Typed `error.data.kind` values for the same two capacity states.
-const PROJECT_OPEN_CAPACITY_ERROR_KINDS: [&str; 2] = [
-    "project_open_task_capacity_reached",
-    "project_server_capacity_reached",
-];
-/// Message fragments emitted when a daemon request misses its read deadline.
-const DAEMON_READ_DEADLINE_MESSAGES: [&str; 3] = [
-    "before deadline",
-    "deadline already elapsed",
-    "did not answer after",
-];
-
 /// True when a daemon error is the typed project/profile/owner warming refusal.
 pub(crate) fn error_is_project_warming(error: &TraceDecayError) -> bool {
     matches!(
@@ -155,47 +141,43 @@ pub(crate) fn error_is_project_warming(error: &TraceDecayError) -> bool {
     )
 }
 
+fn project_open_retryable_reason(reason_code: &str) -> bool {
+    matches!(
+        reason_code,
+        PROJECT_WARMING_REASON_CODE
+            | REPOSITORY_DISCOVERY_DEFERRED_REASON_CODE
+            | PROJECT_OPEN_TASK_CAPACITY_REASON_CODE
+            | PROJECT_SERVER_CAPACITY_REASON_CODE
+    )
+}
+
+fn project_open_capacity_limit(reason_code: &str) -> Option<usize> {
+    match reason_code {
+        PROJECT_OPEN_TASK_CAPACITY_REASON_CODE => Some(MAX_TRACKED_PROJECT_OPEN_TASKS),
+        PROJECT_SERVER_CAPACITY_REASON_CODE => Some(MAX_CACHED_PROJECT_SERVERS),
+        _ => None,
+    }
+}
+
 /// True when a daemon error describes a project open that has not finished
 /// yet: typed warming, deferred repository discovery, or a saturated open
-/// queue (still named in the `Config` message until those producers migrate).
+/// queue. Capacity clears as in-flight opens finish, so it is retryable for
+/// the same reason [`PROJECT_WARMING_REASON_CODE`] is. Classification keys on
+/// the reason code, never on English detail.
 pub(crate) fn error_is_project_open_retryable(error: &TraceDecayError) -> bool {
-    error_is_project_warming(error)
-        || matches!(
-            error.project_route_context(),
-            Some((REPOSITORY_DISCOVERY_DEFERRED_REASON_CODE, true, _))
-        )
-        || matches!(
-            error,
-            TraceDecayError::Config { message }
-                if PROJECT_OPEN_CAPACITY_MESSAGES
-                    .iter()
-                    .any(|capacity| message.contains(*capacity))
-        )
+    error
+        .project_route_context()
+        .is_some_and(|(reason, retryable, _)| retryable && project_open_retryable_reason(reason))
 }
 
 /// Response-side form of [`error_is_project_open_retryable`] for clients that
-/// still hold the JSON-RPC `error` member. Warming/deferred key on
-/// `data.reason_code`; capacity states also carry a typed `data.kind`.
+/// still hold the JSON-RPC `error` member. Every retryable open refusal,
+/// including capacity, carries `data.reason_code`.
 pub(crate) fn json_rpc_error_is_project_open_retryable(error: &serde_json::Value) -> bool {
     error
         .pointer("/data/reason_code")
         .and_then(serde_json::Value::as_str)
-        .is_some_and(|reason| {
-            reason == PROJECT_WARMING_REASON_CODE
-                || reason == REPOSITORY_DISCOVERY_DEFERRED_REASON_CODE
-        })
-        || error
-            .pointer("/data/kind")
-            .and_then(serde_json::Value::as_str)
-            .is_some_and(|kind| PROJECT_OPEN_CAPACITY_ERROR_KINDS.contains(&kind))
-        || error
-            .get("message")
-            .and_then(serde_json::Value::as_str)
-            .is_some_and(|message| {
-                PROJECT_OPEN_CAPACITY_MESSAGES
-                    .iter()
-                    .any(|capacity| message.contains(*capacity))
-            })
+        .is_some_and(project_open_retryable_reason)
 }
 
 /// True when a one-shot tool-call transport error should be retried by a
@@ -212,20 +194,15 @@ pub fn tool_call_transport_error_is_retryable(error: &TraceDecayError) -> bool {
     )
 }
 
-/// True when a daemon error message reports a missed read deadline.
-pub fn error_message_is_read_deadline(message: &str) -> bool {
-    DAEMON_READ_DEADLINE_MESSAGES
-        .iter()
-        .any(|deadline| message.contains(deadline))
-}
-
-/// True when a daemon client missed its read deadline, including the typed
-/// `daemon_response_stalled` reason code.
+/// True when a daemon client missed its read deadline.
+///
+/// Keys only on [`tracedecay_daemon_protocol::DAEMON_RESPONSE_STALLED`]. English
+/// detail, including the stalled wait phrase, is not a second classifier.
 pub fn error_is_read_deadline(error: &TraceDecayError) -> bool {
     matches!(
         error.project_route_context(),
         Some((tracedecay_daemon_protocol::DAEMON_RESPONSE_STALLED, _, _))
-    ) || error_message_is_read_deadline(&error.to_string())
+    )
 }
 
 mod bootstrap;
diff --git a/crates/tracedecay/src/daemon/connection_serving.rs b/crates/tracedecay/src/daemon/connection_serving.rs
index c6794f9aa3..c9db9cf0db 100644
--- a/crates/tracedecay/src/daemon/connection_serving.rs
+++ b/crates/tracedecay/src/daemon/connection_serving.rs
@@ -1305,11 +1305,7 @@ fn serve_broker_socket_client_inner(
                                 .await
                             }
                             Ok(None) => return Ok(()),
-                            Err(error) => JsonRpcResponse::error(
-                                request.id.clone(),
-                                ErrorCode::InternalError,
-                                error.to_string(),
-                            ),
+                            Err(error) => project_open_error_response(request.id.clone(), &error),
                         };
                         drop(setup_activity);
                         write_json_rpc_response(&mut transport, &response).await?;
@@ -1808,11 +1804,7 @@ pub(super) async fn serve_windows_broker_client_with_class_and_invocation(
                 .await
             }
             Ok(None) => return Ok(()),
-            Err(error) => JsonRpcResponse::error(
-                request.id.clone(),
-                ErrorCode::InternalError,
-                error.to_string(),
-            ),
+            Err(error) => project_open_error_response(request.id.clone(), &error),
         };
         drop(setup_activity);
         write_json_rpc_response(&mut transport, &response).await?;
diff --git a/crates/tracedecay/src/daemon/core_client.rs b/crates/tracedecay/src/daemon/core_client.rs
index 2a26b305fe..12b01ca4b9 100644
--- a/crates/tracedecay/src/daemon/core_client.rs
+++ b/crates/tracedecay/src/daemon/core_client.rs
@@ -468,7 +468,7 @@ fn is_project_open_retryable_error(error: &TraceDecayError) -> bool {
 
 /// Reconstruct a typed daemon tool refusal from the JSON-RPC error frame.
 ///
-/// Warming, deferred discovery, and response-revoked refusals carry
+/// Warming, deferred discovery, capacity, and response-revoked refusals carry
 /// `data.reason_code`; those must round-trip as [`TraceDecayError::ProjectRoute`]
 /// so journey/client retry keys on the code rather than English detail.
 fn daemon_tool_call_error(error: JsonRpcError) -> TraceDecayError {
@@ -668,8 +668,9 @@ mod tests {
     use serde_json::json;
 
     use super::super::{
-        JsonRpcError, PROJECT_SERVER_RESPONSE_REVOKED_REASON_CODE, PROJECT_WARMING_REASON_CODE,
-        tool_call_transport_error_is_retryable,
+        JsonRpcError, PROJECT_SERVER_CAPACITY_REASON_CODE,
+        PROJECT_SERVER_RESPONSE_REVOKED_REASON_CODE, PROJECT_WARMING_REASON_CODE,
+        error_is_project_open_retryable, tool_call_transport_error_is_retryable,
     };
     use super::daemon_tool_call_error;
 
@@ -724,5 +725,41 @@ mod tests {
         });
         assert!(error.project_route_context().is_none());
         assert!(!tool_call_transport_error_is_retryable(&error));
+        assert!(
+            !error_is_project_open_retryable(&error),
+            "warming prose without a reason code must not ride project-open retry"
+        );
+    }
+
+    #[test]
+    fn daemon_tool_call_error_round_trips_capacity_without_using_prose() {
+        let capacity = daemon_tool_call_error(JsonRpcError {
+            code: -32603,
+            message: "prose must not decide retry".to_owned(),
+            data: Some(json!({
+                "reason_code": PROJECT_SERVER_CAPACITY_REASON_CODE,
+                "retryable": true,
+                "detail": "daemon project server capacity reached (capacity=8); retry after active clients finish",
+                "kind": PROJECT_SERVER_CAPACITY_REASON_CODE,
+                "capacity": 8,
+            })),
+        });
+        assert!(error_is_project_open_retryable(&capacity));
+        assert!(
+            !tool_call_transport_error_is_retryable(&capacity),
+            "capacity is a project-open retry, not a journey-transport retry"
+        );
+
+        let prose_only = daemon_tool_call_error(JsonRpcError {
+            code: -32603,
+            message: "daemon project server capacity reached (capacity=8); retry after active clients finish"
+                .to_owned(),
+            data: Some(json!({
+                "kind": PROJECT_SERVER_CAPACITY_REASON_CODE,
+                "retryable": true,
+                "capacity": 8,
+            })),
+        });
+        assert!(!error_is_project_open_retryable(&prose_only));
     }
 }
diff --git a/crates/tracedecay/src/daemon/core_proxy.rs b/crates/tracedecay/src/daemon/core_proxy.rs
index ece1c00696..dc848c5cc3 100644
--- a/crates/tracedecay/src/daemon/core_proxy.rs
+++ b/crates/tracedecay/src/daemon/core_proxy.rs
@@ -987,6 +987,7 @@ mod tests {
                     "code": -32603,
                     "message": "daemon project open task capacity reached",
                     "data": {
+                        "reason_code": "project_open_task_capacity_reached",
                         "kind": "project_open_task_capacity_reached",
                         "retryable": true,
                         "capacity": 8
@@ -1000,6 +1001,7 @@ mod tests {
                     "code": -32603,
                     "message": "daemon project server capacity reached",
                     "data": {
+                        "reason_code": "project_server_capacity_reached",
                         "kind": "project_server_capacity_reached",
                         "retryable": true,
                         "capacity": 8
@@ -1026,6 +1028,23 @@ mod tests {
             }
         })
         .to_string()]));
+        assert!(
+            !responses_are_project_open_retryable(&[json!({
+                "jsonrpc": "2.0",
+                "id": 5,
+                "error": {
+                    "code": -32603,
+                    "message": "daemon project server capacity reached",
+                    "data": {
+                        "kind": "project_server_capacity_reached",
+                        "retryable": true,
+                        "capacity": 8
+                    }
+                }
+            })
+            .to_string()]),
+            "capacity prose and kind without reason_code must not decide proxy retry"
+        );
     }
 
     /// The post-disconnect drain must never cut short work the daemon is still
diff --git a/crates/tracedecay/src/daemon/project_open_admission.rs b/crates/tracedecay/src/daemon/project_open_admission.rs
index 97b17ac0f1..95b61a84a1 100644
--- a/crates/tracedecay/src/daemon/project_open_admission.rs
+++ b/crates/tracedecay/src/daemon/project_open_admission.rs
@@ -230,6 +230,11 @@ pub(super) enum ProjectOpenTypedFailure {
         authority: String,
         reason: String,
     },
+    ProjectRoute {
+        reason_code: String,
+        retryable: bool,
+        detail: String,
+    },
 }
 
 pub(super) enum ProjectOpenTaskClaim {
@@ -429,28 +434,45 @@ impl ProjectOpenFailure {
                 None => ProjectOpenStatusReasonV1::Unavailable,
             },
         };
-        Self {
-            message: error.to_string(),
-            retry_at,
-            reason,
-            typed: match error {
-                TraceDecayError::ProfileResetRequired {
-                    component,
-                    found_version,
-                    required_version,
-                } => Some(ProjectOpenTypedFailure::ProfileResetRequired {
+        let (message, typed) = match error {
+            TraceDecayError::ProfileResetRequired {
+                component,
+                found_version,
+                required_version,
+            } => (
+                error.to_string(),
+                Some(ProjectOpenTypedFailure::ProfileResetRequired {
                     component,
                     found_version: *found_version,
                     required_version: *required_version,
                 }),
-                TraceDecayError::ResetRequired { authority, reason } => {
-                    Some(ProjectOpenTypedFailure::ResetRequired {
-                        authority: authority.clone(),
-                        reason: reason.clone(),
-                    })
-                }
-                _ => None,
-            },
+            ),
+            TraceDecayError::ResetRequired { authority, reason } => (
+                error.to_string(),
+                Some(ProjectOpenTypedFailure::ResetRequired {
+                    authority: authority.clone(),
+                    reason: reason.clone(),
+                }),
+            ),
+            TraceDecayError::ProjectRoute {
+                reason_code,
+                retryable,
+                detail,
+            } => (
+                detail.clone(),
+                Some(ProjectOpenTypedFailure::ProjectRoute {
+                    reason_code: reason_code.clone(),
+                    retryable: *retryable,
+                    detail: detail.clone(),
+                }),
+            ),
+            _ => (error.to_string(), None),
+        };
+        Self {
+            message,
+            retry_at,
+            reason,
+            typed,
             refused_store: None,
         }
     }
@@ -505,6 +527,17 @@ impl ProjectOpenFailure {
                     reason: reason.clone(),
                 };
             }
+            Some(ProjectOpenTypedFailure::ProjectRoute {
+                reason_code,
+                retryable,
+                detail,
+            }) => {
+                return TraceDecayError::project_route(
+                    reason_code.clone(),
+                    *retryable,
+                    detail.clone(),
+                );
+            }
             None => {}
         }
         let message = match self.retry_at {
@@ -1204,6 +1237,27 @@ mod typed_failure_tests {
             } if authority == "workflow" && reason == "partial workflow schema"
         ));
     }
+
+    #[test]
+    fn cached_project_open_failure_preserves_capacity_reason() {
+        let error = super::super::project_server_capacity_error();
+        let failure = ProjectOpenFailure::from_error(&error);
+        let replayed = failure.to_error();
+
+        assert_eq!(
+            replayed
+                .project_route_context()
+                .map(|(reason, retryable, _)| (reason, retryable)),
+            error
+                .project_route_context()
+                .map(|(reason, retryable, _)| (reason, retryable)),
+        );
+        assert!(super::super::error_is_project_open_retryable(&replayed));
+        let Some((_, _, detail)) = error.project_route_context() else {
+            panic!("capacity refusal is a project route");
+        };
+        assert_eq!(failure.message, detail);
+    }
 }
 
 #[cfg(test)]
diff --git a/crates/tracedecay/src/daemon/project_open_handshake.rs b/crates/tracedecay/src/daemon/project_open_handshake.rs
index 5048a457d0..6b584d084c 100644
--- a/crates/tracedecay/src/daemon/project_open_handshake.rs
+++ b/crates/tracedecay/src/daemon/project_open_handshake.rs
@@ -233,19 +233,23 @@ pub(super) fn project_open_error_response(
             reason_code,
             retryable,
             detail,
-        } if reason_code == PROJECT_WARMING_REASON_CODE
-            || reason_code == REPOSITORY_DISCOVERY_DEFERRED_REASON_CODE =>
-        {
+        } if project_open_retryable_reason(reason_code) => {
+            let mut data = json!({
+                "reason_code": reason_code,
+                "retryable": retryable,
+                "detail": detail,
+                "kind": reason_code,
+            });
+            if let Some(capacity) = project_open_capacity_limit(reason_code)
+                && let Some(object) = data.as_object_mut()
+            {
+                object.insert("capacity".to_owned(), json!(capacity));
+            }
             JsonRpcResponse::error_with_data(
                 id,
                 ErrorCode::InternalError,
                 detail.clone(),
-                Some(json!({
-                    "reason_code": reason_code,
-                    "retryable": retryable,
-                    "detail": detail,
-                    "kind": reason_code,
-                })),
+                Some(data),
             )
         }
         TraceDecayError::Config { message }
@@ -262,34 +266,6 @@ pub(super) fn project_open_error_response(
                 })),
             )
         }
-        TraceDecayError::Config { message }
-            if message.starts_with("daemon project open task capacity reached") =>
-        {
-            JsonRpcResponse::error_with_data(
-                id,
-                ErrorCode::InternalError,
-                message.clone(),
-                Some(json!({
-                    "kind": "project_open_task_capacity_reached",
-                    "retryable": true,
-                    "capacity": MAX_TRACKED_PROJECT_OPEN_TASKS,
-                })),
-            )
-        }
-        TraceDecayError::Config { message }
-            if message.starts_with("daemon project server capacity reached") =>
-        {
-            JsonRpcResponse::error_with_data(
-                id,
-                ErrorCode::InternalError,
-                message.clone(),
-                Some(json!({
-                    "kind": "project_server_capacity_reached",
-                    "retryable": true,
-                    "capacity": MAX_CACHED_PROJECT_SERVERS,
-                })),
-            )
-        }
         TraceDecayError::ResetRequired { authority, reason } => JsonRpcResponse::error_with_data(
             id,
             ErrorCode::InternalError,
diff --git a/crates/tracedecay/src/daemon/project_routing.rs b/crates/tracedecay/src/daemon/project_routing.rs
index 3542840825..7de92ca006 100644
--- a/crates/tracedecay/src/daemon/project_routing.rs
+++ b/crates/tracedecay/src/daemon/project_routing.rs
@@ -8,19 +8,23 @@ use super::*;
 use tracedecay_daemon_identity::{authority, profile_identity};
 
 pub(super) fn project_server_capacity_error() -> TraceDecayError {
-    TraceDecayError::Config {
-        message: format!(
+    TraceDecayError::project_route(
+        PROJECT_SERVER_CAPACITY_REASON_CODE,
+        true,
+        format!(
             "daemon project server capacity reached (capacity={MAX_CACHED_PROJECT_SERVERS}); retry after active clients finish"
         ),
-    }
+    )
 }
 
 pub(super) fn project_open_task_capacity_error() -> TraceDecayError {
-    TraceDecayError::Config {
-        message: format!(
+    TraceDecayError::project_route(
+        PROJECT_OPEN_TASK_CAPACITY_REASON_CODE,
+        true,
+        format!(
             "daemon project open task capacity reached (capacity={MAX_TRACKED_PROJECT_OPEN_TASKS}); retry shortly"
         ),
-    }
+    )
 }
 
 pub(super) fn project_open_cancellation_error() -> TraceDecayError {
diff --git a/crates/tracedecay/src/daemon/tests/bootstrap.rs b/crates/tracedecay/src/daemon/tests/bootstrap.rs
index af1ce407e9..c7cd664d93 100644
--- a/crates/tracedecay/src/daemon/tests/bootstrap.rs
+++ b/crates/tracedecay/src/daemon/tests/bootstrap.rs
@@ -1985,6 +1985,7 @@ async fn project_open_task_registry_caps_distinct_inflight_routes() {
         .expect("typed task capacity rejection")
         .data
         .expect("task capacity rejection data");
+    assert_eq!(data["reason_code"], "project_open_task_capacity_reached");
     assert_eq!(data["kind"], "project_open_task_capacity_reached");
     assert_eq!(data["retryable"], true);
     assert_eq!(
@@ -2484,16 +2485,15 @@ fn a_recorded_open_failure_replaces_only_the_warming_hint() {
         );
     }
 
-    let unrelated = "daemon project server capacity reached";
+    let capacity = super::super::project_server_capacity_error();
     let passed_through = prefer_recorded_open_failure::<()>(
-        Err(tracedecay_domain::errors::TraceDecayError::Config {
-            message: unrelated.to_owned(),
-        }),
+        Err(super::super::project_server_capacity_error()),
         &failed.1,
     )
     .expect_err("a refusal that is not the warming hint is the caller's answer");
-    assert!(
-        passed_through.to_string().contains(unrelated),
+    assert_eq!(
+        passed_through.to_string(),
+        capacity.to_string(),
         "only the warming hint may be replaced: {passed_through:?}"
     );
     prefer_recorded_open_failure(Ok("published owner"), &failed.1)
diff --git a/crates/tracedecay/src/daemon/tests/lifecycle.rs b/crates/tracedecay/src/daemon/tests/lifecycle.rs
index 2a2a34cff3..6616d796eb 100644
--- a/crates/tracedecay/src/daemon/tests/lifecycle.rs
+++ b/crates/tracedecay/src/daemon/tests/lifecycle.rs
@@ -391,15 +391,28 @@ fn project_server_capacity_response_is_typed_json_rpc_data() {
         serde_json::Value::Null,
         &super::super::project_server_capacity_error(),
     );
-    let data = response
-        .error
-        .expect("error response")
-        .data
-        .expect("typed data");
+    let error = response.error.expect("error response");
+    let refusal = serde_json::to_value(&error).expect("serialize capacity refusal");
+    assert!(
+        super::super::json_rpc_error_is_project_open_retryable(&refusal),
+        "branch add and the proxy must retry this refusal: {refusal}"
+    );
+    let data = error.data.expect("typed data");
 
+    assert_eq!(data["reason_code"], "project_server_capacity_reached");
     assert_eq!(data["kind"], "project_server_capacity_reached");
     assert_eq!(data["retryable"], true);
     assert_eq!(data["capacity"], super::super::MAX_CACHED_PROJECT_SERVERS);
+    assert!(super::super::error_is_project_open_retryable(
+        &super::super::project_server_capacity_error()
+    ));
+    let prose = tracedecay_domain::errors::TraceDecayError::Config {
+        message: "daemon project server capacity reached".to_owned(),
+    };
+    assert!(
+        !super::super::error_is_project_open_retryable(&prose),
+        "capacity English prose must not decide project-open retry"
+    );
 }
 
 #[tokio::test]
diff --git a/crates/tracedecay/src/daemon/tests/restart_proxy.rs b/crates/tracedecay/src/daemon/tests/restart_proxy.rs
index ae4345d7a2..0a8ee98c81 100644
--- a/crates/tracedecay/src/daemon/tests/restart_proxy.rs
+++ b/crates/tracedecay/src/daemon/tests/restart_proxy.rs
@@ -221,9 +221,12 @@ fn read_deadline_classifier_accepts_typed_stalled() {
         super::super::error_is_read_deadline(&error),
         "typed stalled must classify as a read deadline"
     );
+    let prose = tracedecay_domain::errors::TraceDecayError::Config {
+        message: "daemon did not answer after 5s; stalled or saturated".to_owned(),
+    };
     assert!(
-        super::super::error_message_is_read_deadline(&error.to_string()),
-        "stalled Display must still match the string classifier"
+        !super::super::error_is_read_deadline(&prose),
+        "stalled English prose must not classify as a read deadline"
     );
     let down = tracedecay_daemon_protocol::daemon_connect_failure(
         "/tmp/daemon.sock",
diff --git a/crates/tracedecay/src/mcp/server/ledger.rs b/crates/tracedecay/src/mcp/server/ledger.rs
index 42c73405ae..ab2425e444 100644
--- a/crates/tracedecay/src/mcp/server/ledger.rs
+++ b/crates/tracedecay/src/mcp/server/ledger.rs
@@ -9,6 +9,51 @@ use tracedecay_global_db::RegisteredGlobalDb;
 /// is *finite* — a wedged recorder task can never hang the caller (tests,
 /// shutdown drains) indefinitely as the previous unbounded loop allowed.
 const LEDGER_SETTLE_TIMEOUT: Duration = Duration::from_secs(10);
+const MAX_SPAN_IDENTIFIER_BYTES: usize = 256;
+
+fn bounded_span_identifier(value: Option<&str>) -> Option<String> {
+    value
+        .filter(|value| {
+            !value.is_empty()
+                && value.len() <= MAX_SPAN_IDENTIFIER_BYTES
+                && !value.chars().any(char::is_control)
+        })
+        .map(str::to_string)
+}
+
+fn derive_hook_span_git_context(
+    cwd: &Path,
+    project_root: PathBuf,
+    active_project_root: &Path,
+) -> Option<(String, Option<String>)> {
+    let deadline = tracedecay_runtime_core::cancellation::MonotonicDeadline::at(
+        std::time::Instant::now() + std::time::Duration::from_secs(2),
+    );
+    let cancellation = tracedecay_runtime_core::cancellation::CancellationToken::new();
+    let worktree_raw =
+        match tracedecay_runtime_core::git_discovery::discover_repository_identity_with_control(
+            cwd,
+            deadline,
+            &cancellation,
+        ) {
+            tracedecay_runtime_core::git_discovery::GitRepositoryIdentityOutcome::Resolved(
+                identity,
+            ) => identity.worktree_root,
+            tracedecay_runtime_core::git_discovery::GitRepositoryIdentityOutcome::NotRepository => {
+                project_root
+            }
+            tracedecay_runtime_core::git_discovery::GitRepositoryIdentityOutcome::Unknown(_) => {
+                return None;
+            }
+        };
+    let worktree_raw =
+        hook_events::authorize_add_branch_at_root(&worktree_raw, active_project_root).ok()?;
+    let worktree = git_correlation::normalize_worktree(&worktree_raw.to_string_lossy());
+    let branch = bounded_span_identifier(
+        tracedecay_runtime_core::branch::current_branch(&worktree_raw).as_deref(),
+    );
+    Some((worktree, branch))
+}
 
 fn configuration_authority_unavailable(detail: impl std::fmt::Display) -> TraceDecayError {
     TraceDecayError::Config {
@@ -431,22 +476,11 @@ impl McpServer {
         event: &hook_events::HookEvent,
         selected: &crate::mcp::project_route::ResolvedProjectRoute,
     ) {
-        const MAX_SPAN_IDENTIFIER_BYTES: usize = 256;
-
         let Some(route) = event.route.as_ref() else {
             return;
         };
 
-        let bounded_identifier = |value: Option<&str>| {
-            value
-                .filter(|value| {
-                    !value.is_empty()
-                        && value.len() <= MAX_SPAN_IDENTIFIER_BYTES
-                        && !value.chars().any(char::is_control)
-                })
-                .map(str::to_string)
-        };
-        let Some(session_id) = bounded_identifier(route.session_id.as_deref())
+        let Some(session_id) = bounded_span_identifier(route.session_id.as_deref())
             .and_then(|value| tracedecay_privacy::protect_sensitive_structural_id(&value).ok())
         else {
             return;
@@ -461,7 +495,7 @@ impl McpServer {
         let Some(db) = self.project_session_db.clone() else {
             return;
         };
-        let thread_id = bounded_identifier(route.thread_id.as_deref())
+        let thread_id = bounded_span_identifier(route.thread_id.as_deref())
             .and_then(|value| tracedecay_privacy::protect_sensitive_structural_id(&value).ok());
         let ts = crate::project::current_timestamp();
         // Session-only pre-debounce: the full key needs branch/worktree, which
@@ -498,33 +532,7 @@ impl McpServer {
             // spawn git, so it runs on the blocking pool, off the
             // notification hot path.
             let derived = tokio::task::spawn_blocking(move || {
-                let deadline = tracedecay_runtime_core::cancellation::MonotonicDeadline::at(
-                    std::time::Instant::now() + std::time::Duration::from_secs(2),
-                );
-                let cancellation = tracedecay_runtime_core::cancellation::CancellationToken::new();
-                let worktree_raw = match tracedecay_runtime_core::git_discovery::discover_repository_identity_with_control(
-                    &cwd,
-                    deadline,
-                    &cancellation,
-                ) {
-                    tracedecay_runtime_core::git_discovery::GitRepositoryIdentityOutcome::Resolved(
-                        identity,
-                    ) => identity.worktree_root,
-                    tracedecay_runtime_core::git_discovery::GitRepositoryIdentityOutcome::NotRepository => {
-                        project_root
-                    }
-                    tracedecay_runtime_core::git_discovery::GitRepositoryIdentityOutcome::Unknown(_) => {
-                        return None;
-                    }
-                };
-                let worktree_raw =
-                    hook_events::authorize_add_branch_at_root(&worktree_raw, &active_project_root)
-                        .ok()?;
-                let worktree = git_correlation::normalize_worktree(&worktree_raw.to_string_lossy());
-                let branch = bounded_identifier(
-                    tracedecay_runtime_core::branch::current_branch(&worktree_raw).as_deref(),
-                );
-                Some((worktree, branch))
+                derive_hook_span_git_context(&cwd, project_root, &active_project_root)
             })
             .await;
             let Ok(Some((worktree, branch))) = derived else {
diff --git a/crates/tracedecay/src/mcp/server/routing.rs b/crates/tracedecay/src/mcp/server/routing.rs
index fc2a40b200..f5f439e84b 100644
--- a/crates/tracedecay/src/mcp/server/routing.rs
+++ b/crates/tracedecay/src/mcp/server/routing.rs
@@ -217,13 +217,9 @@ async fn resolve_initialize_roots_project_route(
     }
     let discovery = repository_discovery();
     for root in roots {
-        let route = resolve_private_project_route_within(
-            &root,
-            registry_db,
-            resolver.clone(),
-            &discovery,
-        )
-        .await;
+        let route =
+            resolve_private_project_route_within(&root, registry_db, resolver.clone(), &discovery)
+                .await;
         if !matches!(
             &route,
             WorkspaceProjectRoute::Failed(ProjectRouteFailure {
@@ -255,6 +251,38 @@ pub(crate) async fn resolve_private_project_route(
     .await
 }
 
+async fn resolve_private_selected_path(
+    requested_path: &Path,
+    registry_db: &RegisteredGlobalDb,
+    discovery: &RepositoryDiscovery,
+) -> Result<PathBuf, ProjectRouteFailure> {
+    match resolve_initialize_root_project_path(requested_path, registry_db, discovery).await {
+        Ok(Some(path)) => Ok(path),
+        Ok(None) => Err(ProjectRouteFailure {
+            kind: ProjectRouteFailureKind::NotFound,
+            detail: format!(
+                "workspace {} did not resolve to a registered project",
+                requested_path.display()
+            ),
+        }),
+        Err(InitializeRootResolutionError::AmbiguousIdentity) => Err(ProjectRouteFailure {
+            kind: ProjectRouteFailureKind::Ambiguous,
+            detail: format!(
+                "workspace {} matches multiple registered projects",
+                requested_path.display()
+            ),
+        }),
+        Err(InitializeRootResolutionError::AuthorityUnavailable) => Err(ProjectRouteFailure {
+            kind: ProjectRouteFailureKind::Unavailable,
+            detail: "private project route authority is unavailable".to_owned(),
+        }),
+        Err(InitializeRootResolutionError::Discovery(reason)) => Err(ProjectRouteFailure {
+            kind: ProjectRouteFailureKind::Unavailable,
+            detail: format!("repository discovery {reason}"),
+        }),
+    }
+}
+
 async fn resolve_private_project_route_within(
     requested_path: &Path,
     registry_db: Option<&RegisteredGlobalDb>,
@@ -268,38 +296,9 @@ async fn resolve_private_project_route_within(
         });
     };
     let selected_path =
-        match resolve_initialize_root_project_path(requested_path, registry_db, discovery).await {
-            Ok(Some(path)) => path,
-            Ok(None) => {
-                return WorkspaceProjectRoute::Failed(ProjectRouteFailure {
-                    kind: ProjectRouteFailureKind::NotFound,
-                    detail: format!(
-                        "workspace {} did not resolve to a registered project",
-                        requested_path.display()
-                    ),
-                });
-            }
-            Err(InitializeRootResolutionError::AmbiguousIdentity) => {
-                return WorkspaceProjectRoute::Failed(ProjectRouteFailure {
-                    kind: ProjectRouteFailureKind::Ambiguous,
-                    detail: format!(
-                        "workspace {} matches multiple registered projects",
-                        requested_path.display()
-                    ),
-                });
-            }
-            Err(InitializeRootResolutionError::AuthorityUnavailable) => {
-                return WorkspaceProjectRoute::Failed(ProjectRouteFailure {
-                    kind: ProjectRouteFailureKind::Unavailable,
-                    detail: "private project route authority is unavailable".to_owned(),
-                });
-            }
-            Err(InitializeRootResolutionError::Discovery(reason)) => {
-                return WorkspaceProjectRoute::Failed(ProjectRouteFailure {
-                    kind: ProjectRouteFailureKind::Unavailable,
-                    detail: format!("repository discovery {reason}"),
-                });
-            }
+        match resolve_private_selected_path(requested_path, registry_db, discovery).await {
+            Ok(path) => path,
+            Err(failure) => return WorkspaceProjectRoute::Failed(failure),
         };
     let context = match registry_db
         .project_registry_context_by_alias(&selected_path)
@@ -376,7 +375,9 @@ async fn resolve_initialize_roots_project_path(
     }
     let registry_db = registry_db?;
     for root in roots {
-        match resolve_initialize_root_project_path(&root, registry_db, &repository_discovery()).await {
+        match resolve_initialize_root_project_path(&root, registry_db, &repository_discovery())
+            .await
+        {
             Ok(Some(project_path)) => return Some(project_path),
             Ok(None) => {}
             Err(_) => return None,
@@ -417,7 +418,7 @@ async fn resolve_initialize_root_project_path(
                 .await
             {
                 Ok(Some(context)) => {
-                    candidates.push((identity.worktree_root, context.project.project_id))
+                    candidates.push((identity.worktree_root, context.project.project_id));
                 }
                 Ok(None) => {}
                 Err(_) => return Err(InitializeRootResolutionError::AuthorityUnavailable),
diff --git a/crates/tracedecay/tests/transport_acceptance_suite/graph_rebuild_status_test.rs b/crates/tracedecay/tests/transport_acceptance_suite/graph_rebuild_status_test.rs
index 51d23de6ed..5b02449a74 100644
--- a/crates/tracedecay/tests/transport_acceptance_suite/graph_rebuild_status_test.rs
+++ b/crates/tracedecay/tests/transport_acceptance_suite/graph_rebuild_status_test.rs
@@ -116,11 +116,14 @@ async fn search(
     project: &Path,
     query: &str,
 ) -> Value {
+    // Keep the page tiny: a generation-scale refresh batch otherwise returns
+    // multi-dozen-KiB candidate bodies that MCP truncates into a handle, and
+    // the wait helpers never see top-level `results` / `code_generation`.
     tool(
         harness,
         project,
         "tracedecay_search",
-        json!({"query": query, "limit": 20, "format": "json"}),
+        json!({"query": query, "limit": 3, "format": "json"}),
     )
     .await
 }
diff --git a/crates/tracedecay/tests/transport_acceptance_suite/typed_terminal_restart_acceptance.rs b/crates/tracedecay/tests/transport_acceptance_suite/typed_terminal_restart_acceptance.rs
index 76c5468628..8609233c82 100644
--- a/crates/tracedecay/tests/transport_acceptance_suite/typed_terminal_restart_acceptance.rs
+++ b/crates/tracedecay/tests/transport_acceptance_suite/typed_terminal_restart_acceptance.rs
@@ -175,13 +175,23 @@ fn add_fact_settling_after_its_deadline(
     barrier_dir: &Path,
     content: &str,
 ) -> Value {
+    // One-shot markers: clear a previous park so a leftover `arrived` cannot
+    // make this helper release before the CLI request reaches the boundary.
+    for marker in ["armed", "claimed", "arrived", "release", "expect_content"] {
+        let _ = std::fs::remove_file(barrier_dir.join(marker));
+    }
+    // Bind the barrier to this fact's content so a foreign write (project-open
+    // side effect, curator, graph publish) cannot claim `arrived` while the
+    // CLI add races past an unarmed commit boundary.
+    std::fs::write(barrier_dir.join("expect_content"), content.as_bytes())
+        .expect("pin the fact commit barrier to the parked content");
     std::fs::write(barrier_dir.join("armed"), b"armed\n").expect("arm the fact commit barrier");
 
     let mut command = tool_command(
         home,
         project,
         "tracedecay_fact_store_add",
-        &json!({ "content": content, "category": "general" }),
+        &json!({ "content": content, "category": "general", "format": "json" }),
     );
     command
         .env(
@@ -226,8 +236,18 @@ fn add_fact_settling_after_its_deadline(
     // test spawned it, so `spawn + deadline` can still be earlier than the real
     // expiry. Arrival is strictly after that clock started, so holding a full
     // deadline plus a margin beyond arrival always outlives it.
+    //
+    // Keep asserting the CLI is still blocked: an early success here means the
+    // commit path skipped the barrier (or a foreign claim wrote `arrived`).
     let release_at = arrived_at + PARTIAL_EFFECT_DEADLINE + Duration::from_secs(1);
     while Instant::now() < release_at {
+        assert!(
+            child
+                .try_wait()
+                .expect("inspect the parked fact_store add")
+                .is_none(),
+            "the fact_store add settled before its request deadline could expire at the commit barrier"
+        );
         std::thread::sleep(Duration::from_millis(20));
     }
     std::fs::write(barrier_dir.join("release"), b"release\n")
@@ -236,7 +256,28 @@ fn add_fact_settling_after_its_deadline(
     let output = child
         .wait_with_output()
         .expect("collect the parked fact_store add");
-    parse_tool_output("tracedecay_fact_store_add", &output)
+    let raw = parse_tool_output("tracedecay_fact_store_add", &output);
+    // Compatibility MCP results nest the typed envelope in content text when
+    // `format: json` is set; also accept a top-level problem field.
+    cli_problem_envelope(&raw, "CLI fact_store_add partial effect")
+}
+
+/// Normalizes the CLI `tracedecay tool --json` MCP payload to `{ "problem": ... }`.
+fn cli_problem_envelope(payload: &Value, context: &str) -> Value {
+    let typed = typed_envelope(payload);
+    for candidate in [
+        payload.clone(),
+        typed.clone(),
+        typed["value"].clone(),
+        typed["data"].clone(),
+        typed["outcome"]["value"].clone(),
+        payload["value"].clone(),
+    ] {
+        if candidate["problem"].is_object() {
+            return json!({ "problem": candidate["problem"].clone() });
+        }
+    }
+    panic!("{context}: no typed problem envelope in the payload: {payload}")
 }
 
 fn assert_partial_effect_committed_receipt(payload: &Value, context: &str) {
diff --git a/crates/tracedecay/tests/transport_acceptance_suite/typed_terminal_restart_acceptance/transport_boundaries.rs b/crates/tracedecay/tests/transport_acceptance_suite/typed_terminal_restart_acceptance/transport_boundaries.rs
index 68c8ec6474..8ec4ecbda1 100644
--- a/crates/tracedecay/tests/transport_acceptance_suite/typed_terminal_restart_acceptance/transport_boundaries.rs
+++ b/crates/tracedecay/tests/transport_acceptance_suite/typed_terminal_restart_acceptance/transport_boundaries.rs
@@ -333,16 +333,18 @@ fn problem_envelope(payload: &Value, context: &str) -> Value {
 /// starts its deadline clock itself: arrival is strictly after that clock
 /// started, so holding a full budget plus a margin beyond arrival always
 /// outlives it.
-fn park_at_commit_barrier<T, F>(barrier_dir: &Path, request: F) -> T
+fn park_at_commit_barrier<T, F>(barrier_dir: &Path, content: &str, request: F) -> T
 where
     F: FnOnce() -> T + Send + 'static,
     T: Send + 'static,
 {
     // The barrier is one-shot per directory: clear a previous park's markers
     // so the same daemon process can serve more than one parked request.
-    for marker in ["armed", "claimed", "arrived", "release"] {
+    for marker in ["armed", "claimed", "arrived", "release", "expect_content"] {
         let _ = std::fs::remove_file(barrier_dir.join(marker));
     }
+    std::fs::write(barrier_dir.join("expect_content"), content.as_bytes())
+        .expect("pin the fact commit barrier to the parked content");
     std::fs::write(barrier_dir.join("armed"), b"armed\n").expect("arm the fact commit barrier");
 
     let started = Instant::now();
@@ -425,7 +427,7 @@ fn partial_effect_survives_http_mcp_and_rust_sdk_across_restart() {
         token: mount.token.clone(),
     };
     let http_identity = identity.clone();
-    let (http_status, http_body) = park_at_commit_barrier(&barrier_path, move || {
+    let (http_status, http_body) = park_at_commit_barrier(&barrier_path, HTTP_MARKER, move || {
         post_application(
             &http_mount_for_request,
             &http_identity,
@@ -447,7 +449,7 @@ fn partial_effect_survives_http_mcp_and_rust_sdk_across_restart() {
     // the `_meta` object on `tools/call`.
     let mcp_home = home_path.clone();
     let mcp_project = project_path.clone();
-    let mcp_response = park_at_commit_barrier(&barrier_path, move || {
+    let mcp_response = park_at_commit_barrier(&barrier_path, MCP_MARKER, move || {
         mcp_tool_call(
             &mcp_home,
             &mcp_project,
@@ -469,7 +471,7 @@ fn partial_effect_survives_http_mcp_and_rust_sdk_across_restart() {
         token: mount.token.clone(),
     };
     let sdk_identity = identity.clone();
-    let sdk_error = park_at_commit_barrier(&barrier_path, move || {
+    let sdk_error = park_at_commit_barrier(&barrier_path, SDK_MARKER, move || {
         let client = sdk_client(&sdk_mount, &sdk_identity);
         let request =
             serde_json::from_value(fact_add_body(SDK_MARKER)).expect("canonical fact-add request");
@@ -546,7 +548,7 @@ fn partial_effect_survives_http_mcp_and_rust_sdk_across_restart() {
         token: mount.token.clone(),
     };
     let restart_identity = identity.clone();
-    let (_, restart_body) = park_at_commit_barrier(&barrier_path, move || {
+    let (_, restart_body) = park_at_commit_barrier(&barrier_path, POST_RESTART_MARKER, move || {
         post_application(
             &restart_mount,
             &restart_identity,
diff --git a/docs/CARGO-CONTENTION-POLICY.md b/docs/CARGO-CONTENTION-POLICY.md
deleted file mode 100644
index b929c0b93a..0000000000
--- a/docs/CARGO-CONTENTION-POLICY.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# Cargo invocation policy
-
-Run plain `cargo <subcommand>` — cargo-conductor brokers every invocation
-(PATH shim). Expect `[cargo-conductor] ticket cc-N` lines on stderr.
-
-Do **not** prefix with `kache` (bypasses the broker), wrap in `flock`, or set
-`CARGO_TARGET_DIR` / isolate builds. The broker serializes per target dir,
-dedupes identical runs, and batches compatible checks. Kache caching still
-applies automatically via the workspace `rustc-wrapper`. Prefer scoped
-commands (`cargo check -p <crate> --lib`) — they coalesce and release early.
-
-```sh
-cargo check -p tracedecay-store --lib
-cargo test -p tracedecay-store
-cargo clippy -p tracedecay-store --all-targets
-```
-
-Never kill cargo processes. Use `conductor status` (not ps/pgrep) for queue
-visibility. If a backgrounded ticket's result will not retrieve, rerun the
-command (dedup makes it cheap) — known issue cargo-conductor#16.
-`daemon unreachable; running cargo directly` is fail-open: proceed and mention
-it. `kache monitor` is a cache dashboard, not a cargo front-end.
-
-cargo-conductor and kache are machine-local practice. They are not product,
-CI, or release architecture, and they are not a revival of the rejected
-`cargo-slot` shim. Stock `cargo` remains the portable command for a fresh
-checkout, CI, and published contributor instructions.
-
-## Contended checkouts
-
-The broker owns serialization. Do not invent a per-lane or `/tmp/...`
-`CARGO_TARGET_DIR` merely to avoid contention, and do not redirect
-`TRACEDECAY_DATA_DIR` for that reason. Those redirects fragment incremental
-artifacts and can bypass the repository's test-profile isolation. The shared
-compile-cache key is profile × features × `RUSTFLAGS` × source, not the
-worktree path.
-
-TraceDecay diagnostic commands manage their own private target directories.
-Do not reuse or delete those directories while a diagnostic command is active.
-Do not reclaim or wipe the machine kache store.
-
-## Repository rules
-
-- Do not commit an absolute `[build].target-dir` or any host-specific build
-  path.
-- Keep `.cargo/config.toml` portable. Its checked-in `target-dir = "target"`
-  is relative to each checkout. Do not edit a machine-local
-  `rustc-wrapper = "kache"` — that is the compile-cache layer, not a cargo
-  prefix.
-- Do not add a cargo-slot, lock-stealing shim, or any wrapper that changes
-  Cargo semantics, feature resolution, or `RUSTFLAGS`. cargo-conductor execs
-  stock Cargo; prefixing `kache cargo` bypasses the broker.
-- Novel feature permutations recompile the workspace spine. Stick to the
-  standard lanes in `AGENTS.md`.
-- CI may select a runner-local target directory or cache through its own
-  environment; that configuration must not leak into published packages or
-  require cargo-conductor or `kache` for a contributor.
-
-## Verification
-
-Before submitting a build-configuration change:
-
-```sh
-cargo check --workspace --all-targets
-cargo test --workspace
-```
-
-Confirm that a fresh shell with a standard Rust toolchain can still run
-ordinary `cargo` commands without machine-local aliases, wrappers, or paths.
diff --git a/docs/DESIGN-DOC.md b/docs/DESIGN-DOC.md
deleted file mode 100644
index 31e05edf42..0000000000
--- a/docs/DESIGN-DOC.md
+++ /dev/null
@@ -1,401 +0,0 @@
-# TraceDecay Design Document
-
-This document is a historical snapshot of the pre-crate-split design, not current
-layout or ownership authority (`AGENTS.md` and the V2 plan set are).
-TraceDecay is a code intelligence tool that builds semantic knowledge graphs from source code.
-It parses source files with tree-sitter, extracts symbols and relationships into
-`tracedecay-graph-db` (Grafeo), and exposes the graph through a CLI, MCP, LSP, and an
-embedded dashboard. Relational SQLite remains for session, memory, and registry
-state — not the code graph.
-The core insight is that AI coding agents waste tokens reading raw files when a pre-built
-graph can answer most questions instantly.
-
-## Architecture Overview
-
-The system is structured as a pipeline: source files flow through extraction, resolution,
-and storage, then get queried via the CLI or MCP server.
-
-```mermaid
-graph LR
-    subgraph Indexing
-        A[Source Files] --> B[Tree-sitter Parsing]
-        B --> C[Language Extractors]
-        C --> D[Nodes + Edges + Unresolved Refs]
-        D --> E[Reference Resolver]
-        E --> F[Graph store]
-    end
-
-    subgraph Querying
-        F --> G[Graph Traversal]
-        F --> H[Graph Queries]
-        F --> I[Context Builder]
-        G --> J[MCP Server]
-        H --> J
-        I --> J
-        G --> K[CLI]
-        H --> K
-        I --> K
-    end
-
-    J --> L[Claude / Gemini / Codex / OpenCode]
-    K --> M[Terminal]
-```
-
-The binary (`src/main.rs`) serves as both the CLI frontend and MCP server entry point.
-The library (`src/lib.rs`) exposes all internals so the CLI and server share the same code
-paths without duplication.
-
-## Module Map
-
-This map is a historical snapshot of the pre-crate-split tree. Current layout
-is in `AGENTS.md` and `CONTRIBUTING.md` (`src/` daemon/MCP, `crates/` members,
-`dashboard/`, `plugin/`).
-
-```
-src/
-  main.rs             CLI entry point, subcommand dispatch
-  lib.rs              Crate root, module declarations, lint config
-  tracedecay.rs        TraceDecay facade -- the main public API
-  branch.rs           Git branch resolution (current branch, default detection, merge-base)
-  branch_meta.rs      Branch metadata persistence (branch-meta.json)
-  config.rs           Per-project config (exclude patterns, limits)
-  errors.rs           Error types (thiserror)
-  sync.rs             Content hashing, stale/new/removed file detection
-  user_config.rs      User-level config (~/.tracedecay/config.toml)
-  cloud.rs            Cloudflare Worker counter, GitHub release checks
-  global_db.rs        Cross-project token tracking (~/.tracedecay/global.db)
-
-  extraction/         Tree-sitter based extractors (one per language)
-    mod.rs            Extractor registry, feature-gated language modules
-    complexity.rs     Cyclomatic complexity counting (language-configurable)
-    rust_extractor.rs ... through qbasic_extractor.rs
-
-  tree_sitter/        Vendored tree-sitter grammars
-    cobol.rs          COBOL (no working crate on crates.io)
-    protobuf.rs       Protobuf (version conflict with tree-sitter 0.26)
-
-  db/                 SQLite persistence
-    connection.rs     Database struct, WAL setup, checkpointing
-    migrations.rs     Sequential schema migrations via PRAGMA user_version
-    queries.rs        All SQL queries as async methods on Database
-
-  resolution/         Cross-file symbol resolution
-    resolver.rs       Matches unresolved references to known nodes
-
-  graph/              Higher-level graph algorithms
-    traversal.rs      BFS/DFS, callers/callees, impact radius, path finding
-    queries.rs        Dead code detection, circular deps, file dependencies
-
-  context/            AI-ready context assembly
-    builder.rs        Builds TaskContext from a natural language query
-    formatter.rs      Markdown and JSON output formatters
-
-  vectors/            Embedding storage and brute-force similarity search
-    search.rs         Store/query/delete vectors, cosine similarity
-
-  mcp/                Model Context Protocol server
-    server.rs         McpServer: stdio JSON-RPC loop, lifecycle
-    tools.rs          37 tool definitions and dispatch
-    transport.rs      JSON-RPC request/response/error types
-
-  agents/             Agent integration (install/uninstall/doctor)
-    mod.rs            Agent trait, registry, shared helpers, git hooks
-    claude.rs         Claude Code: MCP in ~/.claude.json, hooks, permissions
-    codex.rs          Codex CLI: MCP in ~/.codex/config.toml, AGENTS.md
-    opencode.rs       OpenCode: MCP in ~/.config/opencode/opencode.json, ~/.config/opencode/AGENTS.md
-    gemini.rs         Gemini CLI: MCP in ~/.gemini/settings.json, GEMINI.md
-```
-
-## Core Data Model
-
-The graph has three primary entities stored in `tracedecay-graph-db`.
-
-**Nodes** represent code symbols. Each node has:
-
-- A deterministic ID (content-addressed hash of file path + name + kind)
-- A `NodeKind` enum with 50+ variants spanning all supported languages
-  (Function, Method, Struct, Class, Enum, Trait, Interface, Field, etc.)
-- Source location (file, start line, end line)
-- Metadata: signature, visibility, docstring, body hash, line count
-- Complexity metrics: branches, loops, returns, max nesting, unsafe blocks
-
-**Edges** represent relationships between nodes:
-
-| EdgeKind     | Meaning                            |
-|--------------|------------------------------------|
-| Contains     | Parent contains child (file->fn)   |
-| Calls        | Function/method calls another      |
-| Uses         | Symbol references another symbol   |
-| Implements   | Type implements trait/interface     |
-| TypeOf       | Field/param has a type reference    |
-| Returns      | Function returns a type            |
-| Inherits     | Class extends another              |
-| Overrides    | Method overrides a parent method   |
-| Imports      | File imports from another          |
-| AnnotatedBy  | Symbol annotated by annotation     |
-
-**Files** track indexing state per source file:
-
-- Path, content hash (SHA-256), language, size, last-indexed timestamp
-- Content hashing enables incremental sync: only re-extract changed files
-
-## Indexing Pipeline
-
-### 1. File Discovery
-
-`TraceDecay::index_all` walks the project tree, filters by extension (language support)
-and config exclude globs. If `git_ignore` is enabled, it additionally filters through
-`.gitignore` rules via the `ignore` crate.
-
-### 2. Extraction
-
-Each source file is dispatched to a language-specific extractor based on file extension.
-Extractors use tree-sitter to parse the file into a concrete syntax tree, then walk it
-to produce an `ExtractionResult` containing:
-
-- **Nodes**: every symbol found in the file
-- **Edges**: intra-file relationships (contains, calls, uses, implements, etc.)
-- **Unresolved references**: call sites and type references that name symbols
-  potentially defined in other files
-
-The extractor architecture is stateless: `XxxExtractor::extract_source(path, source)`
-takes a file path and source string, returns nodes and edges. An internal `ExtractionState`
-accumulates results during the tree walk, tracks scope nesting for containment edges,
-and collects unresolved references.
-
-Complexity metrics are computed during extraction using a language-configurable walker
-(`ComplexityConfig`) that counts branches, loops, nesting depth, unsafe blocks, and
-unchecked calls in each function body.
-
-### 3. Reference Resolution
-
-After all files are extracted, the `ReferenceResolver` runs a second pass. It loads all
-nodes into memory, builds a name-to-node index, and attempts to match each unresolved
-reference to a known node. Matched references become typed edges (Calls, Uses, TypeOf,
-etc.) that create cross-file connections in the graph.
-
-### 4. Storage
-
-The code graph persists through `tracedecay-graph-db` (Grafeo). Relational
-SQLite (`tracedecay-rusqlite-runtime`) holds session, memory, and registry
-state, not graph nodes.
-
-### 5. Incremental Sync
-
-`TraceDecay::sync` compares the current file system state against the stored file records
-using SHA-256 content hashes. It identifies three sets:
-
-- **New files**: on disk but not in DB, need full extraction
-- **Modified files**: hash mismatch, re-extract and replace
-- **Removed files**: in DB but not on disk, delete nodes and edges
-
-Only changed files are re-extracted. After re-extraction, reference resolution runs
-again on the full graph to pick up any new cross-file edges.
-
-## Database Layer
-
-The code graph is Grafeo. Relational catalogs use SQLite through the bundled
-`tracedecay-rusqlite-runtime`. Sequential migrations still track relational
-schema via `PRAGMA user_version`.
-
-Key schema features:
-
-- **FTS5** full-text search index on node names for fuzzy symbol search
-- **Covering indexes** on edges `(source_id, kind)` and `(target_id, kind)` for
-  fast traversal in both directions
-- **Content-addressed node IDs** enable deduplication and stable references
-- **WAL mode** with `NORMAL` synchronous for concurrent read/write safety
-
-Domain-specific modules under `src/db/` implement data access through the
-engine executor traits. Complex analytical queries (god classes, inheritance
-depth, coupling) use CTEs and window functions to avoid pulling large datasets
-into Rust.
-
-## Graph Algorithms
-
-`graph/traversal.rs` provides BFS and DFS traversal with configurable edge kinds,
-max depth, and direction. Built on top of it:
-
-- **Callers/callees**: follow Calls edges upstream/downstream
-- **Impact radius**: BFS from a node following all edge kinds to find the blast radius
-- **Call graph**: bidirectional expansion from a function
-- **Type hierarchy**: follows Implements and Inherits edges
-- **Path finding**: BFS shortest path between two nodes
-
-`graph/queries.rs` provides higher-level analyses:
-
-- **Dead code detection**: nodes with zero incoming Calls/Uses edges (excluding files)
-- **Circular dependencies**: Tarjan's SCC algorithm on file-level import edges
-- **File dependencies/dependents**: which files a file depends on or is depended upon by
-
-## Context Builder
-
-The context builder (`context/builder.rs`) is the key integration point for AI agents.
-Given a natural language task description, it:
-
-1. Extracts symbol names from the query using heuristics (camelCase splitting, etc.)
-2. Searches for each extracted symbol via FTS5 full-text search
-3. Searches for each agent-provided keyword (the `extra_keywords` field)
-4. Expands relevant nodes by following edges to include callers, callees, and types
-5. Reads source code snippets for the top-ranked nodes
-6. Assembles a `TaskContext` with ranked symbols, their code, and relationship summaries
-
-The output can be formatted as markdown (for humans / LLM prompts) or JSON (for
-programmatic consumption).
-
-### Semantic Search: Keywords vs Embeddings
-
-The primary search mechanism is FTS5 with BM25 scoring, which matches against
-node names, qualified names, signatures, and docstrings. This works well when
-query terms appear literally in the code, but fails when concepts don't match
-symbol names (e.g. "authentication" won't find `login()` unless a docstring
-mentions it).
-
-Rather than embedding models, tracedecay uses **agent-driven keyword expansion**.
-The `tracedecay_context` MCP tool accepts a `keywords` array where the calling
-agent provides synonyms:
-
-```json
-{
-  "task": "how does authentication work",
-  "keywords": ["login", "session", "credential", "token", "jwt"]
-}
-```
-
-Each keyword runs as an independent FTS5 query, and results are merged with the
-main query's results (deduplicated by node ID).
-
-**Why keywords instead of embeddings:**
-
-| | Agent keywords | Local embeddings |
-|---|---|---|
-| Indexing cost | Zero | ~30s per 1,000 nodes (ONNX inference) |
-| Model dependency | None | ~50MB model download |
-| Query latency | ~1ms per keyword (FTS5 index hit) | ~200ms (brute-force cosine) |
-| Binary size impact | None | +15-20 MB (ONNX runtime) |
-| Conceptual match quality | Depends on agent's domain knowledge | Better for truly alien naming |
-| Works without an LLM | No (needs an agent to provide keywords) | Yes (standalone) |
-
-The trade-off: if the codebase uses naming conventions the agent can't predict
-(e.g. `guardianGateway` for authentication), keywords miss while embeddings
-would catch it via distributional semantics. In practice, the agent is an LLM
-that understands programming conventions well enough to supply good synonyms
-for the vast majority of cases.
-
-## MCP Server
-
-The MCP server (`mcp/server.rs`) runs over stdio using JSON-RPC 2.0. It implements
-the Model Context Protocol lifecycle:
-
-1. **initialize**: returns server capabilities and tool list
-2. **tools/list**: returns the 36 available tools with JSON Schema input definitions
-3. **tools/call**: dispatches to `handle_tool_call` which routes by tool name
-
-The server is stateless between calls (each call queries the database independently).
-It tracks basic statistics (call counts, tokens saved per tool) for the `tracedecay_status`
-tool.
-
-### Tool Categories
-
-The MCP tools fall into several categories:
-
-| Category        | Tools                                                    |
-|-----------------|----------------------------------------------------------|
-| Search          | search, context, node, files, diff_context               |
-| Navigation      | callers, callees, impact, affected                       |
-| Analysis        | complexity, dead_code, god_class, circular, coupling     |
-| Metrics         | rank, hotspots, largest, distribution, inheritance_depth |
-| Quality         | doc_coverage, unused_imports, recursion                  |
-| Refactoring     | rename_preview, similar, module_api                      |
-| Git/CI          | changelog, commit_context, pr_context                    |
-| Testing & types | test_map, type_hierarchy                                 |
-| Porting         | port_status, port_order                                  |
-| Branching       | branch_search, branch_diff                               |
-| Status          | status                                                   |
-
-Each tool is defined in `mcp/tools.rs` with a JSON Schema for its parameters.
-`handle_tool_call` deserializes the arguments, calls the appropriate `TraceDecay`
-method, and formats the result.
-
-## Agent Integration
-
-The `agents/` module implements the `Agent` trait, providing `install`, `uninstall`,
-and `healthcheck` operations for each supported coding agent. The registry in `mod.rs`
-maps string IDs to agent implementations.
-
-Each agent's install routine:
-
-1. Registers the MCP server in the agent's config file
-2. Sets up tool permissions / auto-approval where supported
-3. Installs a PreToolUse hook (Claude Code only) to block redundant file reads
-4. Appends prompt rules to the agent's instructions file
-
-```mermaid
-graph TB
-    subgraph "tracedecay install --agent X"
-        I[Install] --> MCP[Register MCP Server]
-        I --> PERM[Set Tool Permissions]
-        I --> HOOK[Install Hook]
-        I --> PROMPT[Append Prompt Rules]
-    end
-
-    subgraph "Agent Config Locations"
-        MCP --> C1["Claude: ~/.claude.json"]
-        MCP --> C2["Codex: ~/.codex/config.toml"]
-        MCP --> C3["OpenCode: ~/.config/opencode/opencode.json"]
-        MCP --> C4["Gemini: ~/.gemini/settings.json"]
-
-        PROMPT --> P1["Claude: ~/.claude/CLAUDE.md"]
-        PROMPT --> P2["Codex: ~/.codex/AGENTS.md"]
-        PROMPT --> P3["OpenCode: ~/.config/opencode/AGENTS.md"]
-        PROMPT --> P4["Gemini: ~/.gemini/GEMINI.md"]
-    end
-```
-
-The `doctor` command runs healthchecks across all (or a specific) agent,
-verifying that the MCP server is registered, permissions are correct, hooks
-are installed, and prompt rules are present.
-
-## Language Support Tiers
-
-Languages are organized into feature-gated tiers to control binary size and
-compile time:
-
-| Tier   | Languages                                                         | Feature Flag |
-|--------|-------------------------------------------------------------------|--------------|
-| Lite   | Rust, Go, Java, Scala, TypeScript/JS, Python, C, C++, Kotlin, C#, Swift | always on |
-| Medium | Dart, Pascal, PHP, Ruby, Bash, Protobuf, PowerShell, Nix, VB.NET | `medium`     |
-| Full   | Lua, Zig, Obj-C, Perl, Batch, Fortran, COBOL, MSBasic2, GWBasic, QBasic | `full` (default) |
-
-Two grammars (COBOL and Protobuf) are vendored as C source compiled via `build.rs`
-because their crate counterparts are either missing or depend on incompatible
-tree-sitter versions. The FFI shims live in `src/tree_sitter/`.
-
-## Token Tracking
-
-TraceDecay tracks how many tokens it saves compared to raw file reads. Each MCP tool
-call estimates the tokens that would have been consumed by reading the relevant files,
-subtracts the size of the tool's response, and accumulates the difference in the
-per-project database.
-
-A global database at `~/.tracedecay/global.db` aggregates totals across all projects
-(an existing legacy `~/.tracedecay/` directory is still honored as a fallback).
-An opt-in worldwide counter (Cloudflare Worker) lets users contribute their totals
-anonymously. Upload is best-effort with 2-second timeouts and never blocks the CLI.
-
-## Concurrency Model
-
-The system uses `tokio` for async I/O but most work is CPU-bound (tree-sitter parsing)
-or SQLite-bound. Key concurrency points:
-
-- The MCP server processes one JSON-RPC request at a time (single stdio stream)
-- The git post-commit hook runs `tracedecay sync` in the background (`&`). `sync` requires an existing database -- it will not create one. This prevents the hook from silently bootstrapping indexes in repos that were never initialized with `tracedecay init`.
-- SQLite WAL mode + busy timeout handles concurrent access gracefully
-- Version checks and counter uploads run on background threads during `sync`
-
-## Build and Distribution
-
-- **GitHub Releases**: checksummed prebuilt archives and `install.sh`
-
-The release workflow (`release.yml`) builds reproducible binary archives for
-four targets and publishes them only as GitHub Release assets.
diff --git a/docs/EXTRACTOR-MIGRATION-GUIDE.md b/docs/EXTRACTOR-MIGRATION-GUIDE.md
deleted file mode 100644
index 117f3106c9..0000000000
--- a/docs/EXTRACTOR-MIGRATION-GUIDE.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# Extractor Traversal Helper Migration Guide
-
-This guide captures the C/C++ pilot migration strategy for consolidating duplicated tree-sitter traversal helpers under `crates/tracedecay-code-extraction/src/traversal.rs`.
-
-## Final utility strategy
-
-Keep the shared traversal module intentionally small and language-agnostic. The current shared helpers are:
-
-- `find_direct_child_by_kind(node, kind)`: exact `Node::kind()` match over direct children only, preserving source-order traversal and including both named and anonymous children.
-- `has_direct_child_kind(node, kind)`: boolean wrapper around `find_direct_child_by_kind`.
-- `find_descendant_by_kind(node, kind)`: exact `Node::kind()` match with pre-order depth-first traversal over all children.
-
-The pilot migrated only the C and C++ extractors to these helpers. That scope is deliberate: both extractors had duplicate local helpers with the same semantics, and the focused C/C++ tests exercise the direct-child and descendant paths through function-pointer typedef extraction.
-
-## Safe consolidation patterns
-
-Consolidate a local helper into `extraction::traversal` only when all of these are true:
-
-1. The helper compares `node.kind()` to a caller-provided string exactly.
-2. Traversal visits both named and anonymous children, not just named children.
-3. Direct-child searches inspect only immediate children in source order.
-4. Descendant searches are pre-order depth-first and return the first matching node.
-5. The helper is stateless: it does not read extractor state, source bytes, language config, field names, or parent context.
-6. Existing tests cover at least one representative call path in the migrating extractor.
-
-The C/C++ pilot is the template for this shape: import helpers from `crate::traversal`, replace `Self::find_*_by_kind(...)` calls with the shared functions, remove the now-unused local helper definitions, and keep extractor behavior unchanged.
-
-## Patterns that should stay local
-
-Do not consolidate helpers that encode language-specific or extractor-specific behavior, including helpers that:
-
-- Filter to named children only or intentionally skip anonymous nodes.
-- Match tree-sitter field names, grammar aliases, supertypes, or language-specific node families.
-- Collect multiple matches rather than returning the first match.
-- Depend on source text, byte ranges, comments, docstrings, visibility state, or the extractor's node stack.
-- Walk parents or siblings, or otherwise use traversal order different from the direct-child / pre-order descendant helpers.
-- Special-case grammar quirks or disambiguate names differently per language.
-- Are performance-sensitive enough to need caller-controlled cursors, caching, or a fused extraction pass.
-
-Keeping these helpers local is preferable to hiding behavior differences behind a shared utility with a misleadingly generic name.
-
-## Migration checklist
-
-For each future extractor migration:
-
-1. Compare the local helper body against `crates/tracedecay-code-extraction/src/traversal.rs`, not just the helper name.
-2. Add or identify tests that cover each shared helper path used by the extractor. At minimum, cover direct-child lookup and nested descendant lookup when both are used.
-3. Run the focused extractor test module (its `crates/tracedecay-code-extraction/tests/main/<lang>.rs` module of the `main` test binary) before and after migration. If behavior changes, either revert the migration or document and test the intended behavior change.
-4. Run the shared traversal unit tests and `cargo check --lib` with the same feature profile used by the extractor tests.
-5. Leave language-specific traversal helpers local until their semantics are proven identical.
-
-Validation commands used for the C/C++ pilot:
-
-```sh
-cargo nextest run -p tracedecay-code-extraction --lib --no-default-features extraction::traversal::tests
-cargo nextest run -p tracedecay-code-extraction --no-default-features --test main -E 'test(/^c::/)'
-cargo nextest run -p tracedecay-code-extraction --no-default-features --test main -E 'test(/^cpp::/)'
-cargo check -p tracedecay-code-extraction --lib --no-default-features
-```
-
-The pilot validation passed with 3/3 traversal unit tests, 25/25 C extractor tests, 30/30 C++ extractor tests, and a clean library check.
diff --git a/docs/MORE-LANGUAGES-SUPPORT.md b/docs/MORE-LANGUAGES-SUPPORT.md
deleted file mode 100644
index 4df9c1bf15..0000000000
--- a/docs/MORE-LANGUAGES-SUPPORT.md
+++ /dev/null
@@ -1,188 +0,0 @@
-# Future Language Support
-
-## Currently Supported (51 languages)
-
-Counted from the `*_extractor.rs` files in
-`crates/tracedecay-code-extraction/src/` and their gating in that crate's
-`Cargo.toml`/`src/lib.rs` (`lite`/`medium`/`full` feature sets).
-
-| Tier | Languages |
-|------|-----------|
-| **Lite** (always compiled) | Rust, Go, Java, Scala, TypeScript/JavaScript/TSX/JSX, Python, C, C++, Kotlin, C#, Swift, Astro, Svelte, Markdown |
-| **Medium** (feature flags) | Dart, Pascal, PHP, Ruby, Bash, Protobuf, PowerShell, Nix, VB.NET |
-| **Full** (feature flags) | Lua, Zig, Objective-C, Perl, Batch, Fortran, COBOL, MSBASIC2, GW-BASIC, QBasic, QuickBASIC, Dockerfile, GLSL, WGSL, HLSL, Metal, R, SQL, Julia, Haskell, OCaml, Clojure, Erlang, Elixir, F#, Quint, TOML, Lean |
-
-## How to add a language
-
-Each language needs 4 things:
-
-| # | What | Where | Pattern to follow |
-|---|------|-------|-------------------|
-| 1 | Tree-sitter grammar | `tracedecay-large-treesitters` crate on crates.io | Add dep + register in `all_languages()` |
-| 2 | Extractor | `crates/tracedecay-code-extraction/src/{lang}_extractor.rs` | Implement `LanguageExtractor` trait |
-| 3 | Wiring | that crate's `Cargo.toml` + `src/lib.rs` | Feature flag, `mod` decl, `LanguageRegistry` push |
-| 4 | Tests | `crates/tracedecay-code-extraction/tests/{lang}.rs` | Sample source + extraction assertions |
-
-### The `LanguageExtractor` trait
-
-```rust
-pub trait LanguageExtractor: Send + Sync {
-    fn extensions(&self) -> &[&str];        // e.g. &["svelte"]
-    fn language_name(&self) -> &str;        // e.g. "Svelte"
-    fn extract(&self, file_path: &str, source: &str) -> ExtractionResult;
-}
-```
-
-### Grammar sourcing
-
-- **Crate on crates.io:** Add as a dependency to `tracedecay-large-treesitters` and register in `all_languages()`. This is the standard path.
-- **Vendor from C source:** If no Rust crate exists, compile the grammar's C source via `build.rs` (same pattern as `protobuf` and `cobol` in the bundled crate).
-- **No grammar at all:** Either write a regex-based extractor (skip tree-sitter) or wait for a community grammar.
-
----
-
-## Proposed languages by tier
-
-Languages are tiered by a combination of: popularity (TIOBE, Stack Overflow, GitHub usage), relevance to tracedecay's target users (professional developers using AI coding tools), and implementation complexity.
-
-### High Priority — Web Frameworks
-
-These produce code graphs that are structurally rich and heavily used in
-AI-assisted development. They also tend to generate high tool-call counts
-in exploration agents because of their component/template structure.
-
-| Language | Extensions | Grammar crate | Complexity | Notes |
-|----------|-----------|---------------|------------|-------|
-| ~~**Svelte**~~ | | | | **Implemented** — see Lite tier above (`svelte_extractor.rs`, always compiled). |
-| **Vue** | `.vue` | `tree-sitter-vue3` (0.0.4) | Medium-high | Same embedded-language challenge as Svelte/Astro: `<script>`, `<template>`, `<style>` blocks. Delegate `<script setup>` to TS extractor. Extract: components, props, emits, composables. |
-| ~~**Astro**~~ | | | | **Implemented** — see Lite tier above (`astro_extractor.rs`, always compiled). |
-
-**Shared challenge:** All three are "embedded language" formats. The tree-sitter
-grammar gives you the document structure, but the `<script>` content needs the
-TypeScript extractor. Consider building a shared `EmbeddedScriptExtractor`
-helper that parses the script block with the existing `TypeScriptExtractor` and
-merges the results.
-
-### High Priority — General Purpose
-
-Popular languages with clear structural semantics and active tree-sitter grammars.
-**All seven below are now implemented** (Full tier — see the table above); kept
-here only as a historical record of the original proposal.
-
-| Language | Extensions | Grammar crate | Complexity | Notes |
-|----------|-----------|---------------|------------|-------|
-| ~~**Elixir**~~ | | | | **Implemented** — see Full tier above (`elixir_extractor.rs`). |
-| ~~**Haskell**~~ | | | | **Implemented** — see Full tier above (`haskell_extractor.rs`). |
-| ~~**OCaml**~~ | | | | **Implemented** — see Full tier above (`ocaml_extractor.rs`). |
-| ~~**Erlang**~~ | | | | **Implemented** — see Full tier above (`erlang_extractor.rs`). |
-| ~~**R**~~ | | | | **Implemented** — see Full tier above (`r_extractor.rs`). |
-| ~~**Julia**~~ | | | | **Implemented** — see Full tier above (`julia_extractor.rs`). |
-| ~~**Clojure**~~ | | | | **Implemented** — see Full tier above (`clojure_extractor.rs`). |
-
-### Medium Priority — Infrastructure & Config
-
-Languages used in CI/CD, infrastructure-as-code, and build systems. Lower
-structural complexity but high value for DevOps-focused users.
-
-| Language | Extensions | Grammar crate | Complexity | Notes |
-|----------|-----------|---------------|------------|-------|
-| **HCL/Terraform** | `.tf`, `.hcl` | `tree-sitter-hcl` (1.1.0) | Low-medium | Resources, data sources, modules, variables, outputs, locals. Graph edges from module refs and resource dependencies. |
-| ~~**Dockerfile**~~ | | | | **Implemented** — see Full tier above (`dockerfile_extractor.rs`). |
-| **Makefile** | `Makefile`, `*.mk` | `tree-sitter-make` (1.1.1) | Low | Targets, dependencies, variables. Target→dependency edges. |
-| **CMake** | `CMakeLists.txt`, `*.cmake` | `tree-sitter-cmake` (0.7.1) | Low | Functions, macros, targets, `add_subdirectory`. |
-| ~~**SQL**~~ | | | | **Implemented** — see Full tier above (`sql_extractor.rs`). |
-| **GraphQL** | `.graphql`, `.gql` | `tree-sitter-graphql` (0.1.0) | Low | Types, queries, mutations, subscriptions, fragments. Clean schema graph. |
-
-### Medium Priority — Emerging / Niche
-
-Languages with growing communities or specific ecosystem value.
-
-| Language | Extensions | Grammar crate | Complexity | Notes |
-|----------|-----------|---------------|------------|-------|
-| **Gleam** | `.gleam` | `tree-sitter-gleam` (1.0.0) | Low-medium | Functions, types, imports, externals. Clean syntax, good graph potential. BEAM ecosystem. |
-| **Odin** | `.odin` | `tree-sitter-odin` (1.3.0) | Medium | Procedures, structs, enums, imports, packages. Systems programming language gaining traction. |
-| **GDScript** | `.gd` | `tree-sitter-gdscript` (6.1.0) | Medium | Classes, functions, signals, exports, `extends`. Godot engine scripting — large gamedev community. |
-| **Solidity** | `.sol` | `tree-sitter-solidity` (1.2.13) | Medium | Contracts, functions, events, modifiers, inheritance. Contract→contract `extends` edges. Web3 niche but high demand. |
-| **Elm** | `.elm` | `tree-sitter-elm` (5.9.0) | Low-medium | Modules, functions, type aliases, custom types, ports, imports. Clean ML-like syntax. |
-| **Groovy** | `.groovy`, `.gradle` | `tree-sitter-groovy` (0.1.2) | Medium | Classes, methods, closures. `.gradle` files are Groovy — useful for build graph analysis. |
-| **Nim** | `.nim` | No direct crate | Medium | Procs, types, templates, macros, imports. Would need vendored grammar. |
-
-### Low Priority — Template & Markup
-
-Limited structural graph value but sometimes requested.
-
-| Language | Extensions | Grammar crate | Complexity | Notes |
-|----------|-----------|---------------|------------|-------|
-| **Liquid** | `.liquid` | No crate (vendor from GitHub) | Low-medium | Blocks, includes, assigns, filters. Template language — limited function-level structure. Would need vendored C grammar from [tree-sitter-liquid](https://github.com/nicklockwood/tree-sitter-liquid). |
-| **YAML** | `.yml`, `.yaml` | `tree-sitter-yaml` (0.7.2) | Low | Keys, anchors, aliases. Minimal graph value but useful for config file parsing. |
-| ~~**TOML**~~ | | | | **Implemented** — see Full tier above (`toml_extractor.rs`). |
-| **CSS/SCSS** | `.css`, `.scss` | `tree-sitter-css` (0.25.0) | Low | Selectors, rules, variables, mixins (SCSS). Limited graph edges. |
-| **HTML** | `.html` | `tree-sitter-html` (0.23.2) | Low | Elements, attributes, component references. Mostly useful as an inner parser for Svelte/Vue/Astro. |
-| ~~**Markdown**~~ | | | | **Implemented** — see Lite tier above (`markdown_extractor.rs`, rides in `lite` as well as `full`). |
-
-### Shader Languages
-
-Very niche but occasionally requested by game/graphics developers.
-
-| Language | Extensions | Grammar crate | Complexity | Notes |
-|----------|-----------|---------------|------------|-------|
-| ~~**WGSL**~~ | | | | **Implemented** — see Full tier above (`wgsl_extractor.rs`). |
-| ~~**GLSL**~~ | | | | **Implemented** — see Full tier above (`glsl_extractor.rs`). |
-
----
-
-## Implementation notes
-
-### Embedded-language extractors (Svelte, Vue, Astro)
-
-These share a common pattern: the file is a document with embedded script
-blocks. The recommended approach:
-
-1. Parse the document with the component grammar (e.g. `tree-sitter-svelte-ng`)
-2. Find the `<script>` node and extract its text content
-3. Feed that text to the existing `TypeScriptExtractor::extract()`
-4. Merge the resulting nodes/edges, adjusting line offsets to account for
-   the script block's position in the document
-5. Add a top-level component node and edges from script symbols to it
-
-Consider a shared helper:
-
-```rust
-fn extract_embedded_script(
-    doc_source: &str,
-    script_start_line: u32,
-    script_text: &str,
-    file_path: &str,
-) -> ExtractionResult {
-    // Delegate to TypeScriptExtractor, then offset all line numbers
-    let mut result = TypeScriptExtractor.extract(file_path, script_text);
-    for node in &mut result.nodes {
-        node.start_line += script_start_line;
-        node.end_line += script_start_line;
-    }
-    result
-}
-```
-
-### Functional languages (Elixir, Haskell, OCaml, Clojure, Elm)
-
-These need special handling for:
-- **Pattern matching:** Multiple function clauses with the same name should
-  merge into one node (not N separate nodes)
-- **Type classes / protocols / behaviours:** Map to `Trait` + `Implements` edges
-- **Pipe operators:** `|>` chains in Elixir, `$` in Haskell — hard to extract
-  call edges from without type information
-- **Modules as values:** OCaml functors, Elixir `use` macro — generate
-  `uses` edges, not `calls`
-
-### Grammar maturity
-
-Some grammar crates are pre-1.0 or have very low version numbers:
-- `tree-sitter-sql` (0.0.2) — likely incomplete
-- `tree-sitter-clojure` (0.1.0) — may lack edge cases
-- `tree-sitter-groovy` (0.1.2) — early stage
-- `tree-sitter-liquid` — no crate at all
-
-Test grammars against real-world files before committing to an extractor.
-A grammar that can't parse common patterns produces nodes with wrong line
-numbers, which breaks the entire graph for that file.
diff --git a/docs/PLUGIN-VALIDATION.md b/docs/PLUGIN-VALIDATION.md
index afb322f794..945978e9e3 100644
--- a/docs/PLUGIN-VALIDATION.md
+++ b/docs/PLUGIN-VALIDATION.md
@@ -13,9 +13,8 @@ skills are validated, where each check runs, and how to extend the system
 without breaking the contracts.
 
 This document covers the bundled Cursor, Codex, and Claude integrations:
-skills, commands, hooks, rules, manifests, and MCP registrations. It is
-unrelated to the language-extractor plugin runtime described in
-[`PLUGINS-DESIGN.md`](PLUGINS-DESIGN.md).
+skills, commands, hooks, rules, manifests, and MCP registrations. Language
+extractors are compiled into their owning crate, not loaded by these host bundles.
 
 ---
 
diff --git a/docs/PLUGINS-DESIGN.md b/docs/PLUGINS-DESIGN.md
deleted file mode 100644
index 83d279f3d2..0000000000
--- a/docs/PLUGINS-DESIGN.md
+++ /dev/null
@@ -1,207 +0,0 @@
-# Plugin System Design
-
-Replace compile-time, feature-gated language extractors with dynamically loaded plugins so that new languages can be added without recompiling or releasing the main binary.
-
-This is a target design. TraceDecay still uses compile-time language extractor
-features today; plugin discovery and management commands remain implementation
-work.
-
----
-
-## Problem with the current model
-
-Every language extractor is gated on a Cargo feature (`lang-lua`, `lang-zig`, …) and compiled into the binary at build time via `tracedecay-large-treesitters`. Adding a language today means:
-
-1. Adding a grammar crate dependency to `tracedecay-large-treesitters` and cutting a release.
-2. Writing an extractor in `crates/tracedecay-code-extraction/`, adding `#[cfg(feature = "…")]` gates in `lib.rs`, and updating that crate's `Cargo.toml`.
-3. Releasing a new version of `tracedecay` itself.
-
-This is a tight coupling between the extractor author, the grammar maintainer, and the `tracedecay` release cycle. Community contributions have to go through this bottleneck even when the grammar is already a well-maintained crate on crates.io.
-
----
-
-## Goals
-
-- Add language support at runtime — no recompile, no new release.
-- Community plugins ship as standalone artefacts.
-- Incremental: built-in languages stay compiled in; the plugin system is purely additive.
-- Language metadata is driven by a well-known external schema rather than hardcoded in Rust source.
-
----
-
-## Language metadata: the GitHub linguist schema
-
-GitHub publishes [`languages.yml`](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml) — the authoritative, community-maintained catalogue of programming languages. Each entry carries:
-
-| Field | Example | Use in tracedecay |
-|---|---|---|
-| `extensions` | `[".ex", ".exs"]` | Primary dispatch in `extractor_for_file` |
-| `filenames` | `["Dockerfile"]` | Exact filename match |
-| `interpreters` | `["elixir"]` | Shebang detection (future) |
-| `type` | `programming` / `markup` / `data` / `prose` | Skip `data` and `prose` by default |
-| `group` | `C` | Reuse a base extractor for dialects |
-| `aliases` | `["elixir", "ex"]` | Human-readable names in output |
-
-A plugin manifest declares its language using a subset of these fields. tracedecay also ships a bundled snapshot of `languages.yml` for file-type reporting and IDE hints, updated on each release.
-
-### Example plugin manifest (`plugin.toml`)
-
-```toml
-[plugin]
-name        = "tracedecay-elixir"
-version     = "1.2.0"
-api_version = 1          # bumped on breaking ABI changes
-
-[language]
-name         = "Elixir"
-extensions   = [".ex", ".exs"]
-filenames    = ["mix.exs"]
-interpreters = ["elixir"]
-type         = "programming"
-```
-
----
-
-## Architecture
-
-### Current (compile-time)
-
-```mermaid
-graph TD
-    A[Cargo.toml features] -->|cfg gates| B[mod.rs]
-    B --> C[LanguageRegistry::new]
-    C --> D[extractor_for_file]
-    D --> E[extract]
-```
-
-### Target (plugin-aware)
-
-```mermaid
-graph TD
-    A[Cargo.toml features] -->|lite/medium/full| B[Built-in extractors]
-    B --> C[LanguageRegistry::new]
-    P1[plugin.toml] --> PL[PluginLoader]
-    P2[extractor.so / .dylib / .dll] --> PL
-    PL -->|dlopen + ABI check| C
-    C --> D[extractor_for_file]
-    D -->|built-in| E[StaticExtractor]
-    D -->|plugin| F[DynExtractor wrapper]
-    E --> G[ExtractionResult]
-    F --> G
-```
-
-`LanguageRegistry::new()` loads built-ins first, then calls `PluginLoader::discover()` to find and link plugins. Plugins that declare an extension already claimed by a built-in extractor take precedence (opt-in override), unless disabled in config.
-
----
-
-## Plugin binary format (v1)
-
-Plugins ship as native shared libraries (`.so` on Linux, `.dylib` on macOS, `.dll` on Windows). The grammar is statically linked inside the dylib — no separate grammar file to manage.
-
-### C ABI exported from the dylib
-
-```c
-/* ABI version this plugin was compiled against */
-uint32_t tracedecay_plugin_api_version(void);
-
-/* Null-terminated list of file extensions (without leading dot) */
-const char* const* tracedecay_extensions(void);
-
-/* Human-readable language name */
-const char* tracedecay_language_name(void);
-
-/* Main extraction entry point.
-   Returns a JSON-encoded ExtractionResult; caller must free with tracedecay_free. */
-const char* tracedecay_extract(const char* file_path, const char* source, size_t source_len);
-
-/* Free a string returned by tracedecay_extract */
-void tracedecay_free(const char* ptr);
-```
-
-### Plugin SDK crate
-
-A `tracedecay-plugin-sdk` crate (published separately) provides:
-
-- A `#[tracedecay_plugin]` proc-macro that generates the C ABI glue from a normal `LanguageExtractor` impl.
-- Safe Rust wrappers around the JSON serialisation / deserialisation boundary.
-- A `grammar!` macro that embeds the tree-sitter grammar and calls `ts_provider::try_language`.
-
-Authors implement the same `LanguageExtractor` trait they would for a built-in, then add two lines:
-
-```rust
-use tracedecay_plugin_sdk::tracedecay_plugin;
-
-#[tracedecay_plugin]
-pub struct ElixirExtractor;
-
-impl LanguageExtractor for ElixirExtractor { … }
-```
-
----
-
-## Plugin discovery (target)
-
-When implemented, TraceDecay should search the following directories in order,
-stopping at the first match for a given extension:
-
-1. `$TRACEDECAY_PLUGIN_PATH` (colon-separated, same convention as `PATH`)
-2. `.tracedecay/plugins/` in the current project root only if project-local
-   plugin discovery is approved for the active storage mode
-3. `~/.tracedecay/plugins/`
-4. Platform config dir (`%APPDATA%\tracedecay\plugins` on Windows, `~/Library/Application Support/tracedecay/plugins` on macOS)
-
-Each plugin lives in its own subdirectory:
-
-```
-~/.tracedecay/plugins/
-  tracedecay-elixir/
-    plugin.toml          # manifest
-    tracedecay_elixir.so  # extractor + grammar (platform-specific name)
-```
-
-### Plugin commands (future)
-
-```bash
-tracedecay plugin install tracedecay-elixir   # download from registry, verify checksum
-tracedecay plugin list                        # installed plugins + languages covered
-tracedecay plugin disable tracedecay-elixir   # add to ignore list in config
-```
-
----
-
-## Migration path for built-in languages
-
-Built-in extractors are not removed. The three tiers (lite / medium / full) remain the defaults for zero-setup installs. The plugin system is a fourth tier that activates at runtime.
-
-Long-term, thin languages from the `full` tier (COBOL, GW-BASIC, etc.) could graduate to optional plugins, shrinking the default binary. That migration is separate from this design and requires measuring whether binary size is actually a pain point.
-
----
-
-## `ExtractionResult` serialisation
-
-The plugin boundary uses JSON to avoid Rust ABI instability across compiler versions. `ExtractionResult` is already `serde::Serialize / Deserialize`. The host calls `tracedecay_extract`, deserialises the JSON, and feeds the result into the same graph-building pipeline as built-in extractors. The overhead is one `serde_json::from_str` call per file — negligible compared to tree-sitter parsing.
-
-If benchmarks show the JSON round-trip is hot, a future ABI v2 can switch to a length-prefixed binary format (MessagePack or a hand-rolled layout), but the same proc-macro generates it transparently from the SDK side.
-
----
-
-## Security model (v1)
-
-- Plugins run in-process with full trust. No sandboxing.
-- `tracedecay plugin install` verifies a SHA-256 checksum declared in the manifest against a future plugin registry.
-- Config option `plugins.enabled = false` disables all plugin loading (useful in CI or locked environments).
-- A `plugins.allow = ["tracedecay-elixir"]` allowlist can restrict which plugins are loaded.
-
-WASM sandboxing (via `wasmtime`) is a plausible v2 model: the grammar and extractor compile to a single `.wasm`, and the host runs it inside a Wasmtime store with memory isolation. This would add cross-platform portability (one `.wasm` instead of three platform dylibs) at the cost of a heavier runtime dependency and ~2–5× slower parse throughput.
-
----
-
-## Open questions
-
-1. **Grammar distribution.** Should plugins bundle the compiled tree-sitter grammar (current proposal) or reference a grammar by crate + version and have tracedecay compile/link it? Bundling is simpler; referencing avoids duplicating grammars when multiple plugins use the same language family.
-
-2. **Registry.** Where do plugins live before an official registry exists? crates.io is a natural host (the `.so` can be embedded in a Rust crate), but cargo-downloading and extracting a dylib is non-standard. A GitHub release asset download is simpler for v1.
-
-3. **ABI stability.** The JSON boundary sidesteps Rust ABI instability, but `api_version` still needs to bump whenever `ExtractionResult`, `Node`, or `Edge` adds a required field. A Protobuf/Flatbuffer schema for `ExtractionResult` would make backwards-compatible evolution explicit.
-
-4. **Dialect reuse.** The `group` field in `languages.yml` lets a plugin declare "I handle TypeScript-flavoured extraction for `.svelte` files." A base-extractor delegation mechanism would let plugins call into a built-in and post-process the result rather than reimplementing from scratch.
diff --git a/docs/QUERY-OPTIMIZATIONS.md b/docs/QUERY-OPTIMIZATIONS.md
deleted file mode 100644
index 132700287e..0000000000
--- a/docs/QUERY-OPTIMIZATIONS.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Graph query behavior
-
-This note supersedes the retired SQL N+1 inventory. It is not an SQL tuning
-guide: V2 does not expose a SQLite graph-query path for operators or clients.
-
-The daemon/application authority selects and serves graph reads. Embedded
-Grafeo owns admitted graph relations, traversals, and vectors; SQLite owns
-relational and content records, manifests, journals, leases, receipts, and
-watermarks. A client must not open either store, construct a parallel query, or
-infer graph state from database files.
-
-## Serving behavior
-
-- A code read is bound to the selected project, repository, checkout, worktree,
-  ref, commit/tree, snapshot, configuration, source watermark, and generation.
-- The daemon performs bounded convergence after it receives a host, MCP, LSP,
-  or workspace hint. Ordinary exact, lexical, graph, and other available reads
-  do not block on historical convergence or force a full synchronization.
-- A newer generation in progress is visible through typed coverage such as
-  `warming`, `refresh_required`, `partial`, or `unavailable`; it is never
-  represented as an empty successful graph.
-- Diagnostics report the selected authority and coverage. An explicit refresh
-  or maintenance action is separate from a read and follows its own
-  authorization and receipt path.
-
-The [V2 product contract](plans/tracedecay-v2/00-plan-set-index.md) is the
-authority for these boundaries. The [V2 operating model](V2-OPERATING-MODEL.md)
-describes the generation and projection model; use `tracedecay status --json` and
-`tracedecay doctor` to inspect a running installation.
diff --git a/docs/REBRAND-COMPATIBILITY-POLICY.md b/docs/REBRAND-COMPATIBILITY-POLICY.md
index 045e5f3f00..2ce2af78f4 100644
--- a/docs/REBRAND-COMPATIBILITY-POLICY.md
+++ b/docs/REBRAND-COMPATIBILITY-POLICY.md
@@ -66,7 +66,7 @@ before deleting anything.
 
 ### A4. Historical docs, changelog entries, benchmark outputs, and old daemon cleanup docs
 
-Historical wording in `CHANGELOG.md`, `docs/TRACEDECAY-WHATSNEW.md`, old plans/specs,
+Historical wording in `CHANGELOG.md`, retained old plans/specs,
 benchmark reports, and daemon-removal instructions should remain unless it is
 factually wrong. These references should be labeled as historical when helpful, not
 mechanically rewritten.
@@ -293,7 +293,6 @@ Every audited surface maps to exactly one policy category below.
 | Homebrew/Scoop legacy package note | C | Keep as support warning while external packages lag; not canonical install path. |
 | Primary user docs mentioning fallback behavior | B | Keep aligned with runtime behavior; canonical examples use TraceDecay names. |
 | Design docs mentioning path/env/plugin fallback | B | Keep aligned with runtime behavior or mark as compatibility target. |
-| `docs/TRACEDECAY-WHATSNEW.md` historical narrative | A | Preserve as history. |
 | Historical plans/specs with TraceDecay names | A | Preserve as history unless factually wrong. |
 | Benchmark reports with TraceDecay tool/path names | A | Preserve measured historical names. |
 | Changelog historical TraceDecay references | A | Preserve history; summarize rename in current entries only. |
diff --git a/docs/TRACEDECAY-ALTERNATIVES.md b/docs/TRACEDECAY-ALTERNATIVES.md
deleted file mode 100644
index e7b93dfbf7..0000000000
--- a/docs/TRACEDECAY-ALTERNATIVES.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Why TraceDecay?
-
-TraceDecay is for agents that need attributable code and session evidence from
-one local daemon authority. It registers a project, captures exact code
-generations, and returns typed results with provenance and coverage instead of
-requiring clients to inspect or synchronize a database themselves.
-
-The persisted split is intentional: embedded Grafeo owns the admitted graph
-query projection, while canonical events, facts, content,
-reconstruction manifests, journals, leases, receipts, and verified watermarks
-remain in their domain/relational stores. A Grafeo projection is served only
-after recovered-state verification. Clients never choose a store by path or
-open either store directly.
-
-## What users can rely on
-
-- Routine code changes are submitted as bounded host/MCP/LSP/workspace hints.
-  The daemon performs convergence; a normal read does not run a hidden sync.
-- Results identify their project, repository/worktree/ref/commit/snapshot and
-  generation context. A result that is `warming`, `partial`,
-  `refresh_required`, `unavailable`, `denied`, or `cancelled` remains visibly
-  in that state.
-- Project facts, sessions, and lossless context belong to the registered
-  project. Branch and worktree labels are provenance, not separate fact stores.
-- Diagnostics are read-only. A refresh, retention change, repair, recreation,
-  host change, or repository effect is a separate daemon operation with its
-  own authorization and durable receipt where applicable.
-
-## What this page does not promise
-
-TraceDecay does not use this comparison page to promise a dashboard graph
-visualizer, semantic retrieval, multi-root federation, or an authorized
-refactoring effect. Do not infer those capabilities from roadmap documents,
-generated API contracts, or a comparison with another product.
-
-Other tools may be a better fit when their current, supported journey is the
-one you need: passive context prefill, model-backed search, visual exploration,
-or a particular automated code transformation. Confirm those products' current
-behavior, data handling, and host support in their own documentation.
-
-## Before installing or troubleshooting
-
-Start with the supported local checks:
-
-```bash
-tracedecay init
-tracedecay install
-tracedecay status --json
-tracedecay doctor
-```
-
-`doctor` reports state without changing it. When it reports a typed condition,
-use the documented daemon operation for that condition rather than copying,
-editing, or querying a TraceDecay store directly. See [Comparable tools](COMPARABLE-TOOLS.md)
-for the comparison boundary and [Privacy and Network](USER-GUIDE.md#privacy-and-network)
-for local and remote-effect details.
diff --git a/docs/TRACEDECAY-WHATSNEW.md b/docs/TRACEDECAY-WHATSNEW.md
deleted file mode 100644
index 4639911385..0000000000
--- a/docs/TRACEDECAY-WHATSNEW.md
+++ /dev/null
@@ -1,305 +0,0 @@
-# TraceDecay: From 1.0 to 6.1, the Story So Far
-
-> **Note:** The project described here has since been renamed **TraceDecay**. This page is a historical narrative of the TraceDecay era (1.0 through 6.1) and intentionally keeps the original names for the product, commands, tools, and releases as they existed at the time.
-
-[Illustration: generate a landscape oriented image of a glowing semantic knowledge graph floating above a laptop screen, with nodes and edges made of light connecting code symbols, a small orange crab perched on the laptop corner observing the graph, dark workspace background with subtle warm lighting, photographic style with shallow depth of field]
-
-TraceDecay reached 1.0.0 on March 24, 2026. It could index Rust projects, serve a handful of MCP tools over stdio, and save Claude Code from burning tokens on redundant file scans. Useful, but narrow. A few months and ninety-plus releases later, it speaks more than fifty programming languages, keeps its index fresh on demand with no background process, installs itself into more than a dozen different AI coding agents, maintains optional per-branch code graphs, tracks token savings down to the individual tool call, and edits files through atomic, anchor-based primitives. All in a single ~25 MB binary with zero runtime dependencies.
-
-This is the story of how it got there. Not a changelog transcription, but the arc of decisions, the problems that surfaced, and the features they demanded.
-
-## The Language Explosion
-
-Version 1.0.0 shipped with support for nine languages beyond the original Rust: TypeScript, Python, C, C++, Kotlin, Dart, C#, Pascal, and (carried over from pre-1.0) Java, Go, and Scala. That covered most professional codebases. But "most" isn't "all," and the requests started coming immediately.
-
-PHP and Ruby landed in 1.4.2. Then came 2.0.0, which doubled the language count in a single release. Sixteen new extractors, each with its own tree-sitter grammar, bringing the total to thirty. The list reads like a tour through computing history: Swift and Zig for the modern crowd, Bash and Perl for the Unix faithful, Protobuf for the microservices world, Nix for the reproducible-build enthusiasts, and then the deep cuts. Fortran. COBOL. Objective-C. Three flavors of BASIC: MS BASIC 2.0, GW-BASIC, and QBasic. QuickBASIC 4.5 arrived in 2.1.0 with its own `.bi` and `.bm` file extensions, bringing the total to 31.
-
-Each extractor does real semantic work. The Nix extractor doesn't just find function definitions; it resolves `import ./path.nix` into cross-file dependency edges, extracts derivation fields from `mkDerivation` calls, and understands flake output schemas. The Objective-C extractor parses `@interface`, `@implementation`, and `@protocol` declarations, tracks message-send call sites, and follows inheritance chains through protocol conformance. These aren't grep wrappers.
-
-```mermaid
-%%{init: {'theme': 'base', 'themeVariables': {'fontSize': '16px'}}}%%
-flowchart TB
-    subgraph LITE["Lite Tier -- 11 languages"]
-        direction LR
-        A["Rust . Go . Java . TypeScript . Python<br/>C . C++ . Kotlin . C# . Swift . Scala"]
-    end
-    subgraph MEDIUM["+ Medium Tier -- 9 more"]
-        direction LR
-        B["Dart . Pascal . PHP . Ruby . Bash<br/>Protobuf . PowerShell . Nix . VB.NET"]
-    end
-    subgraph FULL["+ Full Tier -- 11 more"]
-        direction LR
-        C["Lua . Zig . Obj-C . Perl . Batch<br/>Fortran . COBOL . MS BASIC . GW-BASIC<br/>QBasic . QuickBASIC 4.5"]
-    end
-
-    LITE --> MEDIUM --> FULL
-
-    style LITE fill:#2d5a2d,color:#fff
-    style MEDIUM fill:#4a3d6b,color:#fff
-    style FULL fill:#6b3d3d,color:#fff
-    style A fill:#2d5a2d,color:#fff,stroke:#2d5a2d
-    style B fill:#4a3d6b,color:#fff,stroke:#4a3d6b
-    style C fill:#6b3d3d,color:#fff,stroke:#6b3d3d
-```
-
-That many grammars create a binary-size problem. Not everyone needs COBOL parsing. Version 2.0.0 introduced feature-flag tiers: `lite` compiles eleven core languages, `medium` adds nine more, and `full` (the default) includes all thirty-one. Individual `lang-*` flags let source builds cherry-pick languages with `cargo build --release --no-default-features --features lang-nix,lang-bash`.
-
-## From Nine Tools to Thirty-Seven
-
-The MCP tool surface grew in four distinct waves, each responding to a different class of question that AI agents kept asking.
-
-The first wave (1.0 through 1.1) covered navigation. `tracedecay_search`, `tracedecay_context`, `tracedecay_callers`, `tracedecay_callees`, `tracedecay_node`. Then `tracedecay_files` and `tracedecay_affected` for understanding which files matter and which tests break when you touch a given module. These tools replaced the bulk of what Explore agents were doing with grep and glob.
-
-The second wave (1.5.1) added structural analysis. Dead code detection. Circular dependency finding. Module API surfaces. Unused imports. Semantic changelogs between git refs. Rename previews that show every reference to a symbol. Nine new tools, each backed by graph queries over the indexed codebase rather than file-by-file scanning.
-
-The third wave (1.6.0 through 2.0.0) shifted toward code quality and compliance. `tracedecay_complexity` ranks functions by cyclomatic complexity computed from the AST during indexing, not approximated at query time. `tracedecay_recursion` detects recursive and mutually-recursive call cycles. `tracedecay_god_class` finds classes with too many members. `tracedecay_doc_coverage` identifies public symbols missing documentation. The porting tools (`tracedecay_port_status` and `tracedecay_port_order`) arrived for teams migrating codebases across languages.
-
-The fourth wave (3.3 through 4.0) brought workflow integration and multi-branch awareness. `tracedecay_commit_context` generates semantic summaries of uncommitted changes for commit message drafting. `tracedecay_pr_context` produces semantic diffs between git refs for pull request descriptions. `tracedecay_test_map` maps source functions to their test functions at the symbol level, flagging uncovered symbols. `tracedecay_simplify_scan` runs quality analysis on changed files: duplications, dead code introductions, complexity hotspots. And `tracedecay_type_hierarchy` generates recursive inheritance trees for traits, interfaces, and classes.
-
-Then came the branch tools. `tracedecay_branch_search` lets you search symbols in another branch's graph without switching your checkout. `tracedecay_branch_diff` compares code graphs between branches, showing symbols added, removed, and changed. `tracedecay_branch_list` exposes tracked branches with their DB sizes and parent info. Thirty-seven tools total, each read-only, safe to call in parallel, and annotated with MCP metadata so clients know what they're getting.
-
-```mermaid
-%%{init: {'theme': 'base', 'themeVariables': {'fontSize': '16px'}}}%%
-flowchart TB
-    subgraph W1["Wave 1: Navigation"]
-        direction TB
-        S["search"] ~~~ CTX["context"]
-        CTX ~~~ CAL["callers / callees"]
-        CAL ~~~ N["node"]
-        N ~~~ FI["files / affected"]
-    end
-
-    subgraph W2["Wave 2: Structure"]
-        direction TB
-        DC["dead_code"] ~~~ CIR["circular"]
-        CIR ~~~ API["module_api"]
-        API ~~~ UI["unused_imports"]
-        UI ~~~ CL["changelog / diff_context"]
-    end
-
-    subgraph W3["Wave 3: Quality"]
-        direction TB
-        CX["complexity"] ~~~ REC["recursion"]
-        REC ~~~ GC["god_class"]
-        GC ~~~ DOC["doc_coverage"]
-        DOC ~~~ PORT["port_status / port_order"]
-    end
-
-    subgraph W4["Wave 4: Workflow & Branches"]
-        direction TB
-        CC["commit_context"] ~~~ PR["pr_context"]
-        PR ~~~ TM["test_map / simplify_scan"]
-        TM ~~~ TH["type_hierarchy"]
-        TH ~~~ BR["branch_search / branch_diff"]
-    end
-
-    W1 --> W2 --> W3 --> W4
-
-    style W1 fill:#2d5a2d,color:#fff
-    style W2 fill:#4a3d6b,color:#fff
-    style W3 fill:#6b3d3d,color:#fff
-    style W4 fill:#8b4513,color:#fff
-```
-
-Version 1.7.0 embedded three safety metrics directly into every function node during indexing: `unsafe_blocks`, `unchecked_calls` (`.unwrap()`, `!!`, forced optionals), and `assertions`. These numbers are available on every `tracedecay_node` response and power the complexity ranking tool. The goal was NASA Power of 10 compliance auditing without a single grep invocation.
-
-## The Agent Problem
-
-TraceDecay started as a Claude Code plugin. That original Claude-only setup
-eventually became today's `tracedecay install --agent claude`: it configures
-the MCP server and permissions, injects prompt rules into `CLAUDE.md`, and sets
-up a PreToolUse hook to block wasteful Explore agents. That worked fine for
-exactly one agent.
-
-Then the ecosystem diversified. Codex CLI, OpenCode, Gemini CLI, Copilot, Cursor, Zed, Cline, Roo Code. Each with its own configuration format, its own prompt file location, its own way of registering MCP servers. Some use JSON. Some use TOML. Zed and VS Code use JSON with comments and trailing commas, which isn't actually JSON at all.
-
-Version 1.8.0 introduced a trait-based `AgentIntegration` abstraction with three methods: `install`, `uninstall`, and `healthcheck`. The Claude-specific logic (600 lines of it) moved into `src/agents/claude.rs`. OpenCode and Codex CLI followed in 1.8.1. Gemini CLI in 2.1.0. Then 2.3.2 added five more in a single release: Copilot, Cursor, Zed, Cline, and Roo Code. Nine agents total.
-
-The install experience evolved accordingly. Running `tracedecay install` without specifying an agent now auto-detects which ones are present by checking their config directories. If it finds exactly one, it installs directly. If it finds several, it presents an interactive checkbox selector. An `installed_agents` list in `~/.tracedecay/config.toml` tracks which integrations are active, and upgrading from older versions backfills the list by scanning existing configs.
-
-The Claude Code integration deepened further in v3.5.0 with two additional hooks. Beyond the original PreToolUse hook that blocks Explore agents, tracedecay now registers a UserPromptSubmit hook (runs at prompt submission for lifecycle tracking) and a Stop hook (flushes token counters when the session ends). Three hooks, each implemented as a native Rust subcommand, no bash or jq required. The read-only doctor validates that each hook uses the correct subcommand and reports broken configuration; an explicit installer or owner maintenance command performs any authorized repair.
-
-## The Daemon Gets Smarter
-
-Version 2.4.0 introduced daemon mode: `tracedecay daemon` watches all tracked projects for file changes and runs incremental syncs automatically. The debounce interval is configurable (default 15 seconds). On macOS, `--enable-autostart` generates a launchd plist. On Linux, it creates a systemd user unit. On Windows, it registers a Windows Service with SCM failure recovery actions.
-
-But shipping the daemon created an upgrade problem. When `brew upgrade` or `cargo install` replaces the binary while the daemon is running, the old process keeps serving stale code. Version 3.3.1 solved this: the daemon now snapshots its own binary's mtime and size at startup and checks every 60 seconds. When an upgrade is detected, the daemon flushes pending syncs, logs the event, and exits. The service manager (launchd `KeepAlive`, systemd `Restart=on-failure`, Windows SCM failure actions) automatically relaunches with the new version.
-
-The daemon work produced a side effect worth mentioning: `daemon-kit`, a standalone cross-platform daemon/service toolkit published as its own crate. It uses `daemonize2` on Unix and `windows-service` on Windows.
-
-## Bundled Grammars and the 26x Speedup
-
-Version 3.0 consolidated all 31 tree-sitter grammars into a single bundled dependency (`tracedecay-large-treesitters`), eliminating dozens of individual grammar crate dependencies. The grammar provider became a single `LazyLock<HashMap>` lookup, replacing 100+ lines of per-crate match arms.
-
-Version 3.2 tackled indexing performance head-on. rayon parallel extraction, prepared-statement DB writes, suffix-indexed reference resolution, and bulk-load mode with deferred index creation. The results were dramatic: a 1,782-file codebase went from 14.8s to 1.2s. A 28K-file monorepo went from 565s (over nine minutes) to 22s. That's a 13-26x speedup depending on the codebase.
-
-## Multi-Branch Indexing
-
-Version 4.0.0 brought optional multi-branch indexing, which turned out to be more architecturally interesting than expected. The basic idea is simple: keep a separate code graph per git branch so switching branches never gives stale results. The implementation is where it gets clever.
-
-When you run `tracedecay branch add`, tracedecay doesn't build a new graph from scratch. It finds the nearest ancestor branch that already has a database (typically `main`), copies that DB, then runs an incremental sync to update only the files that differ between branches. For a feature branch with 20 changed files off a 5,000-file main branch, this takes seconds instead of the full index time.
-
-Three new MCP tools make cross-branch work possible without switching your checkout. `tracedecay_branch_search` lets the agent search symbols in another branch's graph. `tracedecay_branch_diff` compares two branches structurally, showing symbols added, removed, and changed (with signature diffs). `tracedecay_branch_list` exposes tracked branches with metadata.
-
-The fallback behavior handles the case where a branch isn't tracked gracefully: the MCP server serves from the nearest ancestor branch's database and appends a warning to every tool response suggesting the user run `tracedecay branch add`. This means multi-branch is genuinely opt-in -- everything works without it, just with a single database for all branches.
-
-Managing branch databases could easily become a chore, so there's CLI support for the full lifecycle: `tracedecay branch list` shows tracked branches with DB sizes and parent info, `tracedecay branch remove` drops a single branch, `tracedecay branch removeall` clears everything except the default, and `tracedecay branch gc` cleans up databases for branches that have been deleted from git.
-
-## Token Tracking Gets Serious
-
-The worldwide counter was always there, but v3.5.0 made token tracking granular. Every MCP tool response now appends a `tracedecay_metrics: before=N after=M` line showing how many raw-file tokens that specific call avoided. Not a session estimate, not a heuristic -- the actual before-and-after token count for each query.
-
-Two new CLI commands (`tracedecay current-counter` and `tracedecay reset-counter`) expose a per-project local counter, separate from the lifetime total. The worldwide counter continues to aggregate anonymous totals across all users via a Cloudflare Worker.
-
-The real showpiece is `tracedecay monitor`: a global live TUI that shows MCP tool calls from all projects in real time. The implementation uses a shared memory-mapped ring buffer at `~/.tracedecay/monitor.mmap`. Multiple MCP server instances (one per project) write concurrently using file locking via `fs2`, and the monitor TUI reads the ring in a `crossterm`-powered terminal UI. Each entry shows the tool suite prefix, the project name, and the tool called, so you can watch activity across multiple projects and multiple tool suites simultaneously.
-
-## The Embedding Decision
-
-Version 4.0.0 also made a deliberate subtraction: the vector/embedding module was removed entirely. The `src/vectors/` directory, the `enable_embeddings` config field, the ONNX model dependency -- all gone.
-
-The replacement is the `keywords` parameter on `tracedecay_context`. Instead of embedding symbols during indexing and matching by cosine similarity at query time, the calling agent simply provides synonyms. When you ask "how does authentication work?", the agent passes `keywords: ["login", "session", "credential", "token"]` and the context builder runs an FTS5 search for each keyword independently.
-
-The trade-offs are real. Embeddings catch conceptual matches with zero lexical overlap -- "authentication" would find a function called `guardianGateway` because the embedding model learned that association from training data. Agent-driven keywords can't do that if the agent doesn't know the codebase's naming conventions.
-
-But the practical advantages won out. Zero indexing cost (no ~30s per 1,000 nodes). Zero model dependency (no ~50MB download). Sub-millisecond per keyword instead of ~200ms per query. And since the calling agent is an LLM, it usually knows the right synonyms -- it's seen the user's question, it's seen nearby code, and it can infer what terms to expand. The edge case where embeddings genuinely outperform keywords (completely unfamiliar codebase with unconventional naming) wasn't common enough to justify the complexity.
-
-## Annotation Extraction
-
-Version 3.4.0 added decorator and annotation extraction across 12 languages. Rust attributes, Swift attributes, Java annotations, Python decorators, TypeScript decorators, Kotlin annotations, C# attributes, Dart metadata, Scala annotations, PHP attributes, C++ `[[attributes]]`, and VB.NET `<Attributes>` are all tracked as nodes in the graph with edges to the symbols they decorate. This means queries like "find all functions annotated with `@Deprecated`" or "what attributes does this struct have?" work through the standard MCP tools.
-
-## The Visualizer
-
-> **Removed.** `tracedecay visualize`, `src/visualizer.rs`, and the embedded
-> HTML file were deleted; the command no longer exists on any current build.
-> Browser-based graph exploration now lives in the dashboard's Explorer
-> workspace (`tracedecay dashboard`). The paragraph below describes the
-> feature as it stood at the time.
-
-`tracedecay visualize` serves an interactive code graph in the browser via Cytoscape.js. Right-clicking any node opens a context menu with callers, callees, call graph, and impact analysis actions. It's useful for getting a spatial sense of how a codebase is structured, especially for onboarding or architecture reviews. The implementation is a single embedded HTML file served by a lightweight HTTP handler in the tracedecay binary -- no external dependencies.
-
-## Self-Upgrade
-
-Version 3.4.0 introduced `tracedecay upgrade`, which downloads the correct platform binary from GitHub releases, stops the daemon, replaces the running executable via `self-replace`, and restarts the daemon. Stable and beta channels are tracked independently: a beta build only sees beta releases and vice versa. `tracedecay channel` shows the current channel, and `tracedecay channel beta` or `tracedecay channel stable` switches between them.
-
-The upgrade path had its own set of platform bugs. Homebrew installs use relative symlinks (e.g., `../Cellar/tracedecay/4.1.1/bin/tracedecay`), and `self-replace` resolves them via `fs::read_link`, which returns the raw relative target. Subsequent operations resolve that relative path from CWD instead of the symlink's parent, causing ENOENT. The fix: canonicalize the exe path before passing it to self-replace. Twelve regression tests cover every symlink layout we've seen in the wild.
-
-## Windows: Still Harder Than It Looks
-
-The Windows saga continued through the 3.x series. The daemon autostart check via `daemon-kit` used a file-path probe that returns `None` on Windows, so `is_service_installed()` never detected an existing service. Running `tracedecay daemon --enable-autostart` twice would error with "service already exists." Non-elevated terminals couldn't register the Windows Service at all. Each of these required its own fix: dispatching to the SCM query, idempotent stop-and-remove before re-creating, and automatic UAC elevation for just the service installation step.
-
-The zip handling in `tracedecay upgrade` hit a memorable bug. Users on v3.4.4 couldn't self-upgrade because the `self_update` crate had pulled in the `zip` crate without deflate support -- meaning it could only open uncompressed zip entries. But the release archives use Deflate compression. The upgrade tool was guaranteed to fail on the archives it was trying to download. Version 3.4.5 replaced `self_update` entirely with a direct implementation using `ureq` for downloads and `zip` v8 with explicit deflate support.
-
-## The Infrastructure That Grew Around It
-
-Some features don't fit neatly into "languages" or "tools." They're the connective tissue.
-
-**The doctor command** (1.5.1, expanded continuously) runs a comprehensive,
-read-only health check: binary version, project index integrity, global database,
-user config, daemon status, agent integrations, MCP server registration, hook
-configuration (now validating that each hook uses the correct subcommand),
-permissions, prompt rules, and network connectivity. It reports typed findings and
-evidence; it never auto-repairs hooks or mutates installation, storage, retention,
-GC, links, or migrations. Installation and daemon-owner maintenance commands own
-those explicitly authorized writes.
-
-**The worldwide counter** (1.4.0) aggregates anonymous token-savings counts across all TraceDecay users via a Cloudflare Worker. `tracedecay status` shows three tiers: project, all local projects, and worldwide. The counter is opt-out. Getting the accounting right took a few iterations: 1.5.4 fixed an inflation bug, and the periodic flush interval moved from shutdown-only to every 30 seconds during MCP sessions.
-
-**MCP resources** (3.3.0) expose four read-only resources via the standard `resources/list` and `resources/read` protocol: `tracedecay://status`, `tracedecay://files`, `tracedecay://overview`, and `tracedecay://branches`. MCP annotations (`readOnlyHint`, `title`) distinguish read-only tools from edit and session-memory tools, and `anthropic/alwaysLoad` on the three core tools lets clients load the essentials without a tool-search round-trip.
-
-**Atomic config writes** (3.0.1) protect agent config files from corruption. A `.bak` copy is created before any modification, new content is written to a `.new` sibling file, and an atomic `rename(2)` moves it into place. A crash during install can't leave a half-written config. Twenty regression tests cover the full lifecycle.
-
-**The gix migration** (2.1.0) replaced all `Command::new("git")` shell-outs with the `gix` crate for native git operations. No more runtime dependency on a git binary.
-
-## Search Quality: Five Ported Improvements
-
-The upstream CodeGraph project spent 55 commits refining its search and context-building pipeline. Five of those ideas were worth porting to tracedecay, each targeting a different failure mode.
-
-The first was per-file diversity caps. Without them, a single large file with many FTS matches could monopolize the entire context result. A 2,000-line `utils.rs` with 40 functions would place a dozen of them in the top 20 results, crowding out the three functions from `auth.rs` that actually mattered. The fix is a simple post-ranking pass: each file gets at most `max_nodes/3` slots (minimum 3), and excess results go to a spillover list that fills remaining slots. The cap is configurable via the `max_per_file` parameter on `tracedecay_context`.
-
-The second was exact name match supplementing. FTS5's BM25 ranking optimizes for term frequency and inverse document frequency, which is exactly wrong when a user searches for "Parser" and the function named `Parser` gets buried below "HTMLParserFactory" and "parseStreamConfig" because they have more matching terms in their docstrings. A supplementary `WHERE LOWER(name) IN (...)` query now injects perfect name matches with a high base score, guaranteeing they compete in the final ranking.
-
-The third was stem variant expansion. Searching for "authenticate" wouldn't find a function called "authentication" because FTS5 does prefix matching only (via the `*` operator), not suffix derivation. Thirteen suffix-pair rules now expand search terms: "authenticate" generates "authentication" and "authenticator", "parsing" generates "parse", "logging" generates "loge" and "logion" (harmless misses that cost nothing). The expanded terms are searched independently.
-
-The fourth was co-occurrence boosting for multi-term queries. When someone searches "user authentication", a symbol named `user_auth_handler` in `src/auth/user.rs` should rank higher than one named `user_list` in `src/admin.rs`, even if both have similar BM25 scores. The boost counts how many query terms appear in each candidate's name, qualified name, and file path, scaling multiplicatively: two terms co-occurring gives 1.3x, three gives 1.6x.
-
-The fifth was edge recovery after node trimming. When BFS expansion collects 200 nodes but `max_nodes` is 20, the trimmed subgraph used to retain edges that referenced deleted nodes, producing a disconnected graph. Now edges are filtered to retain only those connecting surviving nodes, which is both more correct and more useful to the consuming agent.
-
-## What the Numbers Say
-
-The progression from 1.0.0 to 4.0.0 in three weeks is dense. Here's the shape of it.
-
-```mermaid
-%%{init: {'theme': 'base', 'themeVariables': {'fontSize': '16px'}}}%%
-flowchart TB
-    V1["v1.0.0<br/>9 tools, 15 languages<br/>Rust-only CI"]
-    V15["v1.5 -- v1.6<br/>27 tools<br/>Doctor, worldwide counter<br/>Complexity metrics"]
-    V18["v1.8 -- v1.10<br/>Multi-agent support<br/>4 agents<br/>Git hook, version checks"]
-    V2["v2.0.0<br/>29 tools, 30 languages<br/>Feature flag tiers<br/>Porting tools"]
-    V3["v3.0 -- v3.3<br/>34 tools<br/>Bundled grammars, 26x speedup<br/>Daemon, 5 workflow tools"]
-    V35["v3.4 -- v3.5<br/>37 tools<br/>Self-upgrade, annotations<br/>Per-call token tracking<br/>1,000+ tests"]
-    V4["v4.0.0<br/>37 tools, 31 languages<br/>Multi-branch indexing<br/>Global monitor TUI<br/>Graph visualizer"]
-
-    V1 --> V15 --> V18 --> V2 --> V3 --> V35 --> V4
-
-    style V1 fill:#2d5a2d,color:#fff
-    style V15 fill:#2d6a4f,color:#fff
-    style V18 fill:#3a5a8c,color:#fff
-    style V2 fill:#4a3d6b,color:#fff
-    style V3 fill:#5a4d7b,color:#fff
-    style V35 fill:#6b3d3d,color:#fff
-    style V4 fill:#8b4513,color:#fff
-```
-
-Languages went from 15 to 31. MCP tools from 9 to 37. Supported agents from 1 to 9. Test count from a handful to over 1,000 with 84% line coverage (measured at v3.4.0). The database schema migrated multiple times, each migration triggering an automatic re-index so users never have to think about it. The codebase refactored itself twice along the way: once to extract the agent abstraction (1.8.0), once to decompose oversized functions for NASA Power of 10 compliance (1.7.1, where no function exceeds 47 lines).
-
-## The Daemon Goes Away (6.0.0)
-
-The daemon was a 4.x-era idea, and by 5.x it had become disproportionate to what it actually provided. Roughly 1,100 lines of OS-coupling code -- Unix fork/setsid, launchd plists, systemd user units, Windows SCM registration with failure-recovery actions, PID files, upgrade self-detection, idempotent re-installs, UAC elevation for service registration -- all in service of one job: notice when files change and run an incremental sync. Useful, but the cost-to-benefit ratio kept getting worse with every platform-specific bug fix.
-
-Meanwhile, the MCP server was always running anyway. Whenever an agent is attached to a project, an MCP server instance is alive for the duration of that session. It already has exactly the lifecycle a file watcher needs: it starts when the agent connects and dies when the agent disconnects. Version 6.0.0 moves the file watcher inside it. When the MCP server boots, it spawns a `notify`-backed watcher that debounces file events and runs `sync_if_stale_silent` directly. No separate process, no service registration, no platform-specific install steps.
-
-Multiple agents on the same project converge correctly through the existing per-project sync lock plus a `sync_if_stale_silent` peer-coordination call. When two MCP servers see a file change at nearly the same moment, only one of them holds the lock and performs the sync; the other detects that the index is already fresh and skips. No new coordination primitive was needed -- the locking that already protected concurrent writes turned out to be sufficient for concurrent watchers, too.
-
-The config field renames accordingly: `daemon_debounce` becomes `watcher_debounce`. The rename is friendly in both directions. Existing `~/.tracedecay/config.toml` files load fine because the new field is annotated with `#[serde(alias = "daemon_debounce")]`, and the next command that mutates the config (anything that writes it back -- adding an agent, switching channels, etc.) silently rewrites the file using the new name. There is no manual migration step; users who never edit their config will see the new name appear naturally the first time the file is touched.
-
-### Breaking
-
-- The pre-rename daemon subcommand is removed. The autostart flags (`--enable-autostart`, `--disable-autostart`), the foreground mode, and all `daemon-kit`-backed service registration are gone.
-- `UserConfig::daemon_debounce` is now `UserConfig::watcher_debounce`. This is a programmatic-API break. The `user_config` module is `pub`, so any external crate that constructs a `UserConfig` literal referencing the old field name will fail to compile. The serde alias only covers deserialization from TOML, not Rust struct literals.
-- `McpServer::new` now returns `Arc<Self>` instead of `Self`. The embedded watcher task captures a `Weak<Self>` so it cannot extend the server's lifetime, which forces the constructor to own the strong `Arc`. External embedders that previously bound the return value (e.g. `let server = McpServer::new(cg, None).await;`) keep compiling, but anything that destructured by value or stored the server in a non-`Arc` field needs to adapt.
-
-### Migration
-
-CLI-only users (anyone who runs `tracedecay` commands without an attached agent)
-lose automatic background syncing. The recommended replacement is a git
-post-commit hook -- a starter script lives at `scripts/post-commit` in the
-TraceDecay repo. Drop it into `.git/hooks/post-commit` in each project where you
-want the index to update on commit.
-
-### What this means for you
-
-If you use TraceDecay through an AI coding agent (Claude Code, Codex CLI, OpenCode, Gemini, Cursor, Zed, Cline, Roo Code, Copilot, Antigravity, Kilo, Kiro, Kimi, or Vibe), nothing changes from your perspective except that you no longer have a background process to manage. The MCP server keeps your index fresh while you work, just without a separate lifecycle to debug.
-
-If you use TraceDecay purely from the CLI without an attached agent, this is a real regression: the index won't update on its own anymore. Install the post-commit hook, or run `tracedecay sync` manually before queries.
-
-**A 6.1.0 postscript.** The embedded watcher introduced here did not survive long. On large monorepos it registered OS-level watches on nested `node_modules`/`target`/`dist` trees that the top-level ignore filter missed, producing event storms and unbounded memory growth (one report reached 19 GB). 6.1.0 removed the watcher entirely — along with the `notify-debouncer-full` dependency — and replaced it with an on-demand staleness check at the top of every MCP tool call (30-second cooldown) plus a catch-up sync when the server connects. The reaction is no longer instant-on-save, but resource use is bounded, and concurrent multi-agent work is expected to use git worktrees rather than a shared watched directory.
-
-## What Comes Next
-
-The competitive landscape is getting interesting. Dual-Graph (GrapeRoot) approaches the problem as a context prefill layer, intercepting prompts and pre-loading ranked files. code-review-graph takes a similar tree-sitter/SQLite approach to TraceDecay but adds multi-repo search, execution flow analysis, and community detection. OpenWolf goes in a completely different direction with lifecycle hooks that block redundant file reads and carry forward correction memory across sessions.
-
-Each tool has ideas worth learning from. CodeGraph's `codegraph_explore` tool, which combines search, traversal, and source extraction into a single call with budget signalling, represents a genuinely better interaction pattern for Explore agents. code-review-graph's multi-repo registry and accuracy benchmarks are features TraceDecay should adopt. OpenWolf's redundant-read blocking attacks a class of waste that graph queries alone don't address.
-
-The language coverage is broad — the functional family (Haskell, Elixir, OCaml, F#, Clojure, Erlang), the shader languages (GLSL, WGSL, HLSL, Metal), R, SQL, Julia, and most recently Svelte and Astro have all landed — but not complete. Vue single-file components, Solidity, and HCL/Terraform are plausible next targets. The feature-flag system makes adding them straightforward without bloating the default binary.
-
-The agent ecosystem keeps growing too. Every month brings a new AI coding tool with its own configuration format. The trait-based architecture handles this well, but the real challenge is keeping more than a dozen integration paths tested and working across three operating systems.
-
-TraceDecay started as a way to make Claude Code stop reading the same files over and over. It has become a code graph that any AI coding agent can query, refreshing its index on demand, understanding more than fifty languages across optional per-branch databases, tracking its own impact down to the individual tool call, and shipping as a single native binary that upgrades itself. The core insight has not changed. Give the AI a graph instead of making it grep.
-
----
-
-Learn more at [the TraceDecay repository on GitHub](https://github.com/ScriptedAlchemy/tracedecay).
-
-Want more like this?
-I write regularly about Rust, design patterns, and performance tips.
-Follow me here [on Medium](https://enzolombardi.net) to stay updated.
diff --git a/docs/plans/tracedecay-v2/00-plan-set-index.md b/docs/plans/tracedecay-v2/00-plan-set-index.md
index 2eec9645d4..013b8e835b 100644
--- a/docs/plans/tracedecay-v2/00-plan-set-index.md
+++ b/docs/plans/tracedecay-v2/00-plan-set-index.md
@@ -227,10 +227,7 @@ records the rejected mechanism, the reason, and the retained replacement:
 6. **The Cargo shim and `cargo-slot` are rejected.** The earlier local build
    shim was removed by explicit direction and is not product, contributor, CI,
    or release architecture. Stock Cargo behavior and portable repository
-   configuration supersede it. Machine-local cargo-conductor brokers `cargo`
-   invocations; `kache` remains the `rustc-wrapper` compile cache, not a
-   cargo prefix. Neither is a revived cargo-slot, and neither is product or
-   CI architecture.
+   configuration supersede it. Run ordinary `cargo` commands.
 7. **Delivery choreography is not product authority.** Capability plans,
    production callers, direct behavior, and ordinary CI define completion;
    branch, worktree, or pull-request layouts do not.
diff --git a/docs/plans/tracedecay-v2/39-embedded-grafeo-graph-database.md b/docs/plans/tracedecay-v2/39-embedded-grafeo-graph-database.md
index a0de37fbb2..109cf0e672 100644
--- a/docs/plans/tracedecay-v2/39-embedded-grafeo-graph-database.md
+++ b/docs/plans/tracedecay-v2/39-embedded-grafeo-graph-database.md
@@ -837,7 +837,7 @@ git commit -am "feat(graph-db): wire embedded graph journeys"
 - Delete: `crates/tracedecay-migrate/src/consolidate/sqlite.rs`
 - Modify: `crates/tracedecay-migrate/src/lib.rs`
 - Modify: `docs/plans/tracedecay-v2/*.md`
-- Modify: `docs/DESIGN-DOC.md`
+- Modify: `docs/V2-OPERATING-MODEL.md`
 - Modify: `docs/dashboard.md`
 
 **Interfaces:**
diff --git a/docs/plans/tracedecay-v2/NEXT.md b/docs/plans/tracedecay-v2/NEXT.md
index 592c137b47..3ee8bb5ad8 100644
--- a/docs/plans/tracedecay-v2/NEXT.md
+++ b/docs/plans/tracedecay-v2/NEXT.md
@@ -5,10 +5,7 @@ This file records outcomes only. Last reconciled: 2026-08-30.
 
 Branch: `codex/tracedecay-total-redesign-plan-reopened` (PR #707).
 Workspace: 38 crates under `crates/` (virtual root; counted from workspace
-`members` in the root `Cargo.toml`). Build via plain `cargo` (cargo-conductor
-brokers it; see `docs/CARGO-CONTENTION-POLICY.md`). Do not reclaim or wipe
-the machine kache store; do not treat sccache or a per-worktree
-`CARGO_TARGET_DIR=/tmp/...` as the compile cache.
+`members` in the root `Cargo.toml`).
 
 ## Outcomes since 2026-08-19
 
diff --git a/dogfood-journey.md b/dogfood-journey.md
index c0d9399a2a..1f87a8a934 100644
--- a/dogfood-journey.md
+++ b/dogfood-journey.md
@@ -45,14 +45,14 @@ The installed artifact identified itself as:
 tracedecay 0.1.0-beta.37+2314bd9a349479e965bc43030713ca2580b8b6d0
 ```
 
-Hauler built and installed the artifact:
+The artifact was built and installed with these recorded commands:
 
 - `cc-21907` ran `cargo build --release -p tracedecay-cli --bin tracedecay`.
 - `cc-21908` ran `cargo install --path crates/tracedecay-cli --root /fast/tmp/td-1281-dogfood-state-2314bd9/install --locked --force` after `cc-21907`.
 
 The earlier `cc-21881` build completed before the branch rebase. The replacement
-build and install tickets `cc-21900` and `cc-21902` were killed when the Hauler
-daemon stopped, so this journey did not use their artifacts.
+build and install attempts `cc-21900` and `cc-21902` were interrupted, so this
+journey did not use their artifacts.
 
 ## Typed state results
 
diff --git a/evals/hermetic/README.md b/evals/hermetic/README.md
index b073437de6..feafa2410f 100644
--- a/evals/hermetic/README.md
+++ b/evals/hermetic/README.md
@@ -18,6 +18,16 @@ evals/hermetic/run.sh run   --agent claude --env-dir "$ENV" --corpus my-corpus.j
 evals/hermetic/run.sh teardown --env-dir "$ENV"
 ```
 
+Without `--project`, the harness indexes the checkout containing `run.sh`, not
+the caller's working directory or a machine-specific primary checkout. Pass
+`--project` explicitly to evaluate another repository.
+
+Offline harness path-selection checks (no build, agent, or daemon required):
+
+```bash
+python3 -m unittest discover -s evals/hermetic -p 'test_run.py' -v
+```
+
 ## Why a naive PATH override is not enough
 
 An eval session launched via `claude -p` resolves tracedecay **three** ways:
diff --git a/evals/hermetic/run.sh b/evals/hermetic/run.sh
index 86a1e5cad4..3a7a274d99 100755
--- a/evals/hermetic/run.sh
+++ b/evals/hermetic/run.sh
@@ -32,8 +32,8 @@ WORKTREE_ROOT="$(cd -- "${SCRIPT_DIR}/../.." >/dev/null 2>&1 && pwd -P)"
 TMP_ROOT="${TMPDIR:-/tmp}"
 TMP_ROOT="${TMP_ROOT%/}"
 
-# Default project to index/eval against: the main tracedecay checkout.
-DEFAULT_PROJECT="/fast/projects/tracedecay"
+# Default to the checkout that owns this harness, independent of the caller's cwd.
+DEFAULT_PROJECT="${WORKTREE_ROOT}"
 
 log()  { printf '[hermetic] %s\n' "$*" >&2; }
 die()  { printf '[hermetic] ERROR: %s\n' "$*" >&2; exit 1; }
@@ -565,7 +565,7 @@ Subcommands:
 Common options:
   --env-dir <path>      Reuse an existing env dir (else a fresh one is created).
   --agent <name>        Agent driver: claude or codex (default: claude).
-  --project <path>      Project to index / default cwd (default: main tracedecay checkout).
+  --project <path>      Project to index / default cwd (default: this harness's checkout).
   --corpus <path.jsonl> Corpus file for `run`.
   --model <name>        Model override (default: sonnet for claude; gpt-5.6-sol for codex).
   --reps <N>            Re-run the corpus N times (default: 1; `run` only).
diff --git a/evals/hermetic/test_run.py b/evals/hermetic/test_run.py
new file mode 100644
index 0000000000..894ef37a31
--- /dev/null
+++ b/evals/hermetic/test_run.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python3
+"""Exercise harness path selection without building or touching a live profile."""
+
+import json
+import os
+from pathlib import Path
+import shlex
+import shutil
+import subprocess
+import tempfile
+import unittest
+
+
+class HarnessProjectTests(unittest.TestCase):
+    def setUp(self):
+        temporary = tempfile.TemporaryDirectory(prefix="hermetic harness ")
+        self.addCleanup(temporary.cleanup)
+        self.root = Path(temporary.name).resolve()
+        self.checkout = self.root / "checkout with spaces"
+        self.script = self.checkout / "evals" / "hermetic" / "run.sh"
+        self.script.parent.mkdir(parents=True)
+        shutil.copyfile(Path(__file__).with_name("run.sh"), self.script)
+        self.env_dir = self.root / "isolated env"
+        self.env_dir.mkdir()
+        self.record = self.root / "invocation.json"
+        self.executable = self.env_dir / "record-command"
+        self.executable.write_text(
+            '#!/usr/bin/env python3\n'
+            'import json, os, sys\n'
+            'from pathlib import Path\n'
+            'Path(os.environ["HARNESS_RECORD"]).write_text(json.dumps({\n'
+            '    "args": sys.argv[1:], "home": os.environ["HOME"],\n'
+            '    "data": os.environ["TRACEDECAY_DATA_DIR"],\n'
+            '    "socket": os.environ["TRACEDECAY_DAEMON_SOCKET"]}))\n'
+            'sys.exit(int(os.environ.get("HARNESS_EXIT", "0")))\n'
+        )
+        self.executable.chmod(0o755)
+        (self.env_dir / "env.sh").write_text(
+            f"export HERMETIC_TRACEDECAY_BIN={shlex.quote(str(self.executable))}\n"
+        )
+
+    def run_index(self, *args, exit_code=0):
+        return subprocess.run(
+            ["bash", str(self.script), "index", "--env-dir", str(self.env_dir), *args],
+            cwd=self.root,
+            env={**os.environ, "HARNESS_RECORD": str(self.record),
+                 "HARNESS_EXIT": str(exit_code)},
+            text=True,
+            capture_output=True,
+            check=False,
+        )
+
+    def test_default_uses_harness_checkout_from_another_cwd(self):
+        result = self.run_index()
+        self.assertEqual(result.returncode, 0, result.stderr)
+        invocation = json.loads(self.record.read_text())
+        self.assertEqual(invocation["args"], ["init", str(self.checkout)])
+        self.assertEqual(invocation["home"], str(self.env_dir / "home"))
+        self.assertEqual(invocation["data"], str(self.env_dir / "tracedecay-data"))
+        self.assertEqual(invocation["socket"], str(self.env_dir / "tracedecay-data/daemon.sock"))
+
+    def test_explicit_project_overrides_checkout(self):
+        project = self.root / "another project"
+        project.mkdir()
+        result = self.run_index("--project", str(project))
+        self.assertEqual(result.returncode, 0, result.stderr)
+        self.assertEqual(json.loads(self.record.read_text())["args"], ["init", str(project)])
+
+    def test_missing_project_does_not_invoke_binary(self):
+        result = self.run_index("--project", str(self.root / "missing"))
+        self.assertNotEqual(result.returncode, 0)
+        self.assertIn("project dir does not exist", result.stderr)
+        self.assertFalse(self.record.exists())
+
+    def test_index_failure_is_not_reported_as_success(self):
+        result = self.run_index(exit_code=17)
+        self.assertNotEqual(result.returncode, 0)
+        self.assertIn("indexing failed", result.stderr)
+        self.assertEqual(json.loads(self.record.read_text())["args"], ["init", str(self.checkout)])
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/scripts/agent-worktree.sh b/scripts/agent-worktree.sh
index 15c81688f7..82e59ec583 100755
--- a/scripts/agent-worktree.sh
+++ b/scripts/agent-worktree.sh
@@ -14,8 +14,7 @@ dashboard/app-dist from the primary checkout. Symlink root and
 dashboard/node_modules when the primary has them. Prints the unlock+remove
 one-liner for the owning lane and the recommended env
 (TRACEDECAY_SKIP_DASHBOARD_BUILD=1 plus the seeded bundle's
-TRACEDECAY_DASHBOARD_BUNDLE_SHA256 digest). Do not export
-CARGO_TARGET_DIR — cargo-conductor serializes the default target dir.
+TRACEDECAY_DASHBOARD_BUNDLE_SHA256 digest).
 EOF
 }
 
diff --git a/server.json b/server.json
index e08e6662ec..aa533ac669 100644
--- a/server.json
+++ b/server.json
@@ -8,6 +8,6 @@
     "source": "github"
   },
   "websiteUrl": "https://github.com/ScriptedAlchemy/tracedecay",
-  "version": "0.1.0-beta.39",
+  "version": "0.1.0-beta.40",
   "packages": []
 }
diff --git a/version.txt b/version.txt
index 60ac22bd52..4e63b6726b 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.1.0-beta.39
+0.1.0-beta.40