From 43defd01e03a29231a55a1c4e87099b43882999e Mon Sep 17 00:00:00 2001
From: Test User <test@test.com>
Date: Tue, 5 May 2026 19:15:33 -0700
Subject: [PATCH] fix merger post-rebase CI polling

---
 .../__tests__/scripts/core-flow-smoke.test.ts | 64 +++++++++++++++++++
 scripts/night-watch-merger-cron.sh            |  6 +-
 2 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/__tests__/scripts/core-flow-smoke.test.ts b/packages/cli/src/__tests__/scripts/core-flow-smoke.test.ts
index 7931408..f57213a 100644
--- a/packages/cli/src/__tests__/scripts/core-flow-smoke.test.ts
+++ b/packages/cli/src/__tests__/scripts/core-flow-smoke.test.ts
@@ -159,6 +159,70 @@ describe('core flow smoke tests (bash scripts)', () => {
     expect(result.stdout).toContain('NIGHT_WATCH_RESULT:skip_no_open_prs');
   });
 
+  it('merger should merge an eligible PR after a successful rebase', () => {
+    const projectDir = mkTempDir('nw-smoke-merger-success-');
+    fs.mkdirSync(path.join(projectDir, 'logs'), { recursive: true });
+
+    const fakeBin = mkTempDir('nw-smoke-bin-merger-success-');
+    const ghCallLog = path.join(projectDir, '.smoke-gh-calls');
+
+    fs.writeFileSync(
+      path.join(fakeBin, 'sleep'),
+      '#!/usr/bin/env bash\n' +
+        'if [[ "${1:-}" == "15" ]]; then\n' +
+        '  exit 0\n' +
+        'fi\n' +
+        'exec /usr/bin/sleep "$@"\n',
+      {
+        encoding: 'utf-8',
+        mode: 0o755,
+      },
+    );
+
+    fs.writeFileSync(
+      path.join(fakeBin, 'gh'),
+      '#!/usr/bin/env bash\n' +
+        'printf \'%s\\n\' "$*" >> "$NW_SMOKE_GH_CALL_LOG"\n' +
+        'if [[ "$1" == "pr" && "$2" == "list" ]]; then\n' +
+        '  if [[ "$*" == *"headRefName"* ]]; then\n' +
+        '    echo \'[{"number":123,"headRefName":"night-watch/smoke","createdAt":"2026-01-01T00:00:00Z","isDraft":false,"labels":[]}]\'\n' +
+        '  else\n' +
+        "    echo '[]'\n" +
+        '  fi\n' +
+        '  exit 0\n' +
+        'fi\n' +
+        'if [[ "$1" == "pr" && "$2" == "checks" ]]; then\n' +
+        "  echo '[]'\n" +
+        '  exit 0\n' +
+        'fi\n' +
+        'if [[ "$1" == "pr" && "$2" == "view" ]]; then\n' +
+        "  echo '100'\n" +
+        '  exit 0\n' +
+        'fi\n' +
+        'if [[ "$1" == "pr" && "$2" == "update-branch" ]]; then\n' +
+        '  exit 0\n' +
+        'fi\n' +
+        'if [[ "$1" == "pr" && "$2" == "merge" ]]; then\n' +
+        "  echo 'merged'\n" +
+        '  exit 0\n' +
+        'fi\n' +
+        'exit 0\n',
+      { encoding: 'utf-8', mode: 0o755 },
+    );
+
+    const result = runScript(mergerScript, projectDir, {
+      PATH: `${fakeBin}:${process.env.PATH}`,
+      NW_SMOKE_GH_CALL_LOG: ghCallLog,
+      NW_MERGER_MAX_PRS_PER_RUN: '1',
+    });
+
+    expect(result.status).toBe(0);
+    expect(result.stdout).toContain('NIGHT_WATCH_RESULT:success|merged=1|failed=0|prs=123');
+    const ghCalls = fs.readFileSync(ghCallLog, 'utf-8');
+    expect(ghCalls).toContain('pr update-branch --rebase 123');
+    expect(ghCalls).toContain('pr merge 123 --squash --delete-branch');
+  });
+
   it('executor should emit success_open_pr and move PRD to done when PR is detected after provider run', () => {
     const projectDir = mkTempDir('nw-smoke-executor-success-');
     initGitRepo(projectDir);
diff --git a/scripts/night-watch-merger-cron.sh b/scripts/night-watch-merger-cron.sh
index 5b1b61e..01a168a 100755
--- a/scripts/night-watch-merger-cron.sh
+++ b/scripts/night-watch-merger-cron.sh
@@ -281,9 +281,9 @@ while IFS= read -r pr_json; do
     log "INFO: PR #${pr_number}: Rebase successful"
 
     # Poll CI until all checks complete after rebase (up to 5 minutes)
-    local ci_max_wait=300
-    local ci_waited=0
-    local ci_poll=15
+    ci_max_wait=300
+    ci_waited=0
+    ci_poll=15
     while [ "${ci_waited}" -lt "${ci_max_wait}" ]; do
       sleep "${ci_poll}"
       ci_waited=$((ci_waited + ci_poll))