Conversation
Contributor
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 2b012624ce
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
92d239d to
e6f78d1
Compare
8cc6c06 to
deee4fd
Compare
jif-oai
approved these changes
Mar 6, 2026
1b7e3ec to
b23aeee
Compare
456e627 to
84ec355
Compare
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
zsh-forksessions launched through unified-exec need the escalation socket to survive the wrapper -> server -> child handoff so later interceptedexec()calls can still reach the escalation server.The inherited-fd spawn path also needs to avoid closing Rust's internal exec-error pipe, and the shell-escalation handoff needs to tolerate the receive-side case where a transferred fd is installed into the same stdio slot it will be mapped onto.
What Changed
SpawnLifecycle::inherited_fds()incodex-rs/core/src/unified_exec/process.rsand threaded inherited fds throughcodex-rs/core/src/unified_exec/process_manager.rsso unified-exec can preserve required descriptors across both PTY and no-stdin pipe spawn paths.codex-rs/core/src/tools/runtimes/shell/zsh_fork_backend.rsto expose the escalation socket fd through the spawn lifecycle.codex-rs/utils/pty/src/pty.rsandcodex-rs/utils/pty/src/pipe.rs, including Unix pre-exec fd pruning that preserves requested inherited fds while leavingFD_CLOEXECdescriptors alone. The pruning helper is now namedclose_inherited_fds_except()to better describe that behavior.codex-rs/shell-escalation/src/unix/escalate_client.rsto duplicate local stdio before transfer and send destination stdio numbers inSuperExecMessage, so the wrapper keeps using its ownstdin/stdout/stderruntil the escalated child takes over.codex-rs/shell-escalation/src/unix/escalate_server.rsso the server accepts the overlap case where a received fd reuses the same stdio descriptor number that the child setup will target withdup2.Verification
cargo test -p codex-utils-ptycargo test -p codex-shell-escalationdup2pathStack created with Sapling. Best reviewed with ReviewStack.