From 648d4e3d5f505456f00058af98d437ae7eccb7d3 Mon Sep 17 00:00:00 2001
From: Zac Farrell <zac@hotdata.dev>
Date: Mon, 1 Jun 2026 13:59:08 -0700
Subject: [PATCH] ci(regenerate): enable auto-merge on generated PRs

---
 .github/workflows/regenerate.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/regenerate.yml b/.github/workflows/regenerate.yml
index 46cd5fe..6e3e073 100644
--- a/.github/workflows/regenerate.yml
+++ b/.github/workflows/regenerate.yml
@@ -236,6 +236,7 @@ jobs:
           rm -f test-scenarios.yaml
 
       - name: Create PR
+        id: cpr
         uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8
         with:
           token: ${{ steps.app-token.outputs.token }}
@@ -243,3 +244,16 @@ jobs:
           branch: openapi-update-${{ github.run_id }}
           commit-message: "chore: regenerate client from OpenAPI spec"
           body: "Auto-generated from updated HotData OpenAPI spec."
+
+      # Enable native auto-merge (squash). Branch protection on main gates the
+      # merge on the test checks (scenario-parity, integration) plus the org
+      # Claude review check and its approving review, so this only merges once
+      # everything is green and Claude has approved.
+      - name: Enable auto-merge
+        if: steps.cpr.outputs.pull-request-number
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: |
+          gh pr merge "${{ steps.cpr.outputs.pull-request-number }}" \
+            --repo "${{ github.repository }}" \
+            --squash --auto