@snapcommit/cli 3.3.1 → 3.4.0

package/dist/commands/cursor-style.js

@@ -292,16 +292,90 @@ async function executeCommitWithAI(intent) {
     // Push if requested
     const shouldPush = intent.shouldPush || intent.gitCommands?.some((cmd) => cmd.includes('push'));
     if (shouldPush) {
+        // STEP 1: Pull first to avoid conflicts (like Cursor does!)
+        try {
+            const currentBranch = (0, child_process_1.execSync)('git rev-parse --abbrev-ref HEAD', { encoding: 'utf-8' }).trim();
+            const hasRemote = (0, child_process_1.execSync)(`git ls-remote --heads origin ${currentBranch}`, { encoding: 'utf-8' }).trim();
+            if (hasRemote) {
+                console.log(chalk_1.default.blue('⚡ Syncing with remote...'));
+                try {
+                    (0, child_process_1.execSync)('git pull --rebase', { encoding: 'utf-8', stdio: 'pipe' });
+                    console.log(chalk_1.default.green('✓ Synced'));
+                }
+                catch (pullError) {
+                    // Handle rebase conflicts
+                    if (pullError.message.includes('conflict')) {
+                        console.log(chalk_1.default.yellow('\n⚠️  Merge conflicts detected - resolving...'));
+                        // Try to auto-resolve conflicts
+                        const resolved = await tryAdvancedConflictResolution();
+                        if (resolved) {
+                            console.log(chalk_1.default.green('✓ Conflicts resolved'));
+                        }
+                        else {
+                            console.log(chalk_1.default.red('\n❌ Cannot auto-resolve conflicts'));
+                            console.log(chalk_1.default.white('\nConflicted files:'));
+                            const conflicts = (0, child_process_1.execSync)('git diff --name-only --diff-filter=U', { encoding: 'utf-8' });
+                            conflicts.split('\n').filter(f => f.trim()).forEach(file => {
+                                console.log(chalk_1.default.red(`  ✗ ${file}`));
+                            });
+                            console.log(chalk_1.default.cyan('\nTo resolve manually:'));
+                            console.log(chalk_1.default.gray('  1. Fix conflicts in the files above'));
+                            console.log(chalk_1.default.gray('  2. Run: ') + chalk_1.default.cyan('git add <files>'));
+                            console.log(chalk_1.default.gray('  3. Run: ') + chalk_1.default.cyan('git rebase --continue'));
+                            console.log(chalk_1.default.gray('  4. Then try: ') + chalk_1.default.cyan('snap') + chalk_1.default.gray(' and ') + chalk_1.default.cyan('push changes\n'));
+                            return;
+                        }
+                    }
+                    else {
+                        // Other pull errors
+                        console.log(chalk_1.default.yellow(`⚠️  Sync issue: ${pullError.message}`));
+                    }
+                }
+            }
+        }
+        catch {
+            // No remote or other issues - continue with push
+        }
+        // STEP 2: Now push
         try {
             (0, child_process_1.execSync)('git push', { encoding: 'utf-8', stdio: 'pipe' });
             console.log(chalk_1.default.green('✓ Pushed\n'));
         }
-        catch (error) {
-            if (error.message.includes('no configured push destination')) {
+        catch (pushError) {
+            const errorMsg = pushError.message.toLowerCase();
+            if (errorMsg.includes('no configured push destination')) {
                 console.log(chalk_1.default.gray('✓ Committed locally (no remote)\n'));
             }
+            else if (errorMsg.includes('rejected') && errorMsg.includes('non-fast-forward')) {
+                // Need force push - but be safe!
+                console.log(chalk_1.default.yellow('\n⚠️  Remote has changes that would be overwritten'));
+                console.log(chalk_1.default.white('This requires force push, which can be dangerous.\n'));
+                const rlForce = await Promise.resolve().then(() => __importStar(require('readline')));
+                const rlForcePush = rlForce.createInterface({
+                    input: process.stdin,
+                    output: process.stdout,
+                });
+                const confirmForce = await new Promise((resolve) => {
+                    rlForcePush.question(chalk_1.default.cyan('Force push? ') + chalk_1.default.gray('(yes/no): '), (ans) => {
+                        setImmediate(() => rlForcePush.close());
+                        resolve(ans.trim().toLowerCase());
+                    });
+                });
+                if (confirmForce === 'yes') {
+                    try {
+                        (0, child_process_1.execSync)('git push --force-with-lease', { encoding: 'utf-8', stdio: 'pipe' });
+                        console.log(chalk_1.default.green('✓ Force pushed (safely)\n'));
+                    }
+                    catch (forceError) {
+                        console.log(chalk_1.default.red(`\n❌ Force push failed: ${forceError.message}\n`));
+                    }
+                }
+                else {
+                    console.log(chalk_1.default.gray('\n✗ Push cancelled\n'));
+                }
+            }
             else {
-                console.log(chalk_1.default.yellow(`⚠️  Push failed: ${error.message}\n`));
+                console.log(chalk_1.default.yellow(`\n⚠️  Push failed: ${pushError.message}\n`));
             }
         }
     }
@@ -309,6 +383,46 @@ async function executeCommitWithAI(intent) {
         console.log();
     }
 }
+/**
+ * Advanced conflict resolution - try multiple strategies
+ */
+async function tryAdvancedConflictResolution() {
+    try {
+        // Strategy 1: Try accepting ours (our changes)
+        try {
+            (0, child_process_1.execSync)('git checkout --ours .', { encoding: 'utf-8', stdio: 'pipe' });
+            (0, child_process_1.execSync)('git add .', { encoding: 'utf-8', stdio: 'pipe' });
+            (0, child_process_1.execSync)('git rebase --continue', { encoding: 'utf-8', stdio: 'pipe' });
+            return true;
+        }
+        catch {
+            // Strategy 1 failed
+        }
+        // Strategy 2: Try accepting theirs (remote changes)
+        try {
+            (0, child_process_1.execSync)('git rebase --abort', { encoding: 'utf-8', stdio: 'pipe' });
+            (0, child_process_1.execSync)('git pull --rebase', { encoding: 'utf-8', stdio: 'pipe' });
+            (0, child_process_1.execSync)('git checkout --theirs .', { encoding: 'utf-8', stdio: 'pipe' });
+            (0, child_process_1.execSync)('git add .', { encoding: 'utf-8', stdio: 'pipe' });
+            (0, child_process_1.execSync)('git rebase --continue', { encoding: 'utf-8', stdio: 'pipe' });
+            return true;
+        }
+        catch {
+            // Strategy 2 failed
+        }
+        // Strategy 3: Abort and let user handle
+        try {
+            (0, child_process_1.execSync)('git rebase --abort', { encoding: 'utf-8', stdio: 'pipe' });
+        }
+        catch {
+            // Already aborted
+        }
+        return false;
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * Execute Git commands - Cursor-style (clean, fast, auto-fix)
  */

package/package.json

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