diff --git a/Makefile b/Makefile
index 2beffd2..8833dd0 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,12 @@
 .PHONY: help config config-upgrade check install dev dev-daemon start stop up down clean docker-init docker-start docker-stop docker-logs docker-logs-frontend docker-logs-gateway
 
 PYTHON ?= python
+BASH ?= bash
+
+# Detect OS for Windows compatibility
+ifeq ($(OS),Windows_NT)
+    SHELL := cmd.exe
+endif
 
 help:
 	@echo "DeerFlow Development Commands:"
@@ -90,11 +96,21 @@ setup-sandbox:
 
 # Start all services in development mode (with hot-reloading)
 dev:
+ifeq ($(OS),Windows_NT)
+	@echo "Detected Windows - using Git Bash..."
+	@$(BASH) ./scripts/serve.sh --dev
+else
 	@./scripts/serve.sh --dev
+endif
 
 # Start all services in production mode (with optimizations)
 start:
+ifeq ($(OS),Windows_NT)
+	@echo "Detected Windows - using Git Bash..."
+	@$(BASH) ./scripts/serve.sh --prod
+else
 	@./scripts/serve.sh --prod
+endif
 
 # Start all services in daemon mode (background)
 dev-daemon: