git shims for fork detection disablement

2026-08-12 07:24:32 -04:00
parent f4c4c17dc6
commit 368164d7dc
3 changed files with 170 additions and 42 deletions
--- a/tests/install/installer-script-e2e.sh
+++ b/tests/install/installer-script-e2e.sh
@@ -122,18 +122,67 @@ git -C "$SERVE_REPO" symbolic-ref HEAD refs/heads/main
 git -C "$SERVE_REPO" config uploadpack.allowAnySHA1InWant true
 ok "serve.git main = $OLD_SHA ($INSTALL_REF), update target $HEAD_SHA"

-# --- the git URL redirect -----------------------------------------------------
-
-# A driver-owned global gitconfig, NOT GIT_CONFIG_COUNT/KEY_n/VALUE_n env
-# config: install.sh sets those itself and would clobber ours.
-GIT_CFG="$WORK_ROOT/gitconfig"
-cat > "$GIT_CFG" <<EOF
+arm_redirect() {
+  # --- the git URL redirect -----------------------------------------------------
+  # we redirect to our own repo so we can play around with what commit hermes thinks we're on.
+  # A driver-owned global gitconfig, NOT GIT_CONFIG_COUNT/KEY_n/VALUE_n env
+  # config: install.sh sets those itself and would clobber ours.
+  actual_git_url="$(git -C "$REPO_ROOT" remote get-url origin)"
+  GIT_CFG="$WORK_ROOT/gitconfig"
+  cat > "$GIT_CFG" <<EOF
 [url "file://$SERVE_REPO"]
-	insteadOf = $REPO_URL_HTTPS
-	insteadOf = $REPO_URL_SSH
+  insteadOf = $actual_git_url
 EOF
-export GIT_CONFIG_GLOBAL="$GIT_CFG"
-ok "git URL redirect via GIT_CONFIG_GLOBAL=$GIT_CFG"
+  export GIT_CONFIG_GLOBAL="$GIT_CFG"
+
+  # check it worked
+  expected_git_url="file://$SERVE_REPO"
+  actual_git_url="$(git -C "$REPO_ROOT" remote get-url origin)"
+  if [[ "$actual_git_url" != "$expected_git_url" ]]; then
+    fail "failed git remote get-url shim: origin resolves to '$actual_git_url', expected '$expected_git_url'"
+  fi
+  ok "git URL redirect via GIT_CONFIG_GLOBAL=$GIT_CFG"
+
+
+  # shim git and make 'git remote get-url origin' report the actual HA upstream
+
+  # insteadOf is transparent for transport but `git remote get-url origin` gives you the
+  # replacement, so _get_origin_url() sees file://$SERVE_REPO and _is_fork() would return true.
+  # we check for the arguments "remote get-url origin" in order in any position
+  # to allow for e.g. -c with some config being passed.
+  # if we didn't do this, we'd need the  .skip_upstream_prompt file to prevent a hang in headless,"add the
+  # official repo as upstream?" prompt would hang a headless run. But we don't anymore :D
+  REAL_GIT="$(command -v git)"
+  REAL_GIT_QUOTED="$(printf '%q' "$REAL_GIT")"
+  SHIM_DIR="$WORK_ROOT/shim"
+  mkdir -p "$SHIM_DIR"
+  cat > "$SHIM_DIR/git" <<EOF
+#!/usr/bin/env bash
+prev2=""
+prev1=""
+for arg in "\$@"; do
+    if [ "\$prev2" = "remote" ] && [ "\$prev1" = "get-url" ] && [ "\$arg" = "origin" ]; then
+        echo "$REPO_URL_HTTPS"
+        exit 0
+    fi
+    prev2="\$prev1"
+    prev1="\$arg"
+done
+exec "$REAL_GIT_QUOTED" "\$@"
+EOF
+  chmod +x "$SHIM_DIR/git"
+  export PATH="$SHIM_DIR:$PATH"
+
+  # check it worked
+  observed_git_url="$(git -C "$REPO_ROOT" remote get-url origin)"
+  if [[ "$observed_git_url" != "$REPO_URL_HTTPS" ]]; then
+    fail "failed git remote get-url shim: origin resolves to '$actual', expected '$REPO_URL_HTTPS'"
+  fi
+  ok "git remote get-url shim: $SHIM_DIR/git -> $REAL_GIT (origin reports $REPO_URL_HTTPS)"
+}
+
+# later, we might factor this out into a separate step like the macos desktop one.
+arm_redirect

 # Isolated HOME: the runner's real one may carry a preinstalled hermes or a
 # developer config, and old installer scripts hardcode $HOME/.hermes (the
@@ -144,10 +193,6 @@ mkdir -p "$HOME/.local/bin"
 export PATH="$HOME/.local/bin:$PATH"
 export HERMES_HOME="$HOME/.hermes"
 mkdir -p "$HERMES_HOME"
-# serve.git's file:// origin looks like a fork to the updater, whose "add the
-# official repo as upstream?" prompt would hang a headless run. This marker is
-# the product's own mechanism for suppressing it.
-touch "$HERMES_HOME/.skip_upstream_prompt"

 INSTALL_DIR="$HERMES_HOME/hermes-agent"

--- a/tests/install/macos-desktop-e2e.sh
+++ b/tests/install/macos-desktop-e2e.sh
@@ -84,8 +84,65 @@ log_group() {
 # Every phase runs in its own process (separate CI steps), so the redirect
 # env is re-established here, not inherited.
 arm_redirect() {
+  # --- the git URL redirect -----------------------------------------------------
+
+  # we redirect to our own repo so we can play around with what commit hermes thinks we're on.
+  # A driver-owned global gitconfig, NOT GIT_CONFIG_COUNT/KEY_n/VALUE_n env
+  # config: install.sh sets those itself and would clobber ours.
+  actual_git_url="$(git -C "$REPO_ROOT" remote get-url origin)"
  GIT_CFG="$WORK_ROOT/gitconfig"
+  cat > "$GIT_CFG" <<EOF
+[url "file://$SERVE_REPO"]
+  insteadOf = $actual_git_url
+EOF
  export GIT_CONFIG_GLOBAL="$GIT_CFG"
+
+  # check it worked
+  expected_git_url="file://$SERVE_REPO"
+  actual_git_url="$(git -C "$REPO_ROOT" remote get-url origin)"
+  if [[ "$actual_git_url" != "$expected_git_url" ]]; then
+    fail "failed git remote get-url shim: origin resolves to '$actual_git_url', expected '$expected_git_url'"
+  fi
+  ok "git URL redirect via GIT_CONFIG_GLOBAL=$GIT_CFG"
+
+
+  # shim git and make 'git remote get-url origin' report the actual HA upstream
+
+  # insteadOf is transparent for transport but `git remote get-url origin` gives you the
+  # replacement, so _get_origin_url() sees file://$SERVE_REPO and _is_fork() would return true.
+  # we check for the arguments "remote get-url origin" in order in any position
+  # to allow for e.g. -c with some config being passed.
+  # if we didn't do this, we'd need the  .skip_upstream_prompt file to prevent a hang in headless,"add the
+  # official repo as upstream?" prompt would hang a headless run. But we don't anymore :D
+  REAL_GIT="$(command -v git)"
+  REAL_GIT_QUOTED="$(printf '%q' "$REAL_GIT")"
+  SHIM_DIR="$WORK_ROOT/shim"
+  mkdir -p "$SHIM_DIR"
+  cat > "$SHIM_DIR/git" <<EOF
+#!/usr/bin/env bash
+prev2=""
+prev1=""
+for arg in "\$@"; do
+    if [ "\$prev2" = "remote" ] && [ "\$prev1" = "get-url" ] && [ "\$arg" = "origin" ]; then
+        echo "$REPO_URL_HTTPS"
+        exit 0
+    fi
+    prev2="\$prev1"
+    prev1="\$arg"
+done
+exec "$REAL_GIT_QUOTED" "\$@"
+EOF
+  chmod +x "$SHIM_DIR/git"
+  export PATH="$SHIM_DIR:$PATH"
+
+  # check it worked
+  observed_git_url="$(git -C "$REPO_DIR" remote get-url origin)"
+  if [[ "$observed_git_url" != "$REPO_URL_HTTPS" ]]; then
+    fail "failed git remote get-url shim: origin resolves to '$actual', expected '$REPO_URL_HTTPS'"
+  fi
+  ok "git remote get-url shim: $SHIM_DIR/git -> $REAL_GIT (origin reports $REPO_URL_HTTPS)"
+
+  # -------
  export HOME="$HOME_SANDBOX"
  export PATH="$HOME/.local/bin:$PATH"
  export HERMES_HOME="$HOME/.hermes"
@@ -115,11 +172,6 @@ phase_stage() {
  git -C "$SERVE_REPO" symbolic-ref HEAD refs/heads/main
  git -C "$SERVE_REPO" config uploadpack.allowAnySHA1InWant true

-  cat > "$WORK_ROOT/gitconfig" <<EOF
-[url "file://$SERVE_REPO"]
-	insteadOf = $REPO_URL_HTTPS
-	insteadOf = $REPO_URL_SSH
-EOF
  arm_redirect
  mkdir -p "$HERMES_HOME"
  touch "$HERMES_HOME/.skip_upstream_prompt"
--- a/tests/install/windows-e2e.ps1
+++ b/tests/install/windows-e2e.ps1
@@ -48,17 +48,15 @@
 # both phases, ahk.log, and the hand-off log. All uploaded as CI artifacts.
 #
 # DEVIATIONS FROM PRODUCTION (each one deliberate and small):
-#   * the git URL redirect itself -- the staging requirement.
+#   * the git URL redirect itself
 #   * serve.git gets uploadpack.allowAnySHA1InWant=true so the installer's
 #     baked -Commit pin can be fetched from the redirected clone the same
 #     way GitHub's upload-pack allows it.
 #   * A dummy provider key is seeded after install so the update leg sees
 #     the ready app shell instead of the onboarding overlay (a real
 #     updating user has a configured provider).
-#   * .skip_upstream_prompt is set: serve.git's file:// origin looks like a
-#     fork to `hermes update`, whose fork-only upstream prompt is a bare
-#     input() that hangs forever under the desktop's detached console.
-#     Real GUI users are on the official origin and never see it.
+#   * we don't set .skip_upstream_prompt, but we shim `git` so it returns
+#     the real upstream url for 'git remote get-url origin' 
 #
 # USAGE (local Windows box or CI):
 #   powershell -File tests\install\windows-e2e.ps1 -Phase all
@@ -165,8 +163,7 @@ function Invoke-Git([string[]]$GitArgs) {
 }

 function Set-GitRedirect {
-    # Route the canonical repo URLs to the local bare repo for THIS process
-    # and every child (the installer's git, hermes update's git).
+    # we redirect to our own repo so we can play around with what commit hermes thinks we're on.
    #
    # MECHANISM: a driver-owned global gitconfig selected via
    # GIT_CONFIG_GLOBAL. Do NOT use GIT_CONFIG_COUNT/KEY_n/VALUE_n env
@@ -180,14 +177,62 @@ function Set-GitRedirect {
    if (-not (Test-Path -LiteralPath $WorkRoot)) {
        New-Item -ItemType Directory -Path $WorkRoot -Force | Out-Null
    }
+    # first, get the set origin url
+    $actualGitUrl = Invoke-Git @("-C", $RepoRoot, "remote", "get-url", "origin")
+    # then override it 
    @"
 [url "$fileUrl"]
-	insteadOf = $RepoUrlHttps
-	insteadOf = $RepoUrlSsh
+	insteadOf = $actualGitUrl
 "@ | Set-Content -LiteralPath $gitCfg -Encoding ASCII
    $env:GIT_CONFIG_GLOBAL = $gitCfg
+
+    # check it worked
+    $actualGitUrl = Invoke-Git @("-C", $RepoRoot, "remote", "get-url", "origin")
+    Assert-True ($actualGitUrl -eq $fileUrl) "git URL redirect: origin resolves to '$actualGitUrl', expected '$fileUrl'."
    Write-Host "  git URL redirect via GIT_CONFIG_GLOBAL=$gitCfg"
    Write-Host "    $RepoUrlHttps -> $fileUrl"
+
+
+    # shim git and make 'git remote get-url origin' report the actual HA upstream
+
+    # insteadOf is transparent for transport but `git remote get-url origin` gives you the
+    # replacement, so _get_origin_url() sees file://$SERVE_REPO and _is_fork() would return true.
+    # we check for the arguments "remote get-url origin" in order in any position
+    # to allow for e.g. -c with some config being passed.
+    # if we didn't do this, we'd need the  .skip_upstream_prompt file to prevent a hang in headless,"add the
+    # official repo as upstream?" prompt would hang a headless run. But we don't anymore :D
+
+    $realGit = (Get-Command git.exe -ErrorAction Stop).Source
+    $shimDir = Join-Path $WorkRoot "shim"
+    New-Item -ItemType Directory -Path $shimDir -Force | Out-Null
+    $shimPath = Join-Path $shimDir "git.bat"
+    @"
+@echo off
+setlocal enabledelayedexpansion
+set prev2=
+set prev1=
+:loop
+if "%~1"=="" goto passthrough
+if /I "!prev2!"=="remote" if /I "!prev1!"=="get-url" if /I "%~1"=="origin" (
+    echo $RepoUrlHttps
+    exit /b 0
+)
+set prev2=!prev1!
+set prev1=%~1
+shift
+goto loop
+:passthrough
+`"$realGit`" %*
+exit /b %ERRORLEVEL%
+"@ | Set-Content -LiteralPath $shimPath -Encoding ASCII
+
+    $env:PATH = "$shimDir;$env:PATH"
+
+    # check it worked
+    $observedGitUrl = Invoke-Git @("-C", $RepoRoot, "remote", "get-url", "origin")
+    Assert-True ($observedGitUrl -eq $RepoUrlHttps) "git remote get-url shim: origin resolves to '$observedGitUrl', expected '$RepoUrlHttps'"
+    Write-Host "  git remote get-url shim: $shimPath -> $realGit"
+    Write-Host "    'remote get-url origin' now reports $RepoUrlHttps"
 }

 function Read-State {
@@ -586,19 +631,6 @@ function Invoke-PhaseInstallGui {
        Add-Content -LiteralPath $envFile -Value "OPENROUTER_API_KEY=sk-or-...-key"
    }
    Write-Host "  seeded placeholder provider key for the update leg"
-
-    # Suppress the interactive "add upstream remote?" prompt during the GUI
-    # update leg. Our serve.git origin (file://) looks like a fork to
-    # `hermes update`, so `_sync_with_upstream_if_needed` would call bare
-    # input() -- which HANGS FOREVER when the Desktop spawns the hand-off via
-    # `cmd start /min` (a real but empty console; input() blocks waiting for a
-    # keystroke that never comes). Real GUI users on the official github
-    # origin never hit this path (_is_fork is false). The skip marker
-    # (.skip_upstream_prompt in HERMES_HOME) is the product's own mechanism
-    # for "don't ask about upstream", so setting it keeps the update flow
-    # faithful while avoiding the fork-only prompt.
-    New-Item -ItemType File -Path (Join-Path $HermesHome ".skip_upstream_prompt") -Force | Out-Null
-    Write-Host "  set .skip_upstream_prompt (serve.git origin looks like a fork; avoids the fork-only input() hang)"
 }

 # ----------------------------------------------------------------------------
@@ -777,7 +809,6 @@ function Invoke-PhaseInstall {
    # product's own suppression mechanism.
    $env:HERMES_HOME = $HermesHome
    New-Item -ItemType Directory -Path $HermesHome -Force | Out-Null
-    New-Item -ItemType File -Path (Join-Path $HermesHome ".skip_upstream_prompt") -Force | Out-Null
    switch ($InstallMethod) {
        "desktop-installer@latest" {
            Invoke-PhaseInstallGui