cleanup pass, wip

Author: mikolalysenko

.gitignore

@@ -5,6 +5,7 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
+*.DS_Store
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
@@ -151,3 +152,4 @@ pypi/socket-patch/README.md
 
 # Generated by scripts/study-crates.ts
 study-output/
+simplify-output/

crates/.DS_Store

@@ -13,7 +13,7 @@
 //! names are still read at runtime (via `socket_patch_core::env_compat`) with
 //! a one-shot deprecation warning; they will be removed in the next major.
 
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 use clap::Args;
 
@@ -305,13 +305,14 @@ pub struct GlobalArgs {
 }
 
 impl GlobalArgs {
-    /// Resolve `manifest_path` against `cwd`. See
-    /// `socket_patch_core::manifest::operations::resolve_manifest_path`.
+    /// Resolve `manifest_path` against `cwd`: absolute paths are returned
+    /// as-is, relative paths are joined to `cwd`.
     pub(crate) fn resolved_manifest_path(&self) -> PathBuf {
-        socket_patch_core::manifest::operations::resolve_manifest_path(
-            &self.cwd,
-            &self.manifest_path,
-        )
+        if Path::new(&self.manifest_path).is_absolute() {
+            PathBuf::from(&self.manifest_path)
+        } else {
+            self.cwd.join(&self.manifest_path)
+        }
     }
 
     /// Build [`ApiClientEnvOverrides`] from the CLI flags.
@@ -902,14 +903,30 @@ mod tests {
     /// An absolute `manifest_path` ignores `cwd` and passes through unchanged.
     #[test]
     fn resolved_manifest_path_passes_absolute_through() {
+        let absolute = if cfg!(windows) {
+            r"C:\etc\socket\manifest.json"
+        } else {
+            "/etc/socket/manifest.json"
+        };
+        let args = GlobalArgs {
+            cwd: PathBuf::from("/work/project"),
+            manifest_path: absolute.to_string(),
+            ..GlobalArgs::default()
+        };
+        assert_eq!(args.resolved_manifest_path(), PathBuf::from(absolute));
+    }
+
+    /// A dotted relative `manifest_path` is joined verbatim, not normalized.
+    #[test]
+    fn resolved_manifest_path_joins_dotted_relative_verbatim() {
         let args = GlobalArgs {
             cwd: PathBuf::from("/work/project"),
-            manifest_path: "/etc/socket/manifest.json".to_string(),
+            manifest_path: "../manifest.json".to_string(),
             ..GlobalArgs::default()
         };
         assert_eq!(
             args.resolved_manifest_path(),
-            PathBuf::from("/etc/socket/manifest.json"),
+            PathBuf::from("/work/project/../manifest.json"),
         );
     }
 

crates/socket-patch-cli/.DS_Store

@@ -508,9 +508,9 @@ pub(crate) fn result_to_event(result: &ApplyResult, dry_run: bool) -> PatchEvent
         .collect();
     // Sidecar data is NOT attached here — it's surfaced at the
     // envelope level under `Envelope.sidecars[]` by the run loop.
-    // See `Envelope::record_sidecar`. Keeping events clean of
-    // sidecar info means each event describes only the apply
-    // action; sidecar reporting is a separate, JOIN-able list.
+    // Keeping events clean of sidecar info means each event describes
+    // only the apply action; sidecar reporting is a separate,
+    // JOIN-able list.
     PatchEvent::new(PatchAction::Applied, purl).with_files(files)
 }
 
@@ -660,7 +660,7 @@ pub async fn run(args: ApplyArgs) -> i32 {
                     // `envelope.sidecars[]` and JOIN against
                     // `events[]` by `purl` for per-package context.
                     if let Some(ref sidecar) = result.sidecar {
-                        env.record_sidecar(sidecar.clone());
+                        env.sidecars.push(sidecar.clone());
                     }
                 }
                 // Manifest entries that targeted in-scope ecosystems but
@@ -957,7 +957,6 @@ async fn apply_patches_inner(
         cwd: args.common.cwd.clone(),
         global: args.common.global,
         global_prefix: args.common.global_prefix.clone(),
-        batch_size: 100,
     };
 
     let all_packages = find_packages_for_purls(

crates/socket-patch-cli/src/args.rs

@@ -720,7 +720,6 @@ async fn filter_to_installed_releases(
         cwd: params.cwd.clone(),
         global: params.global,
         global_prefix: params.global_prefix.clone(),
-        batch_size: 100,
     };
     let paths = find_packages_for_rollback(&partitioned, &crawler_options, true).await;
 
@@ -844,16 +843,11 @@ pub(crate) async fn download_patch_records(
     for search_result in &selected {
         // Idempotency: a detached entry already at this uuid carries its
         // own record — no view fetch needed.
-        let existing = vendor_state
-            .entries
-            .get(&search_result.purl)
-            .or_else(|| {
-                vendor_state
-                    .entries
-                    .values()
-                    .find(|e| e.base_purl == search_result.purl)
-            })
-            .filter(|e| e.detached && e.uuid == search_result.uuid);
+        let existing = socket_patch_core::patch::vendor::lookup_entry(
+            &vendor_state.entries,
+            &search_result.purl,
+        )
+        .filter(|e| e.detached && e.uuid == search_result.uuid);
         if let Some(record) = existing.and_then(|e| e.record.clone()) {
             if !params.json && !params.silent {
                 eprintln!("  [skip] {} (already vendored)", search_result.purl);
@@ -967,10 +961,7 @@ async fn warn_on_vendored_uuid_drift(
         if !matches!(rec["action"].as_str(), Some("added" | "updated")) {
             continue;
         }
-        let entry = vendor_state
-            .entries
-            .get(purl)
-            .or_else(|| vendor_state.entries.values().find(|e| e.base_purl == purl));
+        let entry = socket_patch_core::patch::vendor::lookup_entry(&vendor_state.entries, purl);
         if let Some(entry) = entry.filter(|e| e.uuid != uuid) {
             let w = format!(
                 "{purl} is vendored at patch {} but the manifest now records {uuid}; \
@@ -1507,7 +1498,6 @@ pub async fn run(args: GetArgs) -> i32 {
                 cwd: args.common.cwd.clone(),
                 global: args.common.global,
                 global_prefix: args.common.global_prefix.clone(),
-                batch_size: 100,
             };
             let (all_packages, _) = crawl_all_ecosystems(&crawler_options).await;
 

crates/socket-patch-cli/src/commands/apply.rs

@@ -265,15 +265,7 @@ async fn repair_inner(
             .iter()
             .filter(|(purl, rec)| {
                 !referenced_uuids.contains(&rec.uuid)
-                    && vendor_state
-                        .entries
-                        .get(*purl)
-                        .or_else(|| {
-                            vendor_state
-                                .entries
-                                .values()
-                                .find(|e| &e.base_purl == *purl)
-                        })
+                    && socket_patch_core::patch::vendor::lookup_entry(&vendor_state.entries, purl)
                         .is_none_or(|e| e.uuid != rec.uuid)
             })
             .map(|(k, v)| (k.clone(), v.clone()))

crates/socket-patch-cli/src/commands/get.rs

@@ -457,7 +457,6 @@ pub(crate) async fn repair_vendored_artifacts(
         cwd: common.cwd.clone(),
         global: common.global,
         global_prefix: common.global_prefix.clone(),
-        batch_size: 100,
     };
     let mut all_packages = find_packages_for_purls(&partitioned, &crawler_options, quiet).await;
     let inventory = lock_inventory::inventory_project(&common.cwd).await;

crates/socket-patch-cli/src/commands/repair.rs

@@ -662,7 +662,6 @@ async fn rollback_patches_inner(
         cwd: args.common.cwd.clone(),
         global: args.common.global,
         global_prefix: args.common.global_prefix.clone(),
-        batch_size: 100,
     };
 
     let all_packages = find_packages_for_rollback(

crates/socket-patch-cli/src/commands/repair_vendor.rs

@@ -130,6 +130,7 @@ pub(super) async fn run_redirect(
             let mut integrity = reference
                 .artifacts
                 .iter()
+                .flatten()
                 .find(|a| a.kind == "tarball")
                 .map(|a| a.integrity.clone())
                 .unwrap_or_default();
@@ -139,6 +140,7 @@ pub(super) async fn run_redirect(
             let berry_zip = reference
                 .artifacts
                 .iter()
+                .flatten()
                 .find(|a| a.kind == "yarn-berry-zip");
             if let Some(c) = berry_zip.and_then(|a| a.integrity.yarn_berry10c0.clone()) {
                 integrity.yarn_berry10c0 = Some(c);