@harryisfish/gitt 1.6.6 → 1.6.8

package/dist/commands/clean.js

@@ -18,7 +18,8 @@ async function cleanDeletedBranches(options = {}) {
         const state = {
             mainBranch: '',
             currentBranch: '',
-            deletedBranches: []
+            deletedBranches: [],
+            isStaleMode: options.stale || false
         };
         // Phase 1: Discovery
         const discoveryTasks = new listr2_1.Listr([
@@ -84,12 +85,19 @@ async function cleanDeletedBranches(options = {}) {
                     }
                     // Filter out worktree branches
                     candidates = candidates.filter(c => !worktreeBranches.includes(c.name));
-                    // Check merge status for each branch
-                    const branchesWithStatus = await Promise.all(candidates.map(async (c) => {
-                        const isMerged = await (0, git_1.isBranchMerged)(c.name, ctx.mainBranch);
-                        return { ...c, isMerged };
-                    }));
-                    ctx.deletedBranches = branchesWithStatus;
+                    // For stale mode, check merge status; for gone mode, skip (PR completed = safe to delete)
+                    if (options.stale) {
+                        const branchesWithStatus = await Promise.all(candidates.map(async (c) => {
+                            const isMerged = await (0, git_1.isBranchMerged)(c.name, ctx.mainBranch);
+                            return { ...c, isMerged };
+                        }));
+                        // In stale mode, only auto-delete merged branches
+                        ctx.deletedBranches = branchesWithStatus.filter(b => b.isMerged);
+                    }
+                    else {
+                        // Gone mode: remote deleted = PR completed, safe to delete all
+                        ctx.deletedBranches = candidates;
+                    }
                 }
             }
         ]);
@@ -102,9 +110,9 @@ async function cleanDeletedBranches(options = {}) {
         if (options.interactive) {
             try {
                 const choices = state.deletedBranches.map(b => ({
-                    name: `${b.name} (${b.reason}${b.isMerged ? '' : ', Unmerged'})`,
+                    name: `${b.name} (${b.reason})`,
                     value: b,
-                    checked: b.isMerged // Only check merged branches by default
+                    checked: true // All candidates are safe to delete
                 }));
                 const selected = await (0, prompts_1.checkbox)({
                     message: 'Select branches to delete:',
@@ -117,15 +125,7 @@ async function cleanDeletedBranches(options = {}) {
                 throw new errors_1.UserCancelError('Operation cancelled');
             }
         }
-        else {
-            // Auto mode: Filter out unmerged branches
-            const unmerged = state.deletedBranches.filter(b => !b.isMerged);
-            state.deletedBranches = state.deletedBranches.filter(b => b.isMerged);
-            if (state.deletedBranches.length === 0 && unmerged.length > 0) {
-                (0, errors_1.printSuccess)(`No merged branches to clean up (${unmerged.length} unmerged branch${unmerged.length > 1 ? 'es' : ''} skipped, use -i to review)`);
-                return;
-            }
-        }
+        // Non-interactive mode: delete all candidates (already filtered in discovery phase)
         if (state.deletedBranches.length === 0) {
             (0, errors_1.printSuccess)('No branches selected for deletion');
             return;

package/dist/utils/git.js

@@ -79,11 +79,28 @@ async function setMainBranch(branch) {
 }
 /**
  * Check if a branch is merged into the main branch.
+ * Supports regular merge, squash merge, and rebase merge detection.
  */
 async function isBranchMerged(branch, mainBranch) {
     try {
+        // Method 1: Check regular merge with git branch --merged
         const mergedBranches = await git.branch(['--merged', mainBranch]);
-        return mergedBranches.all.includes(branch);
+        if (mergedBranches.all.includes(branch)) {
+            return true;
+        }
+        // Method 2: Check squash/rebase merge with git cherry
+        // git cherry returns empty or all lines start with '-' if fully merged
+        // '-' means the commit exists in upstream (merged)
+        // '+' means the commit does not exist in upstream (not merged)
+        const cherryOutput = await git.raw(['cherry', mainBranch, branch]);
+        const lines = cherryOutput.trim().split('\n').filter(Boolean);
+        // If no commits unique to branch, or all commits are merged (start with -)
+        if (lines.length === 0) {
+            return true;
+        }
+        // Check if all commits are merged (all lines start with '-')
+        const hasUnmergedCommits = lines.some(line => line.startsWith('+'));
+        return !hasUnmergedCommits;
     }
     catch (error) {
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harryisfish/gitt",
-  "version": "1.6.6",
+  "version": "1.6.8",
   "description": "A command-line tool to help you manage Git repositories and remote repositories, such as keeping in sync, pushing, pulling, etc.",
   "main": "dist/index.js",
   "bin": {