Fix Windows PTY teardown by preserving ConPTY ownership#20685
Merged
Conversation
Collaborator
Author
|
@codex review |
Collaborator
Author
|
@codex review |
Contributor
|
Codex Review: Didn't find any major issues. Swish! ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
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". |
jif-oai
approved these changes
May 4, 2026
…owner-teardown-fix
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.
Why
On Windows, background terminals could stay visible after their shell process had already exited. The elevated runner waits for the PTY output reader to reach EOF before it sends the final exit message, but the ConPTY helper was reducing ownership down to raw handles too early. That left the pseudoconsole's borrowed pipe handles alive past teardown, so EOF never propagated and the session stayed
running.What changed
utils/pty/src/win/conpty.rsto hand off owned ConPTY resources instead of leaking only raw handleswindows-sandbox-rs/src/conpty/mod.rskeep the pseudoconsole owner and the backing pipe handles together until teardownConptyInstancealive, take only the specific pipe handles they need, and drop the owner at teardown instead of trying to close a detached pseudoconsole handle laterTesting
Auto-review: 11 xcmd /c "ping -n 3 google.com"all exited cleanly and did not accumulate in the UIAuto-review: 5 xcmd /c "ping -n 30 google.com"appeared in the UI and drained back out on their own