From 711e8213acbe7b59f724ece6fbba37b02654fd24 Mon Sep 17 00:00:00 2001
From: Taylor Ho <taylorkmho@gmail.com>
Date: Wed, 15 Apr 2026 10:49:00 -1000
Subject: [PATCH] fix: derive staging ports from worktree to avoid collisions
 (#329)

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 justfile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/justfile b/justfile
index 9f52bb8fd..75aaef1ec 100644
--- a/justfile
+++ b/justfile
@@ -151,9 +151,17 @@ dev *ARGS:
 
 # Run the desktop app against the internal staging relay (installs deps + builds agent tools automatically)
 staging *ARGS:
-    cd {{desktop_dir}} && pnpm install
+    #!/usr/bin/env bash
+    set -euo pipefail
+    cd {{desktop_dir}}
+    pnpm install
+    cd ..
     cargo build --release -p sprout-acp -p sprout-mcp
-    cd {{desktop_dir}} && SPROUT_RELAY_URL="wss://sprout-oss.stage.blox.sqprod.co" pnpm exec tauri dev --config src-tauri/tauri.dev.conf.json {{ARGS}}
+    cd {{desktop_dir}}
+    source ../scripts/instance-env.sh
+    export SPROUT_RELAY_URL="wss://sprout-oss.stage.blox.sqprod.co"
+    echo "Starting staging on Vite port ${SPROUT_VITE_PORT}, relay ${SPROUT_RELAY_URL}"
+    pnpm exec tauri dev --config "$SPROUT_TAURI_CONFIG" {{ARGS}}
 
 # Run the desktop frontend dev server (port derived from worktree)
 desktop-dev: