From d6a604d5a144c47bb4aa9603340cf1ee4c5619ed Mon Sep 17 00:00:00 2001
From: FallingSnowFlake <fallingsnowflake@163.com>
Date: Mon, 1 Jun 2026 07:28:13 +0800
Subject: [PATCH] fix(makefile): extract setup-sandbox inline bash to script
 for Windows compatibility (#3326)

---
 Makefile                 | 31 +--------------------------
 scripts/setup-sandbox.sh | 45 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 30 deletions(-)
 create mode 100644 scripts/setup-sandbox.sh

diff --git a/Makefile b/Makefile
index 81c929634..cea782c2a 100644
--- a/Makefile
+++ b/Makefile
@@ -89,36 +89,7 @@ install:
 
 # Pre-pull sandbox Docker image (optional but recommended)
 setup-sandbox:
-	@echo "=========================================="
-	@echo "  Pre-pulling Sandbox Container Image"
-	@echo "=========================================="
-	@echo ""
-	@IMAGE=$$(grep -A 20 "# sandbox:" config.yaml 2>/dev/null | grep "image:" | awk '{print $$2}' | head -1); \
-	if [ -z "$$IMAGE" ]; then \
-		IMAGE="enterprise-public-cn-beijing.cr.volces.com/vefaas-public/all-in-one-sandbox:latest"; \
-		echo "Using default image: $$IMAGE"; \
-	else \
-		echo "Using configured image: $$IMAGE"; \
-	fi; \
-	echo ""; \
-	if command -v container >/dev/null 2>&1 && [ "$$(uname)" = "Darwin" ]; then \
-		echo "Detected Apple Container on macOS, pulling image..."; \
-		container image pull "$$IMAGE" || echo "⚠ Apple Container pull failed, will try Docker"; \
-	fi; \
-	if command -v docker >/dev/null 2>&1; then \
-		echo "Pulling image using Docker..."; \
-		if docker pull "$$IMAGE"; then \
-			echo ""; \
-			echo "✓ Sandbox image pulled successfully"; \
-		else \
-			echo ""; \
-			echo "⚠ Failed to pull sandbox image (this is OK for local sandbox mode)"; \
-		fi; \
-	else \
-		echo "✗ Neither Docker nor Apple Container is available"; \
-		echo "  Please install Docker: https://docs.docker.com/get-docker/"; \
-		exit 1; \
-	fi
+	@$(RUN_WITH_GIT_BASH) ./scripts/setup-sandbox.sh
 
 # Start all services in development mode (with hot-reloading)
 dev:
diff --git a/scripts/setup-sandbox.sh b/scripts/setup-sandbox.sh
new file mode 100644
index 000000000..2f51f786a
--- /dev/null
+++ b/scripts/setup-sandbox.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+# Pre-pull sandbox container image for DeerFlow
+
+set -uo pipefail
+
+echo "=========================================="
+echo "  Pre-pulling Sandbox Container Image"
+echo "=========================================="
+echo ""
+
+# Try to extract image from config.yaml (handles both commented and uncommented sandbox sections)
+IMAGE=""
+if [ -f "config.yaml" ]; then
+    # Look for uncommented image: field under the sandbox section
+    IMAGE=$(grep -A 20 "^sandbox:" config.yaml 2>/dev/null | grep "^  image:" | awk '{print $2}' | head -1 || true)
+fi
+
+if [ -z "$IMAGE" ]; then
+    IMAGE="enterprise-public-cn-beijing.cr.volces.com/vefaas-public/all-in-one-sandbox:latest"
+    echo "Using default image: $IMAGE"
+else
+    echo "Using configured image: $IMAGE"
+fi
+
+echo ""
+
+if command -v container >/dev/null 2>&1 && [ "$(uname)" = "Darwin" ]; then
+    echo "Detected Apple Container on macOS, pulling image..."
+    container image pull "$IMAGE" || echo "⚠ Apple Container pull failed, will try Docker"
+fi
+
+if command -v docker >/dev/null 2>&1; then
+    echo "Pulling image using Docker..."
+    if docker pull "$IMAGE"; then
+        echo ""
+        echo "✓ Sandbox image pulled successfully"
+    else
+        echo ""
+        echo "⚠ Failed to pull sandbox image (this is OK for local sandbox mode)"
+    fi
+else
+    echo "✗ Neither Docker nor Apple Container is available"
+    echo "  Please install Docker: https://docs.docker.com/get-docker/"
+    exit 1
+fi