Skip to content

fix(rust): reap spawned process trees #2292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lukehoban wants to merge 2 commits into
base: main
Choose a base branch
from
+913 −60
Open

fix(rust): reap spawned process trees #2292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ac6b1f
fix(rust): reap spawned process trees
lukehoban Aug 7, 2026
0f89915
style(rust): group Windows process imports
lukehoban Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions rust/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,18 @@ reqwest = { version = "0.12", default-features = false, features = ["stream", "h
tokio-tungstenite = { version = "0.24", default-features = false, features = ["connect", "native-tls"] }

[target.'cfg(windows)'.dependencies]
windows-sys = { version = "0.61", features = [
"Win32_Foundation",
"Win32_Security",
"Win32_System_Diagnostics_ToolHelp",
"Win32_System_JobObjects",
"Win32_System_Threading",
] }
zip = { version = "2", default-features = false, features = ["deflate"], optional = true }

[target.'cfg(unix)'.dependencies]
libc = "0.2"

[dev-dependencies]
rusqlite = { version = "0.35", features = ["bundled"] }
schemars = "1"
Expand Down
12 changes: 6 additions & 6 deletions rust/src/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,11 +396,11 @@ fn capture_backtrace() -> Option<Box<Backtrace>> {
/// Aggregate of errors collected during [`crate::Client::stop`].
///
/// `Client::stop` performs cooperative shutdown across every active
/// session before killing the CLI child process. Errors from any
/// per-session `session.destroy` RPC and from the terminal child-kill
/// step are collected here rather than short-circuiting on the first
/// failure, so callers see the full picture of what went wrong during
/// teardown.
/// session before terminating and reaping the SDK-owned CLI process tree.
/// Errors from any per-session `session.destroy` RPC and from the terminal
/// process-tree teardown are collected here rather than short-circuiting on
/// the first failure, so callers see the full picture of what went wrong
/// during teardown.
///
/// Implements [`std::error::Error`] and forwards to `Display` for the
/// first error, with a count suffix when there are more.
Expand All @@ -409,7 +409,7 @@ pub struct StopErrors(pub(crate) Vec<Error>);

impl StopErrors {
/// Borrow the collected errors as a slice, in the order they
/// occurred (per-session destroys first, then child-kill last).
/// occurred (per-session destroys first, then process-tree teardown).
pub fn errors(&self) -> &[Error] {
&self.0
}
Expand Down
Loading
Loading