Conversation
pakrym-oai
approved these changes
Apr 29, 2026
dylan-hurd-oai
approved these changes
Apr 29, 2026
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.
Summary
This fixes the CI regression introduced by #20040.
That PR migrated several
apply_patch_clitests from directcodex.submit(Op::UserTurn { ... })calls toharness.submit(...).harness.submit()waits forTurnCompletebefore returning, which drains the same event stream that these tests use to assertTurnDiff,PatchApplyUpdated, and related live events. The regressed tests then timed out waiting for events that had already been consumed.This change restores a no-wait submit path for the event-observing
apply_patch_clitests so they can watch the turn stream directly again.What Changed
submit_without_wait(...)helper incodex-rs/core/tests/suite/apply_patch_cli.rsapply_patch_clitests that assert live turn events back to that helperharness.submit(...)migration in place for tests that only care about final filesystem or tool output stateWhy macOS Looked Green
In the failing run 25084487331,
//codex-rs/core:core-all-testwas cached on macOS, so the regressed tests were not rerun there. The Linux GNU, Linux MUSL, and Windows Bazel jobs reran the target and exposed the failure.Verification
cargo test -p codex-core apply_patch_ -- --nocaptureapply_patch_cli_move_without_content_change_has_no_turn_diffapply_patch_turn_diff_for_rename_with_content_changeapply_patch_aggregates_diff_across_multiple_tool_calls