@snapcommit/cli 2.1.0 → 2.2.0

package/dist/commands/cursor-style.js

@@ -1,8 +1,41 @@
 "use strict";
 /**
  * Cursor-style natural language Git assistant
- * DEAD SIMPLE: Check status → Show changes → Commit → Push → Done!
+ * 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 };
 };
@@ -12,67 +45,219 @@ const chalk_1 = __importDefault(require("chalk"));
 const child_process_1 = require("child_process");
 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;
     }
-    // Check if there are any changes first
+    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;
+    }
+    // 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 - no changes to commit\n'));
+        console.log(chalk_1.default.gray('\n✓ Branch clean\n'));
         return;
     }
-    // Show what changed
-    console.log(chalk_1.default.blue('\n📦 Changes detected:\n'));
-    if (status.unstaged > 0)
-        console.log(chalk_1.default.yellow(`   • ${status.unstaged} modified`));
-    if (status.untracked > 0)
-        console.log(chalk_1.default.yellow(`   • ${status.untracked} new`));
-    if (status.staged > 0)
-        console.log(chalk_1.default.green(`   • ${status.staged} staged`));
-    console.log();
-    // Stage everything
+    // Stage all
     try {
         (0, git_1.stageAllChanges)();
     }
     catch (error) {
-        console.log(chalk_1.default.red(`❌ Failed to stage changes: ${error.message}\n`));
+        console.log(chalk_1.default.red(`❌ ${error.message}\n`));
         return;
     }
-    // Generate commit message
-    console.log(chalk_1.default.blue('🤖 Generating commit message...'));
+    // Generate AI commit message
     const diff = (0, git_1.getGitDiff)(true);
     const commitMessage = await generateCommitMessage(diff);
-    console.log(chalk_1.default.green(`\n📝 ${commitMessage.split('\n')[0]}\n`));
     // Commit
     try {
         (0, child_process_1.execSync)(`git commit -m "${commitMessage.replace(/"/g, '\\"')}"`, { encoding: 'utf-8', stdio: 'pipe' });
-        console.log(chalk_1.default.green('✓ Committed'));
+        console.log(chalk_1.default.green(`✓ ${commitMessage.split('\n')[0]}`));
     }
     catch (error) {
-        console.log(chalk_1.default.red(`❌ Commit failed: ${error.message}\n`));
+        console.log(chalk_1.default.red(`❌ Commit failed\n`));
         return;
     }
     // Push
     try {
-        console.log(chalk_1.default.blue('⬆️  Pushing to remote...'));
         (0, child_process_1.execSync)('git push', { encoding: 'utf-8', stdio: 'pipe' });
         console.log(chalk_1.default.green('✓ Pushed\n'));
     }
     catch (error) {
-        // If push fails (e.g., no remote), that's okay
         if (error.message.includes('no configured push destination')) {
-            console.log(chalk_1.default.yellow('⚠️  No remote configured - changes committed locally\n'));
+            console.log(chalk_1.default.gray('✓ Committed locally (no remote)\n'));
         }
         else {
-            console.log(chalk_1.default.yellow(`⚠️  Push failed: ${error.message}\n`));
+            console.log(chalk_1.default.yellow(`⚠️  ${error.message}\n`));
+        }
+    }
+}
+/**
+ * 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 {
+            (0, child_process_1.execSync)(cmd, { encoding: 'utf-8', stdio: 'pipe' });
+        }
+        catch (error) {
+            // Try to auto-fix common errors
+            const fixed = await tryAutoFix(error, cmd);
+            if (!fixed) {
+                console.log(chalk_1.default.red(`❌ ${error.message}\n`));
+                return;
+            }
         }
     }
-    console.log(chalk_1.default.green('✅ Done!\n'));
 }
-// All removed - we're keeping it SUPER simple now!
+/**
+ * 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;
+        }
+    }
+    // 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;
+        }
+    }
+    return false;
+}
+/**
+ * Get AI interpretation for complex commands
+ */
+async function getAIInterpretation(userInput, token) {
+    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(),
+                },
+            }),
+        });
+        if (!response.ok)
+            return null;
+        const data = await response.json();
+        return data.intent;
+    }
+    catch {
+        return null;
+    }
+}
 async function generateCommitMessage(diff) {
     const token = (0, auth_1.getToken)();
     if (!token) {

package/package.json

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