From bde4b59f2fcf0eb1a48b764bbb52fa408e650714 Mon Sep 17 00:00:00 2001
From: ethernet <arilotter@gmail.com>
Date: Mon, 10 Aug 2026 21:29:24 -0400
Subject: [PATCH] fix(windows-e2e): screen-native button crop, ImageSearch only
 - PixelSearch removed

install-button.png is now cut from run 31449192962's LOSSLESS
welcome-screen.png (blue-text extents x465-558 y449-459 plus 3px margin,
verified complete '[ INSTALL ]' with no foreign pixels) instead of the
H.264 recording whose chroma subsampling made every video-sourced crop
miss the live screen. Tolerance drops from *60 to *20 accordingly.

PixelSearch is deleted outright: color-hunting matched the blue title
(run 31446691812) and the progress view's stage text (run 31447405319)
before it ever matched the button. Click-landed detection reuses the
same ImageSearch (button visible = not clicked). The TEMP
stop-after-screenshot exit is removed - the AHK path is live again.
---
 tests/install/windows/install-button.png      | Bin 2034 -> 680 bytes
 .../windows/install-hermes-desktop.ahk        |  64 +++++++-----------
 tests/install/windows/install-update-e2e.ps1  |   9 ---
 3 files changed, 24 insertions(+), 49 deletions(-)

diff --git a/tests/install/windows/install-button.png b/tests/install/windows/install-button.png
index 4a7705fcca7b8796da06004de2d341113ffbec8c..19c478dc81023bf3d01c1e68acd33ebdd50b7aab 100644
GIT binary patch
literal 680
zcmV;Z0$2TsP)<h;3K|Lk000e1NJLTq003kF000pP0ssI2q;H;a0007SNkl<Zc%1E+
zO=uHQ5Xb)`sZ9-~(5L|uJ=oe1w9rEvv9(AWK?@d|Lutst2rZss?p|8s!Fu$Ni(tWe
z2#P`qUZWy@5E4&~(pYn7n(o1v1Vc!&z4$yN=40K`-NZF0`(qEw%=?&`eecb@C4Tn@
zRHSjB-3I(isKJtfruw#(!iy*aaMFN@Gt@ql+D~B@&p)sNkAoUq8ls~;6?wzT(rMv1
zPtqgh@<Hol)n_eSQ!NLW*2$Iw3_v7~0S}ABYubDXHgBbu*~7SOO%;j5u)ykvEe}$K
z%fjptPFH3v48uahM1mPzK1qJ*I^h_j>0#>VXpn36XfKIXH|{uT@)o-`ftz-b5I=l{
zs~1E%x>o?;+X{7e2~{Kg`1*h%aa_5}?q8=FtFS>N4wD`h69QrUu2mET&#V)N@x6#g
zubDueFJUJm6iR1<V<tVFJ%ybN%a>X+Q6>ro>$o201`u3_z@_dk+?b+wpK)YfxCi$o
zUqWylb}KFpQZj=W_h(Js2W7LNXNo>15sV7uGgk0^nj57=8hvh&(`PSY9FiFrdvUB6
z1O%hauh1q?HdrJ5xI9G9LgFs1y7A^V^&G+mC)H;zi|sVV7g?X1CDMp-e>H0>UT4{@
z*iIu?6xVWD<chEurTQEQV{VjqKk<HAnnh?+-Y#yDmV)K-q5OrtPa&Gi0oVpHW^Rzw
z*A0$)Y-v_%Qsc4+Z8H0>#ug(b(hw91xgy3FMM{}6Pu^ElHg7Y@fvR`ItrS9E*z_>z
zI%SXYUy{n<<tH|Ix>l4n)L8`{kKZ!2g0HXO>ml{8gLKr3v<%c>$>1ld<p7~sQCZpm
O0000<MNUMnLSTZ+YA`VX

literal 2034
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
Q>i_@%07*qoM6N<$f@+52<^TWy

diff --git a/tests/install/windows/install-hermes-desktop.ahk b/tests/install/windows/install-hermes-desktop.ahk
index 838804cd24..46efd2b9f7 100644
--- a/tests/install/windows/install-hermes-desktop.ahk
+++ b/tests/install/windows/install-hermes-desktop.ahk
@@ -13,11 +13,13 @@
 ;   2: bootstrap-complete marker path to poll for (required)
 ;
 ; The Install button image lives next to this script. It is a literal crop
-; of the published installer's button from a CI screen recording;
-; ImageSearch runs with a generous shade tolerance because the reference
-; passed through video compression. Completion deliberately does NOT use a
-; second button image: the marker file is the installer's own completion
-; signal and cannot go stale with a UI restyle.
+; of the published installer's "[ INSTALL ]" button, cut from the LOSSLESS
+; welcome-screen.png the driver captures in CI (run 31449192962) -- never
+; from the ffmpeg recording, whose H.264/yuv420p chroma subsampling shifts
+; glyph pixels enough that a video-sourced crop misses the live screen.
+; Completion deliberately does NOT use a second button image: the marker
+; file is the installer's own completion signal and cannot go stale with a
+; UI restyle.
 
 logPath := A_Args.Length >= 1 ? A_Args[1] : "ahk.log"
 markerPath := A_Args.Length >= 2 ? A_Args[2] : ""
@@ -98,9 +100,9 @@ FindImageInWindow(winTitle, imageFile, &outX, &outY, timeoutMs := 10000, interva
     timeLeft := 1
 
     Log(Format("Searching for button file {} in window {}...", imageFile, winTitle))
-    ; *60: the reference crop survived H.264 video compression, so per-channel
-    ; drift up to ~60 shades must still count as a match.
-    searchImage := Format("*60 {}", imageFile)
+    ; *20: the reference is a lossless screen crop, so only minor rendering
+    ; drift (ClearType phase, sub-shade rounding) needs absorbing.
+    searchImage := Format("*20 {}", imageFile)
     while (timeLeft > 0)
     {
         if ImageSearch(&x, &y, wx, wy, wx + ww, wy + wh, searchImage)
@@ -139,44 +141,26 @@ if (markerPath = "") {
     throw Error("marker path argument is required")
 }
 
-; Find the Install button and click it.
-;
-; ImageSearch against the reference crop is attempted first, but it is
-; expected to fail on a real screen: the crop came from an H.264/yuv420p
-; recording, whose chroma subsampling smears the glyph edges -- the same
-; crop matches a RECORDING of this screen within 8 shades/channel while
-; missing the live screen entirely. The reliable path is PixelSearch for
-; the saturated blue of the "[ INSTALL ]" text. Scan only the CENTER THIRD
-; horizontally and BELOW 55% of the window height: the HERMES AGENT title
-; is blue too (bottom rows ~47% -- run 31446691812 clicked it ten times),
-; and the post-click PROGRESS view has blue stage text on the left side
-; (run 31447405319 clicked that while the install was running fine).
+; Find the Install button via ImageSearch against the lossless screen crop.
+; No PixelSearch fallback: color-hunting matched the blue HERMES AGENT title
+; (run 31446691812) and the progress view's blue stage text (run 31447405319)
+; before it ever matched the button.
 FindInstallClickPoint(winTitle, &outX, &outY) {
-    WinGetPos(&wx, &wy, &ww, &wh, winTitle)
     try {
         FindImageInWindow(winTitle, A_ScriptDir "\install-button.png", &outX, &outY, 3000, 250)
         Log("Install button located via ImageSearch")
         return true
     } catch {
+        return false
     }
-    x1 := wx + Floor(ww * 0.33)
-    x2 := wx + Floor(ww * 0.67)
-    y1 := wy + Floor(wh * 0.55)
-    if PixelSearch(&px, &py, x1, y1, x2, wy + wh, 0x3B82F6, 90) {
-        outX := px
-        outY := py
-        Log(Format("Install button located via PixelSearch (blue text at {1}, {2})", px, py))
-        return true
-    }
-    return false
 }
 
-; Did the click land? Check whether the blue we clicked is still at THAT
-; SPOT (small box around the click point): the button vanishes when the UI
-; flips to the progress view, and a point check cannot false-positive on
-; the progress view's own blue elsewhere in the window.
-BlueStillAt(x, y) {
-    return PixelSearch(&px, &py, x - 12, y - 12, x + 12, y + 12, 0x3B82F6, 90)
+; Did the click land? The button vanishes when the UI flips to the progress
+; view, so finding it again means the click did not take.
+InstallButtonStillVisible(winTitle) {
+    x := 0
+    y := 0
+    return FindInstallClickPoint(winTitle, &x, &y)
 }
 
 ; Best-effort clicking: NEVER throw here. The authoritative signals are
@@ -211,11 +195,11 @@ while (attempts < 10) {
     ClickWithMarker(x, y)
     everClicked := true
     Sleep(3000)
-    if (!BlueStillAt(x, y)) {
-        Log("Install click landed (button gone from click point)")
+    if (!InstallButtonStillVisible(winTitle)) {
+        Log("Install click landed (button no longer on screen)")
         break
     }
-    Log(Format("Install click attempt {}: blue persists at click point; retrying", attempts))
+    Log(Format("Install click attempt {}: button still visible; retrying", attempts))
 }
 
 ; Wait for the installer's own completion signal: the bootstrap-complete
diff --git a/tests/install/windows/install-update-e2e.ps1 b/tests/install/windows/install-update-e2e.ps1
index a8af3d3421..a252a8cd83 100644
--- a/tests/install/windows/install-update-e2e.ps1
+++ b/tests/install/windows/install-update-e2e.ps1
@@ -278,15 +278,6 @@ try {
     }
     Ok "welcome screen captured (lossless) to welcome-screen.png"
 
-    # TEMPORARY: stop here. The ImageSearch reference crop has to be cut from
-    # this capture before the AHK click path can work, so running it now only
-    # burns a doomed 30-minute leg. Remove this exit once install-button.png
-    # is regenerated from welcome-screen.png.
-    Stop-Process -Id $proc.Id -Force -ErrorAction SilentlyContinue
-    Stop-Recording
-    Write-Host "STOPPING EARLY: welcome-screen.png captured; AHK path disabled until the button crop is regenerated from it."
-    exit 0
-
     $ahkLog = Join-Path $LogDir "ahk.log"
     # The helper polls for the installer's own completion signal instead of a
     # second button screenshot (see paths.rs likely_bootstrap_marker).