From b8ad763a3369241056c1a3894d6a7fe135669924 Mon Sep 17 00:00:00 2001
From: Zack Kitzmiller <zackkitzmiller@gmail.com>
Date: Wed, 10 Jun 2026 09:46:17 -0500
Subject: [PATCH] chore: automate CI wait, merge, and release watch in release
 recipe

---
 justfile | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/justfile b/justfile
index e4b279b..2aa6a38 100644
--- a/justfile
+++ b/justfile
@@ -280,11 +280,23 @@ release LEVEL: release-check
         --title "release: v${VERSION}" \
         --body "Bump to v${VERSION} ({{ LEVEL }} release)" \
         --base main
-    echo ""
-    echo "PR created. Next steps:"
-    echo "  gh pr checks           # watch CI"
-    echo "  gh pr merge --squash --delete-branch"
-    echo "  gh run watch           # watch release workflow"
+
+    echo "Waiting for CI checks to appear..."
+    for i in $(seq 1 30); do
+        if gh pr checks --json name 2>/dev/null | grep -q name; then break; fi
+        sleep 2
+    done
+    echo "Watching CI checks..."
+    gh pr checks --watch --fail-fast
+
+    echo "CI passed. Merging..."
+    gh pr merge --squash --delete-branch
+
+    git checkout main
+    git pull --ff-only origin main
+
+    echo "Watching release workflow..."
+    gh run watch
 
 # ─── Cleanup ─────────────────────────────────────────────────────