@snapcommit/cli 2.0.5 → 2.2.0

package/dist/commands/cursor-style.js

@@ -1,8 +1,41 @@
 "use strict";
 /**
  * Cursor-style natural language Git assistant
- * Shows preview, asks confirmation, handles errors automatically
+ * Fast, simple, auto-fixes errors, handles ALL Git + GitHub operations
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -10,135 +43,216 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeCursorStyle = executeCursorStyle;
 const chalk_1 = __importDefault(require("chalk"));
 const child_process_1 = require("child_process");
-const readline_1 = __importDefault(require("readline"));
 const git_1 = require("../utils/git");
 const auth_1 = require("../lib/auth");
+const github_connect_1 = require("./github-connect");
+const github = __importStar(require("../lib/github"));
 async function executeCursorStyle(userInput) {
     if (!(0, git_1.isGitRepo)()) {
         console.log(chalk_1.default.red('\n❌ Not a git repository\n'));
         return;
     }
-    // Get AI interpretation of the request
-    console.log(chalk_1.default.blue('\n✨ Understanding your request...\n'));
-    const plan = await interpretRequest(userInput);
-    if (!plan) {
-        console.log(chalk_1.default.red('❌ Could not understand the request\n'));
+    const input = userInput.toLowerCase().trim();
+    // FAST PATH: Simple commit/push (no AI needed)
+    if (input.includes('commit') || input.includes('push') || input.includes('save')) {
+        await handleCommitAndPush();
         return;
     }
-    // Show the execution plan
-    console.log(chalk_1.default.bold('📋 Here\'s what I\'ll do:\n'));
-    plan.actions.forEach((action, i) => {
-        console.log(chalk_1.default.gray(`   ${i + 1}. `) + chalk_1.default.white(action.description));
-    });
-    console.log();
-    // If commit is involved, show the AI-generated message
-    if (plan.commitMessage) {
-        console.log(chalk_1.default.gray('📝 Commit message: ') + chalk_1.default.cyan(`"${plan.commitMessage}"`));
-        console.log();
+    // COMPLEX PATH: Use AI for everything else (branch, merge, rebase, undo, GitHub, etc.)
+    await handleComplexCommand(userInput);
+}
+/**
+ * Fast path: Commit and push (no AI interpretation needed)
+ */
+async function handleCommitAndPush() {
+    const status = (0, git_1.getGitStatus)();
+    const hasChanges = status.staged > 0 || status.unstaged > 0 || status.untracked > 0;
+    if (!hasChanges) {
+        console.log(chalk_1.default.gray('\n✓ Branch clean\n'));
+        return;
     }
-    // Ask for confirmation (natural language!)
-    const needsConfirm = plan.actions.some(a => a.requiresConfirmation);
-    if (needsConfirm) {
-        const confirmPrompt = plan.commitMessage
-            ? chalk_1.default.cyan('What next? ') + chalk_1.default.gray('(') + chalk_1.default.white('continue') + chalk_1.default.gray(' • ') + chalk_1.default.white('cancel') + chalk_1.default.gray(' • ') + chalk_1.default.white('edit message') + chalk_1.default.gray('): ')
-            : chalk_1.default.cyan('What next? ') + chalk_1.default.gray('(') + chalk_1.default.white('continue') + chalk_1.default.gray(' • ') + chalk_1.default.white('cancel') + chalk_1.default.gray('): ');
-        const answer = await askQuestion(confirmPrompt);
-        const input = answer.toLowerCase().trim();
-        // Cancel commands
-        if (input === 'cancel' || input === 'no' || input === 'n' || input === 'stop' || input === 'abort') {
-            console.log(chalk_1.default.gray('\n✗ Cancelled\n'));
-            return;
+    // Stage all
+    try {
+        (0, git_1.stageAllChanges)();
+    }
+    catch (error) {
+        console.log(chalk_1.default.red(`❌ ${error.message}\n`));
+        return;
+    }
+    // Generate AI commit message
+    const diff = (0, git_1.getGitDiff)(true);
+    const commitMessage = await generateCommitMessage(diff);
+    // Commit
+    try {
+        (0, child_process_1.execSync)(`git commit -m "${commitMessage.replace(/"/g, '\\"')}"`, { encoding: 'utf-8', stdio: 'pipe' });
+        console.log(chalk_1.default.green(`✓ ${commitMessage.split('\n')[0]}`));
+    }
+    catch (error) {
+        console.log(chalk_1.default.red(`❌ Commit failed\n`));
+        return;
+    }
+    // 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')) {
+            console.log(chalk_1.default.gray('✓ Committed locally (no remote)\n'));
         }
-        // Edit commands
-        if (plan.commitMessage && (input === 'edit' || input === 'e' || input === 'change' || input === 'edit message')) {
-            plan.commitMessage = await editMessage(plan.commitMessage);
+        else {
+            console.log(chalk_1.default.yellow(`⚠️  ${error.message}\n`));
         }
-        // Everything else (including "continue", "yes", "go ahead", "do it", "y", or just Enter) → proceed
     }
-    // Execute the plan
-    console.log(chalk_1.default.blue('\n⚙️  Executing...\n'));
-    for (const action of plan.actions) {
+}
+/**
+ * Complex path: Use AI to interpret and execute any Git/GitHub command
+ */
+async function handleComplexCommand(userInput) {
+    const token = (0, auth_1.getToken)();
+    if (!token) {
+        console.log(chalk_1.default.red('❌ Not authenticated\n'));
+        return;
+    }
+    // Get AI interpretation
+    const intent = await getAIInterpretation(userInput, token);
+    if (!intent) {
+        console.log(chalk_1.default.red('❌ Could not understand command\n'));
+        return;
+    }
+    // Execute based on type
+    if (intent.type === 'git') {
+        await executeGitCommands(intent.gitCommands || []);
+    }
+    else if (intent.type === 'github') {
+        await executeGitHubCommand(intent);
+    }
+    console.log(chalk_1.default.green('✓ Done\n'));
+}
+/**
+ * Execute Git commands with auto-retry on errors
+ */
+async function executeGitCommands(commands) {
+    for (const cmd of commands) {
         try {
-            await executeAction(action, plan.commitMessage);
+            (0, child_process_1.execSync)(cmd, { encoding: 'utf-8', stdio: 'pipe' });
         }
         catch (error) {
             // Try to auto-fix common errors
-            const fixed = await tryAutoFix(error, action);
+            const fixed = await tryAutoFix(error, cmd);
             if (!fixed) {
-                console.log(chalk_1.default.red(`\n❌ Error: ${error.message}\n`));
-                console.log(chalk_1.default.yellow('💡 Try: "undo last change" to revert\n'));
+                console.log(chalk_1.default.red(`❌ ${error.message}\n`));
                 return;
             }
         }
     }
-    console.log(chalk_1.default.green('\n✅ All done!\n'));
 }
-async function interpretRequest(userInput) {
-    // This will call the backend AI to interpret the request
-    // For now, let's handle some common patterns
-    const input = userInput.toLowerCase();
-    const actions = [];
-    let commitMessage;
-    // "commit and push" pattern
-    if (input.includes('commit') && input.includes('push')) {
-        // Generate commit message
-        const diff = await getChangeDiff();
-        if (diff) {
-            commitMessage = await generateCommitMessage(diff);
+/**
+ * Execute GitHub operations (PRs, CI, issues)
+ */
+async function executeGitHubCommand(intent) {
+    if (!(0, github_connect_1.isGitHubConnected)()) {
+        console.log(chalk_1.default.yellow('⚠️  GitHub not connected. Run: snap github connect\n'));
+        return;
+    }
+    try {
+        switch (intent.action) {
+            case 'pr_create':
+                console.log(chalk_1.default.blue('Creating PR...'));
+                const pr = await github.createPullRequest(intent.options || {});
+                console.log(chalk_1.default.green(`✓ PR created: ${pr.html_url}`));
+                break;
+            case 'pr_list':
+                console.log(chalk_1.default.blue('Listing PRs...'));
+                const prs = await github.listPullRequests({ state: 'open', limit: 10 });
+                if (prs.length === 0) {
+                    console.log(chalk_1.default.gray('No open PRs'));
+                }
+                else {
+                    prs.forEach((p) => console.log(chalk_1.default.cyan(`  #${p.number}: ${p.title}`)));
+                }
+                break;
+            default:
+                console.log(chalk_1.default.yellow(`⚠️  GitHub action not implemented: ${intent.action}\n`));
+        }
+    }
+    catch (error) {
+        console.log(chalk_1.default.red(`❌ ${error.message}\n`));
+    }
+}
+/**
+ * Auto-fix common Git errors (like Cursor does)
+ */
+async function tryAutoFix(error, command) {
+    const errorMsg = error.message?.toLowerCase() || '';
+    // Merge conflict
+    if (errorMsg.includes('conflict')) {
+        console.log(chalk_1.default.yellow('⚠️  Merge conflict - attempting auto-resolve...'));
+        try {
+            // Try to accept current changes
+            (0, child_process_1.execSync)('git add .', { 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('✓ Auto-resolved'));
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    // Diverged branches
+    if (errorMsg.includes('diverged') || errorMsg.includes('non-fast-forward')) {
+        console.log(chalk_1.default.yellow('⚠️  Branches diverged - pulling and retrying...'));
+        try {
+            (0, child_process_1.execSync)('git pull --rebase', { encoding: 'utf-8', stdio: 'pipe' });
+            (0, child_process_1.execSync)(command, { encoding: 'utf-8', stdio: 'pipe' });
+            console.log(chalk_1.default.green('✓ Fixed'));
+            return true;
+        }
+        catch {
+            return false;
         }
-        actions.push({
-            type: 'stage',
-            description: 'Stage all changes',
-            requiresConfirmation: false,
-        });
-        actions.push({
-            type: 'commit',
-            description: `Commit with message: "${commitMessage || 'Update'}"`,
-            requiresConfirmation: true,
-            requiresCommitMessage: true,
-        });
-        actions.push({
-            type: 'push',
-            description: 'Push to origin',
-            command: 'git push',
-            requiresConfirmation: true,
-        });
-        return {
-            actions,
-            commitMessage,
-            explanation: 'Stage all changes, commit with AI-generated message, and push to remote',
-        };
     }
-    // "commit" only
-    if (input.includes('commit') && !input.includes('push')) {
-        const diff = await getChangeDiff();
-        if (diff) {
-            commitMessage = await generateCommitMessage(diff);
+    // Unstaged changes
+    if (errorMsg.includes('unstaged') || errorMsg.includes('uncommitted')) {
+        console.log(chalk_1.default.yellow('⚠️  Unstaged changes - stashing and retrying...'));
+        try {
+            (0, child_process_1.execSync)('git stash', { encoding: 'utf-8', stdio: 'pipe' });
+            (0, child_process_1.execSync)(command, { encoding: 'utf-8', stdio: 'pipe' });
+            (0, child_process_1.execSync)('git stash pop', { encoding: 'utf-8', stdio: 'pipe' });
+            console.log(chalk_1.default.green('✓ Fixed'));
+            return true;
+        }
+        catch {
+            return false;
         }
-        actions.push({
-            type: 'stage',
-            description: 'Stage all changes',
-            requiresConfirmation: false,
-        });
-        actions.push({
-            type: 'commit',
-            description: `Commit with message: "${commitMessage || 'Update'}"`,
-            requiresConfirmation: true,
-            requiresCommitMessage: true,
-        });
-        return {
-            actions,
-            commitMessage,
-            explanation: 'Stage and commit changes with AI-generated message',
-        };
     }
-    // Let the AI handle complex requests
-    return await getAIInterpretation(userInput);
+    return false;
 }
-async function getChangeDiff() {
+/**
+ * Get AI interpretation for complex commands
+ */
+async function getAIInterpretation(userInput, token) {
     try {
-        (0, git_1.stageAllChanges)();
-        return (0, git_1.getGitDiff)(true);
+        const currentBranch = (0, git_1.getCurrentBranch)();
+        const status = (0, git_1.getGitStatus)();
+        const response = await fetch('https://snapcommit.dev/api/ai/interpret', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                userInput,
+                token,
+                context: {
+                    currentBranch,
+                    hasUncommittedChanges: status.unstaged > 0 || status.untracked > 0,
+                    lastCommitHash: (0, child_process_1.execSync)('git log -1 --format=%H 2>/dev/null || echo ""', { encoding: 'utf-8' }).trim(),
+                    remoteBranch: (0, child_process_1.execSync)('git rev-parse --abbrev-ref @{upstream} 2>/dev/null || echo ""', { encoding: 'utf-8' }).trim(),
+                },
+            }),
+        });
+        if (!response.ok)
+            return null;
+        const data = await response.json();
+        return data.intent;
     }
     catch {
         return null;
@@ -176,141 +290,4 @@ async function generateCommitMessage(diff) {
         return 'Update changes';
     }
 }
-async function getAIInterpretation(userInput) {
-    const token = (0, auth_1.getToken)();
-    if (!token)
-        return null;
-    try {
-        const currentBranch = (0, git_1.getCurrentBranch)();
-        const status = (0, git_1.getGitStatus)();
-        const response = await fetch('https://snapcommit.dev/api/ai/interpret', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({
-                userInput,
-                token,
-                context: {
-                    currentBranch,
-                    hasUncommittedChanges: status.unstaged > 0 || status.untracked > 0,
-                    lastCommitHash: (0, child_process_1.execSync)('git log -1 --format=%H 2>/dev/null || echo ""', { encoding: 'utf-8' }).trim(),
-                    remoteBranch: (0, child_process_1.execSync)('git rev-parse --abbrev-ref @{upstream} 2>/dev/null || echo ""', { encoding: 'utf-8' }).trim(),
-                },
-            }),
-        });
-        const data = await response.json();
-        // Convert AI intent to execution plan
-        // This is a simplified version - in production, this would be more sophisticated
-        return convertIntentToPlan(data.intent);
-    }
-    catch {
-        return null;
-    }
-}
-function convertIntentToPlan(intent) {
-    // Convert the AI intent format to our execution plan format
-    // This bridges the existing intent format with the new Cursor-style execution
-    if (!intent || !intent.gitCommands)
-        return null;
-    const actions = intent.gitCommands.map((cmd, i) => ({
-        type: inferActionType(cmd),
-        description: intent.explanation || `Execute: ${cmd}`,
-        command: cmd,
-        requiresConfirmation: intent.needsConfirmation || intent.riskLevel !== 'safe',
-    }));
-    return {
-        actions,
-        explanation: intent.explanation,
-    };
-}
-function inferActionType(command) {
-    if (command.includes('git add'))
-        return 'stage';
-    if (command.includes('git commit'))
-        return 'commit';
-    if (command.includes('git push'))
-        return 'push';
-    if (command.includes('git checkout') || command.includes('git switch'))
-        return 'checkout';
-    if (command.includes('git merge'))
-        return 'merge';
-    if (command.includes('git reset'))
-        return 'reset';
-    if (command.includes('git branch'))
-        return 'branch';
-    if (command.includes('git pull'))
-        return 'pull';
-    if (command.includes('git rebase'))
-        return 'rebase';
-    if (command.includes('git cherry-pick'))
-        return 'cherry-pick';
-    return 'stage';
-}
-async function executeAction(action, commitMessage) {
-    switch (action.type) {
-        case 'stage':
-            (0, git_1.stageAllChanges)();
-            console.log(chalk_1.default.green('   ✓ Staged all changes'));
-            break;
-        case 'commit':
-            if (commitMessage) {
-                (0, child_process_1.execSync)(`git commit -m "${commitMessage.replace(/"/g, '\\"')}"`, { encoding: 'utf-8' });
-                console.log(chalk_1.default.green(`   ✓ Committed`));
-            }
-            break;
-        case 'push':
-            (0, child_process_1.execSync)('git push', { encoding: 'utf-8', stdio: 'pipe' });
-            console.log(chalk_1.default.green('   ✓ Pushed to remote'));
-            break;
-        default:
-            if (action.command) {
-                (0, child_process_1.execSync)(action.command, { encoding: 'utf-8', stdio: 'pipe' });
-                console.log(chalk_1.default.green(`   ✓ ${action.description}`));
-            }
-            break;
-    }
-}
-async function tryAutoFix(error, action) {
-    const errorMsg = error.message?.toLowerCase() || '';
-    // Handle "no remote configured"
-    if (errorMsg.includes('no configured push destination')) {
-        console.log(chalk_1.default.yellow('\n⚠️  No remote repository configured'));
-        console.log(chalk_1.default.gray('   You need to add a remote first\n'));
-        return false;
-    }
-    // Handle merge conflicts
-    if (errorMsg.includes('conflict')) {
-        console.log(chalk_1.default.yellow('\n⚠️  Merge conflict detected'));
-        console.log(chalk_1.default.gray('   Use: "resolve conflicts" to fix\n'));
-        return false;
-    }
-    // Handle auth failures
-    if (errorMsg.includes('authentication') || errorMsg.includes('permission denied')) {
-        console.log(chalk_1.default.yellow('\n⚠️  Authentication failed'));
-        console.log(chalk_1.default.gray('   Check your Git credentials\n'));
-        return false;
-    }
-    return false;
-}
-function askQuestion(query) {
-    const rl = readline_1.default.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-        terminal: false, // Don't process terminal escape sequences
-    });
-    return new Promise((resolve) => {
-        // Write prompt manually
-        process.stdout.write(query);
-        // Listen for ONE line of input
-        rl.once('line', (answer) => {
-            rl.close();
-            resolve(answer.trim());
-        });
-    });
-}
-async function editMessage(originalMessage) {
-    console.log(chalk_1.default.cyan('\n✏️  Edit commit message:\n'));
-    console.log(chalk_1.default.gray('   (Press Enter to keep, or type new message)\n'));
-    console.log(chalk_1.default.white(`   Current: ${chalk_1.default.cyan(originalMessage)}\n`));
-    const newMessage = await askQuestion(chalk_1.default.yellow('   New message: '));
-    return newMessage.trim() || originalMessage;
-}
+// All complex logic removed - keeping it DEAD SIMPLE!

package/package.json

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