@snapcommit/cli 3.4.0 → 3.6.0

package/dist/commands/cursor-style.js

@@ -384,47 +384,165 @@ async function executeCommitWithAI(intent) {
     }
 }
 /**
- * Advanced conflict resolution - try multiple strategies
+ * AI-POWERED conflict resolution - intelligently resolves merge conflicts!
  */
 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
+        // Get conflicted files
+        const conflictedFiles = (0, child_process_1.execSync)('git diff --name-only --diff-filter=U', { encoding: 'utf-8' })
+            .split('\n')
+            .filter(f => f.trim());
+        if (conflictedFiles.length === 0)
+            return false;
+        console.log(chalk_1.default.white(`\n📋 Analyzing ${conflictedFiles.length} conflicted file(s)...\n`));
+        // For each conflicted file, use AI to resolve
+        for (const file of conflictedFiles) {
+            try {
+                // Read the conflicted file
+                const conflictContent = (0, child_process_1.execSync)(`git show :1:${file}`, { encoding: 'utf-8', stdio: 'pipe' });
+                const oursContent = (0, child_process_1.execSync)(`git show :2:${file}`, { encoding: 'utf-8', stdio: 'pipe' });
+                const theirsContent = (0, child_process_1.execSync)(`git show :3:${file}`, { encoding: 'utf-8', stdio: 'pipe' });
+                // Ask AI to resolve the conflict
+                console.log(chalk_1.default.blue(`🤖 AI analyzing: ${file}...`));
+                const resolution = await resolveConflictWithAI(file, conflictContent, oursContent, theirsContent);
+                if (resolution) {
+                    console.log(chalk_1.default.green(`✓ AI resolved: ${file}`));
+                    // Write the resolved content
+                    const fs = await Promise.resolve().then(() => __importStar(require('fs')));
+                    fs.writeFileSync(file, resolution);
+                    (0, child_process_1.execSync)(`git add ${file}`, { encoding: 'utf-8', stdio: 'pipe' });
+                }
+                else {
+                    // Fallback: ask user which version to keep
+                    console.log(chalk_1.default.yellow(`\n⚠️  ${file} - Choose resolution:`));
+                    console.log(chalk_1.default.gray('  1. Keep your changes (ours)'));
+                    console.log(chalk_1.default.gray('  2. Keep their changes (theirs)'));
+                    console.log(chalk_1.default.gray('  3. Skip (resolve manually later)\n'));
+                    const rlConflict = await Promise.resolve().then(() => __importStar(require('readline')));
+                    const rlChoice = rlConflict.createInterface({
+                        input: process.stdin,
+                        output: process.stdout,
+                    });
+                    const choice = await new Promise((resolve) => {
+                        rlChoice.question(chalk_1.default.cyan('Choice (1/2/3): '), (ans) => {
+                            setImmediate(() => rlChoice.close());
+                            resolve(ans.trim());
+                        });
+                    });
+                    if (choice === '1') {
+                        (0, child_process_1.execSync)(`git checkout --ours ${file}`, { encoding: 'utf-8', stdio: 'pipe' });
+                        (0, child_process_1.execSync)(`git add ${file}`, { encoding: 'utf-8', stdio: 'pipe' });
+                        console.log(chalk_1.default.green(`✓ Kept your changes: ${file}`));
+                    }
+                    else if (choice === '2') {
+                        (0, child_process_1.execSync)(`git checkout --theirs ${file}`, { encoding: 'utf-8', stdio: 'pipe' });
+                        (0, child_process_1.execSync)(`git add ${file}`, { encoding: 'utf-8', stdio: 'pipe' });
+                        console.log(chalk_1.default.green(`✓ Kept their changes: ${file}`));
+                    }
+                    else {
+                        console.log(chalk_1.default.gray(`⊘ Skipped: ${file}`));
+                        return false; // User wants to resolve manually
+                    }
+                }
+            }
+            catch (fileError) {
+                console.log(chalk_1.default.yellow(`⚠️  Couldn't auto-resolve ${file}`));
+                // Fallback: ask user
+                const rlFallback = await Promise.resolve().then(() => __importStar(require('readline')));
+                const rlFallbackChoice = rlFallback.createInterface({
+                    input: process.stdin,
+                    output: process.stdout,
+                });
+                const fallbackChoice = await new Promise((resolve) => {
+                    rlFallbackChoice.question(chalk_1.default.cyan(`Keep (1) yours or (2) theirs? [1/2]: `), (ans) => {
+                        setImmediate(() => rlFallbackChoice.close());
+                        resolve(ans.trim());
+                    });
+                });
+                if (fallbackChoice === '1') {
+                    (0, child_process_1.execSync)(`git checkout --ours ${file}`, { encoding: 'utf-8', stdio: 'pipe' });
+                    (0, child_process_1.execSync)(`git add ${file}`, { encoding: 'utf-8', stdio: 'pipe' });
+                }
+                else if (fallbackChoice === '2') {
+                    (0, child_process_1.execSync)(`git checkout --theirs ${file}`, { encoding: 'utf-8', stdio: 'pipe' });
+                    (0, child_process_1.execSync)(`git add ${file}`, { encoding: 'utf-8', stdio: 'pipe' });
+                }
+                else {
+                    return false;
+                }
+            }
         }
-        // Strategy 2: Try accepting theirs (remote changes)
+        // Continue the rebase
         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
+        catch (continueError) {
+            // If rebase fails, might need to commit first
+            try {
+                (0, child_process_1.execSync)('git commit --no-edit', { encoding: 'utf-8', stdio: 'pipe' });
+                (0, child_process_1.execSync)('git rebase --continue', { encoding: 'utf-8', stdio: 'pipe' });
+                return true;
+            }
+            catch {
+                return false;
+            }
         }
-        // Strategy 3: Abort and let user handle
+    }
+    catch (error) {
+        console.log(chalk_1.default.red(`❌ Conflict resolution failed: ${error.message}`));
         try {
             (0, child_process_1.execSync)('git rebase --abort', { encoding: 'utf-8', stdio: 'pipe' });
         }
-        catch {
-            // Already aborted
-        }
+        catch { }
         return false;
     }
-    catch {
-        return false;
+}
+/**
+ * Use AI to intelligently resolve merge conflicts
+ */
+async function resolveConflictWithAI(filename, base, ours, theirs) {
+    try {
+        const axios = (await Promise.resolve().then(() => __importStar(require('axios')))).default;
+        const { getAuthConfig } = await Promise.resolve().then(() => __importStar(require('../lib/auth')));
+        // Get auth token
+        const authConfig = getAuthConfig();
+        if (!authConfig || !authConfig.token) {
+            console.log(chalk_1.default.yellow('⚠️  Authentication required for AI conflict resolution'));
+            return null;
+        }
+        // Get the backend URL from env or default
+        const backendUrl = process.env.SNAPCOMMIT_BACKEND_URL || 'https://snapcommit.dev';
+        const response = await axios.post(`${backendUrl}/api/ai/resolve-conflict`, {
+            filename,
+            base,
+            ours,
+            theirs,
+            token: authConfig.token,
+        }, {
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            timeout: 30000, // 30 second timeout
+        });
+        if (response.data?.resolution) {
+            return response.data.resolution;
+        }
+        return null;
+    }
+    catch (error) {
+        // AI resolution failed - fall back to manual choice
+        if (error.response?.status === 403) {
+            console.log(chalk_1.default.red('\n❌ Subscription required for AI conflict resolution'));
+            console.log(chalk_1.default.cyan('Visit: https://snapcommit.dev/pricing\n'));
+        }
+        return null;
     }
 }
 /**
  * Execute Git commands - Cursor-style (clean, fast, auto-fix)
+ * NOW SUPPORTS: commits, pushes, pulls, merges, rebases, cherry-picks, stash,
+ * resets, reverts, blame, bisect, tags, reflog, and MORE!
  */
 async function executeGitCommands(commands) {
     for (const cmd of commands) {

package/package.json

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