fix(tui): retry safety-buffered turns using session forks#31921
Open
fcoury-oai wants to merge 2 commits into
Open
fix(tui): retry safety-buffered turns using session forks#31921fcoury-oai wants to merge 2 commits into
fcoury-oai wants to merge 2 commits into
Conversation
Contributor
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: dc9d0472f3
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
This was referenced Jul 9, 2026
dc9d047 to
d46fb69
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
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.
Why
The safety-buffering prompt can offer to retry a slow request with a faster model. Today that retry interrupts the active turn and then calls
thread/rollback, mutating the source conversation before resubmitting the prompt. This couples an otherwise optional retry to destructive history editing and can leave local transcript state out of sync if the new submission fails.This change treats the retry as a new conversation derived from the source. The interrupted thread remains intact, while the retry starts from the last canonical completed turn and submits the original prompt on the derived thread.
What Changed
turn/startsucceeds.How to Test
Focused coverage:
just test -p codex-tui safety_buffer— 10 passedjust test -p codex-tui cancelled_turn_edit— 2 passedjust test -p codex-tui prompt_edit— 3 passedjust test -p codex-tui— 2,984 passed; the two remaining failures are the existing Guardian feature-flag tests onmainStack