codex: preserve the stable base when freezing recovery - #92
Merged
Conversation
tnm-oai
approved these changes
Sep 8, 2026
After resolving an unstable conflict, publish-topics assembles the stable candidate again. Its merge timestamps change even when its tree and topic integrations do not. The recovered preview still descends from the old candidate, so the exact-base check rejects the completed recovery. Keep that original base after checking its ancestry, tree, and expected topic integrations against the rebuilt candidate. The existing output verification still checks the complete recovered graph before freezing it. Advance the test clock between recovery and publication, and verify that the frozen candidate retains the recovered graph's exact stable base. Signed-off-by: Taylor Blau <ttaylorr@openai.com>
ttaylorr-oai
force-pushed
the
tb/codex/recovery-stable-base
branch
from
September 8, 2026 01:35
37ff424 to
be1c3ac
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
After resolving an unstable conflict,
publish-topicsrebuilds the unchanged stable candidate with new merge timestamps. The recovered preview still descends from the original commit, so freezing fails with “completed unstable recovery belongs to a different stable candidate.”Reuse the original base after checking its ancestry, tree, and expected topic integrations against the rebuilt candidate. Complete output verification and the exact preview-base check still run before freezing.
Validation: advance the test clock between recovery and freezing. The regression fails on the current controller and passes with this change, retaining the exact stable base and leaving remote refs unchanged. The full controller suite was not rerun for this change.