Merge pull request #1005 from yasinBursali/fix/macos-install-polish

fix(macos): install-time polish — DIM constant, busybox pin, healthcheck rewrite

Author: Lightheartdevs

dream-server/installers/macos/docker-compose.macos.yml

@@ -6,7 +6,7 @@
 
 services:
   llama-server:
-    image: busybox:latest   # Placeholder -- container never runs (replicas: 0)
+    image: busybox:1.36.1   # Placeholder -- container never runs (replicas: 0)
     deploy:
       replicas: 0    # Disabled -- running natively on macOS host via Metal
 
@@ -15,7 +15,7 @@ services:
   # lightweight container bridges the gap.  open-webui waits on its
   # healthcheck before starting.
   llama-server-ready:
-    image: busybox:latest
+    image: busybox:1.36.1
     container_name: dream-llama-ready
     restart: unless-stopped
     extra_hosts:

dream-server/installers/macos/install-macos.sh

@@ -1093,31 +1093,48 @@ fi
 
 # Health check loop
 ai "Running health checks..."
-MAX_ATTEMPTS=30
+MAX_ATTEMPTS=90   # 90 * 2s = 180s -- covers base compose start_period (60s) + image pull
 ALL_HEALTHY=true
 
-# Parallel arrays (Bash 3.2 compatible -- no associative arrays)
+# Parallel arrays (Bash 3.2 compatible -- no associative arrays).
+# HEALTH_CONTAINERS holds the Docker container name when a service runs in
+# Docker; an empty string means the service is host-native (llama-server
+# runs natively on macOS via Metal; OpenCode is a LaunchAgent). Docker
+# services wait on `docker inspect ... .State.Health.Status == healthy`;
+# host-native services fall back to an HTTP probe on 127.0.0.1.
 HEALTH_NAMES=("LLM (llama-server)" "Chat UI (Open WebUI)")
-HEALTH_URLS=("http://localhost:8080/health" "http://localhost:3000")
-$ENABLE_VOICE && HEALTH_NAMES+=("Whisper (STT)") && HEALTH_URLS+=("http://localhost:9000/health")
-$ENABLE_WORKFLOWS && HEALTH_NAMES+=("n8n (Workflows)") && HEALTH_URLS+=("http://localhost:5678/healthz")
-[[ -x "$OPENCODE_BIN" ]] && HEALTH_NAMES+=("OpenCode (IDE)") && HEALTH_URLS+=("http://localhost:${OPENCODE_PORT}")
+HEALTH_URLS=("http://127.0.0.1:8080/health" "http://127.0.0.1:3000")
+HEALTH_CONTAINERS=("" "dream-webui")
+$ENABLE_VOICE && HEALTH_NAMES+=("Whisper (STT)") && HEALTH_URLS+=("http://127.0.0.1:9000/health") && HEALTH_CONTAINERS+=("dream-whisper")
+$ENABLE_WORKFLOWS && HEALTH_NAMES+=("n8n (Workflows)") && HEALTH_URLS+=("http://127.0.0.1:5678/healthz") && HEALTH_CONTAINERS+=("dream-n8n")
+[[ -x "$OPENCODE_BIN" ]] && HEALTH_NAMES+=("OpenCode (IDE)") && HEALTH_URLS+=("http://127.0.0.1:${OPENCODE_PORT}") && HEALTH_CONTAINERS+=("")
 
 for ((idx=0; idx<${#HEALTH_NAMES[@]}; idx++)); do
     NAME="${HEALTH_NAMES[$idx]}"
     URL="${HEALTH_URLS[$idx]}"
+    CONTAINER="${HEALTH_CONTAINERS[$idx]}"
     HEALTHY=false
 
     for ((attempt=1; attempt<=MAX_ATTEMPTS; attempt++)); do
-        HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" "$URL" 2>/dev/null || echo "000")
-        if [[ "$HTTP_CODE" -ge 200 ]] && [[ "$HTTP_CODE" -lt 400 ]]; then
-            HEALTHY=true
-            break
-        fi
-        # 401/403 means service is responding (auth-protected) -- treat as healthy
-        if [[ "$HTTP_CODE" == "401" ]] || [[ "$HTTP_CODE" == "403" ]]; then
-            HEALTHY=true
-            break
+        if [[ -n "$CONTAINER" ]]; then
+            # Docker service -- wait for the container healthcheck to report healthy.
+            STATUS=$(docker inspect --format '{{.State.Health.Status}}' "$CONTAINER" 2>/dev/null || echo "missing")
+            if [[ "$STATUS" == "healthy" ]]; then
+                HEALTHY=true
+                break
+            fi
+        else
+            # Host-native service -- poll HTTP on 127.0.0.1.
+            HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" "$URL" 2>/dev/null || echo "000")
+            if [[ "$HTTP_CODE" -ge 200 ]] && [[ "$HTTP_CODE" -lt 400 ]]; then
+                HEALTHY=true
+                break
+            fi
+            # 401/403 means service is responding (auth-protected) -- treat as healthy
+            if [[ "$HTTP_CODE" == "401" ]] || [[ "$HTTP_CODE" == "403" ]]; then
+                HEALTHY=true
+                break
+            fi
         fi
         if (( attempt <= 3 || attempt % 5 == 0 )); then
             ai "  Waiting for ${NAME}... (${attempt}/${MAX_ATTEMPTS})"

dream-server/installers/macos/lib/constants.sh

@@ -79,6 +79,7 @@ BGRN='\033[1;32m'        # Bright green -- emphasis, success, headings
 DGRN='\033[2;32m'        # Dim green -- secondary text, lore
 AMB='\033[0;33m'         # Amber -- warnings, ETA labels
 WHT='\033[1;37m'         # White -- key URLs
+DIM='\033[2;37m'         # Dim white -- subdued hints, lore
 NC='\033[0m'             # Reset
 CURSOR='█'               # Block cursor for typing