Round 5 approved relocation at f4395941. Before it could merge, main moved two merges: d6122533 `moves-phase1-5f` and 01edf901 `feat/claim-admitted-provenance`. They are merged into `region-ha-1b-next-build` at the commit under review (merge 87146236).
4
5
Conflicts and how they were resolved (see the merge commit message):
6
- `hostfiles/publisher.go`: both sides kept. Main's new `OpenAt` now applies `manifestWithinCap`, as `Open` does.
7
- `hostfiles/prepared.go`: `Prepared.Stage` and `StageSkipped` now hold `withinTreeCap`.
8
- Census: relocation's `Publisher.Commit` digest was kept, and main's `prepared.go` rows were added.
9
- Copy: relocation's row is renumbered MV-N450 → MV-N500, because moves reserved MV-N450 to MV-N499.
10
11
**Judge only what the merge changes for relocation.** Round 4 found that main's `Staged` launch field was dropped by relocation's own builder. Look for the same class of problem. Did main add a field, a guard, a phase, a journal key or a new contract that relocation's code (under `internal/host/relocation*`, `internal/hostrelocate`, `internal/hostops` completion and `hostclaim` relocating phases) must now carry, check or honour, and doesn't? Check in particular:
12
- `claimfiles.go`, `claimoriginproof.go`, `movesfiles.go`, Manifest `Origins`/`SetOrigins`, `OpenAt` and `NewFromCopy` origins. Do relocation's files publication and restore need the origin set?
13
- Changes to `claimmoveparks`, `claimproduction`, `claimlaunch_production`, `claimstop_run`, and to `genselect` (generation max).
14
- Claim-admitted provenance: do relocation's admissions need to record the provenance main now requires?
15
- Whether the conflict resolutions are correct.
16
17
**Verdict:** may relocation merge dormant at this commit? Give findings P1/P2/P3 with file:line. Report only new items.
amadan