@@ -261,16 +261,22 @@ boot_installed() { # OpenCore picker -> installed macOS (2nd entry, right of EF
261261 for t in 1 2 3 4 5; do mon " sendkey ret" ; sleep 8; done
262262}
263263
264- stage_setup () { # M2b: boot the installed base image and verify it reaches Setup Assistant fast (recon)
264+ sa_shot () { sleep " ${2:- 4} " ; screendump " su-$1 " ; kill -0 " $QEMU_PID " 2> /dev/null || { log " QEMU exited" ; return 1; }; }
265+
266+ stage_setup () { # M2b: drive the installed system's Setup Assistant (best-effort; dense screenshots to refine)
265267 boot_installed
266- local i
267- for (( i = 1 ; i <= 10 ; i++ )) ; do
268- python3 " $QMP_PY " " $QMP_SOCK " move $(( 420 + i % 180 )) 420 2> /dev/null || true # jiggle: keep display awake
269- sleep 30
270- screendump " setup-01-$( printf ' %02d' " $i " ) "
271- kill -0 " $QEMU_PID " 2> /dev/null || { log " QEMU exited at setup recon $i " ; return 1; }
272- done
273- log " setup recon done — verify fast boot to Setup Assistant (setup-01-*.png)"
268+ sleep 35; screendump " su-00-region"
269+ log " Setup Assistant click-through (best-effort)"
270+ typestr " United States" ; sleep 1; ocrclick Continue 600 720; sa_shot 01 6 # Country/Region
271+ ocrclick Continue 600 720; sa_shot 02 5 # Written/Spoken Languages
272+ ocrclick Now 540 720; sa_shot 03 5 # Accessibility -> Not Now
273+ ocrclick Continue 600 720; sa_shot 04 5 # Data & Privacy
274+ ocrclick Now 540 720; sa_shot 05 5 # Migration -> Not Now
275+ ocrclick Later 700 720; sa_shot 06 5 # Apple Account -> Set Up Later
276+ ocrclick Skip 420 560; sa_shot 07 4 # confirm "Skip"
277+ ocrclick Agree 600 720; sa_shot 08 3 # Terms & Conditions -> Agree
278+ keys tab; sleep 1; keys spc; sleep 1; ocrclick Agree 360 480; sa_shot 09 5 # terms confirm sheet
279+ log " Setup Assistant recon done — inspect su-*.png to refine the sequence"
274280}
275281
276282main () {
0 commit comments