@snapcommit/cli 3.8.24 → 3.9.0

package/dist/commands/cursor-style.js

@@ -134,8 +134,31 @@ async function showStatus() {
 async function executeCommitWithAI(intent) {
     const status = (0, git_1.getGitStatus)();
     const hasChanges = status.staged > 0 || status.unstaged > 0 || status.untracked > 0;
-    if (!hasChanges) {
-        console.log(chalk_1.default.gray('\n✓ Branch clean\n'));
+    // Check if there are unpushed commits (even if working tree is clean)
+    let hasUnpushedCommits = false;
+    try {
+        const unpushed = (0, child_process_1.execSync)('git log @{u}.. --oneline 2>/dev/null || echo ""', { encoding: 'utf-8' }).trim();
+        hasUnpushedCommits = unpushed.length > 0;
+    }
+    catch {
+        // No upstream or other error - assume we need to push
+        hasUnpushedCommits = true;
+    }
+    // If no changes AND no unpushed commits, nothing to do
+    if (!hasChanges && !hasUnpushedCommits) {
+        console.log(chalk_1.default.gray('\n✓ Branch clean - nothing to commit or push\n'));
+        return;
+    }
+    // If no changes but there are unpushed commits, just push
+    if (!hasChanges && hasUnpushedCommits) {
+        console.log(chalk_1.default.blue('\n🔄 Pushing unpushed commits...\n'));
+        try {
+            (0, child_process_1.execSync)('git push', { encoding: 'utf-8', stdio: 'inherit' });
+            console.log(chalk_1.default.green('\n✓ Pushed successfully\n'));
+        }
+        catch (error) {
+            console.log(chalk_1.default.red(`\n❌ Push failed: ${error.message}\n`));
+        }
         return;
     }
     // Count files
@@ -977,6 +1000,102 @@ async function executeGitHubCommand(intent) {
                 await github.markPRReady(readyPrNum);
                 console.log(chalk_1.default.green(`✓ PR #${readyPrNum} is now ready for review\n`));
                 break;
+            case 'merge_queue_add':
+            case 'merge_queue_enable_auto':
+                // GitHub native merge queue (requires branch protection rules)
+                let queuePrNum = intent.target || intent.options?.number;
+                // Auto-detect PR if not specified
+                if (!queuePrNum) {
+                    queuePrNum = await github.findPRNumber('current');
+                    if (!queuePrNum) {
+                        console.log(chalk_1.default.red('\n❌ No PR found for current branch\n'));
+                        return;
+                    }
+                }
+                // GitHub merge queue = enable auto-merge
+                console.log(chalk_1.default.blue(`\n🔄 Adding PR #${queuePrNum} to merge queue...\n`));
+                console.log(chalk_1.default.gray('   ℹ️  This enables auto-merge (GitHub merge queue requires branch protection)\n'));
+                try {
+                    await github.enableAutoMerge(queuePrNum, 'MERGE');
+                    console.log(chalk_1.default.green(`✓ PR #${queuePrNum} will auto-merge when:\n`));
+                    console.log(chalk_1.default.gray('   • All checks pass'));
+                    console.log(chalk_1.default.gray('   • Required reviews are approved'));
+                    console.log(chalk_1.default.gray('   • Branch is up to date\n'));
+                }
+                catch (error) {
+                    if (error.message.includes('not enabled')) {
+                        console.log(chalk_1.default.yellow('\n⚠️  Merge queue not enabled for this repository\n'));
+                        console.log(chalk_1.default.white('To enable:'));
+                        console.log(chalk_1.default.gray('  1. Go to repo Settings → Branches'));
+                        console.log(chalk_1.default.gray('  2. Edit branch protection rules'));
+                        console.log(chalk_1.default.gray('  3. Enable "Require merge queue"\n'));
+                    }
+                    else {
+                        throw error;
+                    }
+                }
+                break;
+            case 'merge_queue_status':
+                // Show auto-merge status for current PR
+                let statusPrNum = intent.target || intent.options?.number;
+                if (!statusPrNum) {
+                    statusPrNum = await github.findPRNumber('current');
+                    if (!statusPrNum) {
+                        console.log(chalk_1.default.red('\n❌ No PR found for current branch\n'));
+                        return;
+                    }
+                }
+                console.log(chalk_1.default.blue(`\n🔍 Checking merge queue status for PR #${statusPrNum}...\n`));
+                try {
+                    const prDetails = await github.getPullRequest(statusPrNum);
+                    const autoMergeEnabled = prDetails.auto_merge !== null;
+                    if (autoMergeEnabled) {
+                        console.log(chalk_1.default.green('✓ PR is in merge queue (auto-merge enabled)\n'));
+                        console.log(chalk_1.default.white('Status:'));
+                        console.log(chalk_1.default.gray(`  • Merge method: ${prDetails.auto_merge.merge_method.toUpperCase()}`));
+                        console.log(chalk_1.default.gray(`  • Waiting for: ${prDetails.mergeable_state}`));
+                        // Check CI status
+                        const ciStatus = await github.getCommitStatus();
+                        if (ciStatus.status.state === 'success') {
+                            console.log(chalk_1.default.green('  • CI: ✓ Passed'));
+                        }
+                        else if (ciStatus.status.state === 'pending') {
+                            console.log(chalk_1.default.yellow('  • CI: ⏳ Running'));
+                        }
+                        else {
+                            console.log(chalk_1.default.red('  • CI: ❌ Failed'));
+                        }
+                        console.log();
+                    }
+                    else {
+                        console.log(chalk_1.default.gray('✓ PR is not in merge queue\n'));
+                        console.log(chalk_1.default.white('To add to queue:'));
+                        console.log(chalk_1.default.cyan('  enable auto-merge when CI passes\n'));
+                    }
+                }
+                catch (error) {
+                    console.log(chalk_1.default.red(`\n❌ Failed to check status: ${error.message}\n`));
+                }
+                break;
+            case 'merge_queue_remove':
+                // Disable auto-merge
+                let removePrNum = intent.target || intent.options?.number;
+                if (!removePrNum) {
+                    removePrNum = await github.findPRNumber('current');
+                    if (!removePrNum) {
+                        console.log(chalk_1.default.red('\n❌ No PR found for current branch\n'));
+                        return;
+                    }
+                }
+                console.log(chalk_1.default.blue(`\n🔄 Removing PR #${removePrNum} from merge queue...\n`));
+                try {
+                    await github.disableAutoMerge(removePrNum);
+                    console.log(chalk_1.default.green(`✓ PR #${removePrNum} removed from merge queue\n`));
+                }
+                catch (error) {
+                    console.log(chalk_1.default.red(`\n❌ Failed: ${error.message}\n`));
+                }
+                break;
             default:
                 console.log(chalk_1.default.yellow(`\n⚠️  Action not supported: ${intent.action}\n`));
         }

package/dist/lib/github.js

@@ -25,6 +25,7 @@ exports.rerunWorkflow = rerunWorkflow;
 exports.getPullRequestFiles = getPullRequestFiles;
 exports.addLabels = addLabels;
 exports.enableAutoMerge = enableAutoMerge;
+exports.disableAutoMerge = disableAutoMerge;
 exports.createDraftPullRequest = createDraftPullRequest;
 exports.markPRReady = markPRReady;
 exports.getPRStack = getPRStack;
@@ -481,6 +482,49 @@ async function enableAutoMerge(prNumber, mergeMethod = 'MERGE') {
     }
     return await response.json();
 }
+/**
+ * Disable auto-merge for a PR
+ */
+async function disableAutoMerge(prNumber) {
+    const repo = getCurrentRepo();
+    if (!repo) {
+        throw new Error('Not a GitHub repository');
+    }
+    // GraphQL query for disabling auto-merge
+    const token = (0, github_connect_1.getGitHubToken)();
+    if (!token) {
+        throw new Error('GitHub not connected');
+    }
+    // First get PR node ID
+    const pr = await getPullRequest(prNumber);
+    const nodeId = pr.node_id;
+    const query = `
+    mutation {
+      disablePullRequestAutoMerge(input: {
+        pullRequestId: "${nodeId}"
+      }) {
+        pullRequest {
+          id
+          autoMergeRequest {
+            enabledAt
+          }
+        }
+      }
+    }
+  `;
+    const response = await fetch('https://api.github.com/graphql', {
+        method: 'POST',
+        headers: {
+            Authorization: `Bearer ${token}`,
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ query }),
+    });
+    if (!response.ok) {
+        throw new Error('Failed to disable auto-merge');
+    }
+    return await response.json();
+}
 /**
  * Create a draft PR (for stacked PRs)
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snapcommit/cli",
-  "version": "3.8.24",
+  "version": "3.9.0",
   "description": "Instant AI commits. Beautiful progress tracking. Never write commit messages again.",
   "main": "dist/index.js",
   "bin": {