@snapcommit/cli 3.9.9 → 3.9.11

package/dist/commands/cursor-style.js

@@ -679,13 +679,26 @@ async function executeGitCommands(commands) {
             }
         }
         catch (error) {
-            const errorMsg = error.message?.toLowerCase() || '';
-            // Special handling for merge conflicts (check for ANY merge conflict indicators)
-            if (cmd.includes('git merge') && (errorMsg.includes('conflict') ||
-                errorMsg.includes('both added') ||
-                errorMsg.includes('both modified') ||
-                errorMsg.includes('unmerged paths') ||
-                errorMsg.includes('automatic merge failed'))) {
+            // Capture both message and stderr for comprehensive error checking
+            const errorMsg = (error.message?.toLowerCase() || '') + ' ' + (error.stderr?.toString().toLowerCase() || '');
+            // Special handling for merge conflicts (check for ANY merge conflict indicators OR conflicted files exist)
+            let hasConflicts = false;
+            if (cmd.includes('git merge')) {
+                // Check if there are actually conflicted files
+                try {
+                    const conflictedFiles = (0, child_process_1.execSync)('git diff --name-only --diff-filter=U', { encoding: 'utf-8', stdio: 'pipe' }).trim();
+                    hasConflicts = conflictedFiles.length > 0;
+                }
+                catch {
+                    // If command fails, check error message
+                    hasConflicts = errorMsg.includes('conflict') ||
+                        errorMsg.includes('both added') ||
+                        errorMsg.includes('both modified') ||
+                        errorMsg.includes('unmerged paths') ||
+                        errorMsg.includes('automatic merge failed');
+                }
+            }
+            if (hasConflicts) {
                 console.log(chalk_1.default.yellow('\n⚠️  Merge conflicts detected!\n'));
                 // Try AI auto-resolution first
                 console.log(chalk_1.default.blue('🤖 Attempting AI conflict resolution...\n'));
@@ -912,6 +925,8 @@ async function executeGitHubCommand(intent) {
                 break;
             case 'pr_show':
             case 'pr_status':
+            case 'pr_view':
+            case 'pr_details':
                 let showPrNum = intent.target || intent.options?.number;
                 // Smart PR detection: "show my PR" / "show this PR"
                 if (!showPrNum) {

package/package.json

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