From 4bca80affe2174775abef4a39672bcea67387942 Mon Sep 17 00:00:00 2001
From: Lawrence Chen <54008264+lawrencecchen@users.noreply.github.com>
Date: Tue, 10 Feb 2026 16:38:06 -0800
Subject: [PATCH] CI: discover vm via subnet scan when host alias missing

---
 .github/workflows/ci.yml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f7fbef19..efe8222c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -87,6 +87,7 @@ jobs:
             -o StrictHostKeyChecking=no
             -o UserKnownHostsFile=/dev/null
             -o ConnectTimeout=15
+            -o PreferredAuthentications=publickey
           )
 
           # Resolve a usable vm host. Prefer explicit env, then ssh config, then a known default.
@@ -113,6 +114,22 @@ jobs:
               break
             fi
           done
+
+          # If the host isn't explicitly configured, fall back to scanning the common UTM/VZ subnet.
+          if [ -z "$vm_host" ] && [ -z "${CMUX_VM_HOST:-}" ]; then
+            subnet="${CMUX_VM_SUBNET:-192.168.64}"
+            port="${CMUX_VM_PORT:-22}"
+            echo "Attempting VM discovery on ${subnet}.0/24 (port ${port})..."
+            candidates="$(
+              seq 1 254 | xargs -n1 -P 64 -I{} sh -c "nc -z -w 1 ${subnet}.{} ${port} >/dev/null 2>&1 && echo ${subnet}.{}" | head -n 20
+            )"
+            for ip in $candidates; do
+              if ssh "${ssh_opts[@]}" "$vm_user@$ip" 'true' >/dev/null 2>&1; then
+                vm_host="$ip"
+                break
+              fi
+            done
+          fi
           if [ -z "$vm_host" ]; then
             echo "ERROR: Could not reach the UI-test VM via SSH; UI tests are required."
             echo "Tried:"
@@ -123,9 +140,9 @@ jobs:
             ssh -G cmux-vm 2>/dev/null | head -40 || true
             echo "Name resolution:"
             dscacheutil -q host -a name cmux-vm || true
-            echo "Network probe:"
-            ping -c 1 cmux-vm || true
-            ping -c 1 192.168.64.73 || true
+            echo "Network probe (nc):"
+            nc -z -w 1 cmux-vm 22 || true
+            nc -z -w 1 192.168.64.73 22 || true
             exit 1
           fi