running-process 4.5.7__tar.gz → 4.5.9__tar.gz

{running_process-4.5.7 → running_process-4.5.9}/Cargo.lock

@@ -561,6 +561,15 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
+[[package]]
+name = "iced-x86"
+version = "1.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c447cff8c7f384a7d4f741cfcff32f75f3ad02b406432e8d6c878d56b1edf6b"
+dependencies = [
+ "lazy_static",
+]
+
 [[package]]
 name = "icu_collections"
 version = "2.2.0"
@@ -827,6 +836,15 @@ dependencies = [
  "logos-codegen",
 ]
 
+[[package]]
+name = "mach2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "matchers"
 version = "0.2.0"
@@ -875,6 +893,16 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "mmap-fixed-fixed"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0681853891801e4763dc252e843672faf32bcfee27a0aa3b19733902af450acc"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "multimap"
 version = "0.10.1"
@@ -1279,6 +1307,34 @@ version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
 
+[[package]]
+name = "region"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6b6ebd13bc009aef9cd476c1310d49ac354d36e240cf1bd753290f3dc7199a7"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+ "mach2",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "retour"
+version = "0.4.0-alpha.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ead4bc8e12d553ff70769c5f5c21f5f4f0e73c0018068a6bb5a3d7d3b9e57ec7"
+dependencies = [
+ "cfg-if",
+ "generic-array",
+ "iced-x86",
+ "libc",
+ "mmap-fixed-fixed",
+ "once_cell",
+ "region",
+ "slice-pool2",
+]
+
 [[package]]
 name = "ring"
 version = "0.17.14"
@@ -1295,7 +1351,7 @@ dependencies = [
 
 [[package]]
 name = "running-process"
-version = "4.5.7"
+version = "4.5.9"
 dependencies = [
  "anyhow",
  "blake3",
@@ -1332,9 +1388,41 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "running-process-observer"
+version = "4.5.9"
+dependencies = [
+ "blake3",
+ "dirs",
+ "tempfile",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "running-process-observer-interposer-linux"
+version = "4.5.9"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "running-process-observer-interposer-macos"
+version = "4.5.9"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "running-process-observer-interposer-windows"
+version = "4.5.9"
+dependencies = [
+ "retour",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "running-process-py"
-version = "4.5.7"
+version = "4.5.9"
 dependencies = [
  "interprocess",
  "libc",
@@ -1346,6 +1434,13 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "running-process-win-gnu-bridge"
+version = "4.5.9"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "rusqlite"
 version = "0.32.1"
@@ -1559,6 +1654,12 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
+[[package]]
+name = "slice-pool2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a3d689654af89bdfeba29a914ab6ac0236d382eb3b764f7454dde052f2821f8"
+
 [[package]]
 name = "smallvec"
 version = "1.15.1"

{running_process-4.5.7 → running_process-4.5.9}/Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/running-process", "crates/running-process-py", "crates/test-watchdog"]
 
 [workspace.package]
-version = "4.5.7"
+version = "4.5.9"
 edition = "2021"
 rust-version = "1.85"
 license = "BSD-3-Clause"

{running_process-4.5.7 → running_process-4.5.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: running_process
-Version: 4.5.7
+Version: 4.5.9
 License-File: LICENSE
 Summary: A Rust-backed subprocess wrapper with split stdout/stderr streaming
 Home-Page: https://github.com/zackees/running-process

{running_process-4.5.7 → running_process-4.5.9}/crates/running-process/Cargo.toml

@@ -66,7 +66,8 @@ required-features = ["client"]
 
 [features]
 # Final feature scheme per #165:
-# * `core`   — always-available API (spawn / pty / containment).
+# * `core`   — always-available API (spawn / containment).
+# * `pty`    — PTY-backed process APIs.
 # * `client` — adds proto types + IPC client (prost, interprocess, dirs).
 # * `telemetry` — tee sink primitives without the full daemon runtime.
 # * `daemon`    — superset of client; adds the full daemon runtime
@@ -74,16 +75,13 @@ required-features = ["client"]
 # Default ships `client` so `cargo install running-process` installs
 # the `runpm` binary out of the box (per Q1 resolution in #165:
 # `required-features` are not auto-activated by cargo install).
-default = ["client"]
+default = ["client", "pty", "conpty-sidecar"]
 core = []
 telemetry = []
+pty = ["dep:portable-pty"]
 client = [
     "dep:prost", "dep:prost-types", "dep:interprocess", "dep:dirs",
     "dep:anyhow", "dep:clap", "dep:blake3", "dep:sha2", "dep:getrandom",
-    # #445: Windows-only sidecar self-acquisition. These deps live under
-    # `[target.'cfg(windows)'.dependencies]` so enabling the feature on
-    # non-Windows targets is a cargo-level no-op for them.
-    "dep:ureq", "dep:zstd", "dep:tar",
     # Phase 5 of #222 (#428): the `runpm` CLI parses `runpm.toml` batch
     # config files (`[[app]]` entries). The TOML parsing helpers live
     # in `src/runpm_config.rs` and are exercised by both the binary
@@ -93,6 +91,15 @@ client = [
     # the same dep transitively.
     "dep:toml",
 ]
+# #445: Windows-only ConPTY sidecar self-acquisition. Kept in the default
+# feature set for compatibility, but split from `client` so broker-only
+# consumers can use `default-features = false, features = ["client"]`
+# without pulling a second HTTP/TLS stack.
+conpty-sidecar = [
+    "pty",
+    "dep:dirs", "dep:sha2",
+    "dep:ureq", "dep:zstd", "dep:tar",
+]
 # Opt-in async client surface for tokio daemons (#414). Adds async
 # variants of `BackendHandle::probe_with_service` and `FrameClient`
 # on top of the existing blocking surface. The synchronous probe and
@@ -108,6 +115,7 @@ client-async = [
 daemon = [
     "client",
     "client-async",
+    "pty",
     "interprocess/tokio",
     "dep:tokio", "dep:tokio-util", "dep:bytes", "dep:futures-util",
     "tokio/full",
@@ -127,7 +135,7 @@ test-support = ["client"]
 
 [dependencies]
 libc = "0.2"
-portable-pty = "0.9"
+portable-pty = { version = "0.9", optional = true }
 sysinfo = "0.30"
 thiserror = { workspace = true }
 winapi = { version = "0.3", features = ["errhandlingapi", "fileapi", "handleapi", "ioapiset", "jobapi2", "namedpipeapi", "processthreadsapi", "winnt", "minwindef", "windef", "winuser", "consoleapi", "processenv", "synchapi", "winbase", "wincon", "tlhelp32", "securitybaseapi", "winerror", "sysinfoapi"] }
@@ -216,9 +224,8 @@ windows-sys = { version = "0.59", features = [
 # #445: transparent Win10 ConPTY sidecar self-acquisition. The runtime
 # fetches a per-arch zstd-19 compressed tarball from this crate's
 # matching GitHub release on first ConPTY use, caches it, and loads
-# `conpty.dll` from there. Gated optional and pulled in by the `client`
-# feature (which also enables `dirs` for cache-path discovery). ureq
-# uses rustls so we don't drag in a C OpenSSL build on Windows.
+# `conpty.dll` from there. Gated optional behind `conpty-sidecar`.
+# ureq uses rustls so we don't drag in a C OpenSSL build on Windows.
 ureq = { version = "2", default-features = false, features = ["tls"], optional = true }
 zstd = { version = "0.13", default-features = false, optional = true }
 tar = { version = "0.4", default-features = false, optional = true }

{running_process-4.5.7 → running_process-4.5.9}/crates/running-process/src/bin/running-process-broker-v2.rs

@@ -432,10 +432,19 @@ fn build_hello_reply(hello: &Hello, loader: &ServiceDefinitionLoader) -> HelloRe
     // 3. Happy path. Empty backend_pipe; real adopt-forwarding is a
     //    follow-up slice. The peer can still observe the Negotiated
     //    reply + the registered binary_path via subsequent control RPCs.
+    //
+    // `daemon_version` reports the **broker binary's own version**, not
+    // `definition.min_version`. Min-version is a per-service floor
+    // expressed *by* the service definition; daemon_version is the
+    // running broker's actual version — they are unrelated. Using
+    // min_version here regressed the original behavior (see PR #533's
+    // diff) and yields an empty string for any servicedef that
+    // doesn't explicitly opt in to a floor, which violates the test's
+    // and the proto's "non-empty" expectation.
     HelloReply {
         result: Some(hello_reply::Result::Negotiated(Negotiated {
             negotiated_protocol: ENVELOPE_VERSION as u32,
-            daemon_version: definition.min_version.clone(),
+            daemon_version: env!("CARGO_PKG_VERSION").into(),
             backend_pipe: String::new(),
             warnings: Vec::new(),
             server_capabilities: 0,
@@ -718,9 +727,18 @@ mod tests {
     }
 
     #[test]
-    fn is_already_bound_error_does_not_misclassify_permission_denied() {
+    fn is_already_bound_error_classifies_permission_denied() {
+        // PR #536 deliberately added `PermissionDenied` to the
+        // is_already_bound_error matcher: on Windows, a double-bind
+        // surfaces as `ERROR_ACCESS_DENIED` (raw os error 5) because
+        // the existing pipe instance's ACL blocks the second bind —
+        // not as `AddrInUse`. This test was added in PR #534 before
+        // that classification was widened, expecting the negation;
+        // PR #536 updated the impl but forgot the test, which then
+        // cascade-failed every CI run until this fix. Rename +
+        // invert to match the now-current contract.
         let err = std::io::Error::new(std::io::ErrorKind::PermissionDenied, "denied");
-        assert!(!is_already_bound_error(&err));
+        assert!(is_already_bound_error(&err));
     }
 
     #[test]

{running_process-4.5.7 → running_process-4.5.9}/crates/running-process/src/lib.rs

@@ -92,6 +92,7 @@ pub mod telemetry;
 #[cfg(feature = "daemon")]
 /// Daemon runtime APIs and helpers enabled by the `daemon` feature.
 pub mod daemon;
+#[cfg(feature = "pty")]
 /// PTY-backed process APIs.
 pub mod pty;
 mod public_symbols;
@@ -134,7 +135,7 @@ pub(crate) use helpers::{exit_code, feed_chunk, kill_drain_deadline, log_spawned
 pub use unix::{unix_set_priority, unix_signal_process, unix_signal_process_group, UnixSignal};
 #[cfg(windows)]
 pub(crate) use windows::{
-    assign_child_to_windows_kill_on_close_job_impl, windows_priority_flags, CapturePipeHandles,
+    assign_child_to_windows_kill_on_close_job_impl, windows_creation_flags, CapturePipeHandles,
     WindowsJobHandle,
 };
 
@@ -324,9 +325,48 @@ impl NativeProcess {
         if let Some(emitter) = self.shared.observer.as_ref() {
             emitter.emit_started(child.id());
         }
+        // #539 slice 2: when the observer requests EventCategory::Process,
+        // associate an IOCP with the per-spawn Job Object so a pump thread
+        // can forward descendant lifecycle events. The Lifecycle category
+        // is still served by emit_started / emit_exited above and below.
         #[cfg(windows)]
-        let job = public_symbols::rp_assign_child_to_windows_kill_on_close_job_public(&child)
-            .map_err(ProcessError::Spawn)?;
+        let job = {
+            let descendant_sink = self
+                .shared
+                .observer
+                .as_ref()
+                .and_then(|e| e.descendant_sink());
+            let direct_pid = child.id();
+            public_symbols::rp_assign_child_to_windows_kill_on_close_job_with_observer_public(
+                &child,
+                descendant_sink,
+                direct_pid,
+            )
+            .map_err(ProcessError::Spawn)?
+        };
+        // #539 slice 5: Linux descendant lifecycle via PR_SET_CHILD_SUBREAPER
+        // + /proc polling pump. No-admin, polling-based — see
+        // observer::descendants_linux module docs for tradeoffs.
+        #[cfg(target_os = "linux")]
+        {
+            if let Some(emitter) = self.shared.observer.as_ref() {
+                if let Some(sink) = emitter.descendant_sink() {
+                    crate::observer::descendants_linux::enable_subreaper();
+                    crate::observer::descendants_linux::spawn_pump(child.id(), sink);
+                }
+            }
+        }
+        // #539 slice 7: macOS descendant lifecycle via kqueue + EVFILT_PROC
+        // + NOTE_TRACK. Fully event-driven (no polling) — see
+        // observer::descendants_macos module docs for tradeoffs.
+        #[cfg(target_os = "macos")]
+        {
+            if let Some(emitter) = self.shared.observer.as_ref() {
+                if let Some(sink) = emitter.descendant_sink() {
+                    crate::observer::descendants_macos::spawn_pump(child.id(), sink);
+                }
+            }
+        }
         if self.config.capture {
             let stdout = child.stdout.take().expect("stdout pipe missing");
             let stderr = child.stderr.take().expect("stderr pipe missing");
@@ -977,19 +1017,15 @@ impl NativeProcess {
         {
             use std::os::windows::process::CommandExt;
 
-            // CREATE_NEW_PROCESS_GROUP makes GenerateConsoleCtrlEvent
-            // with CTRL_BREAK_EVENT route to this child's group
-            // (rather than the daemon's group) — required for the
-            // pipe-session soft-signal path on Windows (#130 M4).
-            const CREATE_NEW_PROCESS_GROUP: u32 = 0x0000_0200;
-            let extra = if self.config.create_process_group {
-                CREATE_NEW_PROCESS_GROUP
-            } else {
-                0
-            };
-            let flags = self.config.creationflags.unwrap_or(0)
-                | extra
-                | windows_priority_flags(self.config.nice);
+            // #584: defaults to CREATE_NO_WINDOW so a console child spawned
+            // by the window-less daemon does not flash a console window,
+            // while preserving the caller's console opinion, priority, and
+            // CREATE_NEW_PROCESS_GROUP bits. See `windows_creation_flags`.
+            let flags = windows_creation_flags(
+                self.config.creationflags,
+                self.config.create_process_group,
+                self.config.nice,
+            );
             if flags != 0 {
                 command.creation_flags(flags);
             }