Conversation
Summary: - reuse the helper materialization bundled-executable lookup for sandbox setup helper resolution - remove duplicate direct-sibling/package-resources/legacy-resources lookup code from setup.rs Test plan: - just fmt - cargo test -p codex-windows-sandbox - just fix -p codex-windows-sandbox Also attempted cargo check -p codex-windows-sandbox --target x86_64-pc-windows-gnullvm, but the local host is missing x86_64-w64-mingw32-clang.
iceweasel-oai
approved these changes
May 20, 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.
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.
Summary
Follow-up to #23636 review feedback: the Windows sandbox had two copies of the same bundled-helper lookup order, one for
codex-command-runner.exeinhelper_materialization.rsand one forcodex-windows-sandbox-setup.exeinsetup.rs.This PR centralizes that lookup in
helper_materialization::bundled_executable_path_for_exe()and has setup reuse it forcodex-windows-sandbox-setup.exe. The lookup behavior is unchanged: direct sibling first, package-rootcodex-resources/when running frombin/, then legacy siblingcodex-resources/.Test plan
cargo test -p codex-windows-sandboxNotes
I also attempted
cargo check -p codex-windows-sandbox --target x86_64-pc-windows-gnullvm, but this local host is missingx86_64-w64-mingw32-clang.