Conversation
6ec7a2d to
e679a8e
Compare
jif-oai
approved these changes
Mar 26, 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.
Why
#[large_stack_test]made theapply_patch_clitests pass by giving them more stack, but it did not address why those tests needed the extra stack in the first place.The real problem is the async state built by the
apply_patch_cliharness path. Those tests await three helper boundaries directly: harness construction, turn submission, and apply-patch output collection. If those helpers inline their full child futures, the test future grows to include the whole harness startup and request/response path.This change replaces the workaround from #12768 with the same basic approach used in #13429, but keeps the fix narrower: only the helper boundaries awaited directly by
apply_patch_clistay boxed.What Changed
#[large_stack_test]fromcore/tests/suite/apply_patch_cli.rs#[tokio::test(flavor = "multi_thread", worker_threads = 2)]annotations in that suitecodex-test-macroscrate and removed its workspace wiringapply_patch_harness_with(...)TestCodexHarness::submit(...)TestCodexHarness::apply_patch_output(...)Testing
cargo test -p codex-core --test all suite::apply_patch_cli -- --nocaptureReferences