running-process 4.5.5__tar.gz → 4.5.8__tar.gz

{running_process-4.5.5 → running_process-4.5.8}/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.5"
+version = "4.5.8"
 dependencies = [
  "anyhow",
  "blake3",
@@ -1332,9 +1388,41 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "running-process-observer"
+version = "4.5.8"
+dependencies = [
+ "blake3",
+ "dirs",
+ "tempfile",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "running-process-observer-interposer-linux"
+version = "4.5.8"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "running-process-observer-interposer-macos"
+version = "4.5.8"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "running-process-observer-interposer-windows"
+version = "4.5.8"
+dependencies = [
+ "retour",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "running-process-py"
-version = "4.5.5"
+version = "4.5.8"
 dependencies = [
  "interprocess",
  "libc",
@@ -1346,6 +1434,13 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "running-process-win-gnu-bridge"
+version = "4.5.8"
+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.5 → running_process-4.5.8}/Cargo.toml

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

{running_process-4.5.5 → running_process-4.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: running_process
-Version: 4.5.5
+Version: 4.5.8
 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.5 → running_process-4.5.8}/crates/running-process/build.rs

@@ -10,6 +10,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("cargo:rerun-if-changed=proto/broker_v1/broker_v1_service_def.proto");
     println!("cargo:rerun-if-changed=proto/broker_v2/broker_v2_service_def.proto");
     println!("cargo:rerun-if-changed=proto/broker_v2/broker_v2_control.proto");
+    println!("cargo:rerun-if-changed=proto/broker_v2/broker_v2_manifest.proto");
     println!("cargo:rerun-if-changed=build.rs");
     let file_descriptors = protox::compile(
         [
@@ -20,6 +21,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             "proto/broker_v1/broker_v1_service_def.proto",
             "proto/broker_v2/broker_v2_service_def.proto",
             "proto/broker_v2/broker_v2_control.proto",
+            "proto/broker_v2/broker_v2_manifest.proto",
         ],
         ["proto/"],
     )?;

running_process-4.5.8/crates/running-process/proto/broker_v2/broker_v2_manifest.proto

@@ -0,0 +1,133 @@
+// running-process v2 broker — cache manifest schema.
+//
+// v2 supersedes the v1 cache manifest (`broker_v1_manifest.proto`,
+// FROZEN FOREVER per #228). The v2 schema lives in its own package so the
+// two coexist during rollout; consumers opt in to v2 individually.
+//
+// Persistence layout mirrors v1:
+//   1. Inside daemon's cache root: `<cache_root>/.running-process-manifest.v2.pb`
+//   2. In central registry: `<broker_state>/manifests/{service}-{version}.v2.pb`
+//
+// The `.v2` suffix on the on-disk file lets a v1 broker and a v2 broker
+// coexist without misreading each other's manifests.
+//
+// Field-number policy: numbers used by v1 are reused here for diff
+// legibility (service_name=1, service_version=2, etc.). v2-only fields
+// (none yet at slice 23-A) start at 200 to leave room for backports
+// of mid-range v1 expansions.
+//
+// Slice 23-A of zackees/zccache#782: this slice introduces only the
+// fields downstream consumers (zccache) write today — `service_name`,
+// `service_version`, `created_at_unix_ms`, `last_active_unix_ms`,
+// `broker_envelope_version`, `broker_instance`, `bundle_id`, and the
+// `roots` list with the [`CacheRootKind`] enum. The HostIdentity /
+// Operation / observability v1 fields land in follow-up slices once a
+// v2 broker actually consumes them. Per proto3 forward-compat, adding
+// fields later is non-breaking for existing consumers.
+
+syntax = "proto3";
+package running_process.broker.v2;
+
+// One cache root the daemon exposes. v2 mirrors v1's shape so the
+// CacheManifestBuilder API is identical at the call site.
+message CacheRoot {
+  // Logical role of this root (see [`CacheRootKind`]).
+  CacheRootKind kind = 1;
+
+  // Canonical absolute path on the daemon's host.
+  string path = 2;
+}
+
+// Logical role classification for cache roots. Wire values mirror v1's
+// `broker_v1.CacheRootKind` EXACTLY (see `broker_v1_manifest.proto`).
+// Keeping the integer values aligned avoids subtle bugs when consumers
+// mix the two generations (e.g. via `as i32` casts in test fixtures or
+// in code that bridges between v1 and v2). New kinds land in the
+// reserved range; v1's enum is FROZEN so anything past 9 is v2-only.
+enum CacheRootKind {
+  // Unknown / unset (proto3 zero value). Consumers MUST treat this as
+  // "ignore" rather than a real cache role.
+  CACHE_ROOT_KIND_UNSPECIFIED = 0;
+
+  // Primary cache data (the largest root; sccache-style content store).
+  CACHE_DATA = 1;
+
+  // Log directory (daemon stderr / structured event log).
+  CACHE_LOGS = 2;
+
+  // PID files, lock files, sockets, manifests, identity JSON.
+  CACHE_LOCKS = 3;
+
+  // Copied daemon binaries (relocated install destination).
+  CACHE_RUNTIME = 4;
+
+  // Temporary / ephemeral working tree (artifact build scratch,
+  // depfile staging, repeatedly emptied).
+  CACHE_TMP = 5;
+
+  // User config (do NOT prune).
+  CACHE_CONFIG = 6;
+
+  // Separately bounded index (redb, depgraph snapshot, compile journal).
+  CACHE_INDEX = 7;
+
+  // WAL files needing separate fsync semantics.
+  CACHE_JOURNAL = 8;
+
+  // API keys / tokens. mode 0600. NEVER LOGGED.
+  CACHE_SECRETS = 9;
+
+  // v2-only future kinds live here.
+  reserved 10 to 20;
+}
+
+// v2 cache manifest envelope.
+//
+// Carries the daemon's identity (service + version), heartbeat
+// timestamps, and the list of cache roots brokers care about.
+// `broker_envelope_version` is "v2" for files written under this
+// schema.
+//
+// Field numbers shared with v1 (service_name=1, service_version=2,
+// broker_envelope_version=3, created_at_unix_ms=4, last_active_unix_ms=5,
+// roots=10, broker_instance=40, bundle_id=70) keep the human-readable
+// diff between v1 and v2 manifests obvious and make the consumer-side
+// migration mechanical.
+message CacheManifest {
+  // Service this manifest describes. Same validation as
+  // ServiceDefinition.service_name.
+  string service_name = 1;
+
+  // Semver of the daemon binary that wrote this manifest.
+  string service_version = 2;
+
+  // Always "v2" for files written under this schema. Pinning this in
+  // the proto rather than relying on the file extension alone lets a
+  // broker mis-route detection work even when the file has been
+  // renamed.
+  string broker_envelope_version = 3;
+
+  // Unix-ms timestamp the daemon first wrote this manifest.
+  uint64 created_at_unix_ms = 4;
+
+  // Unix-ms timestamp of the daemon's last heartbeat write.
+  uint64 last_active_unix_ms = 5;
+
+  // Cache roots the daemon exposes for broker-side discovery
+  // (eviction, observability, etc.). Order is not significant.
+  repeated CacheRoot roots = 10;
+
+  // Broker instance label this daemon is registered under. Empty for
+  // private brokers; mirrors `ServiceDefinition.explicit_instance`
+  // for shared-broker deployments.
+  string broker_instance = 40;
+
+  // Opaque bundle identifier for deployments that ship multiple
+  // related services. Empty when unused.
+  string bundle_id = 70;
+
+  // Field numbers reserved for v1 fields that will be backported in
+  // subsequent slices (HostIdentity, Operation, observability,
+  // dependencies, cleanup policy, current_daemon).
+  reserved 20, 30, 50, 51, 60, 100 to 199;
+}

running_process-4.5.8/crates/running-process/proto/broker_v2/broker_v2_service_def.proto

@@ -0,0 +1,118 @@
+// running-process v2 broker — service definition schema.
+//
+// v2 supersedes the v1 service definition (`broker_v1_service_def.proto`,
+// FROZEN FOREVER per #228). The v2 schema lives in its own package so the
+// two coexist during rollout; consumers opt in to v2 individually.
+//
+// Service-definition files live in the same per-OS directories the v1
+// loader uses; the v2 broker resolves them via a v2-specific extension
+// (e.g. `.servicedef.v2`) so a v1 broker never reads a v2 file by mistake.
+//
+// This file currently introduces the `HttpServerCapability` optional
+// sub-message defined in #483 plus the minimum `ServiceDefinition`
+// envelope required to attach it. Additional v2 fields (version mode,
+// update backend, broker port mode wiring) land in their own slices.
+
+syntax = "proto3";
+package running_process.broker.v2;
+
+// Optional per-backend HTTP server capability.
+//
+// A backend declares HTTP support by setting this field on its
+// `ServiceDefinition`. Absence of the field means the backend serves no
+// HTTP surface; presence is the capability advertisement. v2 uses
+// structured fields for capabilities rather than the v1 `u64` Hello
+// bitmap (`broker/capabilities.rs`, frozen forever per #228) so new
+// capabilities never collide with frozen v1 bit assignments.
+//
+// Port assignment is NOT carried here. The daemon binds `127.0.0.1:0`
+// at startup and reports its OS-assigned port to the broker via the
+// existing broker↔daemon control channel (see #483 §2). The fields
+// below describe what the backend exposes once it has bound a port.
+message HttpServerCapability {
+  // Loopback IP the backend will bind. Default `127.0.0.1` when empty.
+  // The broker enforces deploy-time bind policy (env-overridden in
+  // container deployments) so backends that try to bind elsewhere
+  // without authorization are still constrained by the surrounding
+  // environment.
+  string bind_addr = 1;
+
+  // Health-check path served by the backend. Default `/health` when
+  // empty. The aggregator polls this to gate the iframe `src` swap.
+  string health_path = 2;
+
+  // Human-readable label shown in the aggregator selector. Default to
+  // the service name when empty.
+  string display_name = 3;
+}
+
+// Broker isolation mode for a service.
+//
+// Mirrors v1's `BrokerIsolation` enum (`broker_v1_service_def.proto`)
+// so v2 service definitions can carry the same trust-grouping semantics
+// the v1 broker has used since #228. New isolation modes (if any) land
+// here; v1's enum is FROZEN FOREVER.
+enum BrokerIsolation {
+  // DEFAULT - safe; private broker per service. Third-party consumers
+  // get isolation automatically with zero ceremony.
+  PRIVATE_BROKER = 0;
+
+  // Opt-in to per-user shared broker. Recommended for first-party tools
+  // that benefit from shared infrastructure + cross-service ops.
+  SHARED_BROKER = 1;
+
+  // Named broker instance, e.g. "ci-trusted" / "ci-untrusted" for
+  // explicit trust grouping.
+  EXPLICIT_INSTANCE = 2;
+}
+
+// v2 service definition envelope.
+//
+// Carries the service identity, the launcher / isolation policy shared
+// with v1, and the new v2-only capability fields. The fields shared
+// with v1 (binary_path, isolation, etc.) intentionally use the same
+// field numbers as `broker_v1.ServiceDefinition` (2–8) to keep the
+// human-readable diff between the two messages obvious and to make
+// the v1 → v2 migration a literal field-by-field move on the consumer
+// side. New v2-only fields start at 10 (http_server) and grow upward.
+message ServiceDefinition {
+  // [a-z0-9-]{1,64}; same validation rules as v1.
+  string service_name = 1;
+
+  // Canonical path to the backend binary. v1: `binary_path` (field 2).
+  // Pre-#522 v2 brokers ignored this; consumers populating the field on
+  // a pre-#522 broker get the v2 envelope round-trip but the broker
+  // can't launch from the path until upgraded.
+  string binary_path = 2;
+
+  // Broker isolation mode. v1: `BrokerIsolation` (field 3). Defaults
+  // to `PRIVATE_BROKER` (proto3 zero value) when absent.
+  BrokerIsolation isolation = 3;
+
+  // Used only when `isolation == EXPLICIT_INSTANCE`. v1: `explicit_instance`
+  // (field 4). Ignored for other isolation modes.
+  string explicit_instance = 4;
+
+  // Canonicalized allow-list root for backends. v1: `per_version_binary_dir`
+  // (field 5). The broker refuses any `binary_path` that does not resolve
+  // under this directory.
+  string per_version_binary_dir = 5;
+
+  // Semver floor — broker refuses any Hello whose `wanted_version` is
+  // below this. v1: `min_version` (field 6). Empty => no floor.
+  string min_version = 6;
+
+  // Optional strict pin list. v1: `version_allow_list` (field 7). When
+  // non-empty, the broker refuses any Hello whose `wanted_version` is
+  // not in this list. Use sparingly — `min_version` is the common case.
+  repeated string version_allow_list = 7;
+
+  // Arbitrary key/value labels (deployment hints, A/B routing tags, …).
+  // v1: `labels` (field 8). Broker does not interpret these; they are
+  // surfaced verbatim to consumers via the existing reflection APIs.
+  map<string, string> labels = 8;
+
+  // Optional HTTP server capability. Absent => backend serves no HTTP.
+  // v2-only field; v1 has no HTTP-server concept.
+  optional HttpServerCapability http_server = 10;
+}

running_process-4.5.8/crates/running-process/src/bin/README.md

@@ -0,0 +1,39 @@
+# `src/bin` — running-process binaries
+
+Five binaries ship from this crate. Each has a different feature gate and
+runtime role.
+
+## Binaries
+
+| binary | what it does | feature gate |
+|---|---|---|
+| `running-process-daemon` | The per-user daemon that owns process state, accepts CLI requests, manages backend lifecycle | `daemon` (requires `client` + `client-async`) |
+| `runpm` | The user-facing CLI — list / kill / inspect tracked processes | `client` |
+| `running-process-broker-v1` | v1 broker — FROZEN per #228; admin RPCs, serve modes, doctor checks (514 LOC) | `client` |
+| `running-process-broker-v2` | v2 broker — accept loop + ServiceDefinitionLoader integration (running-process#532 slice 1) | `client` |
+| `running-process-cleanup` | Standalone manifest-registry GC tool | `client` |
+| `daemon-trampoline` | Detach-on-spawn helper (no required features) | — |
+
+## v1 ↔ v2 broker coexistence
+
+`running-process-broker-v1` is FROZEN FOREVER per #228 — kept verbatim
+for ecosystem stability. `running-process-broker-v2` is the forward
+path: same wire envelope (`broker::protocol` types reused) but a
+distinct pipe namespace (`rpb-v2-<program>-<sid>-<idx>` via
+`names_v2`) so the two brokers can run side-by-side on the same host.
+
+The v2 broker reads `.servicedef.v2` files via
+`broker::protocol_v2::ServiceDefinitionLoader` (slice 23-C of
+zccache#782) — the read-side complement to consumers'
+`ServiceDefinitionBuilder::install()` writes (slice 22b). Both file
+extensions cohabit the same per-OS service-definition directory; each
+broker picks the matching file via extension.
+
+## Conventions
+
+- Every binary's `main()` is `fn main() -> ExitCode` (no panics on
+  startup; print a diagnostic to stderr + return non-zero).
+- CLI parsing is intentionally hand-rolled (no `clap` here) so the
+  startup path stays allocation-light + fast.
+- `--no-bind` / `--once` flags exist for integration tests on
+  binaries that bind sockets.