From 99e3c8ca2f17a89b1e34090d4dee9c59d61a00a4 Mon Sep 17 00:00:00 2001
From: Afonso Oliveira <afonso.oliveira707@gmail.com>
Date: Thu, 24 Sep 2026 22:42:46 +0100
Subject: [PATCH] Test factory reset version mismatches and packaged invocation

---
 test/shell.d/factory-reset-elevation-test.sh | 36 +++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/test/shell.d/factory-reset-elevation-test.sh b/test/shell.d/factory-reset-elevation-test.sh
index 20a894bf..da47d88f 100755
--- a/test/shell.d/factory-reset-elevation-test.sh
+++ b/test/shell.d/factory-reset-elevation-test.sh
@@ -17,7 +17,10 @@ awk '
   { print }
   END { if (!found) exit 1 }
 ' "$ROOT/bin/omarchy-system-factory-reset" >"$tmp/checkout with spaces/reset"
-chmod +x "$tmp/checkout with spaces/reset"
+grep -Fxq 'PACKAGED_PATH=/usr/bin/omarchy-system-factory-reset' "$ROOT/bin/omarchy-system-factory-reset" || fail "factory reset pins the packaged path"
+sed -i "s|^PACKAGED_PATH=.*|PACKAGED_PATH=\"$tmp/packaged-reset\"|" "$tmp/checkout with spaces/reset"
+cp "$tmp/checkout with spaces/reset" "$tmp/packaged-reset"
+chmod +x "$tmp/checkout with spaces/reset" "$tmp/packaged-reset"
 ln -s "$tmp/checkout with spaces/reset" "$tmp/reset-link"
 
 cat >"$tmp/bin/sudo" <<'SH'
@@ -28,11 +31,11 @@ SH
 chmod +x "$tmp/bin/sudo"
 
 args=('argument with spaces' '' '--flag' '$(touch should-not-run)' $'two\nlines')
-expected=(env 'GUM_INPUT_PROMPT=Reset this computer? ' /usr/bin/omarchy-system-factory-reset "${args[@]}")
-for invocation in "$tmp/checkout with spaces/reset" './checkout with spaces/reset' "$tmp/reset-link"; do
+expected=(env 'GUM_INPUT_PROMPT=Reset this computer? ' "$tmp/packaged-reset" "${args[@]}")
+for invocation in "$tmp/checkout with spaces/reset" './checkout with spaces/reset' "$tmp/reset-link" "$tmp/packaged-reset" reset; do
   for status in 0 1 127; do
     actual_status=0
-    (cd "$tmp" && env -i HOME="$tmp" PATH="$tmp/bin:/usr/bin:/bin" \
+    (cd "$tmp" && env -i HOME="$tmp" PATH="$tmp/bin:$tmp/checkout with spaces:/usr/bin:/bin" \
       OMARCHY_PATH="$tmp/checkout with spaces" PACKAGED_PATH="$tmp/wrong-target" \
       GUM_INPUT_PROMPT='Reset this computer? ' CALL_LOG="$tmp/call" SUDO_STATUS="$status" \
       "$invocation" "${args[@]}") || actual_status=$?
@@ -46,3 +49,28 @@ for invocation in "$tmp/checkout with spaces/reset" './checkout with spaces/rese
   done
   pass "factory reset pins $invocation to the packaged command and preserves arguments, styling and status"
 done
+
+if unshare -Ur true >/dev/null 2>&1; then
+  status=0
+  unshare -Ur "$tmp/packaged-reset" || status=$?
+  (( status == 99 )) || fail "matching root invocation did not reach the guarded body"
+  pass "matching packaged root invocation reaches the reset body"
+else
+  skip "user namespaces unavailable; root invocation coverage"
+fi
+
+# A checkout must not hand off to older installed code, even with explicit sudo.
+printf '\n# older packaged copy\n' >>"$tmp/packaged-reset"
+rm -f "$tmp/call"
+if CALL_LOG="$tmp/call" PATH="$tmp/bin:/usr/bin:/bin" "$tmp/reset-link" >"$tmp/mismatch" 2>&1; then
+  fail "mismatched reset implementation was accepted"
+fi
+[[ ! -e $tmp/call ]] || fail "mismatched reset requested elevation"
+grep -Fq 'Install the matching Omarchy package' "$tmp/mismatch" || fail "mismatch explains recovery"
+if unshare -Ur true >/dev/null 2>&1; then
+  status=0
+  unshare -Ur "$tmp/reset-link" >"$tmp/root-mismatch" 2>&1 || status=$?
+  (( status == 1 )) || fail "root invocation did not refuse mismatch before the reset body"
+  pass "root checkout invocation refuses a mismatched packaged reset"
+fi
+pass "mismatched checkout refuses before elevation"