From f95506e665a00d0ad4980a07b65d685dae09744b Mon Sep 17 00:00:00 2001
From: Teknium <127238744+teknium1@users.noreply.github.com>
Date: Tue, 11 Aug 2026 02:12:37 -0700
Subject: [PATCH] fix(e2e): don't require installer pin to be an ancestor of
 CURRENT
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The full GUI install flow now works end-to-end (attempt 4 proof: Install
clicked, bootstrap complete, Launch clicked, real Hermes.exe window
appeared 1024x720, installer exited, 5 Hermes processes running). The
only failure was an over-strict staging assertion.

The website Hermes-Setup.exe pins a main release commit. On a real
push-to-main run CURRENT is main's tip, so that pin is its ancestor and
the check holds. On a diverged feature branch CURRENT is a branch commit
the release pin is not an ancestor of — a legitimate topology, not a bug.
The update leg resets the checkout to serve.git's main ref (= CURRENT)
regardless of ancestry and asserts it lands there, which is the actual
forward-update proof. Downgrade the ancestor check to an informational
note so branch validation can exercise the update legs.
---
 tests/install/windows-desktop-gui-e2e.ps1 | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/install/windows-desktop-gui-e2e.ps1 b/tests/install/windows-desktop-gui-e2e.ps1
index d5cda4b694..f466d716d1 100644
--- a/tests/install/windows-desktop-gui-e2e.ps1
+++ b/tests/install/windows-desktop-gui-e2e.ps1
@@ -335,8 +335,13 @@ function Invoke-PhaseInstallGui {
     Stop-HermesAppProcesses "post-install"
 
     # The website exe installs its baked release pin — record it as the
-    # "before" version. Must be an ancestor of CURRENT (i.e. genuinely
-    # "before" this commit) and must not already BE CURRENT.
+    # "before" version. It must differ from CURRENT (an update is genuinely
+    # available). We do NOT require it to be an ancestor of CURRENT: on a
+    # real `push: main` run CURRENT is main's tip and the release pin is
+    # behind it (ancestor), but on a feature branch CURRENT has diverged
+    # from main, so the release pin legitimately isn't in its ancestry. The
+    # update leg resets the checkout to serve.git's main ref regardless, and
+    # asserts it lands on CURRENT — that is the real forward-update proof.
     $installedSha = Get-InstalledHead
     Write-Host "  installer landed on: $installedSha (website release pin)"
     Assert-True ($installedSha -ne $state.current) "installed pin differs from CURRENT (an update is genuinely available)"
@@ -344,7 +349,11 @@ function Invoke-PhaseInstallGui {
     & git -C $InstallDir merge-base --is-ancestor $installedSha $state.current 2>&1 | Out-Null
     $isAncestor = ($LASTEXITCODE -eq 0)
     $ErrorActionPreference = $prevEap
-    Assert-True $isAncestor "installed pin is an ancestor of CURRENT (before -> current is a forward update)"
+    if ($isAncestor) {
+        Write-Host "  [ok] installed pin is an ancestor of CURRENT (linear before -> current)"
+    } else {
+        Write-Host "  [note] installed pin is NOT an ancestor of CURRENT — expected on a diverged feature branch; the update leg still resets to CURRENT"
+    }
     Test-HermesRuns "post-install-gui"
     Assert-True ($null -ne (Get-DesktopExe)) "packaged Desktop Hermes.exe exists"