@snapcommit/cli 3.8.23 → 3.8.25

package/dist/commands/cursor-style.js

@@ -134,8 +134,31 @@ async function showStatus() {
 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('\n✓ Branch clean\n'));
+    // Check if there are unpushed commits (even if working tree is clean)
+    let hasUnpushedCommits = false;
+    try {
+        const unpushed = (0, child_process_1.execSync)('git log @{u}.. --oneline 2>/dev/null || echo ""', { encoding: 'utf-8' }).trim();
+        hasUnpushedCommits = unpushed.length > 0;
+    }
+    catch {
+        // No upstream or other error - assume we need to push
+        hasUnpushedCommits = true;
+    }
+    // If no changes AND no unpushed commits, nothing to do
+    if (!hasChanges && !hasUnpushedCommits) {
+        console.log(chalk_1.default.gray('\n✓ Branch clean - nothing to commit or push\n'));
+        return;
+    }
+    // If no changes but there are unpushed commits, just push
+    if (!hasChanges && hasUnpushedCommits) {
+        console.log(chalk_1.default.blue('\n🔄 Pushing unpushed commits...\n'));
+        try {
+            (0, child_process_1.execSync)('git push', { encoding: 'utf-8', stdio: 'inherit' });
+            console.log(chalk_1.default.green('\n✓ Pushed successfully\n'));
+        }
+        catch (error) {
+            console.log(chalk_1.default.red(`\n❌ Push failed: ${error.message}\n`));
+        }
         return;
     }
     // Count files
@@ -434,7 +457,7 @@ async function tryAdvancedConflictResolution() {
                 const theirsContent = (0, child_process_1.execSync)(`git show :3:${file}`, { encoding: 'utf-8', stdio: 'pipe' });
                 // Ask AI to resolve the conflict
                 console.log(chalk_1.default.blue(`🤖 AI analyzing: ${file}...`));
-                const resolution = await resolveConflictWithAI(file, conflictContent, oursContent, theirsContent);
+                const resolution = await resolveConflictWithAIDetailed(file, conflictContent, oursContent, theirsContent);
                 if (resolution) {
                     console.log(chalk_1.default.green(`✓ AI resolved: ${file}`));
                     // Write the resolved content
@@ -531,7 +554,7 @@ async function tryAdvancedConflictResolution() {
 /**
  * Use AI to intelligently resolve merge conflicts
  */
-async function resolveConflictWithAI(filename, base, ours, theirs) {
+async function resolveConflictWithAIDetailed(filename, base, ours, theirs) {
     try {
         const axios = (await Promise.resolve().then(() => __importStar(require('axios')))).default;
         const { getAuthConfig } = await Promise.resolve().then(() => __importStar(require('../lib/auth')));
@@ -885,6 +908,98 @@ async function executeGitHubCommand(intent) {
                 await github.rerunWorkflow(runId);
                 console.log(chalk_1.default.green(`✓ Workflow re-run started\n`));
                 break;
+            case 'pr_label':
+                const labelPrNum = intent.target || intent.options?.number;
+                if (!labelPrNum) {
+                    console.log(chalk_1.default.red('\n❌ PR number required\n'));
+                    return;
+                }
+                const labels = intent.options?.labels || [];
+                if (labels.length === 0) {
+                    console.log(chalk_1.default.red('\n❌ Labels required\n'));
+                    return;
+                }
+                console.log(chalk_1.default.blue(`\n🏷️  Adding labels to PR #${labelPrNum}...`));
+                await github.addLabels(labelPrNum, labels);
+                console.log(chalk_1.default.green(`✓ Labels added: ${labels.join(', ')}\n`));
+                break;
+            case 'pr_auto_merge':
+                const autoMergePrNum = intent.target || intent.options?.number;
+                if (!autoMergePrNum) {
+                    console.log(chalk_1.default.red('\n❌ PR number required\n'));
+                    return;
+                }
+                const mergeMethod = intent.options?.method || 'MERGE';
+                console.log(chalk_1.default.blue(`\n🔄 Enabling auto-merge for PR #${autoMergePrNum}...`));
+                await github.enableAutoMerge(autoMergePrNum, mergeMethod);
+                console.log(chalk_1.default.green(`✓ Auto-merge enabled (will merge when CI passes)\n`));
+                break;
+            case 'pr_stack_show':
+                console.log(chalk_1.default.blue('\n📚 Loading PR stack...\n'));
+                const stack = await github.getPRStack(intent.options?.base || 'main');
+                if (stack.length === 0) {
+                    console.log(chalk_1.default.gray('✓ No stacked PRs found\n'));
+                }
+                else {
+                    console.log(chalk_1.default.white.bold(`Stacked PRs (${stack.length}):\n`));
+                    // Group by dependency
+                    const roots = stack.filter(pr => !pr.dependsOn);
+                    const children = stack.filter(pr => pr.dependsOn);
+                    roots.forEach((pr) => {
+                        console.log(chalk_1.default.cyan(`  #${pr.number} `) + chalk_1.default.white(pr.title));
+                        // Find children
+                        const deps = children.filter((c) => c.dependsOn === pr.head.ref);
+                        deps.forEach((dep) => {
+                            console.log(chalk_1.default.gray('    ↳ ') + chalk_1.default.cyan(`#${dep.number} `) + chalk_1.default.white(dep.title));
+                        });
+                    });
+                    console.log();
+                }
+                break;
+            case 'pr_stack_create':
+                const branches = intent.options?.branches || [];
+                if (branches.length < 2) {
+                    console.log(chalk_1.default.red('\n❌ Need at least 2 branches for stacked PRs\n'));
+                    console.log(chalk_1.default.gray('   Example: "create stacked PRs for auth, api, ui"\n'));
+                    return;
+                }
+                console.log(chalk_1.default.blue(`\n📚 Creating stacked PRs for ${branches.length} branches...\n`));
+                const baseBranch = intent.options?.base || 'main';
+                let currentBase = baseBranch;
+                const createdPRs = [];
+                for (let i = 0; i < branches.length; i++) {
+                    const branch = branches[i];
+                    const title = intent.options?.titles?.[i] || `[Stack ${i + 1}/${branches.length}] ${branch}`;
+                    try {
+                        const pr = await github.createDraftPullRequest({
+                            title,
+                            body: `Part of stacked PRs:\n${branches.map((b, idx) => `${idx + 1}. ${b}`).join('\n')}`,
+                            head: branch,
+                            base: currentBase,
+                        });
+                        console.log(chalk_1.default.green(`   ✓ Created PR #${pr.number}: ${branch} → ${currentBase}`));
+                        createdPRs.push(pr);
+                        currentBase = branch; // Next PR builds on this one
+                    }
+                    catch (error) {
+                        console.log(chalk_1.default.red(`   ❌ Failed to create PR for ${branch}: ${error.message}`));
+                        break;
+                    }
+                }
+                console.log();
+                console.log(chalk_1.default.white.bold(`📋 Created ${createdPRs.length}/${branches.length} stacked PRs\n`));
+                console.log(chalk_1.default.gray('💡 Merge from bottom to top for best results!\n'));
+                break;
+            case 'pr_mark_ready':
+                const readyPrNum = intent.target || intent.options?.number;
+                if (!readyPrNum) {
+                    console.log(chalk_1.default.red('\n❌ PR number required\n'));
+                    return;
+                }
+                console.log(chalk_1.default.blue(`\n🔄 Marking PR #${readyPrNum} as ready for review...`));
+                await github.markPRReady(readyPrNum);
+                console.log(chalk_1.default.green(`✓ PR #${readyPrNum} is now ready for review\n`));
+                break;
             default:
                 console.log(chalk_1.default.yellow(`\n⚠️  Action not supported: ${intent.action}\n`));
         }
@@ -894,50 +1009,189 @@ async function executeGitHubCommand(intent) {
     }
 }
 /**
- * Auto-fix common Git errors (like Cursor does - silently when possible)
+ * Auto-fix common Git errors (like Cursor does - with clear messaging)
  */
 async function tryAutoFix(error, command) {
     const errorMsg = error.message?.toLowerCase() || '';
-    // Merge conflict
+    // Merge conflict - ENHANCED with AI resolution
     if (errorMsg.includes('conflict')) {
-        console.log(chalk_1.default.yellow('\n⚠️  Conflict detected - auto-resolving...'));
-        try {
-            (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('✓ Resolved\n'));
-            return true;
-        }
-        catch {
-            return false;
-        }
+        return await handleMergeConflict();
     }
     // Diverged branches
     if (errorMsg.includes('diverged') || errorMsg.includes('non-fast-forward')) {
-        console.log(chalk_1.default.yellow('\n⚠️  Syncing with remote...'));
+        console.log(chalk_1.default.yellow('\n⚠️  Branch diverged from remote'));
+        console.log(chalk_1.default.gray('   Syncing with remote...\n'));
         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('✓ Synced\n'));
+            console.log(chalk_1.default.green('✓ Synced with remote\n'));
             return true;
         }
         catch {
+            console.log(chalk_1.default.red('❌ Could not sync automatically'));
+            console.log(chalk_1.default.gray('   Try: "pull latest changes" first\n'));
             return false;
         }
     }
     // Unstaged changes
     if (errorMsg.includes('unstaged') || errorMsg.includes('uncommitted')) {
-        console.log(chalk_1.default.yellow('\n⚠️  Stashing changes...'));
+        console.log(chalk_1.default.yellow('\n⚠️  Uncommitted changes detected'));
+        console.log(chalk_1.default.gray('   Stashing temporarily...\n'));
         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('✓ Restored\n'));
+            console.log(chalk_1.default.green('✓ Changes restored\n'));
             return true;
         }
         catch {
+            console.log(chalk_1.default.red('❌ Could not stash changes'));
+            console.log(chalk_1.default.gray('   Try: "commit my changes" first\n'));
+            return false;
+        }
+    }
+    // Force push needed
+    if (errorMsg.includes('rejected') || errorMsg.includes('would overwrite')) {
+        return await handleForcePush(command);
+    }
+    return false;
+}
+/**
+ * Handle merge conflicts with AI resolution + clear guidance
+ */
+async function handleMergeConflict() {
+    console.log(chalk_1.default.red('\n❌ Merge conflict detected!\n'));
+    try {
+        // Get list of conflicted files
+        const conflictedFilesOutput = (0, child_process_1.execSync)('git diff --name-only --diff-filter=U', {
+            encoding: 'utf-8',
+            stdio: 'pipe'
+        }).trim();
+        if (!conflictedFilesOutput) {
+            // No conflicted files found, might be a different error
+            return false;
+        }
+        const conflictedFiles = conflictedFilesOutput.split('\n').filter(f => f.trim());
+        console.log(chalk_1.default.yellow('📋 Conflicted files:\n'));
+        // Count conflicts per file
+        const fileConflicts = [];
+        for (const file of conflictedFiles) {
+            try {
+                const diffOutput = (0, child_process_1.execSync)(`git diff ${file}`, { encoding: 'utf-8', stdio: 'pipe' });
+                const conflictCount = (diffOutput.match(/^<<<<<<< HEAD/gm) || []).length;
+                fileConflicts.push({ file, count: conflictCount });
+                console.log(chalk_1.default.cyan(`   • ${file}`) + chalk_1.default.gray(` (${conflictCount} conflict${conflictCount === 1 ? '' : 's'})`));
+            }
+            catch {
+                fileConflicts.push({ file, count: 0 });
+                console.log(chalk_1.default.cyan(`   • ${file}`));
+            }
+        }
+        console.log();
+        // Try AI resolution
+        console.log(chalk_1.default.blue('🤖 Attempting AI resolution...\n'));
+        let resolvedCount = 0;
+        const failedFiles = [];
+        for (const { file, count } of fileConflicts) {
+            if (count === 0)
+                continue;
+            try {
+                const resolved = await resolveConflictWithAI(file);
+                if (resolved) {
+                    console.log(chalk_1.default.green(`   ✓ Resolved: ${file}`));
+                    (0, child_process_1.execSync)(`git add ${file}`, { encoding: 'utf-8', stdio: 'pipe' });
+                    resolvedCount++;
+                }
+                else {
+                    console.log(chalk_1.default.yellow(`   ⚠️  ${file} needs manual review`));
+                    failedFiles.push(file);
+                }
+            }
+            catch {
+                console.log(chalk_1.default.yellow(`   ⚠️  ${file} needs manual review`));
+                failedFiles.push(file);
+            }
+        }
+        console.log();
+        // If all resolved, commit
+        if (failedFiles.length === 0) {
+            (0, child_process_1.execSync)('git commit --no-edit', { encoding: 'utf-8', stdio: 'pipe' });
+            console.log(chalk_1.default.green('✅ All conflicts resolved automatically!\n'));
+            return true;
+        }
+        // Some failed - show manual instructions
+        console.log(chalk_1.default.yellow(`⚠️  ${failedFiles.length} file${failedFiles.length === 1 ? '' : 's'} need${failedFiles.length === 1 ? 's' : ''} manual resolution:\n`));
+        failedFiles.forEach(file => {
+            console.log(chalk_1.default.cyan(`   • ${file}`));
+        });
+        console.log();
+        console.log(chalk_1.default.white.bold('📖 How to resolve manually:\n'));
+        console.log(chalk_1.default.gray('   1. Open the conflicted files in your editor'));
+        console.log(chalk_1.default.gray('   2. Look for ') + chalk_1.default.yellow('<<<<<<< HEAD') + chalk_1.default.gray(' markers'));
+        console.log(chalk_1.default.gray('   3. Choose which version to keep (or merge both)'));
+        console.log(chalk_1.default.gray('   4. Remove the conflict markers ') + chalk_1.default.yellow('(<<<<<<< ======= >>>>>>>)'));
+        console.log(chalk_1.default.gray('   5. Save the files'));
+        console.log(chalk_1.default.gray('   6. Type: ') + chalk_1.default.cyan('"commit the resolved changes"') + chalk_1.default.gray(' or ') + chalk_1.default.cyan('"continue"') + '\n');
+        console.log(chalk_1.default.white.bold('💡 Useful commands:\n'));
+        console.log(chalk_1.default.cyan('   "show the conflicts"') + chalk_1.default.gray(' - See conflict details again'));
+        console.log(chalk_1.default.cyan('   "abort the merge"') + chalk_1.default.gray(' - Cancel and go back'));
+        console.log(chalk_1.default.cyan('   "use their version"') + chalk_1.default.gray(' - Accept incoming changes'));
+        console.log(chalk_1.default.cyan('   "use my version"') + chalk_1.default.gray(' - Keep your changes\n'));
+        return false;
+    }
+    catch (error) {
+        console.log(chalk_1.default.red('❌ Could not analyze conflicts'));
+        console.log(chalk_1.default.gray(`   ${error.message}\n`));
+        return false;
+    }
+}
+/**
+ * Resolve conflict with AI (calls Gemini to analyze and resolve)
+ */
+async function resolveConflictWithAI(file) {
+    try {
+        const token = (0, auth_1.getToken)();
+        if (!token)
             return false;
+        // Get the conflicted content
+        const conflictContent = (0, child_process_1.execSync)(`git show :1:${file} 2>/dev/null || echo ""`, { encoding: 'utf-8' }).trim();
+        const ourContent = (0, child_process_1.execSync)(`git show :2:${file} 2>/dev/null || echo ""`, { encoding: 'utf-8' }).trim();
+        const theirContent = (0, child_process_1.execSync)(`git show :3:${file} 2>/dev/null || echo ""`, { encoding: 'utf-8' }).trim();
+        if (!ourContent && !theirContent)
+            return false;
+        // Call AI to resolve (simplified - real implementation would call Gemini API)
+        // For now, just try simple auto-resolution
+        const diffOutput = (0, child_process_1.execSync)(`git diff ${file}`, { encoding: 'utf-8' });
+        // If conflict is simple (just additions, no deletions), can auto-resolve
+        const hasDeleteConflict = diffOutput.includes('-') && diffOutput.includes('+');
+        if (!hasDeleteConflict) {
+            // Simple conflict - keep both
+            (0, child_process_1.execSync)(`git checkout --ours ${file}`, { encoding: 'utf-8', stdio: 'pipe' });
+            return true;
         }
+        return false;
     }
+    catch {
+        return false;
+    }
+}
+/**
+ * Handle force push with safety confirmation
+ */
+async function handleForcePush(originalCommand) {
+    console.log(chalk_1.default.red('\n⚠️  FORCE PUSH REQUIRED\n'));
+    console.log(chalk_1.default.yellow('🚨 Warning: Force pushing rewrites history!\n'));
+    console.log(chalk_1.default.white('📖 What this means:\n'));
+    console.log(chalk_1.default.gray('   • Remote commits will be ') + chalk_1.default.red('permanently deleted'));
+    console.log(chalk_1.default.gray('   • Collaborators may lose their work'));
+    console.log(chalk_1.default.gray('   • History will be rewritten\n'));
+    console.log(chalk_1.default.white.bold('✅ Safer alternatives:\n'));
+    console.log(chalk_1.default.cyan('   "pull and merge"') + chalk_1.default.gray(' - Merge remote changes first'));
+    console.log(chalk_1.default.cyan('   "create a new branch"') + chalk_1.default.gray(' - Keep both versions'));
+    console.log(chalk_1.default.cyan('   "revert my changes"') + chalk_1.default.gray(' - Undo local commits\n'));
+    console.log(chalk_1.default.white.bold('💡 If you must force push:\n'));
+    console.log(chalk_1.default.gray('   Use: ') + chalk_1.default.cyan('"force push (i know what i\'m doing)"'));
+    console.log(chalk_1.default.gray('   Or: ') + chalk_1.default.cyan('"force push with lease"') + chalk_1.default.gray(' (safer - checks remote)\n'));
     return false;
 }
 /**

package/dist/lib/github.js

@@ -23,6 +23,12 @@ exports.getPullRequestDiff = getPullRequestDiff;
 exports.reopenIssue = reopenIssue;
 exports.rerunWorkflow = rerunWorkflow;
 exports.getPullRequestFiles = getPullRequestFiles;
+exports.addLabels = addLabels;
+exports.enableAutoMerge = enableAutoMerge;
+exports.createDraftPullRequest = createDraftPullRequest;
+exports.markPRReady = markPRReady;
+exports.getPRStack = getPRStack;
+exports.updatePRBase = updatePRBase;
 const child_process_1 = require("child_process");
 const github_connect_1 = require("../commands/github-connect");
 const GITHUB_API = 'https://api.github.com';
@@ -418,3 +424,159 @@ async function getPullRequestFiles(prNumber) {
     }
     return await githubRequest(`/repos/${repo.owner}/${repo.name}/pulls/${prNumber}/files`);
 }
+/**
+ * Add labels to PR or Issue
+ */
+async function addLabels(number, labels) {
+    const repo = getCurrentRepo();
+    if (!repo) {
+        throw new Error('Not a GitHub repository');
+    }
+    return await githubRequest(`/repos/${repo.owner}/${repo.name}/issues/${number}/labels`, {
+        method: 'POST',
+        body: JSON.stringify({ labels }),
+    });
+}
+/**
+ * Enable auto-merge for a PR
+ */
+async function enableAutoMerge(prNumber, mergeMethod = 'MERGE') {
+    const repo = getCurrentRepo();
+    if (!repo) {
+        throw new Error('Not a GitHub repository');
+    }
+    // GraphQL query for auto-merge
+    const token = (0, github_connect_1.getGitHubToken)();
+    if (!token) {
+        throw new Error('GitHub not connected');
+    }
+    // First get PR node ID
+    const pr = await getPullRequest(prNumber);
+    const nodeId = pr.node_id;
+    const query = `
+    mutation {
+      enablePullRequestAutoMerge(input: {
+        pullRequestId: "${nodeId}"
+        mergeMethod: ${mergeMethod}
+      }) {
+        pullRequest {
+          id
+          autoMergeRequest {
+            enabledAt
+          }
+        }
+      }
+    }
+  `;
+    const response = await fetch('https://api.github.com/graphql', {
+        method: 'POST',
+        headers: {
+            Authorization: `Bearer ${token}`,
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ query }),
+    });
+    if (!response.ok) {
+        throw new Error('Failed to enable auto-merge');
+    }
+    return await response.json();
+}
+/**
+ * Create a draft PR (for stacked PRs)
+ */
+async function createDraftPullRequest(options) {
+    const repo = getCurrentRepo();
+    if (!repo) {
+        throw new Error('Not a GitHub repository');
+    }
+    return await githubRequest(`/repos/${repo.owner}/${repo.name}/pulls`, {
+        method: 'POST',
+        body: JSON.stringify({
+            title: options.title,
+            body: options.body || '',
+            head: options.head,
+            base: options.base,
+            draft: true,
+        }),
+    });
+}
+/**
+ * Mark PR as ready for review (convert from draft)
+ */
+async function markPRReady(prNumber) {
+    const repo = getCurrentRepo();
+    if (!repo) {
+        throw new Error('Not a GitHub repository');
+    }
+    const token = (0, github_connect_1.getGitHubToken)();
+    if (!token) {
+        throw new Error('GitHub not connected');
+    }
+    // Get PR node ID
+    const pr = await getPullRequest(prNumber);
+    const nodeId = pr.node_id;
+    const query = `
+    mutation {
+      markPullRequestReadyForReview(input: {
+        pullRequestId: "${nodeId}"
+      }) {
+        pullRequest {
+          id
+          isDraft
+        }
+      }
+    }
+  `;
+    const response = await fetch('https://api.github.com/graphql', {
+        method: 'POST',
+        headers: {
+            Authorization: `Bearer ${token}`,
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ query }),
+    });
+    if (!response.ok) {
+        throw new Error('Failed to mark PR ready');
+    }
+    return await response.json();
+}
+/**
+ * Get PR dependencies (for stacked PRs)
+ */
+async function getPRStack(baseBranch = 'main') {
+    const repo = getCurrentRepo();
+    if (!repo) {
+        throw new Error('Not a GitHub repository');
+    }
+    const allPRs = await listPullRequests({ state: 'open', limit: 100 });
+    // Build dependency tree
+    const stack = [];
+    const prMap = new Map();
+    allPRs.forEach((pr) => {
+        prMap.set(pr.head.ref, pr);
+    });
+    // Find PRs that build on each other
+    allPRs.forEach((pr) => {
+        const baseRef = pr.base.ref;
+        if (prMap.has(baseRef) || baseRef === baseBranch) {
+            stack.push({
+                ...pr,
+                dependsOn: baseRef === baseBranch ? null : baseRef,
+            });
+        }
+    });
+    return stack;
+}
+/**
+ * Update PR base branch (for stacked PRs)
+ */
+async function updatePRBase(prNumber, newBase) {
+    const repo = getCurrentRepo();
+    if (!repo) {
+        throw new Error('Not a GitHub repository');
+    }
+    return await githubRequest(`/repos/${repo.owner}/${repo.name}/pulls/${prNumber}`, {
+        method: 'PATCH',
+        body: JSON.stringify({ base: newBase }),
+    });
+}

package/package.json

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