Merge pull request #78 from block65/fix/trim-vergen-deps

fix(build): strip unused vergen cargo/rustc features

Author: maxholman

.github/workflows/pr.yml

@@ -53,7 +53,6 @@ jobs:
         if: runner.environment != 'self-hosted'
         with:
           shared-key: musl
-          workspaces: . -> target/musl
 
       - name: Install cross
         run: |
@@ -70,7 +69,7 @@ jobs:
         run: docker build -t wallhack-cross:x86_64-unknown-linux-musl -f Dockerfile.cross-musl .
 
       - name: Test (musl — primary)
-        run: CARGO_TARGET_DIR=target/musl cross test --release --target x86_64-unknown-linux-musl
+        run: cross test --release --target x86_64-unknown-linux-musl
 
   build-musl:
     needs: [test-musl]
@@ -85,7 +84,6 @@ jobs:
         if: runner.environment != 'self-hosted'
         with:
           shared-key: musl
-          workspaces: . -> target/musl
 
       - name: Install cross
         run: |
@@ -102,14 +100,14 @@ jobs:
         run: docker build -t wallhack-cross:x86_64-unknown-linux-musl -f Dockerfile.cross-musl .
 
       - name: Build slim (musl — primary)
-        run: CARGO_TARGET_DIR=target/musl cross build --release --target x86_64-unknown-linux-musl -p wallhack-cli --no-default-features --features slim
+        run: cross build --release --target x86_64-unknown-linux-musl -p wallhack-cli --no-default-features --features slim
 
       - name: Check slim binary size (musl — primary)
         run: ./bench/check_bloat.sh --no-build --only=slim-musl
         continue-on-error: true
 
       - name: Build default (musl — primary)
-        run: CARGO_TARGET_DIR=target/musl cross build --release --target x86_64-unknown-linux-musl -p wallhack-cli
+        run: cross build --release --target x86_64-unknown-linux-musl -p wallhack-cli
 
       - name: Check default binary size (musl — primary)
         run: ./bench/check_bloat.sh --no-build --only=default-musl

Cargo.lock

@@ -11,7 +11,7 @@ pedantic = "warn"
 [workspace.dependencies]
 arc-swap = "1"
 tokio = { version = "1.0" }
-tracing = "0.1"
+tracing = { version = "0.1", default-features = false, features = ["std", "release_max_level_debug"] }
 thiserror = "2"
 console-subscriber = "0.4"
 parking_lot = "0.12"

Cargo.toml

@@ -21,6 +21,7 @@ mkdir -p "$RESULTS_DIR"
 cd "$ROOT_DIR"
 
 # --- Size thresholds (bytes) ---
+# DO NOT BUMP WITHOUT PERMISSION.
 # Updated: 2026-03-15, baseline: worktree-mcp-server
 # slim threshold = exactly 5MiB (5 * 1024 * 1024). Must stay "5MB slim".
 # default threshold = existing measured + ~1% headroom.

bench/check_bloat.sh

@@ -12,7 +12,8 @@ name = "wallhackctl"
 path = "src/bin/wallhack.rs"
 
 [features]
-default = ["quic", "websocket", "http-api", "repl"]
+default = ["quic", "websocket", "http-api", "repl", "json"]
+json = ["dep:serde_json"]
 slim = ["quic", "websocket"]
 
 # Transport features (forwarded to wallhackd)
@@ -30,7 +31,7 @@ repl = ["dep:reedline", "dep:nu-ansi-term"]
 argh = "0.1"
 prost = "0.13"
 serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+serde_json = { version = "1", optional = true }
 wallhack-ipc = { path = "../ipc" }
 rand = { version = "0.9", default-features = false, features = ["std", "std_rng"] }
 # Already a transitive dep via reedline — no additional binary cost.
@@ -51,7 +52,8 @@ wallhackd = { path = "../daemon", default-features = false }
 zeroize = "1"
 
 [build-dependencies]
-vergen-gitcl = { version = "9.1", features = ["build", "cargo", "rustc"] }
+anyhow = "1"
+vergen-gitcl = { version = "9.1", features = ["build"] }
 
 [lints]
 workspace = true

crates/cli/Cargo.toml

@@ -1,22 +1,47 @@
-use vergen_gitcl::{BuildBuilder, CargoBuilder, Emitter, GitclBuilder, RustcBuilder};
+// NOTE: This WallhackBuildEnv impl is duplicated in crates/mcp/build.rs.
+// build.rs files cannot share code via library crates.
+use std::collections::BTreeMap;
 
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // PROFILE is a standard Cargo build env var; emit it for use via env!() in source.
-    println!(
-        "cargo:rustc-env=WALLHACK_BUILD_PROFILE={}",
-        std::env::var("PROFILE").unwrap_or_else(|_| "unknown".to_string())
-    );
+use vergen_gitcl::{
+    AddCustomEntries, BuildBuilder, CargoRerunIfChanged, CargoWarning, DefaultConfig, Emitter,
+    GitclBuilder,
+};
+
+#[derive(Default)]
+struct WallhackBuildEnv;
+
+impl AddCustomEntries<&str, &str> for WallhackBuildEnv {
+    fn add_calculated_entries(
+        &self,
+        _idempotent: bool,
+        cargo_rustc_env_map: &mut BTreeMap<&str, &str>,
+        _cargo_rerun_if_changed: &mut CargoRerunIfChanged,
+        _cargo_warning: &mut CargoWarning,
+    ) -> anyhow::Result<()> {
+        let profile = std::env::var("PROFILE").unwrap_or_else(|_| "unknown".to_string());
+        cargo_rustc_env_map.insert(
+            "WALLHACK_BUILD_PROFILE",
+            Box::leak(profile.into_boxed_str()),
+        );
+        Ok(())
+    }
 
+    fn add_default_entries(
+        &self,
+        _config: &DefaultConfig,
+        _cargo_rustc_env_map: &mut BTreeMap<&str, &str>,
+        _cargo_rerun_if_changed: &mut CargoRerunIfChanged,
+        _cargo_warning: &mut CargoWarning,
+    ) -> anyhow::Result<()> {
+        Ok(())
+    }
+}
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
     Emitter::default()
         .add_instructions(&BuildBuilder::default().build_timestamp(true).build()?)?
         .add_instructions(&GitclBuilder::default().sha(true).dirty(true).build()?)?
-        .add_instructions(
-            &CargoBuilder::default()
-                .target_triple(true)
-                .features(true)
-                .build()?,
-        )?
-        .add_instructions(&RustcBuilder::default().semver(true).build()?)?
+        .add_custom_instructions(&WallhackBuildEnv)?
         .emit()?;
     Ok(())
 }

crates/cli/build.rs

@@ -309,6 +309,7 @@ async fn run_ctl_async(cli: wallhack_cli::cli::Cli) -> Result<(), output::CtlErr
         }),
         CtlCommand::Info(_) => management_request::Request::Status(StatusRequest {}),
         CtlCommand::Stats(_) => management_request::Request::Stats(StatsRequest {}),
+        #[cfg(feature = "json")]
         CtlCommand::Peers(ref cmd) if cmd.json => {
             // JSON output: make the request and short-circuit the standard response path.
             let request = management_request::Request::Peers(PeersRequest {});

crates/cli/src/bin/wallhack.rs

@@ -3,9 +3,10 @@
 use std::io::Write;
 
 use tabwriter::TabWriter;
-use wallhack_wire::management::{
-    ManagementResponse, PeerInfo as WirePeerInfo, management_response,
-};
+use wallhack_wire::management::{ManagementResponse, management_response};
+
+#[cfg(feature = "json")]
+use wallhack_wire::management::PeerInfo as WirePeerInfo;
 
 #[cfg(feature = "repl")]
 use {
@@ -15,6 +16,7 @@ use {
 
 use crate::ipc::IpcError;
 
+#[cfg(feature = "json")]
 #[derive(serde::Serialize)]
 struct PeerJson<'a> {
     name: &'a str,
@@ -50,6 +52,7 @@ fn format_uptime(ms: u64) -> String {
 /// Print the peers list as JSON to stdout.
 ///
 /// Shape matches the REST API `/peers` response plus a `tun_name` field.
+#[cfg(feature = "json")]
 pub fn print_peers_json(peers: &[WirePeerInfo]) {
     let items: Vec<PeerJson<'_>> = peers
         .iter()

crates/cli/src/output.rs

@@ -16,7 +16,8 @@ wallhack-ipc = { path = "../ipc", features = ["vsock"] }
 wallhack-wire = { path = "../wire" }
 
 [build-dependencies]
-vergen-gitcl = { version = "9.1", features = ["build", "cargo"] }
+anyhow = "1"
+vergen-gitcl = { version = "9.1", features = ["build"] }
 
 [lints.rust]
 unsafe_code = "deny"

crates/mcp/Cargo.toml

@@ -1,14 +1,47 @@
-use vergen_gitcl::{BuildBuilder, CargoBuilder, Emitter, GitclBuilder};
+// NOTE: This WallhackBuildEnv impl is duplicated in crates/cli/build.rs.
+// build.rs files cannot share code via library crates.
+use std::collections::BTreeMap;
+
+use vergen_gitcl::{
+    AddCustomEntries, BuildBuilder, CargoRerunIfChanged, CargoWarning, DefaultConfig, Emitter,
+    GitclBuilder,
+};
+
+#[derive(Default)]
+struct WallhackBuildEnv;
+
+impl AddCustomEntries<&str, &str> for WallhackBuildEnv {
+    fn add_calculated_entries(
+        &self,
+        _idempotent: bool,
+        cargo_rustc_env_map: &mut BTreeMap<&str, &str>,
+        _cargo_rerun_if_changed: &mut CargoRerunIfChanged,
+        _cargo_warning: &mut CargoWarning,
+    ) -> anyhow::Result<()> {
+        let profile = std::env::var("PROFILE").unwrap_or_else(|_| "unknown".to_string());
+        cargo_rustc_env_map.insert(
+            "WALLHACK_BUILD_PROFILE",
+            Box::leak(profile.into_boxed_str()),
+        );
+        Ok(())
+    }
+
+    fn add_default_entries(
+        &self,
+        _config: &DefaultConfig,
+        _cargo_rustc_env_map: &mut BTreeMap<&str, &str>,
+        _cargo_rerun_if_changed: &mut CargoRerunIfChanged,
+        _cargo_warning: &mut CargoWarning,
+    ) -> anyhow::Result<()> {
+        Ok(())
+    }
+}
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    println!(
-        "cargo:rustc-env=WALLHACK_BUILD_PROFILE={}",
-        std::env::var("PROFILE").unwrap_or_else(|_| "unknown".to_string())
-    );
     Emitter::default()
         .add_instructions(&BuildBuilder::default().build_timestamp(true).build()?)?
         .add_instructions(&GitclBuilder::default().sha(true).dirty(true).build()?)?
-        .add_instructions(&CargoBuilder::default().target_triple(true).build()?)?
+        .add_custom_instructions(&WallhackBuildEnv)?
         .emit()?;
     Ok(())
 }