From 3c20f08d8d180cef0de732f5d836138ef824e6f4 Mon Sep 17 00:00:00 2001
From: twentyOne2x <contact@attn.market>
Date: Sat, 20 Jun 2026 15:50:55 +0200
Subject: [PATCH] Stabilize leo-test readiness main check

---
 deploy/check-leo-test-deploy-readiness.sh | 5 +++--
 docs/leo-test-deploy-readiness.md         | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/deploy/check-leo-test-deploy-readiness.sh b/deploy/check-leo-test-deploy-readiness.sh
index 8372677..6280998 100755
--- a/deploy/check-leo-test-deploy-readiness.sh
+++ b/deploy/check-leo-test-deploy-readiness.sh
@@ -67,10 +67,11 @@ else
   fi
   github_main="$(git -C "$DEPLOY_INFRA_CHECKOUT" rev-parse github/main 2>/dev/null || true)"
   emit deploy_infra_github_main "$github_main"
-  if [ "$github_main" = "$EXPECTED_GITHUB_MAIN" ]; then
+  emit deploy_infra_github_main_required_ancestor "$EXPECTED_GITHUB_MAIN"
+  if [ "$github_main" = "$EXPECTED_GITHUB_MAIN" ] || git -C "$DEPLOY_INFRA_CHECKOUT" merge-base --is-ancestor "$EXPECTED_GITHUB_MAIN" github/main 2>/dev/null; then
     pass deploy_infra_github_main_expected
   else
-    fail deploy_infra_github_main_expected "expected $EXPECTED_GITHUB_MAIN, got ${github_main:-none}"
+    fail deploy_infra_github_main_expected "expected github/main to equal or descend from $EXPECTED_GITHUB_MAIN, got ${github_main:-none}"
   fi
 
   if git -C "$DEPLOY_INFRA_CHECKOUT" cat-file -e github/main:telegram/agents/leo-test.yaml 2>/dev/null; then
diff --git a/docs/leo-test-deploy-readiness.md b/docs/leo-test-deploy-readiness.md
index 25eaa75..0a575e1 100644
--- a/docs/leo-test-deploy-readiness.md
+++ b/docs/leo-test-deploy-readiness.md
@@ -32,6 +32,10 @@ FETCH_GITHUB_MAIN=1 /opt/teleo-eval/workspaces/deploy-infra/deploy/check-leo-tes
 
 ## Expected Blockers Before Reconciliation
 
+The checker treats PR #5's merge commit as a required ancestor of
+`github/main`, not as the exact current tip. This keeps the readiness check
+stable after follow-up merges such as this checker itself.
+
 The current blocker set should include:
 
 - `teleo_auto_deploy_exec_start_expected`: systemd still points at the legacy
@@ -53,7 +57,8 @@ status=ready_for_leo_test_validate_and_boot
 
 only after:
 
-- deploy-infra can fetch GitHub main at the expected PR #5 merge commit;
+- deploy-infra can read GitHub main at or after the expected PR #5 merge
+  commit;
 - GitHub main contains `telegram/agents/leo-test.yaml`;
 - systemd points auto-deploy at the reviewed deploy-infra script;
 - runtime and pipeline Telegram paths contain `agents/leo-test.yaml`;