From 1f7d0efb0dc22287fbda9fc78c686126c037ddb1 Mon Sep 17 00:00:00 2001
From: Wojtek Majewski <wojciech.majewski@pm.me>
Date: Sun, 16 Nov 2025 21:40:09 +0100
Subject: [PATCH] fix(ci): use origin/main as nx affected base for stacked PRs

- Remove push trigger (CI only runs on PRs, merge queue validates main)
- Replace nx-set-shas with hardcoded origin/main base
- Fixes issue where topmost PR in stack tested against wrong base causing red main
- Keep changeset-release/** exclusion (workspace:* deps make CI redundant)
---
 .../client-realtime-stabilization-delay.md    |  5 ++++
 .github/workflows/ci.yml                      | 27 ++++++++++++-------
 2 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/client-realtime-stabilization-delay.md

diff --git a/.changeset/client-realtime-stabilization-delay.md b/.changeset/client-realtime-stabilization-delay.md
new file mode 100644
index 000000000..c55296de6
--- /dev/null
+++ b/.changeset/client-realtime-stabilization-delay.md
@@ -0,0 +1,5 @@
+---
+'@pgflow/client': patch
+---
+
+Add `realtimeStabilizationDelayMs` option to PgflowClient for improved Supabase Realtime reliability
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c76bfc1a7..8207312c0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,8 +2,7 @@ name: CI
 on:
   pull_request:
     branches: ['**', '!changeset-release/**']
-  push:
-    branches: ['main']
+  # CI only runs on PRs - merge queue validates before merge to main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -43,8 +42,10 @@ jobs:
         with:
           cloud-token: ${{ secrets.ATLAS_CLOUD_TOKEN }}
 
-      - name: Set Nx SHAs for affected commands
-        uses: nrwl/nx-set-shas@v4
+      - name: Set Nx base for affected commands
+        run: |
+          echo "NX_BASE=origin/main" >> $GITHUB_ENV
+          echo "NX_HEAD=HEAD" >> $GITHUB_ENV
 
       - name: Verify NX_BASE and NX_HEAD are set
         run: echo "BASE=$NX_BASE HEAD=$NX_HEAD"
@@ -85,8 +86,10 @@ jobs:
         with:
           cloud-token: ${{ secrets.ATLAS_CLOUD_TOKEN }}
 
-      - name: Set Nx SHAs for affected commands
-        uses: nrwl/nx-set-shas@v4
+      - name: Set Nx base for affected commands
+        run: |
+          echo "NX_BASE=origin/main" >> $GITHUB_ENV
+          echo "NX_HEAD=HEAD" >> $GITHUB_ENV
 
       - name: Verify NX_BASE and NX_HEAD are set
         run: echo "BASE=$NX_BASE HEAD=$NX_HEAD"
@@ -126,8 +129,10 @@ jobs:
 
       - uses: ./.github/actions/setup
 
-      - name: Set Nx SHAs for affected commands
-        uses: nrwl/nx-set-shas@v4
+      - name: Set Nx base for affected commands
+        run: |
+          echo "NX_BASE=origin/main" >> $GITHUB_ENV
+          echo "NX_HEAD=HEAD" >> $GITHUB_ENV
 
       - name: Verify NX_BASE and NX_HEAD are set
         run: echo "BASE=$NX_BASE HEAD=$NX_HEAD"
@@ -202,8 +207,10 @@ jobs:
 
       - uses: ./.github/actions/setup
 
-      - name: Set Nx SHAs for affected commands
-        uses: nrwl/nx-set-shas@v4
+      - name: Set Nx base for affected commands
+        run: |
+          echo "NX_BASE=origin/main" >> $GITHUB_ENV
+          echo "NX_HEAD=HEAD" >> $GITHUB_ENV
 
       - name: Verify NX_BASE and NX_HEAD are set
         run: echo "BASE=$NX_BASE HEAD=$NX_HEAD"