prwatcher 2.2.0 → 2.3.0

package/README.md

@@ -41,14 +41,14 @@ On first run you'll be prompted for a GitHub personal access token. Here's what
 - `Metadata` → Read-only (required)
 - `Pull requests` → Read-only
 
-#### Watching + Auto-merge (`--auto-merge`)
+#### Watching + Auto-merge (`--auto-merge`) or Auto-rebase (`--auto-rebase`)
 
 **Classic token** — check `repo` scope
 
 **Fine-grained token** — enable:
 - `Metadata` → Read-only (required)
 - `Pull requests` → Read and write
-- `Contents` → Read and write ← required for merging
+- `Contents` → Read and write ← required for merging and rebasing
 
 > Your token is saved to `~/.watch-pr` on your machine with owner-only permissions (0600). It is never sent anywhere except the GitHub API.
 
@@ -71,6 +71,7 @@ prwatcher <pr-url> [options]
 Options:
   --interval <minutes>   Polling interval in minutes (default: 1)
   --auto-merge           Automatically merge PR once all required checks pass
+  --auto-rebase          Automatically rebase PR branch when behind (no conflicts only)
   --reset-config         Re-enter GitHub token and Slack webhook URL
   -V, --version          Output version number
   -h, --help             Display help
@@ -85,6 +86,12 @@ prwatcher https://github.com/org/repo/pull/42
 # Watch and auto-merge when ready
 prwatcher https://github.com/org/repo/pull/42 --auto-merge
 
+# Auto-rebase when behind base branch (no conflicts only)
+prwatcher https://github.com/org/repo/pull/42 --auto-rebase
+
+# Auto-rebase + auto-merge (full automation)
+prwatcher https://github.com/org/repo/pull/42 --auto-rebase --auto-merge
+
 # Poll every 30 seconds
 prwatcher https://github.com/org/repo/pull/42 --interval 0.5
 
@@ -107,7 +114,9 @@ You'll get Slack messages when:
 | PR is auto-merged | 🎉 PR was auto-merged! |
 | PR is merged | 🎉 PR was merged! |
 | PR is closed | ❌ PR was closed without merging |
+| Waiting for review approval | 👀 PR waiting for review (CI passed) |
 | Auto-merge failed | ⚠️ Auto-merge failed (with reason) |
+| PR auto-rebased | 🔄 PR branch auto-rebased from base branch |
 
 Notifications only fire on **state changes** — no spam.
 

package/bin/watch-pr.js

@@ -6,7 +6,7 @@ const { run } = require('../src/cli');
 program
   .name('prwatcher')
   .description('Watch a GitHub PR and get Slack notifications on state changes')
-  .version('2.2.0')
+  .version('2.3.0')
   .argument('<pr-url>', 'GitHub PR URL (e.g., https://github.com/owner/repo/pull/123)')
   .option('--interval <minutes>', 'polling interval in minutes', '1')
   .option('--auto-merge', 'automatically merge PR once all required checks pass')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prwatcher",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "CLI tool that watches GitHub PRs and sends Slack notifications when CI passes, fails, or PR is ready to merge",
   "main": "src/cli.js",
   "bin": {

package/src/cli.js

@@ -187,7 +187,16 @@ async function run(prUrl, options = {}) {
         return;
       }
 
-      // Blocked — CI passed but review approval required
+      // Check if CI is still running — show pending status regardless of mergeable state
+      const pending = state.checks ? state.checks.pendingRequired.length : 0;
+      const total = state.checks ? state.checks.requiredTotal : 0;
+
+      if (pending > 0) {
+        console.log(`   ⏳ ${timestamp} — CI running (${total - pending}/${total} required checks done)`);
+        return;
+      }
+
+      // Blocked — all CI passed but review approval or other requirement missing
       if (state.mergeableState === 'blocked') {
         if (lastState !== 'needs_review') {
           console.log(`   👀 ${timestamp} — Waiting for review approval`);
@@ -199,10 +208,8 @@ async function run(prUrl, options = {}) {
         return;
       }
 
-      // Pending / other state
-      const pending = state.checks ? state.checks.pendingRequired.length : 0;
-      const total = state.checks ? state.checks.requiredTotal : 0;
-      console.log(`   ⏳ ${timestamp} — CI running (${total - pending}/${total} required checks done, mergeable: ${state.mergeableState || 'unknown'})`);
+      // Other unknown state
+      console.log(`   ⏳ ${timestamp} — Waiting (mergeable: ${state.mergeableState || 'unknown'})`);
 
     } catch (error) {
       const timestamp = new Date().toLocaleTimeString();