@snapcommit/cli 2.6.0 → 3.0.0

package/dist/commands/cursor-style.js

@@ -57,25 +57,25 @@ async function executeCursorStyle(userInput) {
     await handleAICommand(userInput);
 }
 /**
- * AI-powered command handler - handles EVERYTHING
- * Pure AI interpretation for all operations (like Cursor!)
+ * AI-powered command handler - CURSOR-STYLE!
+ * Pure AI interpretation, minimal output, instant feel
  */
 async function handleAICommand(userInput) {
     const token = (0, auth_1.getToken)();
     if (!token) {
-        console.log(chalk_1.default.red('❌ Not authenticated\n'));
+        console.log(chalk_1.default.red('\n❌ Not authenticated\n'));
         return;
     }
     // Get AI interpretation for EVERYTHING
     const intent = await getAIInterpretation(userInput, token);
     if (!intent) {
-        console.log(chalk_1.default.red('❌ Could not understand command'));
-        console.log(chalk_1.default.gray('Tip: Try "commit and push" or "show me changes"\n'));
+        console.log(chalk_1.default.red('\n❌ Could not understand'));
+        console.log(chalk_1.default.gray('   Try: "commit and push" or "show changes"\n'));
         return;
     }
-    // Debug: Show what AI understood (for now)
+    // Debug mode (if needed)
     if (process.env.DEBUG) {
-        console.log(chalk_1.default.gray(`[DEBUG] Intent: ${JSON.stringify(intent, null, 2)}`));
+        console.log(chalk_1.default.gray(`[DEBUG] ${JSON.stringify(intent, null, 2)}`));
     }
     // Execute based on type
     if (intent.type === 'git') {
@@ -84,30 +84,26 @@ async function handleAICommand(userInput) {
             await showStatus();
             return;
         }
-        // For commits, generate AI message first
+        // Commit/push flow
         if (intent.action === 'commit' || intent.action === 'push' ||
             (intent.gitCommands && intent.gitCommands.some((cmd) => cmd.includes('commit')))) {
             await executeCommitWithAI(intent);
             return;
         }
-        // Other git commands
+        // Other git commands (branch, merge, etc.)
         if (intent.gitCommands && intent.gitCommands.length > 0) {
             await executeGitCommands(intent.gitCommands);
-            console.log(chalk_1.default.green('✓ Done\n'));
+            console.log(chalk_1.default.green('✓\n'));
         }
         else {
-            // Debug: show what we got
-            console.log(chalk_1.default.yellow('⚠️  No commands to execute'));
-            console.log(chalk_1.default.gray(`Intent action: ${intent.action || 'none'}`));
-            console.log(chalk_1.default.gray(`Git commands: ${intent.gitCommands?.length || 0}\n`));
+            console.log(chalk_1.default.yellow('\n⚠️  No action taken\n'));
         }
     }
     else if (intent.type === 'github') {
         await executeGitHubCommand(intent);
-        console.log(chalk_1.default.green('✓ Done\n'));
     }
     else {
-        console.log(chalk_1.default.yellow(`⚠️  Unknown intent type: ${intent.type}\n`));
+        console.log(chalk_1.default.yellow(`\n⚠️  Unknown action\n`));
     }
 }
 /**
@@ -132,8 +128,8 @@ async function showStatus() {
     console.log();
 }
 /**
- * Execute commit with AI-generated message
- * Natural language interactive flow - like talking to Cursor!
+ * Execute commit - EXACTLY like Cursor!
+ * Minimal friction, one prompt, instant feel
  */
 async function executeCommitWithAI(intent) {
     const status = (0, git_1.getGitStatus)();
@@ -142,11 +138,14 @@ async function executeCommitWithAI(intent) {
         console.log(chalk_1.default.gray('\n✓ Branch clean\n'));
         return;
     }
-    // Show ALL changed files with details
-    console.log(chalk_1.default.blue('\n📦 Files changed:\n'));
+    // Count files
+    let fileCount = status.staged + status.unstaged + status.untracked;
+    // Show changed files (like Cursor sidebar)
+    console.log(chalk_1.default.blue(`\n📦 Changes (${fileCount} ${fileCount === 1 ? 'file' : 'files'}):`));
     try {
         const output = (0, child_process_1.execSync)('git status --short', { encoding: 'utf-8' });
-        output.split('\n').filter(line => line.trim()).forEach(line => {
+        const lines = output.split('\n').filter(line => line.trim()).slice(0, 10); // Show max 10
+        lines.forEach(line => {
             const status = line.substring(0, 2);
             const file = line.substring(3);
             if (status.includes('M')) {
@@ -159,6 +158,9 @@ async function executeCommitWithAI(intent) {
                 console.log(chalk_1.default.red(`  - ${file}`));
             }
         });
+        if (fileCount > 10) {
+            console.log(chalk_1.default.gray(`  ... and ${fileCount - 10} more`));
+        }
     }
     catch {
         if (status.unstaged > 0)
@@ -167,79 +169,40 @@ async function executeCommitWithAI(intent) {
             console.log(chalk_1.default.green(`  • ${status.untracked} new`));
     }
     console.log();
-    // Natural language file selection
-    const readline = await Promise.resolve().then(() => __importStar(require('readline')));
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
-    const fileChoice = await new Promise((resolve) => {
-        rl.question(chalk_1.default.cyan('What do you want to do? ') + chalk_1.default.gray('(commit all / select files / cancel): '), (ans) => {
-            rl.close();
-            resolve(ans.toLowerCase().trim());
-        });
-    });
-    if (fileChoice.includes('cancel') || fileChoice === 'n' || fileChoice === 'no') {
-        console.log(chalk_1.default.gray('\n✗ Cancelled\n'));
-        return;
-    }
-    if (fileChoice.includes('select')) {
-        console.log(chalk_1.default.yellow('\n💡 Use: ') + chalk_1.default.cyan('git add <files>') + chalk_1.default.yellow(' to stage specific files'));
-        console.log(chalk_1.default.gray('   Then run: ') + chalk_1.default.cyan('snap') + chalk_1.default.gray(' and try again\n'));
-        return;
-    }
-    // Stage all (default for "commit all" or just pressing Enter)
+    // Stage all
     try {
         (0, git_1.stageAllChanges)();
     }
     catch (error) {
-        console.log(chalk_1.default.red(`\n❌ ${error.message}\n`));
+        console.log(chalk_1.default.red(`❌ ${error.message}\n`));
         return;
     }
-    // Generate AI commit message
-    console.log(chalk_1.default.blue('🤖 Generating commit message...\n'));
+    // Generate AI commit message (like Cursor does instantly)
     const diff = (0, git_1.getGitDiff)(true);
     let commitMessage = await generateCommitMessage(diff);
-    // Show message with natural language prompt
-    console.log(chalk_1.default.cyan('📝 AI generated this commit message:'));
-    console.log(chalk_1.default.white.bold(`   "${commitMessage.split('\n')[0]}"\n`));
-    const rl2 = readline.createInterface({
+    // Show message like Cursor - clean and ready to use
+    console.log(chalk_1.default.cyan('🤖 ') + chalk_1.default.white.bold(commitMessage.split('\n')[0]));
+    console.log();
+    // ONE PROMPT - like Cursor's commit button
+    const readline = await Promise.resolve().then(() => __importStar(require('readline')));
+    const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,
     });
-    const messageAction = await new Promise((resolve) => {
-        rl2.question(chalk_1.default.cyan('What next? ') + chalk_1.default.gray('(looks good / edit / type new message / cancel): '), (ans) => {
-            rl2.close();
-            resolve(ans.toLowerCase().trim());
+    const response = await new Promise((resolve) => {
+        rl.question(chalk_1.default.gray('→ Press Enter to commit, or edit message: '), (ans) => {
+            rl.close();
+            resolve(ans.trim());
         });
     });
-    // Handle response naturally
-    if (messageAction.includes('cancel') || messageAction === 'no' || messageAction === 'n') {
-        console.log(chalk_1.default.gray('\n✗ Cancelled\n'));
-        return;
+    // If they typed something, use it. Otherwise use AI message.
+    if (response) {
+        commitMessage = response;
     }
-    if (messageAction.includes('edit') || messageAction.includes('change')) {
-        const rl3 = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-        });
-        commitMessage = await new Promise((resolve) => {
-            rl3.question(chalk_1.default.cyan('Your message: '), (ans) => {
-                rl3.close();
-                resolve(ans.trim() || commitMessage);
-            });
-        });
-        console.log(chalk_1.default.green('\n✓ Message updated\n'));
-    }
-    else if (messageAction && !messageAction.includes('good') && !messageAction.includes('yes') && !messageAction.includes('ok')) {
-        // They typed a custom message directly
-        commitMessage = messageAction;
-        console.log(chalk_1.default.green('\n✓ Using your message\n'));
-    }
-    // Commit
+    // Commit (like Cursor's instant 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]}`));
+        console.log(chalk_1.default.green(`\n✓ Committed`));
     }
     catch (error) {
         console.log(chalk_1.default.red(`\n❌ Commit failed: ${error.message}\n`));
@@ -266,69 +229,121 @@ async function executeCommitWithAI(intent) {
     }
 }
 /**
- * Execute Git commands with auto-retry on errors
+ * Execute Git commands - Cursor-style (clean, fast, auto-fix)
  */
 async function executeGitCommands(commands) {
     for (const cmd of commands) {
         try {
-            (0, child_process_1.execSync)(cmd, { encoding: 'utf-8', stdio: 'pipe' });
+            const output = (0, child_process_1.execSync)(cmd, { encoding: 'utf-8', stdio: 'pipe' });
+            // Show meaningful output for certain commands
+            if (cmd.includes('git branch') && !cmd.includes('-D')) {
+                if (output.trim()) {
+                    console.log(chalk_1.default.cyan('\n' + output.trim() + '\n'));
+                }
+            }
+            else if (cmd.includes('git log')) {
+                console.log(chalk_1.default.cyan('\n' + output.trim() + '\n'));
+            }
+            else if (cmd.includes('git diff') && !cmd.includes('--name-only')) {
+                if (output.trim()) {
+                    console.log(chalk_1.default.gray('\n' + output.trim().substring(0, 500) + (output.length > 500 ? '...' : '') + '\n'));
+                }
+            }
         }
         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`));
+                console.log(chalk_1.default.red(`\n❌ ${error.message}\n`));
                 return;
             }
         }
     }
 }
 /**
- * Execute GitHub operations (PRs, CI, issues)
+ * Execute GitHub operations - Cursor-style streamlined!
  */
 async function executeGitHubCommand(intent) {
     if (!(0, github_connect_1.isGitHubConnected)()) {
-        console.log(chalk_1.default.yellow('⚠️  GitHub not connected. Run: snap github connect\n'));
+        console.log(chalk_1.default.yellow('\n⚠️  GitHub not connected'));
+        console.log(chalk_1.default.gray('   Run: ') + chalk_1.default.cyan('snap github connect\n'));
         return;
     }
     try {
         switch (intent.action) {
             case 'pr_create':
-                console.log(chalk_1.default.blue('Creating PR...'));
+                console.log(chalk_1.default.blue('\n🔄 Creating PR...'));
                 const pr = await github.createPullRequest(intent.options || {});
-                console.log(chalk_1.default.green(`✓ PR created: ${pr.html_url}`));
+                console.log(chalk_1.default.green(`✓ PR #${pr.number} created`));
+                console.log(chalk_1.default.cyan(`  ${pr.html_url}\n`));
                 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'));
+                    console.log(chalk_1.default.gray('\n✓ No open PRs\n'));
                 }
                 else {
-                    prs.forEach((p) => console.log(chalk_1.default.cyan(`  #${p.number}: ${p.title}`)));
+                    console.log(chalk_1.default.blue(`\n📋 Open PRs (${prs.length}):`));
+                    prs.forEach((p) => {
+                        console.log(chalk_1.default.cyan(`  #${p.number} `) + chalk_1.default.white(p.title));
+                    });
+                    console.log();
+                }
+                break;
+            case 'pr_merge':
+                const prNumber = intent.target || intent.options?.number;
+                if (!prNumber) {
+                    console.log(chalk_1.default.red('\n❌ PR number required\n'));
+                    return;
+                }
+                console.log(chalk_1.default.blue(`\n🔄 Merging PR #${prNumber}...`));
+                await github.mergePullRequest(prNumber);
+                console.log(chalk_1.default.green(`✓ PR #${prNumber} merged\n`));
+                break;
+            case 'ci_check':
+                console.log(chalk_1.default.blue('\n🔍 Checking CI status...'));
+                // TODO: Implement CI status check
+                console.log(chalk_1.default.gray('   CI checks (coming soon)\n'));
+                break;
+            case 'issue_create':
+                console.log(chalk_1.default.blue('\n🔄 Creating issue...'));
+                const issue = await github.createIssue(intent.options || {});
+                console.log(chalk_1.default.green(`✓ Issue #${issue.number} created`));
+                console.log(chalk_1.default.cyan(`  ${issue.html_url}\n`));
+                break;
+            case 'issue_list':
+                const issues = await github.listIssues({ state: 'open', limit: 10 });
+                if (issues.length === 0) {
+                    console.log(chalk_1.default.gray('\n✓ No open issues\n'));
+                }
+                else {
+                    console.log(chalk_1.default.blue(`\n🐛 Open Issues (${issues.length}):`));
+                    issues.forEach((i) => {
+                        console.log(chalk_1.default.cyan(`  #${i.number} `) + chalk_1.default.white(i.title));
+                    });
+                    console.log();
                 }
                 break;
             default:
-                console.log(chalk_1.default.yellow(`⚠️  GitHub action not implemented: ${intent.action}\n`));
+                console.log(chalk_1.default.yellow(`\n⚠️  Action not supported: ${intent.action}\n`));
         }
     }
     catch (error) {
-        console.log(chalk_1.default.red(`❌ ${error.message}\n`));
+        console.log(chalk_1.default.red(`\n❌ ${error.message}\n`));
     }
 }
 /**
- * Auto-fix common Git errors (like Cursor does)
+ * Auto-fix common Git errors (like Cursor does - silently when possible)
  */
 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...'));
+        console.log(chalk_1.default.yellow('\n⚠️  Conflict detected - auto-resolving...'));
         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'));
+            console.log(chalk_1.default.green('✓ Resolved\n'));
             return true;
         }
         catch {
@@ -337,11 +352,11 @@ async function tryAutoFix(error, command) {
     }
     // Diverged branches
     if (errorMsg.includes('diverged') || errorMsg.includes('non-fast-forward')) {
-        console.log(chalk_1.default.yellow('⚠️  Branches diverged - pulling and retrying...'));
+        console.log(chalk_1.default.yellow('\n⚠️  Syncing with remote...'));
         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'));
+            console.log(chalk_1.default.green('✓ Synced\n'));
             return true;
         }
         catch {
@@ -350,12 +365,12 @@ async function tryAutoFix(error, command) {
     }
     // Unstaged changes
     if (errorMsg.includes('unstaged') || errorMsg.includes('uncommitted')) {
-        console.log(chalk_1.default.yellow('⚠️  Unstaged changes - stashing and retrying...'));
+        console.log(chalk_1.default.yellow('\n⚠️  Stashing changes...'));
         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'));
+            console.log(chalk_1.default.green('✓ Restored\n'));
             return true;
         }
         catch {

package/package.json

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