Conversation
bolinfest
force-pushed
the
pr23756
branch
2 times, most recently
from
5883f12 to
6b5de5b
Compare
Summary: - add a checked-in codex-zsh DotSlash manifest for supported Unix targets - fetch the matching zsh fork artifact during package builds and install it at codex-resources/zsh/bin/zsh when available - expose the bundled zsh fork through install-context and thread it through config loading as the lowest-precedence zsh_path default - use copyfile for package executable staging so local package smoke tests do not preserve platform-specific source metadata Test Plan: - just fmt - python3 -m py_compile scripts/codex_package/cli.py scripts/codex_package/layout.py scripts/codex_package/zsh.py - python3 -m unittest discover scripts/codex_package - cargo test -p codex-core zsh_path
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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
The package layout gives Codex a stable place for runtime helpers that should travel with the entrypoint.
shell_zsh_forkstill required users to configurezsh_pathmanually, even though we already publish prebuilt zsh fork artifacts.This PR builds on #24129's shared DotSlash artifact fetcher and uses it to include the zsh fork in Codex packages when a matching target artifact exists. Packaged Codex builds can then discover the bundled fork automatically while still respecting any explicit user-provided
zsh_path.What Changed
scripts/codex_package/codex-zsh, a checked-in DotSlash manifest for the current macOS arm64 and Linux zsh fork artifacts.scripts/build_codex_package.pyto fetch the matching zsh fork artifact and install it atcodex-resources/zsh/bin/zshwhen available for the selected target.InstallContext::bundled_zsh_path()andInstallContext::bundled_zsh_bin_dir()for package-layout resource discovery.zsh_pathdefault, preserving explicit CLI/profile/global config values.copy2()tocopyfile()plus explicit executable bits, which avoids macOS file-flag failures when local smoke tests use system binaries as inputs.Testing
python3 -m py_compile scripts/codex_package/dotslash.py scripts/codex_package/ripgrep.py scripts/codex_package/cli.py scripts/codex_package/layout.py scripts/codex_package/zsh.pypython3 -m unittest discover scripts/codex_packagecargo test -p codex-core zsh_pathStack created with Sapling. Best reviewed with ReviewStack.