@snapcommit/cli 2.4.0 → 2.6.0

package/dist/commands/cursor-style.js

@@ -85,7 +85,8 @@ async function handleAICommand(userInput) {
             return;
         }
         // For commits, generate AI message first
-        if (intent.action === 'commit') {
+        if (intent.action === 'commit' || intent.action === 'push' ||
+            (intent.gitCommands && intent.gitCommands.some((cmd) => cmd.includes('commit')))) {
             await executeCommitWithAI(intent);
             return;
         }
@@ -95,7 +96,10 @@ async function handleAICommand(userInput) {
             console.log(chalk_1.default.green('✓ Done\n'));
         }
         else {
-            console.log(chalk_1.default.yellow('⚠️  No commands to execute\n'));
+            // 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`));
         }
     }
     else if (intent.type === 'github') {
@@ -129,69 +133,137 @@ async function showStatus() {
 }
 /**
  * Execute commit with AI-generated message
- * Shows message and allows editing (like Cursor!)
+ * Natural language interactive flow - like talking to Cursor!
  */
 async function executeCommitWithAI(intent) {
     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('✓ Branch clean'));
+        console.log(chalk_1.default.gray('\n✓ Branch clean\n'));
         return;
     }
-    // Stage all
+    // Show ALL changed files with details
+    console.log(chalk_1.default.blue('\n📦 Files changed:\n'));
+    try {
+        const output = (0, child_process_1.execSync)('git status --short', { encoding: 'utf-8' });
+        output.split('\n').filter(line => line.trim()).forEach(line => {
+            const status = line.substring(0, 2);
+            const file = line.substring(3);
+            if (status.includes('M')) {
+                console.log(chalk_1.default.yellow(`  ✎ ${file}`));
+            }
+            else if (status.includes('?')) {
+                console.log(chalk_1.default.green(`  + ${file}`));
+            }
+            else if (status.includes('D')) {
+                console.log(chalk_1.default.red(`  - ${file}`));
+            }
+        });
+    }
+    catch {
+        if (status.unstaged > 0)
+            console.log(chalk_1.default.yellow(`  • ${status.unstaged} modified`));
+        if (status.untracked > 0)
+            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)
     try {
         (0, git_1.stageAllChanges)();
     }
     catch (error) {
-        console.log(chalk_1.default.red(`❌ ${error.message}`));
+        console.log(chalk_1.default.red(`\n❌ ${error.message}\n`));
         return;
     }
     // Generate AI commit message
+    console.log(chalk_1.default.blue('🤖 Generating commit message...\n'));
     const diff = (0, git_1.getGitDiff)(true);
     let commitMessage = await generateCommitMessage(diff);
-    // Show message and ask if they want to edit (like Cursor!)
-    console.log(chalk_1.default.cyan('\n📝 Commit message:'));
-    console.log(chalk_1.default.white(`   ${commitMessage.split('\n')[0]}\n`));
-    const readline = await Promise.resolve().then(() => __importStar(require('readline')));
-    const rl = readline.createInterface({
+    // 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({
         input: process.stdin,
         output: process.stdout,
     });
-    const answer = await new Promise((resolve) => {
-        rl.question(chalk_1.default.gray('Press Enter to commit, or type new message: '), (ans) => {
-            rl.close();
-            resolve(ans);
+    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());
         });
     });
-    // If user typed something, use that instead
-    if (answer.trim()) {
-        commitMessage = answer.trim();
+    // Handle response naturally
+    if (messageAction.includes('cancel') || messageAction === 'no' || messageAction === 'n') {
+        console.log(chalk_1.default.gray('\n✗ Cancelled\n'));
+        return;
+    }
+    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
     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`));
+        console.log(chalk_1.default.red(`\n❌ Commit failed: ${error.message}\n`));
         return;
     }
     // Push if requested
-    if (intent.shouldPush || intent.gitCommands?.some((cmd) => cmd.includes('push'))) {
+    const shouldPush = intent.shouldPush || intent.gitCommands?.some((cmd) => cmd.includes('push'));
+    if (shouldPush) {
         try {
             (0, child_process_1.execSync)('git push', { encoding: 'utf-8', stdio: 'pipe' });
-            console.log(chalk_1.default.green('✓ Pushed'));
+            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)'));
+                console.log(chalk_1.default.gray('✓ Committed locally (no remote)\n'));
             }
             else {
-                console.log(chalk_1.default.yellow(`⚠️  ${error.message}`));
+                console.log(chalk_1.default.yellow(`⚠️  Push failed: ${error.message}\n`));
             }
         }
     }
+    else {
+        console.log();
+    }
 }
 /**
  * Execute Git commands with auto-retry on errors

package/package.json

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