From 48f7ee96d7cfd0e6ad9902210e8d07b5119f690e Mon Sep 17 00:00:00 2001
From: Taksh <takshkothari09@gmail.com>
Date: Thu, 23 Jul 2026 13:22:56 +0300
Subject: [PATCH 1/2] fix(desktop): add .exe suffix to Windows sidecar stubs

Signed-off-by: Taksh <takshkothari09@gmail.com>

Signed-off-by: Taksh <takshkothari09@gmail.com>
---
 Justfile | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/Justfile b/Justfile
index bcef8983bc..d5225de36a 100644
--- a/Justfile
+++ b/Justfile
@@ -154,9 +154,12 @@ _ensure-sidecar-stubs:
     #!/usr/bin/env bash
     set -euo pipefail
     TARGET=$(rustc -vV | sed -n 's|host: ||p')
+    # Tauri externalBin on Windows requires the `.exe` suffix (#2492).
+    EXT=""
+    case "$TARGET" in *windows*) EXT=".exe";; esac
     mkdir -p desktop/src-tauri/binaries
     for bin in buzz-acp buzz-agent buzz-dev-mcp git-credential-nostr buzz; do
-        touch "desktop/src-tauri/binaries/${bin}-${TARGET}"
+        touch "desktop/src-tauri/binaries/${bin}-${TARGET}${EXT}"
     done
 
 # Ensure Docker dev services (Postgres, Redis, etc.) are running and healthy
@@ -233,12 +236,14 @@ desktop-release-build target="aarch64-apple-darwin":
     #!/usr/bin/env bash
     set -euo pipefail
     TARGET={{target}}
+    EXT=""
+    case "$TARGET" in *windows*) EXT=".exe";; esac
     mkdir -p desktop/src-tauri/binaries
-    touch "desktop/src-tauri/binaries/buzz-acp-$TARGET"
-    touch "desktop/src-tauri/binaries/buzz-agent-$TARGET"
-    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"
+    touch "desktop/src-tauri/binaries/buzz-acp-$TARGET$EXT"
+    touch "desktop/src-tauri/binaries/buzz-agent-$TARGET$EXT"
+    touch "desktop/src-tauri/binaries/buzz-dev-mcp-$TARGET$EXT"
+    touch "desktop/src-tauri/binaries/git-credential-nostr-$TARGET$EXT"
+    touch "desktop/src-tauri/binaries/buzz-$TARGET$EXT"
     pnpm install
     cd {{desktop_dir}} && pnpm tauri build --features mesh-llm --target {{target}}
 
@@ -477,10 +482,12 @@ desktop-standalone *ARGS: _ensure-sidecar-stubs
     export PATH="{{justfile_directory()}}/bin:$PATH"
     cargo build -p buzz-acp -p buzz-agent -p buzz-dev-mcp -p buzz-cli -p git-credential-nostr
     TARGET=$(rustc -vV | sed -n 's|host: ||p')
+    EXT=""
+    case "$TARGET" in *windows*) EXT=".exe";; esac
     TARGET_DIR=$(cargo metadata --format-version 1 --no-deps | node -p "JSON.parse(require('fs').readFileSync(0, 'utf8')).target_directory")
     for bin in buzz-acp buzz-agent buzz-dev-mcp git-credential-nostr buzz; do
-        cp "${TARGET_DIR}/debug/${bin}" "desktop/src-tauri/binaries/${bin}-${TARGET}"
-        chmod +x "desktop/src-tauri/binaries/${bin}-${TARGET}"
+        cp "${TARGET_DIR}/debug/${bin}${EXT}" "desktop/src-tauri/binaries/${bin}-${TARGET}${EXT}"
+        chmod +x "desktop/src-tauri/binaries/${bin}-${TARGET}${EXT}"
     done
     cd {{desktop_dir}}
     [[ -d node_modules ]] || pnpm install
@@ -512,9 +519,11 @@ staging *ARGS: bootstrap _ensure-sidecar-stubs
     fi
     # Replace the 0-byte sidecar stub with the real CLI binary so tauri dev picks it up.
     TARGET=$(rustc -vV | sed -n 's|host: ||p')
+    EXT=""
+    case "$TARGET" in *windows*) EXT=".exe";; esac
     TARGET_DIR=$(cargo metadata --format-version 1 --no-deps | node -p "JSON.parse(require('fs').readFileSync(0, 'utf8')).target_directory")
-    cp "${TARGET_DIR}/release/buzz" "desktop/src-tauri/binaries/buzz-${TARGET}"
-    chmod +x "desktop/src-tauri/binaries/buzz-${TARGET}"
+    cp "${TARGET_DIR}/release/buzz${EXT}" "desktop/src-tauri/binaries/buzz-${TARGET}${EXT}"
+    chmod +x "desktop/src-tauri/binaries/buzz-${TARGET}${EXT}"
     cd {{desktop_dir}}
     export BUZZ_RELAY_URL="wss://sprout-oss.stage.blox.sqprod.co"
     source ../scripts/instance-env.sh

From da4d01cb26cdfcfdea3ba95b97b595e707c8ed4e Mon Sep 17 00:00:00 2001
From: Taksh <takshkothari09@gmail.com>
Date: Thu, 23 Jul 2026 13:39:25 +0300
Subject: [PATCH 2/2] fix(desktop): let machine onboarding steps scroll under
 the docked CTA

Signed-off-by: Taksh <takshkothari09@gmail.com>

Signed-off-by: Taksh <takshkothari09@gmail.com>
---
 desktop/src/features/onboarding/ui/DefaultConfigStep.tsx | 3 ++-
 desktop/src/shared/styles/globals/components.css         | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/desktop/src/features/onboarding/ui/DefaultConfigStep.tsx b/desktop/src/features/onboarding/ui/DefaultConfigStep.tsx
index 50887f08aa..a542c2522e 100644
--- a/desktop/src/features/onboarding/ui/DefaultConfigStep.tsx
+++ b/desktop/src/features/onboarding/ui/DefaultConfigStep.tsx
@@ -296,7 +296,8 @@ export function DefaultConfigStep({
 
   return (
     <OnboardingSlideTransition
-      className="flex min-h-full w-full flex-col items-center"
+      // pb clears the docked footer when the step frame scrolls under it.
+      className="flex min-h-full w-full flex-col items-center pb-20"
       data-testid="onboarding-page-config"
       direction={direction}
       transitionKey={`default-config-${direction}`}
diff --git a/desktop/src/shared/styles/globals/components.css b/desktop/src/shared/styles/globals/components.css
index c21e4a617d..418122b568 100644
--- a/desktop/src/shared/styles/globals/components.css
+++ b/desktop/src/shared/styles/globals/components.css
@@ -162,8 +162,13 @@
   }
 
   .buzz-onboarding-step-frame {
+    /* Fill the shell under the chrome + docked CTA, but keep tall steps
+       (e.g. machine onboarding model defaults) scrollable instead of clipped
+       when max-height binds. */
     min-height: min(1000px, max(0px, calc(100dvh - 106px - 7rem)));
-    max-height: 1000px;
+    max-height: min(1000px, max(0px, calc(100dvh - 106px - 7rem)));
+    overflow-x: hidden;
+    overflow-y: auto;
   }
 
   .buzz-onboarding-step-frame > .buzz-onboarding-slide,