@snapcommit/cli 3.11.6 → 3.11.7

package/dist/commands/cursor-style.js

@@ -54,99 +54,64 @@ async function executeCursorStyle(userInput) {
         console.log(chalk_1.default.red('\n❌ Not a git repository\n'));
         return;
     }
-    // Fast-path for common commands (pattern matching) - Cursor does this!
-    const handled = await tryQuickCommands(userInput);
-    if (handled) {
-        return;
-    }
-    // Everything else goes through AI
+    // EVERYTHING goes through AI - that's the point of SnapCommit!
     await handleAICommand(userInput);
 }
 /**
- * Try to handle common commands with pattern matching (FAST PATH)
- * Returns true if handled, false if should go to AI
+ * Generate conversational feedback based on AI intent
  */
-async function tryQuickCommands(input) {
-    const lower = input.toLowerCase().trim();
-    // Status commands
-    if (lower === 'status' || lower === 'show status' || lower === 'what changed' || lower === 'git status') {
-        await showStatus();
-        return true;
-    }
-    // Stage commands - MUST handle before AI!
-    if (lower.startsWith('stage')) {
-        const rest = input.replace(/^stage\s*/i, '').trim();
-        const ALL_KEYWORDS = ['all', 'all changes', 'everything', 'everything please', 'it all', 'them all'];
-        try {
-            if (!rest || ALL_KEYWORDS.includes(rest.toLowerCase())) {
-                (0, child_process_1.execSync)('git add -A', { stdio: 'ignore' });
-                console.log(chalk_1.default.green('\n✓ Staged all changes\n'));
-            }
-            else {
-                // Parse file list (handle "and", commas, etc.)
-                const files = rest
-                    .replace(/\sand\s/gi, ',')
-                    .split(',')
-                    .map((segment) => segment
-                    .replace(/^(the|file|files)\s+/i, '')
-                    .replace(/\s+please$/i, '')
-                    .trim())
-                    .filter(Boolean);
-                if (files.length === 0) {
-                    console.log(chalk_1.default.yellow('\n⚠️  No files specified to stage.\n'));
-                    return true;
-                }
-                files.forEach((file) => {
-                    const escaped = file.replace(/(["\\$`])/g, '\\$1');
-                    (0, child_process_1.execSync)(`git add -- "${escaped}"`, { stdio: 'ignore' });
-                });
-                console.log(chalk_1.default.green(`\n✓ Staged ${files.length} ${files.length === 1 ? 'file' : 'files'}: ${files.join(', ')}\n`));
-            }
-        }
-        catch (error) {
-            console.log(chalk_1.default.red(`\n❌ Failed to stage: ${error.message}\n`));
+function getConversationalMessage(intent, userInput) {
+    const action = intent.action?.toLowerCase() || '';
+    const commands = intent.gitCommands || [];
+    // Extract file names from commands
+    const fileMatch = commands[0]?.match(/(?:diff|add|checkout|log)\s+(?:--\s+)?([^\s]+)/);
+    const fileName = fileMatch ? fileMatch[1] : '';
+    // Conversational messages based on action
+    if (action === 'status') {
+        return 'Got it! Let me check your repo status...';
+    }
+    if (action === 'diff') {
+        if (fileName) {
+            return `Perfect! Showing you what changed in ${chalk_1.default.cyan(fileName)}...`;
         }
-        return true;
+        return 'Alright, showing you the changes...';
     }
-    // Push commands
-    if (lower === 'push' || lower === 'push it' || lower === 'git push') {
-        try {
-            console.log(chalk_1.default.gray('\n📤 Pushing to remote...\n'));
-            (0, child_process_1.execSync)('git push', { stdio: 'inherit' });
-            console.log(chalk_1.default.green('\n✅ Pushed!\n'));
-            return true;
-        }
-        catch (error) {
-            console.log(chalk_1.default.red('\n❌ Push failed\n'));
-            return true;
-        }
+    if (action === 'log') {
+        return 'Sure thing! Pulling up your recent commits...';
     }
-    // Pull commands
-    if (lower === 'pull' || lower === 'pull latest' || lower === 'git pull') {
-        try {
-            console.log(chalk_1.default.gray('\n📥 Pulling from remote...\n'));
-            (0, child_process_1.execSync)('git pull', { stdio: 'inherit' });
-            console.log(chalk_1.default.green('\n✅ Pulled!\n'));
-            return true;
-        }
-        catch (error) {
-            console.log(chalk_1.default.red('\n❌ Pull failed\n'));
-            return true;
+    if (action === 'commit') {
+        if (intent.shouldPush) {
+            return 'Got it! I\'ll commit your changes and push them up...';
         }
+        return 'Okay! Let me commit those changes for you...';
     }
-    // Diff commands
-    if (lower === 'diff' || lower === 'show diff' || lower === 'what changed' || lower === 'changes') {
-        try {
-            (0, child_process_1.execSync)('git diff', { stdio: 'inherit' });
-            return true;
-        }
-        catch (error) {
-            console.log(chalk_1.default.red('\n❌ Failed to show diff\n'));
-            return true;
+    if (action === 'push') {
+        return 'Pushing your changes to the remote now...';
+    }
+    if (action === 'branch') {
+        if (commands[0]?.includes('-b')) {
+            const branchName = commands[0].match(/checkout -b ([^\s]+)/)?.[1];
+            return `Creating and switching to branch ${chalk_1.default.cyan(branchName)}...`;
         }
+        return 'Switching branches...';
     }
-    // Not handled - let AI process it
-    return false;
+    if (action === 'merge') {
+        return 'Alright, merging that branch...';
+    }
+    if (action === 'stash') {
+        return 'Stashing your changes...';
+    }
+    if (action === 'pr_create') {
+        return 'Perfect! Creating a pull request for you...';
+    }
+    if (action === 'pr_list') {
+        return 'Let me grab your open pull requests...';
+    }
+    if (action === 'ci_check') {
+        return 'Checking CI status...';
+    }
+    // Default fallback
+    return 'On it!';
 }
 /**
  * AI-powered command handler - CURSOR-STYLE!
@@ -158,17 +123,18 @@ async function handleAICommand(userInput) {
         console.log(chalk_1.default.red('\n❌ Not authenticated\n'));
         return;
     }
+    // Show thinking indicator
+    console.log(chalk_1.default.gray('🤔 Understanding your command...\n'));
     // Get AI interpretation for EVERYTHING
     const intent = await getAIInterpretation(userInput, token);
     if (!intent) {
-        console.log(chalk_1.default.red('\n❌ Could not understand'));
-        console.log(chalk_1.default.gray('   Try: "commit and push" or "show changes"\n'));
+        console.log(chalk_1.default.red('❌ Hmm, I couldn\'t quite understand that.'));
+        console.log(chalk_1.default.gray('   💡 Try something like: "commit and push" or "show me what changed"\n'));
         return;
     }
-    // Debug mode (if needed)
-    if (process.env.DEBUG) {
-        console.log(chalk_1.default.gray(`[DEBUG] ${JSON.stringify(intent, null, 2)}`));
-    }
+    // Conversational feedback based on what we're doing
+    const actionMsg = getConversationalMessage(intent, userInput);
+    console.log(chalk_1.default.blue(`✨ ${actionMsg}\n`));
     // Execute based on type
     if (intent.type === 'git') {
         // Status check
@@ -176,6 +142,17 @@ async function handleAICommand(userInput) {
             await showStatus();
             return;
         }
+        // Diff check - show changes
+        if (intent.action === 'diff' || intent.action === 'log') {
+            if (intent.gitCommands && intent.gitCommands.length > 0) {
+                await executeGitCommands(intent.gitCommands);
+            }
+            else {
+                console.log(chalk_1.default.yellow('⚠️  I understood what you want, but couldn\'t generate the right git command.'));
+                console.log(chalk_1.default.gray('   💡 Try: "show diff for test1.txt" or "what changed in this file?"\n'));
+            }
+            return;
+        }
         // Commit/push flow
         if (intent.action === 'commit' || intent.action === 'push' ||
             (intent.gitCommands && intent.gitCommands.some((cmd) => cmd.includes('commit')))) {
@@ -189,6 +166,7 @@ async function handleAICommand(userInput) {
         }
         else {
             console.log(chalk_1.default.yellow('\n⚠️  No action taken\n'));
+            console.log(chalk_1.default.gray(`   Debug: action=${intent.action}, gitCommands=${JSON.stringify(intent.gitCommands)}\n`));
         }
     }
     else if (intent.type === 'github') {
@@ -624,8 +602,26 @@ async function executeGitCommands(commands) {
                 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'));
+                let diffOutput = output.trim();
+                // If no diff (possibly staged), try --cached
+                if (!diffOutput) {
+                    const cachedCmd = cmd.replace('git diff', 'git diff --cached');
+                    try {
+                        const cachedOutput = (0, child_process_1.execSync)(cachedCmd, { encoding: 'utf-8', stdio: 'pipe' }).trim();
+                        if (cachedOutput) {
+                            diffOutput = cachedOutput;
+                            console.log(chalk_1.default.gray('\nShowing staged changes (git diff --cached):\n'));
+                        }
+                    }
+                    catch {
+                        // ignore - we'll handle below
+                    }
+                }
+                if (diffOutput) {
+                    console.log('\n' + diffOutput + '\n');
+                }
+                else {
+                    console.log(chalk_1.default.gray('\n(no changes in working tree or staging area)\n'));
                 }
             }
         }
@@ -1680,8 +1676,6 @@ async function getAIInterpretation(userInput, token) {
     try {
         const currentBranch = (0, git_1.getCurrentBranch)();
         const status = (0, git_1.getGitStatus)();
-        // Show loading indicator for slow AI responses
-        console.log(chalk_1.default.blue('🤔 Understanding your command...'));
         const response = await fetch('https://www.snapcommit.dev/api/ai/interpret', {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
@@ -1723,7 +1717,7 @@ async function getAIInterpretation(userInput, token) {
             return null;
         }
         // Debug: Show what AI returned
-        if (process.env.DEBUG === 'true') {
+        if (process.env.DEBUG === 'true' || process.env.SNAP_DEBUG) {
             console.log(chalk_1.default.gray('[DEBUG] AI Response:'), JSON.stringify(data, null, 2));
         }
         if (!data || !data.intent) {

package/package.json

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