Skip to content

[09/11] Reject inconsistent cached player reality - #10

Merged
oubiwann merged 2 commits into
mainfrom
codex/pr-12-cache-player-state-integrity
Oct 20, 2026
Merged

oubiwann merged 2 commits into
mainfrom
codex/pr-12-cache-player-state-integrity

Conversation

@oubiwann

@oubiwann oubiwann commented Oct 19, 2026 •

Copy link
Copy Markdown
Contributor

Target: main. Remaining merge order: #10 -> #11 -> #12. Previous prerequisites are merged.

Reject cache reads and writes when current_reality disagrees with current_address.reality_index. Preserve valid independent selected-galaxy state and rebuild rejected caches from the authoritative save without changing the 2/2 layout or public error variants.

The branch also carries PR #4’s deterministic cache-test timestamp correction through its dependency history. Its own original implementation increment is preserved.

Original accepted-source validation: Both mismatch directions, byte/file decoding and serialization, exact temporary-file absence, full-model fallback/warm comparisons, source failure and no_cache byte preservation. CDC review; closed slice ledger. These records describe the original accepted commit, not a new acceptance verdict for the PR repair.

Original source: codex/cache-player-state-integrity at a101bd44b277f06c75ed7260b470b31cd5510130. Current dedicated PR branch: codex/pr-12-cache-player-state-integrity at 3c80bccbb9c7e9e45ecbc773ab7fd356ee1bc8a1. The accepted branches and active Arc06 worktree are preserved.

Remaining scope / evidence limits: This enforces an existing physical-player invariant. It does not reject legitimate independent selected or historical galaxy fields, or establish broader historical-state policy.

All open PRs in this series target main. Their branches retain their dependencies, so later diffs are cumulative until predecessors land. GitHub permits rebase merging only: after each merge, restack the remaining dedicated PR branches onto the updated main and require fresh successful CI before merging the next PR. Do not merge a PR into another feature branch.

Merge after #9. Next: #11. Full merge order.

No merges or releases were performed during this repair; Arc06/Project01 closure and reconciliation with ongoing work remain separate.

Rebase refresh after PR #13: rebased onto main at f98d39ed78703d81c0a9481a24bb85571b2397bd, excluding the cache commits already landed there. The complete source tree is byte-identical to the pre-rebase head. The timestamp correction is retained, all successors carry the rebased ancestry, and the stack contains zero merge commits. Prior source validation remains applicable; new CI checks are pending.

Rebase refresh after PR #4: current head 3c80bccbb9c7e9e45ecbc773ab7fd356ee1bc8a1 descends from main at 35105a7f5adf2d6b48662d5be315caba37dc83cc. Already-landed identity commits were excluded from replay. This refresh preserves the complete source tree and cache-test correction; zero merge commits. Fresh CI is pending.

Rebase refresh after PR #5: current head 3c80bccbb9c7e9e45ecbc773ab7fd356ee1bc8a1 descends from main at d319111a26e9ac7d304de48842f2fc41555cd82a. Already-landed prerequisite commits were excluded from replay. The complete source tree and cache-test correction are unchanged; zero merge commits. Prior validation remains applicable; fresh CI is pending.

Rebase refresh after PR #6: current head 3c80bccbb9c7e9e45ecbc773ab7fd356ee1bc8a1 descends from main at b9b6841710babb26f59676b952c4005719b13148. Already-landed prerequisite commits were excluded from replay. The complete source tree and cache-test correction are unchanged; zero merge commits. Prior validation remains applicable; fresh CI is pending.

Rebase refresh after PR #8: current head 3c80bccbb9c7e9e45ecbc773ab7fd356ee1bc8a1 descends from main at daf4f5ebbd772b1e0000a4fcb8c0a87ecb7b9aad. Already-landed prerequisite commits were excluded from replay. The complete source tree and cache-test correction are unchanged; zero merge commits. Prior validation remains applicable; fresh CI is pending.

Rebase refresh after PR #9: current head 3c80bccbb9c7e9e45ecbc773ab7fd356ee1bc8a1 descends from main at 6e6ddca0a06412f3f8ef157ab2334bbc7868a122. Already-landed prerequisite commits were excluded from replay. The complete source tree and cache-test correction are unchanged; zero merge commits. Prior validation remains applicable; fresh CI is pending.

oubiwann and others added 2 commits October 19, 2026 19:29
Co-authored-by: Codex <noreply@openai.com>

Co-authored-by: Billo AI <ai-engineering@billo.systems>
Co-authored-by: Codex <noreply@openai.com>

Co-authored-by: Billo AI <ai-engineering@billo.systems>
@oubiwann
oubiwann force-pushed the codex/pr-12-cache-player-state-integrity branch from ca5f666 to 3c80bcc Compare October 20, 2026 00:29
@oubiwann
oubiwann merged commit 608efce into main Oct 20, 2026
8 checks passed
@oubiwann
oubiwann deleted the codex/pr-12-cache-player-state-integrity branch October 28, 2026 02:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant