Preserve thread context when retrying or editing turns - #33211
Merged
copyberry[bot] merged 1 commit intoJul 15, 2026
Merged
Conversation
## What changed - Add experimental `beforeTurnId` support to `thread/fork` for copying history strictly before a turn, including an in-progress turn. - Use before-turn forks for TUI backtracking and safety retries so the replacement prompt retains thread context instead of recreating the branch from the preceding turn or a new thread. - Add experimental `deferGoalContinuation` support so safety-retry forks can inherit an active goal while waiting for the replacement turn before automatic continuation resumes. - Hide duplicated nested-review prompts when replaying history or selecting a prompt to edit. ## Testing - Cover before-turn truncation, fork validation, active-goal inheritance, TUI safety retries, backtracking, and nested-review replay. GitOrigin-RevId: 4915d85ae1929a0b8c40f3ed7dca29c7a5bdcdf3
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/4915d85ae1929a0b8c40f3ed7dca29c7a5bdcdf3
branch
from
July 15, 2026 02:36
ae586e8 to
d88db19
Compare
copyberry
Bot
deleted the
copyberry/codex-internal-to-codex-oss/4915d85ae1929a0b8c40f3ed7dca29c7a5bdcdf3
branch
July 15, 2026 02:37
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Preserve thread context when retrying or editing turns
What changed
beforeTurnIdsupport tothread/forkfor copying history strictly before a turn, including an in-progress turn.deferGoalContinuationsupport so safety-retry forks can inherit an active goal while waiting for the replacement turn before automatic continuation resumes.Testing