fix: address flakiness in thread_resume_rejoins_running_thread_even_with_override_mismatch#12381
Conversation
aibrahim-oai
approved these changes
Feb 21, 2026
…ith_override_mismatch
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.
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
thread/resumeresponses for already-running threads can be reported asIdleeven while a turn is still in progress. This is caused by a timing window where the runtime watch state has not yet observed the running-thread transition, so API clients can receive stale status information at resume time.Possibly related: #11786
What
resolve_thread_status, incodex-rs/app-server/src/thread_status.rsthat resolvesIdle/NotLoadedtoActive { active_flags: [] }when an in-progress turn is known.codex-rs/app-server/src/codex_message_processor.rs(includingthread/start,thread/unarchive,thread/read,thread/resume,thread/fork, and review/thread-started notification responses).handle_pending_thread_resume_request, use both the in-memoryactive_turn_snapshotand the resumed rollout turns to decide whether a turn is in progress before resolving thread status for the response.thread_statustests to validate the new status-resolution behavior directly.Verification
cargo test -p codex-app-server suite::v2::thread_resume::thread_resume_rejoins_running_thread_even_with_override_mismatch