@snapcommit/cli 3.9.17 → 3.9.19

package/dist/commands/cursor-style.js

@@ -646,10 +646,21 @@ async function executeGitCommands(commands) {
             else if (cmd.includes('git stash')) {
                 // Stashing
                 if (cmd.includes('pop') || cmd.includes('apply')) {
-                    console.log(chalk_1.default.green('\n✓ Stash applied\n'));
+                    // Only show message if there was actually something to pop
+                    if (output.trim() && !output.includes('No stash entries')) {
+                        console.log(chalk_1.default.green('\n✓ Stash applied\n'));
+                    }
                 }
-                else {
-                    console.log(chalk_1.default.green('\n✓ Changes stashed\n'));
+                else if (!cmd.includes('list')) {
+                    // Check if there was actually something to stash
+                    if (output.includes('Saved working directory') || output.includes('No local changes')) {
+                        if (output.includes('No local changes')) {
+                            // Nothing to stash - that's fine, don't show message
+                        }
+                        else {
+                            console.log(chalk_1.default.green('\n✓ Changes stashed\n'));
+                        }
+                    }
                 }
             }
             else if (cmd.includes('git reset')) {
@@ -746,6 +757,11 @@ async function executeGitCommands(commands) {
                 console.log(chalk_1.default.gray('💡 Tip: Most conflicts are simple! Just pick the better code.\n'));
                 return;
             }
+            // Skip harmless errors
+            if (errorMsg.includes('no stash entries found') || errorMsg.includes('no local changes to save')) {
+                // Nothing to stash/pop - that's fine, continue silently
+                continue;
+            }
             // Try to auto-fix common errors
             const fixed = await tryAutoFix(error, cmd);
             if (!fixed) {
@@ -861,12 +877,73 @@ async function executeGitHubCommand(intent) {
                     prNumber = await github.findPRNumber('current');
                     if (!prNumber) {
                         console.log(chalk_1.default.red('\n❌ No PR found for current branch\n'));
+                        console.log(chalk_1.default.white('Why this fails:'));
+                        console.log(chalk_1.default.gray('  • This branch doesn\'t have an open PR\n'));
+                        console.log(chalk_1.default.cyan('💡 Here\'s what to do:\n'));
+                        console.log(chalk_1.default.white('1. Check if a PR exists:'));
+                        console.log(chalk_1.default.cyan('   show all PRs\n'));
+                        console.log(chalk_1.default.white('2. Or create a PR first:'));
+                        console.log(chalk_1.default.cyan('   create a PR to main\n'));
+                        console.log(chalk_1.default.white('3. Then merge it:'));
+                        console.log(chalk_1.default.cyan('   merge my PR\n'));
                         return;
                     }
                 }
                 console.log(chalk_1.default.blue(`\n🔄 Merging PR #${prNumber}...`));
-                await github.mergePullRequest(prNumber);
-                console.log(chalk_1.default.green(`✓ PR #${prNumber} merged\n`));
+                try {
+                    await github.mergePullRequest(prNumber);
+                    console.log(chalk_1.default.green(`✓ PR #${prNumber} merged\n`));
+                }
+                catch (error) {
+                    console.log(chalk_1.default.red('\n❌ Cannot merge PR\n'));
+                    const errorMsg = error.message?.toLowerCase() || '';
+                    if (errorMsg.includes('not mergeable') || errorMsg.includes('merge conflict')) {
+                        console.log(chalk_1.default.yellow('⚠️  PR has merge conflicts!\n'));
+                        console.log(chalk_1.default.white('Why this fails:'));
+                        console.log(chalk_1.default.gray('  • Changes in this PR conflict with main branch'));
+                        console.log(chalk_1.default.gray('  • You need to resolve conflicts first\n'));
+                        console.log(chalk_1.default.cyan('💡 Here\'s what to do:\n'));
+                        console.log(chalk_1.default.white('1. Pull latest changes from main:'));
+                        console.log(chalk_1.default.cyan('   merge main into this branch\n'));
+                        console.log(chalk_1.default.white('2. SnapCommit will auto-resolve conflicts'));
+                        console.log(chalk_1.default.white('3. Then try merging PR again:'));
+                        console.log(chalk_1.default.cyan('   merge my PR\n'));
+                    }
+                    else if (errorMsg.includes('required status check') || errorMsg.includes('checks')) {
+                        console.log(chalk_1.default.yellow('⚠️  CI checks haven\'t passed!\n'));
+                        console.log(chalk_1.default.white('Why this fails:'));
+                        console.log(chalk_1.default.gray('  • GitHub requires all checks to pass before merging'));
+                        console.log(chalk_1.default.gray('  • Your tests/build might be failing\n'));
+                        console.log(chalk_1.default.cyan('💡 Here\'s what to do:\n'));
+                        console.log(chalk_1.default.white('1. Check CI status:'));
+                        console.log(chalk_1.default.cyan('   check if my build passed\n'));
+                        console.log(chalk_1.default.white('2. Fix any failing tests'));
+                        console.log(chalk_1.default.white('3. Push fixes:'));
+                        console.log(chalk_1.default.cyan('   commit and push changes\n'));
+                        console.log(chalk_1.default.white('4. Then try merging again'));
+                    }
+                    else if (errorMsg.includes('review') || errorMsg.includes('approval')) {
+                        console.log(chalk_1.default.yellow('⚠️  PR needs approval!\n'));
+                        console.log(chalk_1.default.white('Why this fails:'));
+                        console.log(chalk_1.default.gray('  • Repository requires code review approval'));
+                        console.log(chalk_1.default.gray('  • You need a teammate to review and approve\n'));
+                        console.log(chalk_1.default.cyan('💡 Here\'s what to do:\n'));
+                        console.log(chalk_1.default.white('1. Ask a teammate to review your PR'));
+                        console.log(chalk_1.default.white('2. Wait for approval'));
+                        console.log(chalk_1.default.white('3. Then try merging again\n'));
+                    }
+                    else {
+                        console.log(chalk_1.default.white('Common reasons:'));
+                        console.log(chalk_1.default.gray('  • CI checks still running'));
+                        console.log(chalk_1.default.gray('  • Required reviews not approved'));
+                        console.log(chalk_1.default.gray('  • Merge conflicts exist\n'));
+                        console.log(chalk_1.default.cyan('💡 Try:\n'));
+                        console.log(chalk_1.default.cyan('  check if my build passed\n'));
+                        if (error.message) {
+                            console.log(chalk_1.default.gray(`Error: ${error.message}\n`));
+                        }
+                    }
+                }
                 break;
             case 'ci_check':
             case 'ci_status':
@@ -879,26 +956,52 @@ async function executeGitHubCommand(intent) {
                     const totalChecks = ciStatus.checks.length;
                     const failedChecks = ciStatus.checks.filter((c) => c.conclusion === 'failure').length;
                     if (state === 'success' || (totalChecks > 0 && failedChecks === 0)) {
-                        console.log(chalk_1.default.green(`✓ All checks passed (${totalChecks} checks)\n`));
+                        console.log(chalk_1.default.green(`✅ All checks passed (${totalChecks} checks)\n`));
                     }
                     else if (state === 'pending') {
                         console.log(chalk_1.default.yellow(`⏳ Checks running (${totalChecks} checks)\n`));
+                        console.log(chalk_1.default.gray('💡 Wait a few minutes and check again\n'));
                     }
                     else {
                         console.log(chalk_1.default.red(`❌ ${failedChecks}/${totalChecks} checks failed\n`));
+                        console.log(chalk_1.default.white('Why this matters:'));
+                        console.log(chalk_1.default.gray('  • Failed checks block PR merging'));
+                        console.log(chalk_1.default.gray('  • Something is broken in your code\n'));
+                        console.log(chalk_1.default.cyan('💡 Here\'s what to do:\n'));
+                        console.log(chalk_1.default.white('1. View full details on GitHub:'));
+                        console.log(chalk_1.default.cyan('   show my PR\n'));
+                        console.log(chalk_1.default.white('2. Fix the failing tests/build'));
+                        console.log(chalk_1.default.white('3. Push the fixes:'));
+                        console.log(chalk_1.default.cyan('   commit and push changes\n'));
+                        console.log(chalk_1.default.white('4. Check status again:'));
+                        console.log(chalk_1.default.cyan('   check if my build passed\n'));
                     }
                 }
                 catch (error) {
-                    console.log(chalk_1.default.gray('   No CI checks found\n'));
+                    console.log(chalk_1.default.gray('\n✓ No CI checks configured\n'));
+                    console.log(chalk_1.default.white('This is fine! Not all repos need CI.\n'));
                 }
                 break;
             case 'issue_create':
             case 'create_issue':
             case 'new_issue':
                 console.log(chalk_1.default.blue('\n🔄 Creating issue...'));
-                const issue = await github.createIssue(intent.options || {});
-                console.log(chalk_1.default.green(`✓ Issue #${issue.number} created`));
-                console.log(chalk_1.default.cyan(`  ${issue.html_url}\n`));
+                try {
+                    const issue = await github.createIssue(intent.options || {});
+                    console.log(chalk_1.default.green(`✓ Issue #${issue.number} created`));
+                    console.log(chalk_1.default.cyan(`  ${issue.html_url}\n`));
+                }
+                catch (error) {
+                    console.log(chalk_1.default.red('\n❌ Cannot create issue\n'));
+                    console.log(chalk_1.default.white('Common reasons:'));
+                    console.log(chalk_1.default.gray('  • Missing title or description'));
+                    console.log(chalk_1.default.gray('  • No permission to create issues\n'));
+                    console.log(chalk_1.default.cyan('💡 Try:\n'));
+                    console.log(chalk_1.default.cyan('  create an issue with title "Bug in login" and description "Users cant login"\n'));
+                    if (error.message) {
+                        console.log(chalk_1.default.gray(`Error: ${error.message}\n`));
+                    }
+                }
                 break;
             case 'issue_list':
             case 'list_issues':
@@ -1308,7 +1411,76 @@ async function executeGitHubCommand(intent) {
         }
     }
     catch (error) {
-        console.log(chalk_1.default.red(`\n❌ ${error.message}\n`));
+        // Intelligent error handling - NEVER show raw API errors
+        const errorMsg = error.message?.toLowerCase() || '';
+        // GitHub authentication errors
+        if (errorMsg.includes('bad credentials') || errorMsg.includes('unauthorized') || errorMsg.includes('401')) {
+            console.log(chalk_1.default.red('\n❌ GitHub authentication failed\n'));
+            console.log(chalk_1.default.white('Why this fails:'));
+            console.log(chalk_1.default.gray('  • Your GitHub connection expired'));
+            console.log(chalk_1.default.gray('  • Invalid or revoked access token\n'));
+            console.log(chalk_1.default.cyan('💡 Here\'s what to do:\n'));
+            console.log(chalk_1.default.white('1. Reconnect GitHub:'));
+            console.log(chalk_1.default.cyan('   github connect\n'));
+            console.log(chalk_1.default.white('2. Then try your command again\n'));
+            return;
+        }
+        // Permission errors
+        if (errorMsg.includes('not found') || errorMsg.includes('404')) {
+            console.log(chalk_1.default.red('\n❌ Repository or resource not found\n'));
+            console.log(chalk_1.default.white('Common reasons:'));
+            console.log(chalk_1.default.gray('  • Repository is private and you don\'t have access'));
+            console.log(chalk_1.default.gray('  • PR/issue number doesn\'t exist'));
+            console.log(chalk_1.default.gray('  • Repository name changed\n'));
+            console.log(chalk_1.default.cyan('💡 Try:\n'));
+            console.log(chalk_1.default.white('• Check repository access'));
+            console.log(chalk_1.default.white('• Verify PR/issue numbers:'));
+            console.log(chalk_1.default.cyan('  show all PRs\n'));
+            return;
+        }
+        // Rate limit errors
+        if (errorMsg.includes('rate limit') || errorMsg.includes('403')) {
+            console.log(chalk_1.default.red('\n❌ GitHub rate limit exceeded\n'));
+            console.log(chalk_1.default.white('Why this fails:'));
+            console.log(chalk_1.default.gray('  • Too many API requests in a short time'));
+            console.log(chalk_1.default.gray('  • GitHub limits API calls per hour\n'));
+            console.log(chalk_1.default.cyan('💡 Here\'s what to do:\n'));
+            console.log(chalk_1.default.white('Wait 10-15 minutes and try again'));
+            console.log(chalk_1.default.gray('(Rate limits reset hourly)\n'));
+            return;
+        }
+        // Validation errors
+        if (errorMsg.includes('validation') || errorMsg.includes('invalid')) {
+            console.log(chalk_1.default.red('\n❌ Invalid input\n'));
+            console.log(chalk_1.default.white('Common reasons:'));
+            console.log(chalk_1.default.gray('  • Missing required information (title, body, etc.)'));
+            console.log(chalk_1.default.gray('  • Invalid format or parameters\n'));
+            console.log(chalk_1.default.cyan('💡 Try:\n'));
+            console.log(chalk_1.default.white('Be more specific with your command'));
+            console.log(chalk_1.default.gray('Example: "create a PR with title \'Fix bug\' and description \'Fixes #123\'"\n'));
+            return;
+        }
+        // Network errors
+        if (errorMsg.includes('network') || errorMsg.includes('fetch failed') || errorMsg.includes('econnrefused')) {
+            console.log(chalk_1.default.red('\n❌ Network error\n'));
+            console.log(chalk_1.default.white('Why this fails:'));
+            console.log(chalk_1.default.gray('  • No internet connection'));
+            console.log(chalk_1.default.gray('  • GitHub API is down (rare)\n'));
+            console.log(chalk_1.default.cyan('💡 Here\'s what to do:\n'));
+            console.log(chalk_1.default.white('1. Check your internet connection'));
+            console.log(chalk_1.default.white('2. Try again in a few seconds\n'));
+            return;
+        }
+        // Generic fallback with helpful context
+        console.log(chalk_1.default.red('\n❌ Command failed\n'));
+        console.log(chalk_1.default.white('What happened:'));
+        console.log(chalk_1.default.gray(`  ${error.message}\n`));
+        console.log(chalk_1.default.cyan('💡 Try:\n'));
+        console.log(chalk_1.default.white('• Check your command:'));
+        console.log(chalk_1.default.cyan('  what branch am i on'));
+        console.log(chalk_1.default.cyan('  show last 5 commits\n'));
+        console.log(chalk_1.default.white('• Reconnect GitHub if needed:'));
+        console.log(chalk_1.default.cyan('  github connect\n'));
     }
 }
 /**

package/package.json

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