@snapcommit/cli 3.9.20 → 3.10.0

package/dist/commands/cursor-style.js

@@ -42,6 +42,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeCursorStyle = executeCursorStyle;
 const chalk_1 = __importDefault(require("chalk"));
+const fs_1 = __importDefault(require("fs"));
 const child_process_1 = require("child_process");
 const git_1 = require("../utils/git");
 const auth_1 = require("../lib/auth");
@@ -343,42 +344,8 @@ async function executeCommitWithAI(intent, originalInput = '') {
                 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 automatically!\n'));
-                        }
-                        else {
-                            // Better messaging for manual resolution
-                            console.log(chalk_1.default.yellow('\n⚠️  AI could not auto-resolve these conflicts\n'));
-                            console.log(chalk_1.default.white('Why? These conflicts require human judgment:'));
-                            console.log(chalk_1.default.gray('  • Business logic decisions (which approach is correct?)'));
-                            console.log(chalk_1.default.gray('  • Architectural changes (incompatible design choices)'));
-                            console.log(chalk_1.default.gray('  • Semantic conflicts (both valid, but different intent)\n'));
-                            console.log(chalk_1.default.white('Conflicted 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('\n📖 How to resolve manually:\n'));
-                            console.log(chalk_1.default.white('  1. Open each file above in your editor'));
-                            console.log(chalk_1.default.gray('     Look for conflict markers: ') + chalk_1.default.yellow('<<<<<<< HEAD'));
-                            console.log(chalk_1.default.gray('                                  ') + chalk_1.default.yellow('======='));
-                            console.log(chalk_1.default.gray('                                  ') + chalk_1.default.yellow('>>>>>>> branch'));
-                            console.log('');
-                            console.log(chalk_1.default.white('  2. Choose which code to keep (or merge both)'));
-                            console.log(chalk_1.default.gray('     Remove the conflict markers when done'));
-                            console.log('');
-                            console.log(chalk_1.default.white('  3. After fixing, stage the resolved files:'));
-                            console.log(chalk_1.default.cyan('     git add <files>'));
-                            console.log('');
-                            console.log(chalk_1.default.white('  4. Continue the rebase:'));
-                            console.log(chalk_1.default.cyan('     git rebase --continue'));
-                            console.log('');
-                            console.log(chalk_1.default.white('  5. Then push your changes:'));
-                            console.log(chalk_1.default.cyan('     snap') + chalk_1.default.gray(' and type ') + chalk_1.default.cyan('push changes\n'));
-                            console.log(chalk_1.default.gray('💡 Tip: Most conflicts are simple! Just pick the better code.\n'));
+                        if (!resolved) {
                             return;
                         }
                     }
@@ -452,162 +419,6 @@ async function executeCommitWithAI(intent, originalInput = '') {
         console.log();
     }
 }
-/**
- * AI-POWERED conflict resolution - intelligently resolves merge conflicts!
- */
-async function tryAdvancedConflictResolution() {
-    try {
-        // 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 resolveConflictWithAIDetailed(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;
-                }
-            }
-        }
-        // Continue the rebase
-        try {
-            (0, child_process_1.execSync)('git rebase --continue', { encoding: 'utf-8', stdio: 'pipe' });
-            return true;
-        }
-        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;
-            }
-        }
-    }
-    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 { }
-        return false;
-    }
-}
-/**
- * Use AI to intelligently resolve merge conflicts
- */
-async function resolveConflictWithAIDetailed(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://www.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://www.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,
@@ -710,51 +521,7 @@ async function executeGitCommands(commands) {
                 }
             }
             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'));
-                const resolved = await tryAdvancedConflictResolution();
-                if (resolved) {
-                    console.log(chalk_1.default.green('✓ Conflicts resolved automatically!\n'));
-                    // Complete the merge
-                    try {
-                        (0, child_process_1.execSync)('git add -A', { encoding: 'utf-8', stdio: 'pipe' });
-                        (0, child_process_1.execSync)('git commit --no-edit', { encoding: 'utf-8', stdio: 'pipe' });
-                        console.log(chalk_1.default.green('✓ Merge completed\n'));
-                    }
-                    catch {
-                        console.log(chalk_1.default.red('\n❌ Failed to complete merge after resolution\n'));
-                    }
-                    return;
-                }
-                // AI couldn't resolve - show manual instructions
-                console.log(chalk_1.default.yellow('⚠️  AI could not auto-resolve these conflicts\n'));
-                console.log(chalk_1.default.white('Why? These conflicts require human judgment:'));
-                console.log(chalk_1.default.gray('  • Business logic decisions (which approach is correct?)'));
-                console.log(chalk_1.default.gray('  • Architectural changes (incompatible design choices)'));
-                console.log(chalk_1.default.gray('  • Semantic conflicts (both valid, but different intent)\n'));
-                console.log(chalk_1.default.white('Conflicted files:'));
-                try {
-                    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}`));
-                    });
-                }
-                catch {
-                    console.log(chalk_1.default.gray('  (could not list files)\n'));
-                }
-                console.log(chalk_1.default.cyan('\n📖 How to resolve manually:\n'));
-                console.log(chalk_1.default.white('  1. Open each file above in your editor'));
-                console.log(chalk_1.default.gray('     Look for conflict markers: ') + chalk_1.default.yellow('<<<<<<< HEAD'));
-                console.log(chalk_1.default.gray('                                  ') + chalk_1.default.yellow('======='));
-                console.log(chalk_1.default.gray('                                  ') + chalk_1.default.yellow('>>>>>>> branch'));
-                console.log('');
-                console.log(chalk_1.default.white('  2. Choose which code to keep (or merge both)'));
-                console.log(chalk_1.default.gray('     Remove the conflict markers when done'));
-                console.log('');
-                console.log(chalk_1.default.white('  3. After fixing, in snap type:'));
-                console.log(chalk_1.default.cyan('     complete the merge\n'));
-                console.log(chalk_1.default.gray('💡 Tip: Most conflicts are simple! Just pick the better code.\n'));
+                await tryAdvancedConflictResolution();
                 return;
             }
             // Skip harmless errors
@@ -1536,120 +1303,227 @@ async function tryAutoFix(error, command) {
  * Handle merge conflicts with AI resolution + clear guidance
  */
 async function handleMergeConflict() {
-    console.log(chalk_1.default.red('\n❌ Merge conflict detected!\n'));
+    const result = await tryAdvancedConflictResolution();
+    return result;
+}
+/**
+ * AI-POWERED conflict resolution - intelligently resolves merge conflicts!
+ */
+async function tryAdvancedConflictResolution() {
+    const result = await attemptConflictAutoResolution();
+    return displayConflictResolution(result);
+}
+async function attemptConflictAutoResolution() {
+    const details = collectConflictDetails();
+    if (details.length === 0) {
+        return { status: 'no-conflicts', details, failedFiles: [] };
+    }
+    const token = (0, auth_1.getToken)();
+    if (!token) {
+        return {
+            status: 'manual',
+            details,
+            failedFiles: details.map((detail) => detail.file),
+            reason: 'missing-token',
+        };
+    }
+    const failedFiles = [];
+    let detectedReason;
+    for (const detail of details) {
+        const { success, reason } = await resolveConflictWithAI(detail, token);
+        if (!success) {
+            failedFiles.push(detail.file);
+            if (!detectedReason && reason) {
+                detectedReason = reason;
+            }
+        }
+    }
+    if (failedFiles.length === 0) {
+        finalizePendingMerge();
+        return { status: 'resolved', details, failedFiles: [] };
+    }
+    return {
+        status: 'manual',
+        details,
+        failedFiles,
+        reason: detectedReason,
+    };
+}
+function displayConflictResolution(result) {
+    if (result.status === 'no-conflicts') {
+        return false;
+    }
+    if (result.details.length > 0) {
+        printConflictSummary(result.details);
+    }
+    if (result.status === 'resolved') {
+        console.log(chalk_1.default.green('🤖 AI resolved all merge conflicts!\n'));
+        return true;
+    }
+    printManualResolutionGuide(result.details, result.failedFiles, result.reason);
+    return false;
+}
+function collectConflictDetails() {
+    let output = '';
     try {
-        // Get list of conflicted files
-        const conflictedFilesOutput = (0, child_process_1.execSync)('git diff --name-only --diff-filter=U', {
+        output = (0, child_process_1.execSync)('git diff --name-only --diff-filter=U', {
             encoding: 'utf-8',
-            stdio: 'pipe'
+            stdio: 'pipe',
         }).trim();
-        if (!conflictedFilesOutput) {
-            // No conflicted files found, might be a different error
-            return false;
+    }
+    catch {
+        return [];
+    }
+    if (!output) {
+        return [];
+    }
+    const files = output
+        .split('\n')
+        .map((file) => file.trim())
+        .filter(Boolean);
+    return files.map((file) => {
+        let conflictCount = 0;
+        try {
+            const content = fs_1.default.readFileSync(file, 'utf-8');
+            conflictCount = (content.match(/^<<<<<<< /gm) || []).length;
         }
-        const conflictedFiles = conflictedFilesOutput.split('\n').filter(f => f.trim());
-        console.log(chalk_1.default.yellow('📋 Conflicted files:\n'));
-        // Count conflicts per file
-        const fileConflicts = [];
-        for (const file of conflictedFiles) {
-            try {
-                const diffOutput = (0, child_process_1.execSync)(`git diff ${file}`, { encoding: 'utf-8', stdio: 'pipe' });
-                const conflictCount = (diffOutput.match(/^<<<<<<< HEAD/gm) || []).length;
-                fileConflicts.push({ file, count: conflictCount });
-                console.log(chalk_1.default.cyan(`   • ${file}`) + chalk_1.default.gray(` (${conflictCount} conflict${conflictCount === 1 ? '' : 's'})`));
+        catch {
+            conflictCount = 0;
+        }
+        return {
+            file,
+            conflictCount,
+            base: readStageBlob(':1', file),
+            ours: readStageBlob(':2', file),
+            theirs: readStageBlob(':3', file),
+        };
+    });
+}
+function readStageBlob(stage, file) {
+    try {
+        const escaped = escapePathForShell(file);
+        return (0, child_process_1.execSync)(`git show ${stage}:"${escaped}"`, { encoding: 'utf-8', stdio: 'pipe' });
+    }
+    catch {
+        return '';
+    }
+}
+function printConflictSummary(details) {
+    if (!details.length) {
+        return;
+    }
+    console.log(chalk_1.default.yellow('⚠️  Merge conflicts detected!\n'));
+    const totalConflicts = details.reduce((sum, detail) => sum + (detail.conflictCount || 0), 0);
+    const suffix = totalConflicts > 0
+        ? chalk_1.default.gray(` (${totalConflicts} conflict${totalConflicts === 1 ? '' : 's'} total)`)
+        : '';
+    console.log(chalk_1.default.red(`❌ Merge conflict${details.length === 1 ? '' : 's'} in ${details.length} file${details.length === 1 ? '' : 's'}`) + suffix);
+    for (const detail of details) {
+        const countText = detail.conflictCount
+            ? chalk_1.default.gray(` (${detail.conflictCount} conflict${detail.conflictCount === 1 ? '' : 's'})`)
+            : '';
+        console.log(chalk_1.default.white(`   • ${detail.file}`) + countText);
+    }
+    console.log();
+}
+function printManualResolutionGuide(details, failedFiles, reason) {
+    const filesToHighlight = failedFiles.length
+        ? details.filter((detail) => failedFiles.includes(detail.file))
+        : details;
+    if (!filesToHighlight.length) {
+        return;
+    }
+    if (reason === 'missing-token') {
+        console.log(chalk_1.default.red('❌ Authentication required for AI conflict resolution\n'));
+        console.log(chalk_1.default.gray('   Run: ') + chalk_1.default.cyan('snap login') + chalk_1.default.gray(' to reconnect, then retry.\n'));
+    }
+    else if (reason === 'subscription-required') {
+        console.log(chalk_1.default.red('❌ Subscription required for AI conflict resolution\n'));
+        console.log(chalk_1.default.cyan('Visit: https://www.snapcommit.dev/pricing\n'));
+    }
+    else if (reason === 'auth-error') {
+        console.log(chalk_1.default.red('❌ Your session expired for AI conflict resolution\n'));
+        console.log(chalk_1.default.gray('   Run: ') + chalk_1.default.cyan('snap login') + chalk_1.default.gray(' to refresh your credentials.\n'));
+    }
+    console.log(chalk_1.default.yellow('🤖 AI tried to resolve but needs your help!\n'));
+    console.log(chalk_1.default.white.bold('📋 What to do:'));
+    console.log(chalk_1.default.gray('   1. Open the files above in your editor'));
+    console.log(chalk_1.default.gray('   2. Look for conflict markers like ') + chalk_1.default.yellow('<<<<<<< HEAD'));
+    console.log(chalk_1.default.gray('   3. Decide which changes to keep (yours, theirs, or a merge)'));
+    console.log(chalk_1.default.gray('   4. Remove the markers ') + chalk_1.default.yellow('<<<<<<< ======= >>>>>>>'));
+    console.log(chalk_1.default.gray('   5. Stage the fixes: ') + chalk_1.default.cyan('git add <file>'));
+    console.log(chalk_1.default.gray('   6. Back in snap, type: ') + chalk_1.default.cyan('commit the resolved changes'));
+    console.log();
+    console.log(chalk_1.default.white.bold('💡 Helpful commands:'));
+    console.log(chalk_1.default.cyan('   show the conflicts') + chalk_1.default.gray(' – Reprint this summary'));
+    console.log(chalk_1.default.cyan('   abort the merge') + chalk_1.default.gray(' – Cancel and restore previous state'));
+    console.log(chalk_1.default.cyan('   use my version / use their version') + chalk_1.default.gray(' – Quick helpers for specific files\n'));
+    console.log(chalk_1.default.white('Files still needing attention:'));
+    filesToHighlight.forEach((detail) => {
+        const countText = detail.conflictCount
+            ? chalk_1.default.gray(` (${detail.conflictCount} conflict${detail.conflictCount === 1 ? '' : 's'})`)
+            : '';
+        console.log(chalk_1.default.cyan(`   • ${detail.file}`) + countText);
+    });
+    console.log();
+}
+function finalizePendingMerge() {
+    const commands = ['git rebase --continue', 'git merge --continue', 'git commit --no-edit'];
+    for (const command of commands) {
+        try {
+            (0, child_process_1.execSync)(command, { encoding: 'utf-8', stdio: 'pipe' });
+            return true;
+        }
+        catch {
+            // Try the next strategy
+        }
+    }
+    return false;
+}
+async function resolveConflictWithAI(detail, token) {
+    try {
+        const backendUrl = process.env.SNAPCOMMIT_BACKEND_URL || 'https://www.snapcommit.dev';
+        const response = await fetch(`${backendUrl}/api/ai/resolve-conflict`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                filename: detail.file,
+                base: detail.base,
+                ours: detail.ours,
+                theirs: detail.theirs,
+                token,
+            }),
+            signal: AbortSignal.timeout(30000),
+        });
+        if (!response.ok) {
+            if (response.status === 403) {
+                return { success: false, reason: 'subscription-required' };
             }
-            catch {
-                fileConflicts.push({ file, count: 0 });
-                console.log(chalk_1.default.cyan(`   • ${file}`));
+            if (response.status === 401) {
+                return { success: false, reason: 'auth-error' };
             }
+            return { success: false, reason: 'api-error' };
         }
-        console.log();
-        // Try AI resolution
-        console.log(chalk_1.default.blue('🤖 Attempting AI resolution...\n'));
-        let resolvedCount = 0;
-        const failedFiles = [];
-        for (const { file, count } of fileConflicts) {
-            if (count === 0)
-                continue;
+        const data = await response.json().catch(() => null);
+        if (data?.resolution) {
+            fs_1.default.writeFileSync(detail.file, data.resolution, 'utf-8');
             try {
-                const resolved = await resolveConflictWithAI(file);
-                if (resolved) {
-                    console.log(chalk_1.default.green(`   ✓ Resolved: ${file}`));
-                    (0, child_process_1.execSync)(`git add ${file}`, { encoding: 'utf-8', stdio: 'pipe' });
-                    resolvedCount++;
-                }
-                else {
-                    console.log(chalk_1.default.yellow(`   ⚠️  ${file} needs manual review`));
-                    failedFiles.push(file);
-                }
+                (0, child_process_1.execSync)(`git add -- "${escapePathForShell(detail.file)}"`, { encoding: 'utf-8', stdio: 'pipe' });
             }
             catch {
-                console.log(chalk_1.default.yellow(`   ⚠️  ${file} needs manual review`));
-                failedFiles.push(file);
+                // Ignore staging failures; user can stage manually later
             }
+            return { success: true };
         }
-        console.log();
-        // If all resolved, commit
-        if (failedFiles.length === 0) {
-            (0, child_process_1.execSync)('git commit --no-edit', { encoding: 'utf-8', stdio: 'pipe' });
-            console.log(chalk_1.default.green('✅ All conflicts resolved automatically!\n'));
-            return true;
-        }
-        // Some failed - show manual instructions
-        console.log(chalk_1.default.yellow(`⚠️  ${failedFiles.length} file${failedFiles.length === 1 ? '' : 's'} need${failedFiles.length === 1 ? 's' : ''} manual resolution:\n`));
-        failedFiles.forEach(file => {
-            console.log(chalk_1.default.cyan(`   • ${file}`));
-        });
-        console.log();
-        console.log(chalk_1.default.white.bold('📖 How to resolve manually:\n'));
-        console.log(chalk_1.default.gray('   1. Open the conflicted files in your editor'));
-        console.log(chalk_1.default.gray('   2. Look for ') + chalk_1.default.yellow('<<<<<<< HEAD') + chalk_1.default.gray(' markers'));
-        console.log(chalk_1.default.gray('   3. Choose which version to keep (or merge both)'));
-        console.log(chalk_1.default.gray('   4. Remove the conflict markers ') + chalk_1.default.yellow('(<<<<<<< ======= >>>>>>>)'));
-        console.log(chalk_1.default.gray('   5. Save the files'));
-        console.log(chalk_1.default.gray('   6. Type: ') + chalk_1.default.cyan('"commit the resolved changes"') + chalk_1.default.gray(' or ') + chalk_1.default.cyan('"continue"') + '\n');
-        console.log(chalk_1.default.white.bold('💡 Useful commands:\n'));
-        console.log(chalk_1.default.cyan('   "show the conflicts"') + chalk_1.default.gray(' - See conflict details again'));
-        console.log(chalk_1.default.cyan('   "abort the merge"') + chalk_1.default.gray(' - Cancel and go back'));
-        console.log(chalk_1.default.cyan('   "use their version"') + chalk_1.default.gray(' - Accept incoming changes'));
-        console.log(chalk_1.default.cyan('   "use my version"') + chalk_1.default.gray(' - Keep your changes\n'));
-        return false;
+        return { success: false, reason: 'api-error' };
     }
     catch (error) {
-        console.log(chalk_1.default.red('❌ Could not analyze conflicts'));
-        console.log(chalk_1.default.gray(`   ${error.message}\n`));
-        return false;
+        console.log(chalk_1.default.yellow(`⚠️  AI resolution failed: ${error.message}`));
+        return { success: false, reason: 'api-error' };
     }
 }
-/**
- * Resolve conflict with AI (calls Gemini to analyze and resolve)
- */
-async function resolveConflictWithAI(file) {
-    try {
-        const token = (0, auth_1.getToken)();
-        if (!token)
-            return false;
-        // Get the conflicted content
-        const conflictContent = (0, child_process_1.execSync)(`git show :1:${file} 2>/dev/null || echo ""`, { encoding: 'utf-8' }).trim();
-        const ourContent = (0, child_process_1.execSync)(`git show :2:${file} 2>/dev/null || echo ""`, { encoding: 'utf-8' }).trim();
-        const theirContent = (0, child_process_1.execSync)(`git show :3:${file} 2>/dev/null || echo ""`, { encoding: 'utf-8' }).trim();
-        if (!ourContent && !theirContent)
-            return false;
-        // Call AI to resolve (simplified - real implementation would call Gemini API)
-        // For now, just try simple auto-resolution
-        const diffOutput = (0, child_process_1.execSync)(`git diff ${file}`, { encoding: 'utf-8' });
-        // If conflict is simple (just additions, no deletions), can auto-resolve
-        const hasDeleteConflict = diffOutput.includes('-') && diffOutput.includes('+');
-        if (!hasDeleteConflict) {
-            // Simple conflict - keep both
-            (0, child_process_1.execSync)(`git checkout --ours ${file}`, { encoding: 'utf-8', stdio: 'pipe' });
-            return true;
-        }
-        return false;
-    }
-    catch {
-        return false;
-    }
+function escapePathForShell(value) {
+    return value.replace(/(["\\$`])/g, '\\$1');
 }
 /**
  * Handle force push with safety confirmation

package/dist/commands/natural.js

@@ -16,7 +16,7 @@ const git_1 = require("../utils/git");
  * Main natural language command handler - Cursor-style!
  * Now everything works like Cursor - just say what you want!
  */
-async function naturalCommand(userInput) {
+async function naturalCommand(userInput, prompt) {
     // Ensure authentication first
     const authConfig = await (0, auth_1.ensureAuth)();
     if (!authConfig) {

package/dist/commands/telemetry.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.telemetryStatusCommand = telemetryStatusCommand;
+exports.telemetryEnableCommand = telemetryEnableCommand;
+exports.telemetryDisableCommand = telemetryDisableCommand;
+const chalk_1 = __importDefault(require("chalk"));
+const settings_1 = require("../utils/settings");
+const telemetry_1 = require("../utils/telemetry");
+async function telemetryStatusCommand() {
+    const settings = (0, settings_1.getSettings)();
+    console.log(chalk_1.default.bold('\nTelemetry Status:\n'));
+    console.log(chalk_1.default.white(`   Enabled: ${(0, telemetry_1.isTelemetryEnabled)() ? chalk_1.default.green('yes') : chalk_1.default.red('no')}`));
+    if (settings.telemetryPromptedAt) {
+        const prompted = new Date(settings.telemetryPromptedAt).toLocaleString();
+        console.log(chalk_1.default.gray(`   Last prompted: ${prompted}`));
+    }
+    else {
+        console.log(chalk_1.default.gray('   Last prompted: never'));
+    }
+    console.log('\nPrivacy: Data is anonymous diagnostics and usage patterns only. No repo contents or secrets.\n');
+}
+async function telemetryEnableCommand() {
+    if ((0, telemetry_1.isTelemetryEnabled)()) {
+        console.log(chalk_1.default.green('\nTelemetry is already enabled. Thank you! 🙌\n'));
+        return;
+    }
+    (0, telemetry_1.setTelemetryEnabled)(true);
+    (0, telemetry_1.markTelemetryPrompted)();
+    (0, telemetry_1.recordTelemetry)('telemetry_enabled');
+    console.log(chalk_1.default.green('\n✅ Telemetry enabled. Thanks for helping us make SnapCommit smarter.\n'));
+}
+async function telemetryDisableCommand() {
+    if (!(0, telemetry_1.isTelemetryEnabled)()) {
+        console.log(chalk_1.default.yellow('\nTelemetry is already disabled.\n'));
+        return;
+    }
+    (0, telemetry_1.setTelemetryEnabled)(false);
+    (0, settings_1.updateSettings)({ telemetryPromptedAt: Date.now() });
+    (0, telemetry_1.recordTelemetry)('telemetry_disabled');
+    console.log(chalk_1.default.green('\n✅ Telemetry disabled. You can re-enable anytime with `snap telemetry enable`.\n'));
+}

package/dist/index.js

@@ -22,6 +22,7 @@ const natural_1 = require("./commands/natural");
 const conflict_1 = require("./commands/conflict");
 const uninstall_1 = require("./commands/uninstall");
 const github_connect_1 = require("./commands/github-connect");
+const telemetry_1 = require("./commands/telemetry");
 const repl_1 = require("./repl");
 // Load environment variables from root .env
 (0, dotenv_1.config)({ path: path_1.default.join(__dirname, '../../.env') });
@@ -149,6 +150,28 @@ githubCmd
     .action(async () => {
     await (0, github_connect_1.githubDisconnectCommand)();
 });
+// Telemetry management
+const telemetryCmd = program
+    .command('telemetry')
+    .description('Manage anonymous telemetry');
+telemetryCmd
+    .command('enable')
+    .description('Enable anonymous telemetry diagnostics')
+    .action(async () => {
+    await (0, telemetry_1.telemetryEnableCommand)();
+});
+telemetryCmd
+    .command('disable')
+    .description('Disable anonymous telemetry diagnostics')
+    .action(async () => {
+    await (0, telemetry_1.telemetryDisableCommand)();
+});
+telemetryCmd
+    .command('status')
+    .description('Show telemetry status')
+    .action(async () => {
+    await (0, telemetry_1.telemetryStatusCommand)();
+});
 // Command: snapcommit uninstall
 program
     .command('uninstall')

package/dist/repl.js

@@ -101,6 +101,52 @@ async function startREPL() {
     }
     console.log(chalk_1.default.gray('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n'));
     console.log(chalk_1.default.bold.yellow('🎯 Try it now! Type what you want to do:\n'));
+    const promptState = {
+        resolver: null,
+    };
+    const promptController = {
+        ask: (question, options = {}) => new Promise((resolve) => {
+            if (promptState.resolver) {
+                console.log(chalk_1.default.red('\n❌ Internal prompt error: previous question still active.\n'));
+                resolve(options.defaultValue ?? '');
+                return;
+            }
+            const { defaultValue, suffix } = options;
+            const segments = [`\n${question}`];
+            if (suffix)
+                segments.push(` ${suffix}`);
+            if (defaultValue !== undefined) {
+                segments.push(` ${chalk_1.default.gray(`[default: ${defaultValue}]`)}`);
+            }
+            process.stdout.write(segments.join('') + '\n' + chalk_1.default.cyan('› '));
+            promptState.resolver = (value) => {
+                const trimmed = value.trim();
+                if (defaultValue !== undefined && trimmed === '') {
+                    resolve(defaultValue);
+                }
+                else {
+                    resolve(trimmed);
+                }
+            };
+        }),
+        confirm: async (question, options = {}) => {
+            const defaultYes = options.defaultValue ?? false;
+            const hint = defaultYes ? chalk_1.default.gray('[Y/n]') : chalk_1.default.gray('[y/N]');
+            while (true) {
+                const response = (await promptController.ask(`${question} ${hint}`)).toLowerCase();
+                if (!response) {
+                    return defaultYes;
+                }
+                if (response === 'y' || response === 'yes') {
+                    return true;
+                }
+                if (response === 'n' || response === 'no') {
+                    return false;
+                }
+                console.log(chalk_1.default.yellow('Please answer with yes or no.'));
+            }
+        },
+    };
     const rl = readline_1.default.createInterface({
         input: process.stdin,
         output: process.stdout,
@@ -108,6 +154,12 @@ async function startREPL() {
     });
     rl.prompt();
     rl.on('line', async (input) => {
+        if (promptState.resolver) {
+            const resolver = promptState.resolver;
+            promptState.resolver = null;
+            resolver(input);
+            return;
+        }
         const line = input.trim();
         if (!line) {
             rl.prompt();
@@ -315,13 +367,10 @@ async function startREPL() {
         }
         // Everything else is natural language
         try {
-            rl.pause(); // Pause REPL readline to avoid conflicts
-            await (0, natural_1.naturalCommand)(line);
-            rl.resume(); // Resume REPL readline
+            await (0, natural_1.naturalCommand)(line, promptController);
         }
         catch (error) {
             console.log(chalk_1.default.red(`\n❌ Error: ${error.message}\n`));
-            rl.resume(); // Make sure to resume even on error
         }
         rl.prompt();
     });

package/dist/types/prompt.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils/prompt-helpers.js

@@ -0,0 +1,62 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createPromptHelpers = createPromptHelpers;
+const readline_1 = __importDefault(require("readline"));
+const chalk_1 = __importDefault(require("chalk"));
+function createPromptHelpers(prompt) {
+    return {
+        ask: (question, options) => askWithFallback(question, options, prompt),
+        confirm: (question, options) => confirmWithFallback(question, options, prompt),
+    };
+}
+async function askWithFallback(question, options = {}, prompt) {
+    if (prompt) {
+        return prompt.ask(question, options);
+    }
+    const rl = readline_1.default.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    const { defaultValue, suffix } = options;
+    const segments = [question];
+    if (suffix)
+        segments.push(` ${suffix}`);
+    if (defaultValue !== undefined) {
+        segments.push(` ${chalk_1.default.gray(`[default: ${defaultValue}]`)}`);
+    }
+    return await new Promise((resolve) => {
+        rl.question(`${segments.join('')}` + '\n› ', (answer) => {
+            rl.close();
+            const trimmed = answer.trim();
+            if (defaultValue !== undefined && trimmed === '') {
+                resolve(defaultValue);
+            }
+            else {
+                resolve(trimmed);
+            }
+        });
+    });
+}
+async function confirmWithFallback(question, options = {}, prompt) {
+    if (prompt) {
+        return prompt.confirm(question, options);
+    }
+    const defaultYes = options.defaultValue ?? false;
+    const hint = defaultYes ? '[Y/n]' : '[y/N]';
+    while (true) {
+        const answer = (await askWithFallback(`${question} ${hint}`, {}, undefined)).toLowerCase();
+        if (!answer) {
+            return defaultYes;
+        }
+        if (answer === 'y' || answer === 'yes') {
+            return true;
+        }
+        if (answer === 'n' || answer === 'no') {
+            return false;
+        }
+        console.log(chalk_1.default.yellow('Please answer with yes or no.'));
+    }
+}

package/dist/utils/settings.js

@@ -0,0 +1,58 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSettings = getSettings;
+exports.saveSettings = saveSettings;
+exports.updateSettings = updateSettings;
+exports.getOrCreateDeviceId = getOrCreateDeviceId;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+const crypto_1 = __importDefault(require("crypto"));
+const CONFIG_DIR = path_1.default.join(os_1.default.homedir(), '.snapcommit');
+const SETTINGS_FILE = path_1.default.join(CONFIG_DIR, 'settings.json');
+const defaultSettings = {
+    telemetryEnabled: false,
+    telemetryPromptedAt: 0,
+};
+function ensureConfigDir() {
+    if (!fs_1.default.existsSync(CONFIG_DIR)) {
+        fs_1.default.mkdirSync(CONFIG_DIR, { recursive: true });
+    }
+}
+function getSettings() {
+    try {
+        ensureConfigDir();
+        if (!fs_1.default.existsSync(SETTINGS_FILE)) {
+            return { ...defaultSettings };
+        }
+        const raw = fs_1.default.readFileSync(SETTINGS_FILE, 'utf-8');
+        const parsed = JSON.parse(raw);
+        return { ...defaultSettings, ...parsed };
+    }
+    catch {
+        return { ...defaultSettings };
+    }
+}
+function saveSettings(settings) {
+    ensureConfigDir();
+    const merged = { ...defaultSettings, ...settings };
+    fs_1.default.writeFileSync(SETTINGS_FILE, JSON.stringify(merged, null, 2));
+    return merged;
+}
+function updateSettings(partial) {
+    const current = getSettings();
+    const merged = { ...current, ...partial };
+    return saveSettings(merged);
+}
+function getOrCreateDeviceId() {
+    const settings = getSettings();
+    if (settings.deviceId) {
+        return settings.deviceId;
+    }
+    const deviceId = crypto_1.default.randomUUID();
+    updateSettings({ deviceId });
+    return deviceId;
+}

package/dist/utils/telemetry.js

@@ -0,0 +1,81 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isTelemetryEnabled = isTelemetryEnabled;
+exports.setTelemetryEnabled = setTelemetryEnabled;
+exports.markTelemetryPrompted = markTelemetryPrompted;
+exports.recordTelemetry = recordTelemetry;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+const settings_1 = require("./settings");
+const LOG_DIR = path_1.default.join(os_1.default.homedir(), '.snapcommit', 'logs');
+const LOG_FILE = path_1.default.join(LOG_DIR, 'telemetry.log');
+const TELEMETRY_ENDPOINT = process.env.SNAPCOMMIT_TELEMETRY_URL || 'https://www.snapcommit.dev/api/telemetry';
+let packageVersion = '0.0.0';
+try {
+    const pkgPath = path_1.default.join(__dirname, '../../package.json');
+    const raw = fs_1.default.readFileSync(pkgPath, 'utf-8');
+    const parsed = JSON.parse(raw);
+    packageVersion = parsed.version || packageVersion;
+}
+catch {
+    // ignore
+}
+function ensureLogDir() {
+    if (!fs_1.default.existsSync(LOG_DIR)) {
+        fs_1.default.mkdirSync(LOG_DIR, { recursive: true });
+    }
+}
+function isTelemetryEnabled() {
+    return Boolean((0, settings_1.getSettings)().telemetryEnabled);
+}
+function setTelemetryEnabled(enabled) {
+    (0, settings_1.updateSettings)({ telemetryEnabled: enabled });
+}
+function markTelemetryPrompted() {
+    (0, settings_1.updateSettings)({ telemetryPromptedAt: Date.now() });
+}
+function appendLocalLog(entry) {
+    try {
+        ensureLogDir();
+        fs_1.default.appendFileSync(LOG_FILE, JSON.stringify(entry) + '\n');
+    }
+    catch {
+        // ignore logging failures
+    }
+}
+function recordTelemetry(event, payload = {}) {
+    if (!isTelemetryEnabled()) {
+        return;
+    }
+    const timestamp = new Date().toISOString();
+    const deviceId = (0, settings_1.getOrCreateDeviceId)();
+    const body = {
+        event,
+        payload,
+        timestamp,
+        version: packageVersion,
+        deviceId,
+    };
+    // Fire and forget
+    void (async () => {
+        try {
+            const response = await fetch(TELEMETRY_ENDPOINT, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify(body),
+            });
+            if (!response.ok) {
+                appendLocalLog({ ...body, status: response.status, error: await response.text().catch(() => undefined) });
+            }
+        }
+        catch (error) {
+            appendLocalLog({ ...body, error: error?.message || 'network-error' });
+        }
+    })();
+}

package/package.json

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