@snapcommit/cli 3.9.15 → 3.9.17

package/dist/commands/cursor-style.js

@@ -771,9 +771,71 @@ async function executeGitHubCommand(intent) {
             case 'new_pr':
                 const isDraft = intent.options?.draft || false;
                 console.log(chalk_1.default.blue(`\n🔄 Creating ${isDraft ? 'draft ' : ''}PR...`));
-                const pr = await github.createPullRequest(intent.options || {});
-                console.log(chalk_1.default.green(`✓ ${isDraft ? 'Draft ' : ''}PR #${pr.number} created`));
-                console.log(chalk_1.default.cyan(`  ${pr.html_url}\n`));
+                try {
+                    const pr = await github.createPullRequest(intent.options || {});
+                    console.log(chalk_1.default.green(`✓ ${isDraft ? 'Draft ' : ''}PR #${pr.number} created`));
+                    console.log(chalk_1.default.cyan(`  ${pr.html_url}\n`));
+                }
+                catch (error) {
+                    console.log(chalk_1.default.red('\n❌ Cannot create PR\n'));
+                    // Check if it's because we're on main branch
+                    try {
+                        const currentBranch = (0, child_process_1.execSync)('git rev-parse --abbrev-ref HEAD', { encoding: 'utf-8' }).trim();
+                        const defaultBranch = (0, child_process_1.execSync)('git symbolic-ref refs/remotes/origin/HEAD', { encoding: 'utf-8' }).trim().replace('refs/remotes/origin/', '');
+                        if (currentBranch === defaultBranch || currentBranch === 'main' || currentBranch === 'master') {
+                            console.log(chalk_1.default.yellow('⚠️  You\'re on the main branch!\n'));
+                            console.log(chalk_1.default.white('Why this fails:'));
+                            console.log(chalk_1.default.gray('  • PRs merge FROM a feature branch TO main'));
+                            console.log(chalk_1.default.gray('  • You can\'t create a PR from main to main\n'));
+                            console.log(chalk_1.default.cyan('💡 Here\'s what to do:\n'));
+                            console.log(chalk_1.default.white('1. Create a new branch:'));
+                            console.log(chalk_1.default.cyan('   create a new branch called feature/your-feature\n'));
+                            console.log(chalk_1.default.white('2. Make your changes'));
+                            console.log(chalk_1.default.white('3. Commit and push:'));
+                            console.log(chalk_1.default.cyan('   commit and push changes\n'));
+                            console.log(chalk_1.default.white('4. Then create PR:'));
+                            console.log(chalk_1.default.cyan('   create a PR to main\n'));
+                            return;
+                        }
+                    }
+                    catch (branchError) {
+                        // If we can't determine branch, show generic error
+                    }
+                    // Check if there are no commits to push
+                    try {
+                        const commitsAhead = (0, child_process_1.execSync)('git rev-list --count @{u}..HEAD 2>/dev/null || echo 0', { encoding: 'utf-8' }).trim();
+                        if (commitsAhead === '0') {
+                            console.log(chalk_1.default.yellow('⚠️  No new commits on this branch!\n'));
+                            console.log(chalk_1.default.white('Why this fails:'));
+                            console.log(chalk_1.default.gray('  • PRs need at least 1 commit that\'s not in main'));
+                            console.log(chalk_1.default.gray('  • Your branch is identical to main\n'));
+                            console.log(chalk_1.default.cyan('💡 Here\'s what to do:\n'));
+                            console.log(chalk_1.default.white('1. Make some changes to your code'));
+                            console.log(chalk_1.default.white('2. Commit and push:'));
+                            console.log(chalk_1.default.cyan('   commit and push changes\n'));
+                            console.log(chalk_1.default.white('3. Then create PR:'));
+                            console.log(chalk_1.default.cyan('   create a PR to main\n'));
+                            return;
+                        }
+                    }
+                    catch (commitError) {
+                        // If we can't check commits, continue to generic error
+                    }
+                    // Generic error with helpful message
+                    console.log(chalk_1.default.white('Common reasons:'));
+                    console.log(chalk_1.default.gray('  • Branch is up to date with main (no changes)'));
+                    console.log(chalk_1.default.gray('  • PR already exists for this branch'));
+                    console.log(chalk_1.default.gray('  • No commits on this branch\n'));
+                    console.log(chalk_1.default.cyan('💡 Try:\n'));
+                    console.log(chalk_1.default.white('• Check existing PRs:'));
+                    console.log(chalk_1.default.cyan('  show all PRs\n'));
+                    console.log(chalk_1.default.white('• Check your branch:'));
+                    console.log(chalk_1.default.cyan('  what branch am i on'));
+                    console.log(chalk_1.default.cyan('  show last 5 commits\n'));
+                    if (error.message) {
+                        console.log(chalk_1.default.gray(`\nError: ${error.message}\n`));
+                    }
+                }
                 break;
             case 'pr_list':
             case 'list_prs':
@@ -865,6 +927,7 @@ async function executeGitHubCommand(intent) {
                 console.log(chalk_1.default.green(`✓ Issue #${closeIssueNum} closed\n`));
                 break;
             case 'issue_reopen':
+            case 'reopen_issue':
                 const reopenIssueNum = intent.target || intent.options?.number;
                 if (!reopenIssueNum) {
                     console.log(chalk_1.default.red('\n❌ Issue number required\n'));
@@ -928,6 +991,8 @@ async function executeGitHubCommand(intent) {
                 console.log(chalk_1.default.green(`✓ Comment added\n`));
                 break;
             case 'issue_comment':
+            case 'comment_issue':
+            case 'add_issue_comment':
                 const commentIssueNum = intent.target || intent.options?.number;
                 if (!commentIssueNum) {
                     console.log(chalk_1.default.red('\n❌ Issue number required\n'));
@@ -1006,6 +1071,9 @@ async function executeGitHubCommand(intent) {
                 console.log();
                 break;
             case 'workflow_rerun':
+            case 'rerun_workflow':
+            case 'retry_ci':
+            case 'rerun_ci':
                 const runId = intent.target || intent.options?.runId;
                 if (!runId) {
                     console.log(chalk_1.default.red('\n❌ Workflow run ID required\n'));
@@ -1016,10 +1084,16 @@ async function executeGitHubCommand(intent) {
                 console.log(chalk_1.default.green(`✓ Workflow re-run started\n`));
                 break;
             case 'pr_label':
-                const labelPrNum = intent.target || intent.options?.number;
+            case 'label_pr':
+            case 'add_labels':
+                let labelPrNum = intent.target || intent.options?.number;
+                // Smart PR detection
                 if (!labelPrNum) {
-                    console.log(chalk_1.default.red('\n❌ PR number required\n'));
-                    return;
+                    labelPrNum = await github.findPRNumber('current');
+                    if (!labelPrNum) {
+                        console.log(chalk_1.default.red('\n❌ No PR found for current branch\n'));
+                        return;
+                    }
                 }
                 const labels = intent.options?.labels || [];
                 if (labels.length === 0) {
@@ -1076,6 +1150,8 @@ async function executeGitHubCommand(intent) {
                 }
                 break;
             case 'pr_stack_create':
+            case 'create_stacked_prs':
+            case 'create_stack':
                 const branches = intent.options?.branches || [];
                 if (branches.length < 2) {
                     console.log(chalk_1.default.red('\n❌ Need at least 2 branches for stacked PRs\n'));
@@ -1110,10 +1186,16 @@ async function executeGitHubCommand(intent) {
                 console.log(chalk_1.default.gray('💡 Merge from bottom to top for best results!\n'));
                 break;
             case 'pr_mark_ready':
-                const readyPrNum = intent.target || intent.options?.number;
+            case 'mark_ready':
+            case 'ready_for_review':
+                let readyPrNum = intent.target || intent.options?.number;
+                // Smart PR detection
                 if (!readyPrNum) {
-                    console.log(chalk_1.default.red('\n❌ PR number required\n'));
-                    return;
+                    readyPrNum = await github.findPRNumber('current');
+                    if (!readyPrNum) {
+                        console.log(chalk_1.default.red('\n❌ No PR found for current branch\n'));
+                        return;
+                    }
                 }
                 console.log(chalk_1.default.blue(`\n🔄 Marking PR #${readyPrNum} as ready for review...`));
                 await github.markPRReady(readyPrNum);
@@ -1201,6 +1283,8 @@ async function executeGitHubCommand(intent) {
                 }
                 break;
             case 'merge_queue_remove':
+            case 'remove_from_queue':
+            case 'disable_auto_merge':
                 // Disable auto-merge
                 let removePrNum = intent.target || intent.options?.number;
                 if (!removePrNum) {

package/package.json

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