Merge origin/main (moves-plan15-proof, region-ha-two-box-build, settings-5-surfaces) into region-ha-1b-next-build
moves-plan15-proof replaces the C8 provider's origin proof with claim Plan 15's ClaimOriginProof (one batch Proven over the claim's recorded admissions, no retained-chain fallback). It addresses none of merge round 6's findings 1 to 4, so relocation's fixes carry forward onto it. Conflicts: - internal/host/claimfiles.go: movesFilesSource.Open takes main's claims store and builds main's ClaimOriginProof, keeps the branch's Routes requirement, and binds EnvFile: claimEnvFileFor (the env file through the row) where main bound the flat FilesDir. The branch's claimEnvFile and claimEnvFileFor are kept. - internal/host/movesfiles.go: the movesFiles fields are the branch's EnvFile with main's Proof comment (nil refuses). movesFilesAllowed takes main's batch body (generations, proveOrigins) over the branch's moves.FilesGenerationBase. preparedBinding, relocationPreparedManifest and preparedOpening carry forward unchanged and feed main's proveOrigins. - internal/host/movesfiles_test.go: main's fixture (a claims store, ClaimOriginProof) with the branch's EnvFile: flatClaimEnvFile. - internal/host/movesprobeowners_test.go: main's realC8 (Proof: ClaimOriginProof) with the branch's EnvFile: envFileOf. - internal/provision/plan9_b8_census_test.go: both sides' rows. handleAPIInstanceList takes main's digest (558d0b3e..., settings-5 changed it; the branch did not). handleAPIInstanceCreate keeps the branch's digest (3a4cbb44..., its EvidenceComplete line; main did not change it) with its review comments. The census passes as merged, so no digest is recomputed. Also: relocation's provider tests turn on CARLOS_HOST_CLAIM_ORIGINS, so the claim records the admissions Plan 15's proof walks. Copy gate passes. Main's moves rows run to MV-N456, so there is no collision with the branch's MV-N500.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
README.md+2 −0apimode.go+22 −0apps_swap.go+20 −13apps_updates.go+135 −0apps_updates_test.go+273 −0cli.go+6 −0docs/site/cli.md+24 −0docs/superpowers/notes/2026-10-08-region-ha-two-box-sweep-diagnosis.md+175 −0docs/superpowers/plans/2026-10-07-instance-settings-5-copy.json+236 −0docs/superpowers/plans/2026-10-07-region-ha-hostlife-two-box.md+10467 −0docs/superpowers/plans/CODEX-FINDINGS-SETTINGS-IMPL-5-R2.md+40 −0docs/superpowers/plans/CODEX-FINDINGS-SETTINGS-IMPL-5-R3.md+31 −0docs/superpowers/plans/CODEX-FINDINGS-SETTINGS-IMPL-5-R4.md+64 −0docs/superpowers/plans/CODEX-FINDINGS-SETTINGS-IMPL-5-R5.md+41 −0docs/superpowers/plans/CODEX-FINDINGS-SETTINGS-IMPL-5-R6.md+28 −0docs/superpowers/plans/CODEX-FINDINGS-SETTINGS-IMPL-5.md+101 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-1.md+53 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-2.md+62 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-3.md+65 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-4.md+65 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-5.md+68 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-6.md+68 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-7.md+68 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-8.md+68 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-9.md+68 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R1.md+71 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R2.md+50 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R3.md+49 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R4.md+54 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R5.md+41 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R6.md+41 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R7.md+47 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R8.md+48 −0docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R9.md+38 −0docs/superpowers/plans/CODEX-REVIEW-BRIEF-TWO-BOX-R1.md+339 −0docs/superpowers/plans/CODEX-REVIEW-BRIEF-TWO-BOX-R2.md+41 −0docs/superpowers/plans/CODEX-REVIEW-BRIEF-TWO-BOX-R3.md+37 −0docs/superpowers/plans/CODEX-REVIEW-TWO-BOX-R1.md+42 −0docs/superpowers/plans/CODEX-REVIEW-TWO-BOX-R2.md+45 −0docs/superpowers/plans/CODEX-REVIEW-TWO-BOX-R3.md+35 −0instances_cli.go+73 −13instances_reason_test.go+105 −0instances_updates.go+286 −0instances_updates_test.go+437 −0internal/console/apiinstances.go+109 −1internal/console/apiinstances_test.go+5 −2internal/console/apiupdates.go+22 −175internal/console/browserupdates.go+314 −0internal/console/browserupdates_test.go+801 −0internal/console/claim_invariant_fixtures_test.go+48 −0internal/console/instancepage.go+6 −0internal/console/server.go+2 −0internal/console/templates/app_instance.html+25 −0internal/console/testdata/claim-routes.txt+2 −0internal/console/updatescore.go+233 −0internal/console/updatesjoin_test.go+303 −0internal/host/buildstate.go+33 −7internal/host/buildstate_astra_test.go+27 −12internal/host/buildstate_test.go+6 −0internal/host/claimfiles.go+7 −3internal/host/movesfiles.go+68 −88internal/host/movesfiles_test.go+266 −82internal/host/movesprobeowners_test.go+10 −1internal/host/movesrecoveryowners_test.go+5 −0internal/host/plan15_originproof_test.go+3 −20internal/host/relocationprobefiles_linux_test.go+6 −1internal/host/tenantchange_test.go+216 −0internal/host/updatesreport.go+31 −5internal/host/updatesreport_test.go+188 −6internal/provision/plan9_b8_census_test.go+12 −6internal/registry/registry.go+50 −2internal/registry/updatesettings_test.go+115 −0internal/release/adopt.go+14 −2internal/release/adoptsettings_test.go+70 −0internal/release/buildstate.go+33 −2internal/release/tenantchange_test.go+221 −0internal/release/updatetarget.go+12 −3internal/sim/hostlife/background_test.go+18 −4internal/sim/hostlife/console_test.go+181 −11internal/sim/hostlife/expected-outcomes.two-box.txt+13 −0internal/sim/hostlife/expected-outcomes.txt+32 −0internal/sim/hostlife/moves_test.go+107 −82internal/sim/hostlife/mutate.sh+39 −16internal/sim/hostlife/onebox_identity_test.go+77 −0internal/sim/hostlife/protocol_test.go+106 −9internal/sim/hostlife/regionha_cases_test.go+733 −0internal/sim/hostlife/regionha_completion_test.go+528 −0internal/sim/hostlife/regionha_completion_witness_test.go+770 −0internal/sim/hostlife/regionha_round1_test.go+1350 −0internal/sim/hostlife/regionha_test.go+2668 −0internal/sim/hostlife/regionha_witness_test.go+1290 −0internal/sim/hostlife/rules_test.go+81 −0internal/sim/hostlife/sim_test.go+68 −7internal/sim/hostlife/twobox_test.go+194 −0internal/sim/hostlife/witness_test.go+123 −3internal/sim/hostlife/world_test.go+233 −3internal/status/contract_test.go+4 −2internal/status/snapshot.go+7 −0internal/status/status_test.go+3 −2internal/updatewords/export_test.go+137 −0internal/updatewords/words_approved_test.go+14 −6internal/updatewords/words_docs_test.go+41 −0internal/updatewords/words_surfaces.go+80 −0
README.mdLoading diff…
apimode.goLoading diff…
apps_swap.goLoading diff…
apps_updates.goLoading diff…
apps_updates_test.goLoading diff…
cli.goLoading diff…
docs/site/cli.mdLoading diff…
docs/superpowers/notes/2026-10-08-region-ha-two-box-sweep-diagnosis.mdLoading diff…
docs/superpowers/plans/2026-10-07-instance-settings-5-copy.jsonLoading diff…
docs/superpowers/plans/2026-10-07-region-ha-hostlife-two-box.mdLoading diff…
docs/superpowers/plans/CODEX-FINDINGS-SETTINGS-IMPL-5-R2.mdLoading diff…
docs/superpowers/plans/CODEX-FINDINGS-SETTINGS-IMPL-5-R3.mdLoading diff…
docs/superpowers/plans/CODEX-FINDINGS-SETTINGS-IMPL-5-R4.mdLoading diff…
docs/superpowers/plans/CODEX-FINDINGS-SETTINGS-IMPL-5-R5.mdLoading diff…
docs/superpowers/plans/CODEX-FINDINGS-SETTINGS-IMPL-5-R6.mdLoading diff…
docs/superpowers/plans/CODEX-FINDINGS-SETTINGS-IMPL-5.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-1.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-2.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-3.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-4.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-5.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-6.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-7.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-8.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-BRIEF-9.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R1.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R2.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R3.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R4.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R5.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R6.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R7.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R8.mdLoading diff…
docs/superpowers/plans/CODEX-PLAN-REGION-HA-TWO-BOX-R9.mdLoading diff…
docs/superpowers/plans/CODEX-REVIEW-BRIEF-TWO-BOX-R1.mdLoading diff…
docs/superpowers/plans/CODEX-REVIEW-BRIEF-TWO-BOX-R2.mdLoading diff…
docs/superpowers/plans/CODEX-REVIEW-BRIEF-TWO-BOX-R3.mdLoading diff…
docs/superpowers/plans/CODEX-REVIEW-TWO-BOX-R1.mdLoading diff…
docs/superpowers/plans/CODEX-REVIEW-TWO-BOX-R2.mdLoading diff…
docs/superpowers/plans/CODEX-REVIEW-TWO-BOX-R3.mdLoading diff…
instances_cli.goLoading diff…
instances_reason_test.goLoading diff…
instances_updates.goLoading diff…
instances_updates_test.goLoading diff…
internal/console/apiinstances.goLoading diff…
internal/console/apiinstances_test.goLoading diff…
internal/console/apiupdates.goLoading diff…
internal/console/browserupdates.goLoading diff…
internal/console/browserupdates_test.goLoading diff…
internal/console/claim_invariant_fixtures_test.goLoading diff…
internal/console/instancepage.goLoading diff…
internal/console/server.goLoading diff…
internal/console/templates/app_instance.htmlLoading diff…
internal/console/testdata/claim-routes.txtLoading diff…
internal/console/updatescore.goLoading diff…
internal/console/updatesjoin_test.goLoading diff…
internal/host/buildstate.goLoading diff…
internal/host/buildstate_astra_test.goLoading diff…
internal/host/buildstate_test.goLoading diff…
internal/host/claimfiles.goLoading diff…
internal/host/movesfiles.goLoading diff…
internal/host/movesfiles_test.goLoading diff…
internal/host/movesprobeowners_test.goLoading diff…
internal/host/movesrecoveryowners_test.goLoading diff…
internal/host/plan15_originproof_test.goLoading diff…
internal/host/relocationprobefiles_linux_test.goLoading diff…
internal/host/tenantchange_test.goLoading diff…
internal/host/updatesreport.goLoading diff…
internal/host/updatesreport_test.goLoading diff…
internal/provision/plan9_b8_census_test.goLoading diff…
internal/registry/registry.goLoading diff…
internal/registry/updatesettings_test.goLoading diff…
internal/release/adopt.goLoading diff…
internal/release/adoptsettings_test.goLoading diff…
internal/release/buildstate.goLoading diff…
internal/release/tenantchange_test.goLoading diff…
internal/release/updatetarget.goLoading diff…
internal/sim/hostlife/background_test.goLoading diff…
internal/sim/hostlife/console_test.goLoading diff…
internal/sim/hostlife/expected-outcomes.two-box.txtLoading diff…
internal/sim/hostlife/expected-outcomes.txtLoading diff…
internal/sim/hostlife/moves_test.goLoading diff…
internal/sim/hostlife/mutate.shLoading diff…
internal/sim/hostlife/onebox_identity_test.goLoading diff…
internal/sim/hostlife/protocol_test.goLoading diff…
internal/sim/hostlife/regionha_cases_test.goLoading diff…
internal/sim/hostlife/regionha_completion_test.goLoading diff…
internal/sim/hostlife/regionha_completion_witness_test.goLoading diff…
internal/sim/hostlife/regionha_round1_test.goLoading diff…
internal/sim/hostlife/regionha_test.goLoading diff…
internal/sim/hostlife/regionha_witness_test.goLoading diff…
internal/sim/hostlife/rules_test.goLoading diff…
internal/sim/hostlife/sim_test.goLoading diff…
internal/sim/hostlife/twobox_test.goLoading diff…
internal/sim/hostlife/witness_test.goLoading diff…
internal/sim/hostlife/world_test.goLoading diff…
internal/status/contract_test.goLoading diff…
internal/status/snapshot.goLoading diff…
internal/status/status_test.goLoading diff…
internal/updatewords/export_test.goLoading diff…
internal/updatewords/words_approved_test.goLoading diff…
internal/updatewords/words_docs_test.goLoading diff…
internal/updatewords/words_surfaces.goLoading diff…