Skip to content

[06/11] Reconcile live movement and session galaxy state - #7

Merged
oubiwann merged 1 commit into
mainfrom
codex/pr-09-galaxy-scoped-session
Oct 20, 2026
Merged

oubiwann merged 1 commit into
mainfrom
codex/pr-09-galaxy-scoped-session

Conversation

@oubiwann

@oubiwann oubiwann commented Oct 19, 2026 •

Copy link
Copy Markdown
Contributor

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

Apply galaxy-qualified movement without losing independent player state. Keep the physical location, selected query galaxy, and explicit session reference coherent; resolve location notifications in their own galaxy and report physical MCP location independently of the selected view.

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: Typed watcher/model movement, selected-view and reference controls, REPL drain/cache behavior, and actual MCP tool/resource paths. CDC review; closed slice ledger. These records describe the original accepted commit, not a new acceptance verdict for the PR repair.

Original source: codex/galaxy-scoped-session at e9cabd5fe63f19e9fe2e6da840845315d2ee2d18. Current dedicated PR branch: codex/pr-09-galaxy-scoped-session at 35a480c25d8ef471267f9d69d98cb1165de2d544. The accepted branches and active Arc06 worktree are preserved.

Remaining scope / evidence limits: This increment does not establish a single application watcher or complete live player-state write-through; that work remains active outside this stack.

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 #6. Next: #8. 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 35a480c25d8ef471267f9d69d98cb1165de2d544 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 35a480c25d8ef471267f9d69d98cb1165de2d544 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 35a480c25d8ef471267f9d69d98cb1165de2d544 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.

Keep physical player location, selected galaxy, session anchors, location
consumers, and drained cache state coherent across typed galaxy movement.

Co-authored-by: Codex <noreply@openai.com>
Co-authored-by: Billo AI <ai-engineering@billo.systems>
@oubiwann
oubiwann force-pushed the codex/pr-09-galaxy-scoped-session branch from 4aeda7b to 35a480c Compare October 20, 2026 00:16
@oubiwann
oubiwann merged commit 6e0bb60 into main Oct 20, 2026
8 checks passed
@oubiwann
oubiwann deleted the codex/pr-09-galaxy-scoped-session 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