Merge remote-tracking branch 'origin/main' into agent/fix-ci-hermetic-vex-commons

# Conflicts:
#	crates/socket-patch-cli/tests/spawn_env_hygiene.rs

Author: claude

crates/socket-patch-cli/tests/common/cache_env.rs

@@ -318,8 +318,9 @@ fn scrub_parent_vars(cmd: &mut Command, parent: Vec<OsString>, ambient: fn(&str)
 
 // ── Ambient-env scrub for the vlt suites ──────────────────────────────
 
-/// True for an ambient variable the real-vlt suites strip from every child
-/// (vlt and the CLI under test) before [`isolate`]:
+/// True for an ambient variable the real-vlt suites strip from every vlt
+/// child before [`isolate`] (a `socket-patch` child built with
+/// `hermetic::command` takes [`scrub_ambient_vlt_tool_env`] instead):
 ///
 /// * every `VLT_*` — vlt reads each config option from `VLT_<OPTION>`
 ///   (`VLT_REGISTRY`, `VLT_REGISTRIES`, `VLT_CACHE`, `VLT_STORE_LINKER`);
@@ -343,6 +344,18 @@ pub fn scrub_ambient_vlt_env(cmd: &mut Command) {
     scrub_parent_vars(cmd, parent_var_names(), is_ambient_vlt_var);
 }
 
+/// [`is_ambient_vlt_var`] minus `SOCKET_*`.
+fn is_ambient_vlt_tool_var(name: &str) -> bool {
+    !name.starts_with("SOCKET_") && is_ambient_vlt_var(name)
+}
+
+/// [`scrub_ambient_vlt_env`] minus `SOCKET_*`, for a `socket-patch` child
+/// built with `hermetic::command`: the builder already handled `SOCKET_*`,
+/// and removing them again would undo the opt-outs it forces on.
+pub fn scrub_ambient_vlt_tool_env(cmd: &mut Command) {
+    scrub_parent_vars(cmd, parent_var_names(), is_ambient_vlt_tool_var);
+}
+
 // ── Self-tests ────────────────────────────────────────────────────────
 //
 // Integration-test crates do not get `cfg(test)`, so — exactly as in
@@ -454,6 +467,24 @@ mod cache_env_selftests {
         }
     }
 
+    /// The CLI-child variant keeps every `SOCKET_*`, so it never undoes
+    /// the opt-outs `hermetic::command` forces on, and still strips the
+    /// vlt, npm and Python config.
+    #[test]
+    fn ambient_vlt_tool_scrub_leaves_socket_vars_to_the_hermetic_builder() {
+        for name in [
+            "SOCKET_TELEMETRY_DISABLED",
+            "SOCKET_NO_UPDATE_CHECK",
+            "SOCKET_NO_CONFIG",
+            "SOCKET_API_TOKEN",
+        ] {
+            assert!(!is_ambient_vlt_tool_var(name), "{name} must survive");
+        }
+        for name in ["VLT_REGISTRY", "npm_config_registry", "VIRTUAL_ENV"] {
+            assert!(is_ambient_vlt_tool_var(name), "{name} must be scrubbed");
+        }
+    }
+
     #[test]
     fn ambient_vlt_scrub_removes_only_matching_parent_vars() {
         let parent = parent_var_names();

crates/socket-patch-cli/tests/spawn_env_hygiene.rs

@@ -55,9 +55,6 @@ const PENDING_RAW_SPAWNS: &[&str] = &[
     "vendor/in_process_vendor_bun.rs",
     "vendor/vendor_gem_lockfile_only_e2e.rs",
     "vendor/vendor_rerun_no_network_e2e.rs",
-    "vlt_e2e_common/mod.rs",
-    "vlt_hosted_common/mod.rs",
-    "vlt_vendor_common/mod.rs",
 ];
 
 /// The environment `cmd`'s child would see: the parent environment with

crates/socket-patch-cli/tests/vlt_e2e_common/mod.rs

@@ -1758,25 +1758,22 @@ pub fn urlencode(s: &str) -> String {
 
 // ── socket-patch ──────────────────────────────────────────────────────────
 
-/// The socket-patch binary with the ambient `SOCKET_*`, `VLT_*`, npm and
-/// proxy environment scrubbed.
+/// The socket-patch binary with the hermetic `SOCKET_*` environment (see
+/// `common::hermetic::command`) and the ambient `VLT_*`, npm and proxy
+/// environment scrubbed.
 pub fn socket_cmd() -> Command {
-    let mut cmd = Command::new(socket_bin());
-    cache_env::scrub_ambient_vlt_env(&mut cmd);
+    let mut cmd = common::hermetic::command(&socket_bin());
+    cache_env::scrub_ambient_vlt_tool_env(&mut cmd);
     for (key, _) in std::env::vars_os() {
         let name = key.to_string_lossy();
         if ["http_proxy", "https_proxy", "all_proxy", "no_proxy"]
             .iter()
             .any(|p| name.eq_ignore_ascii_case(p))
-            || name.starts_with("SOCKET_PATCH_VLT_E2E_")
         {
             cmd.env_remove(&key);
         }
     }
-    cmd.env("SOCKET_NO_CONFIG", "1")
-        .env("SOCKET_NO_UPDATE_CHECK", "1")
-        .env("SOCKET_TELEMETRY_DISABLED", "1")
-        .env("VLT_TELEMETRY", "0")
+    cmd.env("VLT_TELEMETRY", "0")
         .env("LANG", "C")
         .env("LC_ALL", "C");
     cmd

crates/socket-patch-cli/tests/vlt_hosted_common/mod.rs

@@ -91,6 +91,8 @@ pub fn with_flags(line: &str, flags: u8) -> String {
     line.replacen("[0,", &format!("[{flags},"), 1)
 }
 
+#[path = "../common/hermetic.rs"]
+mod hermetic;
 #[path = "../common/oracle.rs"]
 mod oracle;
 
@@ -418,32 +420,19 @@ pub fn ledger_path(root: &Path) -> PathBuf {
     root.join(".socket/vendor/redirect-state.json")
 }
 
-/// The `socket-patch` binary with the ambient `SOCKET_*` and proxy
-/// environment scrubbed (telemetry opt-outs kept).
+/// The `socket-patch` binary with the hermetic `SOCKET_*` environment (see
+/// `hermetic::command`) and the ambient proxy environment scrubbed.
 pub fn scrubbed_cli() -> std::process::Command {
-    let mut cmd = std::process::Command::new(env!("CARGO_BIN_EXE_socket-patch"));
-    cmd.env("SOCKET_DRY_RUN", "true")
-        .env("SOCKET_OFFLINE", "true")
-        .env("SOCKET_NO_VLT_INSTALL_CLEANUP", "true")
-        .env_remove("SOCKET_DRY_RUN")
-        .env_remove("SOCKET_OFFLINE")
-        .env_remove("SOCKET_NO_VLT_INSTALL_CLEANUP");
+    let mut cmd = hermetic::binary_command();
     for (key, _) in std::env::vars_os() {
         let name = key.to_string_lossy();
-        let proxy = name.eq_ignore_ascii_case("http_proxy")
-            || name.eq_ignore_ascii_case("https_proxy")
-            || name.eq_ignore_ascii_case("all_proxy")
-            || name.eq_ignore_ascii_case("no_proxy");
-        if proxy
-            || (name.starts_with("SOCKET_")
-                && !name.contains("TELEMETRY")
-                && name != "SOCKET_NO_CONFIG")
+        if ["http_proxy", "https_proxy", "all_proxy", "no_proxy"]
+            .iter()
+            .any(|p| name.eq_ignore_ascii_case(p))
         {
             cmd.env_remove(&key);
         }
     }
-    cmd.env("SOCKET_NO_CONFIG", "1")
-        .env("SOCKET_NO_UPDATE_CHECK", "1");
     cmd
 }
 

crates/socket-patch-cli/tests/vlt_vendor_common/mod.rs

@@ -18,6 +18,8 @@
 
 #![allow(dead_code)]
 
+#[path = "../common/hermetic.rs"]
+mod hermetic;
 #[path = "../prebuilt_common/mod.rs"]
 mod prebuilt_common;
 
@@ -347,34 +349,20 @@ pub fn capture_project(root: &Path, case: &Case) {
 
 // ── CLI ──────────────────────────────────────────────────────────────────
 
-/// The `socket-patch` binary with the ambient `SOCKET_*`, `VLT_*` and proxy
-/// environment scrubbed (telemetry disabled).
+/// The `socket-patch` binary with the hermetic `SOCKET_*` environment (see
+/// `hermetic::command`) and the ambient `VLT_*` and proxy environment
+/// scrubbed.
 pub fn cli() -> Command {
-    let mut cmd = Command::new(env!("CARGO_BIN_EXE_socket-patch"));
+    let mut cmd = hermetic::binary_command();
     for (key, _) in std::env::vars_os() {
-        let name = key.to_string_lossy().to_string();
+        let name = key.to_string_lossy();
         let proxy = ["http_proxy", "https_proxy", "all_proxy", "no_proxy"]
             .iter()
             .any(|p| name.eq_ignore_ascii_case(p));
-        if proxy
-            || name.starts_with("VLT_")
-            || (name.starts_with("SOCKET_") && name != "SOCKET_NO_CONFIG")
-        {
+        if proxy || name.starts_with("VLT_") {
             cmd.env_remove(&key);
         }
     }
-    for key in [
-        "SOCKET_OFFLINE",
-        "SOCKET_DRY_RUN",
-        "SOCKET_API_URL",
-        "SOCKET_PROXY_URL",
-        "SOCKET_NO_VLT_INSTALL_CLEANUP",
-    ] {
-        cmd.env_remove(key);
-    }
-    cmd.env("SOCKET_TELEMETRY_DISABLED", "1")
-        .env("SOCKET_NO_CONFIG", "1")
-        .env("SOCKET_NO_UPDATE_CHECK", "1");
     cmd
 }
 

crates/socket-patch-core/src/utils/poetry_lock.rs

@@ -33,7 +33,7 @@ pub(crate) fn package_files(package: &Table) -> Vec<&dyn TableLike> {
 
 /// The lock-wide `[metadata.files]` entry for package `name` (lock
 /// 1.0/1.1; keys compared PEP 503-canonical).
-pub(crate) fn metadata_files<'d>(lock: &'d DocumentMut, name: &str) -> Vec<&'d dyn TableLike> {
+pub(crate) fn metadata_files<'d>(lock: &'d Table, name: &str) -> Vec<&'d dyn TableLike> {
     let canon = canonicalize_pypi_name(name);
     let entry = lock
         .get("metadata")
@@ -52,6 +52,10 @@ pub(crate) fn metadata_files<'d>(lock: &'d DocumentMut, name: &str) -> Vec<&'d d
 /// Whether a `[metadata.files]` entry is laid out one file per line, which is
 /// how Poetry 1.0/1.1 write every NON-empty entry (tomlkit `multiline(True)`);
 /// an empty one is `[]`.
+///
+/// Reads the array's layout, so `item` must come from a `DocumentMut`: a
+/// read-only `toml_edit::Document` keeps layout as spans into its source
+/// and this would answer `false` for every entry.
 pub(crate) fn is_multiline_array(item: &Item) -> bool {
     item.as_array().is_some_and(|array| {
         let has_break = |raw: Option<&str>| raw.is_some_and(|s| s.contains('\n'));
@@ -135,13 +139,10 @@ fn multiline_files(files: Array) -> Item {
 /// bumps the minor additively — 2.0 → 2.1 kept every shape we rewrite, and the
 /// vendored loader already accepts newer minors with an advisory; the hosted
 /// path must not refuse what the vendored path accepts).
-pub fn lock_version(lock: &DocumentMut) -> Result<&str, String> {
-    lock_version_of(lock)
-}
-
-/// [`lock_version`] of a parsed lock's root table (a `DocumentMut` or a
-/// spanned `Document`).
-fn lock_version_of(lock: &Table) -> Result<&str, String> {
+///
+/// Takes the root table of either a `DocumentMut` or a read-only spanned
+/// `Document`.
+pub fn lock_version(lock: &Table) -> Result<&str, String> {
     let metadata = lock
         .get("metadata")
         .filter(|item| item.is_table_like())
@@ -616,7 +617,7 @@ fn rewrite_poetry_lock_batch(
         &names,
         |index, lock| {
             if version.is_none() {
-                *version = lock_version_of(lock).ok().map(str::to_string);
+                *version = lock_version(lock).ok().map(str::to_string);
             }
             let dep = &deps[index];
             let sha256 = checked_sha256(
@@ -690,7 +691,7 @@ fn plan_poetry_rewrite(
     source_url: &str,
     sha256: &str,
 ) -> Result<Option<PoetryLockPlan>, String> {
-    let format = lock_version_of(lock)?.to_string();
+    let format = lock_version(lock)?.to_string();
     if format == "0" && source_type == "url" {
         return Err("Poetry 0.x ignores URL sources; hosted patches require Poetry >= 1.0".into());
     }

crates/socket-patch-core/src/utils/python_lock.rs

@@ -34,7 +34,7 @@ impl ArtifactSource<'_> {
 /// (uv 0.2.x) or `package` (uv ≥ 0.2.35 and PEP 723 script locks). The
 /// lock inventory, lockfile discovery and `lock_inventory::
 /// wired_vendor_integrity` all pick the array with this one rule.
-pub(crate) fn lock_package_collection(doc: &DocumentMut) -> (&'static str, bool) {
+pub(crate) fn lock_package_collection(doc: &Table) -> (&'static str, bool) {
     if doc.contains_key("lock-version") {
         ("packages", true)
     } else if doc.contains_key("distribution") {

crates/socket-patch-core/src/vendor/lock_inventory/pypi.rs

@@ -6,7 +6,7 @@
 use std::path::Path;
 
 use serde_json::Value;
-use toml_edit::{DocumentMut, Item, TableLike};
+use toml_edit::{Item, Table, TableLike};
 
 use crate::crawlers::python_crawler::canonicalize_pypi_name;
 use crate::formats::text::strip_bom;
@@ -326,7 +326,8 @@ pub(super) fn portable_wheel_artifact(
 }
 
 pub(super) fn python_lock_inventory(text: &str) -> Option<Vec<LockfileEntry>> {
-    let document: DocumentMut = text.parse().ok()?;
+    // Read-only parse, as in lockfile discovery (`toml_or_diag`, #1473).
+    let document = toml_edit::Document::parse(text).ok()?;
     let (collection, pep751) = lock_package_collection(&document);
     // Only the lock formats the fetch layer understands.
     let supported = if pep751 {
@@ -395,7 +396,7 @@ pub(super) fn python_lock_inventory(text: &str) -> Option<Vec<LockfileEntry>> {
 /// can be chosen there). A lock that is not TOML contributes nothing.
 async fn inventory_poetry_lock(view: &ProjectView<'_>) -> Option<Vec<LockfileEntry>> {
     let text = view.read_text("poetry.lock").await.ok()?;
-    let document: DocumentMut = text.parse().ok()?;
+    let document = toml_edit::Document::parse(text.as_str()).ok()?;
     let pure_wheel_sha = |files: Vec<&dyn TableLike>| {
         files.into_iter().find_map(|entry| {
             let file = entry.get("file")?.as_str()?;
@@ -429,7 +430,7 @@ async fn inventory_poetry_lock(view: &ProjectView<'_>) -> Option<Vec<LockfileEnt
 
 /// `(canonical name, version, purl, table)` of every path-safe `[[package]]`
 /// of a poetry.lock / pdm.lock document.
-fn toml_package_coords(document: &DocumentMut) -> Vec<(String, String, String, &toml_edit::Table)> {
+fn toml_package_coords(document: &Table) -> Vec<(String, String, String, &Table)> {
     let Some(packages) = document.get("package").and_then(Item::as_array_of_tables) else {
         return Vec::new();
     };
@@ -588,7 +589,7 @@ async fn inventory_pipfile_lock(view: &ProjectView<'_>) -> Option<Vec<LockfileEn
 /// does not probe, so a lock-only vendored path would not survive a re-scan.
 async fn inventory_pdm_lock(view: &ProjectView<'_>) -> Option<Vec<LockfileEntry>> {
     let text = view.read_text("pdm.lock").await.ok()?;
-    let document: DocumentMut = text.parse().ok()?;
+    let document = toml_edit::Document::parse(text.as_str()).ok()?;
     let out: Vec<LockfileEntry> = toml_package_coords(&document)
         .into_iter()
         .map(|(name, version, purl, _)| LockfileEntry {

crates/socket-patch-core/src/vex/discover/cargo.rs

@@ -312,7 +312,7 @@ async fn read_toml(ctx: &DiscoverCtx<'_>, file: &str, out: &mut Discovery) -> Op
 }
 
 fn parse_toml(file: &str, text: &str, out: &mut Discovery) -> Option<DocumentMut> {
-    toml_or_diag(file, text, TomlDiag::TrimEnd, out)
+    toml_or_diag(file, text, TomlDiag::TrimEnd, out).map(toml_edit::Document::into_mut)
 }
 
 /// The config file cargo actually reads ([`effective_config_rel_in`]), parsed,