amadan
Astra round 6 brief: the moves-phase1-5f / claim-admitted-provenance merge against relocation
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 file changed,
+17
−0
docs/superpowers/plans/CODEX-REVIEW-L18-MERGE-BRIEF-6.md+17 −0
CI failed — run details
CI log
=== gate === cd launchctx && go vet ./... && go test ./... -count=1 ok amadan.net/carlos/platform.git/launchctx 0.011s ? amadan.net/carlos/platform.git/launchctx/controlname [no test files] ? amadan.net/carlos/platform.git/launchctx/wireid [no test files] go vet ./... # github.com/carlosframework/platform/internal/host # [github.com/carlosframework/platform/internal/host] vet: internal/host/moveswakesource_linux_test.go:227:66: not enough arguments in call to wireClaimAdmission have (*ClaimWakeAssembly, string, func(context.Context, hostclaim.Observed, hostclaim.Observed) error, claimCrossBoxHandover, nil) want (*ClaimWakeAssembly, string, func(context.Context, hostclaim.Observed, hostclaim.Observed) error, claimCrossBoxHandover, *ClaimRelocationOwners, *relocationCompletedHandover) make: *** [Makefile:16: test] Error 1 amadan: step gate failed: exit status 2 amadan: job failed at step gate — its output is above, not at the tail of this log
diff --git a/docs/superpowers/plans/CODEX-REVIEW-L18-MERGE-BRIEF-6.md b/docs/superpowers/plans/CODEX-REVIEW-L18-MERGE-BRIEF-6.md| new file mode 100644 |
| index 000000000..1dd4eae07 |
| --- /dev/null |
| +++ b/docs/superpowers/plans/CODEX-REVIEW-L18-MERGE-BRIEF-6.md |
| @@ -0,0 +1,17 @@ |
| +# Astra: relocation × main merge check (round 6) |
| + |
| +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). |
| + |
| +Conflicts and how they were resolved (see the merge commit message): |
| +- `hostfiles/publisher.go`: both sides kept. Main's new `OpenAt` now applies `manifestWithinCap`, as `Open` does. |
| +- `hostfiles/prepared.go`: `Prepared.Stage` and `StageSkipped` now hold `withinTreeCap`. |
| +- Census: relocation's `Publisher.Commit` digest was kept, and main's `prepared.go` rows were added. |
| +- Copy: relocation's row is renumbered MV-N450 → MV-N500, because moves reserved MV-N450 to MV-N499. |
| + |
| +**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: |
| +- `claimfiles.go`, `claimoriginproof.go`, `movesfiles.go`, Manifest `Origins`/`SetOrigins`, `OpenAt` and `NewFromCopy` origins. Do relocation's files publication and restore need the origin set? |
| +- Changes to `claimmoveparks`, `claimproduction`, `claimlaunch_production`, `claimstop_run`, and to `genselect` (generation max). |
| +- Claim-admitted provenance: do relocation's admissions need to record the provenance main now requires? |
| +- Whether the conflict resolutions are correct. |
| + |
| +**Verdict:** may relocation merge dormant at this commit? Give findings P1/P2/P3 with file:line. Report only new items. |