fix(shard): account for uninstalled lifted CPU roots

Author: HaoZeke

src/site_commands.rs

@@ -4103,7 +4103,15 @@ pub fn run_stack_shard_with_sources(
             .cpu_prerequisites
             .iter()
             .cloned()
-            .chain(cpu_root_lines.iter().map(|&i| closures[i].root.clone()))
+            .chain(cpu_root_lines.iter().filter_map(|&i| {
+                let closure = &closures[i];
+                closure
+                    .to_build
+                    .contains(&closure.root)
+                    .then(|| closure.root.clone())
+            }))
+            .collect::<BTreeSet<_>>()
+            .into_iter()
             .collect();
         let cpu_footprint = crate::inode_budget::shard_footprint(
             &cpu_modules,
@@ -4117,7 +4125,7 @@ pub fn run_stack_shard_with_sources(
             } else {
                 json!("cpu-prerequisites.list")
             },
-            "weight": planned.cpu_prerequisites_weight,
+            "weight": cpu_modules.iter().map(|module| weight(module)).sum::<u64>(),
             "inode_footprint": cpu_footprint.inodes,
             "inode_peak_module": cpu_footprint.peak_module,
             "modules": module_meta(&planned.cpu_prerequisites),

tests/stack_shard_destinations.rs

@@ -88,6 +88,10 @@ fn explicit_destination_controls_root_closure_cost_and_row_retention() {
                     .unwrap()
                     .contains("--installpath-modules")
             );
+            if lifted {
+                assert_eq!(missing["cpu_prerequisites"]["weight"], 2);
+                assert!(missing["cpu_prerequisites"]["inode_footprint"].as_u64().unwrap() > 2000);
+            }
             if !lifted {
                 assert_eq!(missing["shards"][0]["weight"], 2);
                 assert!(missing["shards"][0]["inode_footprint"].as_u64().unwrap() > 1000);
@@ -98,6 +102,10 @@ fn explicit_destination_controls_root_closure_cost_and_row_retention() {
             assert_eq!(present["lines"][0]["closure"], serde_json::json!([]));
             assert_ne!(missing["inputs"]["sha256"], present["inputs"]["sha256"]);
             assert_eq!(present["lines"][0]["text"], row);
+            if lifted {
+                assert_eq!(present["cpu_prerequisites"]["weight"], 0);
+                assert_eq!(present["cpu_prerequisites"]["inode_footprint"], 1000);
+            }
         }
     }
 }