From 2934872266326042a9ccadfa438a7ead6d3596f8 Mon Sep 17 00:00:00 2001
From: Adam Moussa <adam@seahavenind.com>
Date: Fri, 21 Aug 2026 20:25:16 -0400
Subject: [PATCH] fix(ci): re-arm auto-merge as seahaven-bot after failed
 enqueue

---
 .github/workflows/auto-merge.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index a8a074a..633887a 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -55,6 +55,9 @@ jobs:
             exit 0
           fi
           echo "$out"
+          # Re-arm as seahaven-bot. A leftover GITHUB_TOKEN auto-merge would
+          # enqueue without starting merge_group.
+          gh pr merge "$PR" --repo "$REPO" --disable-auto || true
           if ! gh pr merge "$PR" --repo "$REPO" --auto; then
             if [ "$(gh pr view "$PR" --repo "$REPO" --json autoMergeRequest --jq '.autoMergeRequest != null')" = "true" ]; then
               echo "auto-merge already enabled"