feat(desktop): bundle pinned ACP bridges with the app (bridge-only, user-installed CLIs)

.github/workflows/ci.yml

@@ -859,6 +859,12 @@ jobs:
         # Serial: windows_resolver_tests mutate process-global env
         # (BUZZ_SHELL/GIT_BASH/SystemRoot) that SharedState::new reads.
         run: cargo test -p buzz-dev-mcp --target $env:TARGET -- --test-threads=1
+      - name: Test (buzz-acp-node-launcher)
+        # The compiled launcher shim staged as the bundled ACP bridges'
+        # <binary>.exe on Windows; its spawn path (Job Object, exit-code
+        # proxying) only gates if tested ON Windows. The end-to-end tests use
+        # the node preinstalled on windows-latest runners.
+        run: cargo test -p buzz-acp-node-launcher --target $env:TARGET
       # Smoke-test the new host-prereq contract: Git for Windows (which provides
       # bash) is available on the runner, a shell command round-trips, and bash
       # does NOT resolve from System32 (so WSL's launcher is never picked up).

.github/workflows/release.yml

@@ -132,6 +132,12 @@ jobs:
           cargo build --release -p buzz-acp -p buzz-agent -p buzz-dev-mcp -p git-credential-nostr -p buzz-cli
           ./scripts/bundle-sidecars.sh
 
+      # Stage the pinned ACP bridge tools into src-tauri/resources/acp before
+      # `tauri build` bundles resources — without this the app ships an empty
+      # resources/acp and silently falls back to unpinned user installs.
+      - name: Stage bundled ACP tools
+        run: ./desktop/scripts/prepare-acp-tools-resource.sh aarch64-apple-darwin
+
       # Mesh rev derived from Cargo.lock (no lockstep edit on dep bump); cache key tracks it.
       - name: Resolve mesh-llm rev
         id: mesh_rev
@@ -341,6 +347,9 @@ jobs:
           cargo build --release --target "$TARGET" -p buzz-acp -p buzz-agent -p buzz-dev-mcp -p git-credential-nostr -p buzz-cli
           ./scripts/bundle-sidecars.sh "$TARGET"
 
+      - name: Stage bundled ACP tools
+        run: ./desktop/scripts/prepare-acp-tools-resource.sh "$TARGET"
+
       - name: Build unsigned Tauri app
         run: cd desktop && pnpm tauri build --verbose --no-sign --target "$TARGET" --config src-tauri/tauri.release.conf.json
         env:
@@ -588,6 +597,9 @@ jobs:
           cargo build --release -p buzz-acp -p buzz-agent -p buzz-dev-mcp -p git-credential-nostr -p buzz-cli
           ./scripts/bundle-sidecars.sh
 
+      - name: Stage bundled ACP tools
+        run: ./desktop/scripts/prepare-acp-tools-resource.sh x86_64-unknown-linux-gnu
+
       - name: Generate release config
         run: cd desktop && node scripts/build-release-config.mjs
         env:
@@ -745,6 +757,13 @@ jobs:
           cargo build --release --target "$TARGET" -p buzz-acp -p buzz-agent -p buzz-dev-mcp -p git-credential-nostr -p buzz-cli
           ./scripts/bundle-sidecars.sh "$TARGET"
 
+      # Also builds the buzz-acp-node-launcher shim for the target with the
+      # toolchain installed above (Windows targets stage it as the bridges'
+      # <binary>.exe).
+      - name: Stage bundled ACP tools
+        shell: bash
+        run: ./desktop/scripts/prepare-acp-tools-resource.sh "$TARGET"
+
       - name: Build Windows NSIS installer (unsigned)
         shell: bash
         run: cd desktop && pnpm tauri build --verbose --target "$TARGET" --bundles nsis --config src-tauri/tauri.release.conf.json

.gitignore

@@ -38,6 +38,12 @@ node_modules/
 # Root npm lockfiles are accidental; desktop uses pnpm in /desktop.
 /package-lock.json
 
+# Bundled ACP bridge tools (regenerated by desktop/scripts/prepare-acp-tools-resource.sh)
+desktop/src-tauri/resources/acp/bin/*
+!desktop/src-tauri/resources/acp/bin/.gitkeep
+desktop/src-tauri/resources/acp/node/
+desktop/src-tauri/resources/acp/node-runtime.json
+
 # sqlx offline query data (generated, not portable)
 .sqlx/
 

Cargo.toml

@@ -10,6 +10,7 @@ members = [
     "crates/buzz-search",
     "crates/buzz-audit",
     "crates/buzz-acp",
+    "crates/buzz-acp-node-launcher",
     "crates/buzz-agent",
     "crates/sprig",
     "crates/buzz-test-client",

Justfile

@@ -121,6 +121,10 @@ desktop-test:
 desktop-typecheck:
     cd {{desktop_dir}} && pnpm typecheck
 
+# Query the latest npm releases of the bundled ACP bridge tools and update desktop/acp-tools.lock.json
+bump-acp-tools *ARGS:
+    node desktop/scripts/update-acp-tools-lock.mjs {{ARGS}}
+
 # Build desktop frontend assets
 desktop-build:
     cd {{desktop_dir}} && pnpm build
@@ -206,6 +210,7 @@ desktop-release-build target="aarch64-apple-darwin":
     touch "desktop/src-tauri/binaries/buzz-dev-mcp-$TARGET"
     touch "desktop/src-tauri/binaries/git-credential-nostr-$TARGET"
     touch "desktop/src-tauri/binaries/buzz-$TARGET"
+    ./desktop/scripts/prepare-acp-tools-resource.sh "$TARGET"
     pnpm install
     cd {{desktop_dir}} && pnpm tauri build --features mesh-llm --target {{target}}
 
@@ -330,6 +335,11 @@ dev *ARGS: bootstrap _ensure-sidecar-stubs _ensure-migrations
         done
     fi
     cargo build -p buzz-acp -p buzz-agent -p buzz-dev-mcp -p buzz-cli -p git-credential-nostr -p buzz-relay
+    # Stage the pinned ACP bridge tools and point the app at the staged dir so
+    # dev builds resolve the same bundled bridges as packaged builds.
+    ./desktop/scripts/prepare-acp-tools-resource.sh
+    export BUZZ_ACP_TOOLS_DIR="{{justfile_directory()}}/desktop/src-tauri/resources/acp/bin"
+    echo "Using ACP tools dir: ${BUZZ_ACP_TOOLS_DIR}"
     ./target/debug/buzz-relay &
     RELAY_PID=$!
     sleep 1
@@ -358,6 +368,11 @@ staging *ARGS: bootstrap _ensure-sidecar-stubs
     export PATH="{{justfile_directory()}}/bin:$PATH"
     pnpm install  # unconditional: staging must always start with a clean dep tree
     cargo build --release -p buzz-acp -p buzz-agent -p buzz-dev-mcp -p buzz-cli -p git-credential-nostr
+    # Stage the pinned ACP bridge tools and point the app at the staged dir so
+    # staging builds resolve the same bundled bridges as packaged builds.
+    ./desktop/scripts/prepare-acp-tools-resource.sh
+    export BUZZ_ACP_TOOLS_DIR="{{justfile_directory()}}/desktop/src-tauri/resources/acp/bin"
+    echo "Using ACP tools dir: ${BUZZ_ACP_TOOLS_DIR}"
     FEATURES=()
     if [[ -n "{{mesh}}" ]]; then
         FEATURES=(--features mesh-llm)

crates/buzz-acp-node-launcher/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "buzz-acp-node-launcher"
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
+description = "Compiled launcher shim for the bundled ACP bridge tools on Windows"
+
+[[bin]]
+name = "buzz-acp-node-launcher"
+path = "src/main.rs"
+
+[dependencies]
+serde      = { workspace = true }
+serde_json = { workspace = true }
+
+[target.'cfg(windows)'.dependencies]
+# Win32_System_JobObjects alone is not enough: CreateJobObjectW is gated on
+# Win32_Security (its SECURITY_ATTRIBUTES parameter) and the JOBOBJECT_*
+# limit structs on Win32_System_Threading. Same set as buzz-dev-mcp's
+# KillGroup, minus its registry lookup.
+windows-sys = { version = "0.61", features = ["Win32_Foundation", "Win32_Security", "Win32_System_JobObjects", "Win32_System_Threading"] }
+
+[dev-dependencies]
+tempfile = "3"