claude-issue-solver 1.7.1 → 1.8.0

package/dist/commands/clean.d.ts

@@ -1,2 +1,3 @@
 export declare function cleanAllCommand(): Promise<void>;
 export declare function cleanCommand(issueNumber: number): Promise<void>;
+export declare function cleanMergedCommand(): Promise<void>;

package/dist/commands/clean.js

@@ -38,6 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cleanAllCommand = cleanAllCommand;
 exports.cleanCommand = cleanCommand;
+exports.cleanMergedCommand = cleanMergedCommand;
 const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
 const inquirer_1 = __importDefault(require("inquirer"));
@@ -89,16 +90,31 @@ function closeWindowsWithPath(folderPath, issueNumber) {
         // Terminal not running or no matching windows
     }
     // Try to close VS Code windows with this path
+    // Method 1: AppleScript to close windows matching the folder name
     try {
-        // Use VS Code CLI to close the folder if it's open
-        (0, child_process_1.execSync)(`code --folder-uri "file://${folderPath}" --command "workbench.action.closeWindow"`, {
-            stdio: 'pipe',
-            timeout: 3000
-        });
+        (0, child_process_1.execSync)(`osascript -e '
+      tell application "System Events"
+        if exists process "Code" then
+          tell process "Code"
+            set windowList to every window
+            repeat with w in windowList
+              try
+                set windowName to name of w
+                if windowName contains "${folderName}" then
+                  perform action "AXPress" of (first button of w whose subrole is "AXCloseButton")
+                  delay 0.2
+                end if
+              end try
+            end repeat
+          end tell
+        end if
+      end tell
+    '`, { stdio: 'pipe', timeout: 5000 });
     }
     catch {
-        // VS Code CLI method failed, try AppleScript
+        // VS Code not running or no matching windows
     }
+    // Method 2: Also try matching the issue number in window title
     try {
         (0, child_process_1.execSync)(`osascript -e '
       tell application "System Events"
@@ -106,15 +122,18 @@ function closeWindowsWithPath(folderPath, issueNumber) {
           tell process "Code"
             set windowList to every window
             repeat with w in windowList
-              set windowName to name of w
-              if windowName contains "${folderName}" then
-                perform action "AXPress" of (first button of w whose subrole is "AXCloseButton")
-              end if
+              try
+                set windowName to name of w
+                if windowName contains "${issuePattern}" then
+                  perform action "AXPress" of (first button of w whose subrole is "AXCloseButton")
+                  delay 0.2
+                end if
+              end try
             end repeat
           end tell
         end if
       end tell
-    '`, { stdio: 'pipe' });
+    '`, { stdio: 'pipe', timeout: 5000 });
     }
     catch {
         // VS Code not running or no matching windows
@@ -254,40 +273,46 @@ async function cleanAllCommand() {
             }
             // Remove worktree/folder
             const isOrphaned = !wt.branch;
+            // Try git worktree remove first (only if not orphaned)
+            if (!isOrphaned && fs.existsSync(wt.path)) {
+                try {
+                    (0, child_process_1.execSync)(`git worktree remove "${wt.path}" --force`, {
+                        cwd: projectRoot,
+                        stdio: 'pipe',
+                    });
+                }
+                catch {
+                    // Ignore - we'll force delete below
+                }
+            }
+            // Always try to force delete the folder
             if (fs.existsSync(wt.path)) {
-                // Try git worktree remove first (only if not orphaned)
-                if (!isOrphaned) {
-                    try {
-                        (0, child_process_1.execSync)(`git worktree remove "${wt.path}" --force`, {
-                            cwd: projectRoot,
-                            stdio: 'pipe',
-                        });
-                    }
-                    catch {
-                        // Ignore - we'll force delete below if needed
-                    }
+                // Try multiple deletion methods
+                try {
+                    (0, child_process_1.execSync)(`/bin/rm -rf "${wt.path}"`, { stdio: 'pipe', timeout: 10000 });
                 }
-                // If folder still exists, force delete it
-                if (fs.existsSync(wt.path)) {
+                catch {
+                    // Fallback 1: try with shell
                     try {
-                        (0, child_process_1.execSync)(`/bin/rm -rf "${wt.path}"`, { stdio: 'pipe' });
+                        (0, child_process_1.execSync)(`rm -rf "${wt.path}"`, { shell: '/bin/bash', stdio: 'pipe', timeout: 10000 });
                     }
                     catch {
+                        // Fallback 2: Node.js rmSync
                         try {
-                            fs.rmSync(wt.path, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
+                            fs.rmSync(wt.path, { recursive: true, force: true, maxRetries: 5, retryDelay: 200 });
                         }
                         catch {
-                            // Ignore - will check at end
+                            // Will report failure below
                         }
                     }
                 }
-                // Prune git worktrees
-                try {
-                    (0, child_process_1.execSync)('git worktree prune', { cwd: projectRoot, stdio: 'pipe' });
-                }
-                catch {
-                    // Ignore
-                }
+            }
+            // Prune git worktrees
+            try {
+                (0, child_process_1.execSync)('git worktree prune', { cwd: projectRoot, stdio: 'pipe' });
+            }
+            catch {
+                // Ignore
             }
             // Delete branch (if we have one)
             if (wt.branch) {
@@ -301,7 +326,13 @@ async function cleanAllCommand() {
                     // Branch may already be deleted
                 }
             }
-            spinner.succeed(`Cleaned issue #${wt.issueNumber}`);
+            // Check if cleanup was successful
+            if (fs.existsSync(wt.path)) {
+                spinner.warn(`Cleaned issue #${wt.issueNumber} (folder may remain: ${wt.path})`);
+            }
+            else {
+                spinner.succeed(`Cleaned issue #${wt.issueNumber}`);
+            }
         }
         catch (error) {
             spinner.fail(`Failed to clean issue #${wt.issueNumber}: ${error}`);
@@ -462,3 +493,120 @@ async function cleanCommand(issueNumber) {
     console.log();
     console.log(chalk_1.default.green('✅ Cleanup complete!'));
 }
+async function cleanMergedCommand() {
+    const projectRoot = (0, git_1.getProjectRoot)();
+    const worktrees = getIssueWorktrees();
+    if (worktrees.length === 0) {
+        console.log(chalk_1.default.yellow('\nNo issue worktrees found.'));
+        return;
+    }
+    // Fetch status for all worktrees
+    const statusSpinner = (0, ora_1.default)('Fetching PR status...').start();
+    const worktreesWithStatus = worktrees.map((wt) => ({
+        ...wt,
+        issueStatus: (0, github_1.getIssueStatus)(parseInt(wt.issueNumber, 10)),
+        prStatus: wt.branch ? (0, github_1.getPRForBranch)(wt.branch) : null,
+    }));
+    statusSpinner.stop();
+    // Filter to only merged PRs
+    const mergedWorktrees = worktreesWithStatus.filter((wt) => wt.prStatus?.state === 'merged');
+    if (mergedWorktrees.length === 0) {
+        console.log(chalk_1.default.yellow('\nNo worktrees with merged PRs found.'));
+        // Show what's available
+        if (worktreesWithStatus.length > 0) {
+            console.log(chalk_1.default.dim('\nExisting worktrees:'));
+            for (const wt of worktreesWithStatus) {
+                const status = getStatusLabel(wt);
+                console.log(`  ${chalk_1.default.cyan(`#${wt.issueNumber}`)}\t${status}`);
+            }
+        }
+        return;
+    }
+    console.log(chalk_1.default.bold(`\n🧹 Cleaning ${mergedWorktrees.length} worktree(s) with merged PRs:\n`));
+    for (const wt of mergedWorktrees) {
+        console.log(`  ${chalk_1.default.cyan(`#${wt.issueNumber}`)}\t${chalk_1.default.green('✓ PR merged')}`);
+        if (wt.branch) {
+            console.log(chalk_1.default.dim(`  \t${wt.branch}`));
+        }
+    }
+    console.log();
+    for (const wt of mergedWorktrees) {
+        const spinner = (0, ora_1.default)(`Cleaning issue #${wt.issueNumber}...`).start();
+        try {
+            // Close terminal and VS Code windows for this worktree
+            try {
+                closeWindowsWithPath(wt.path, wt.issueNumber);
+                await new Promise((resolve) => setTimeout(resolve, 500));
+            }
+            catch {
+                // Ignore errors closing windows
+            }
+            // Remove worktree/folder
+            const isOrphaned = !wt.branch;
+            // Try git worktree remove first (only if not orphaned)
+            if (!isOrphaned && fs.existsSync(wt.path)) {
+                try {
+                    (0, child_process_1.execSync)(`git worktree remove "${wt.path}" --force`, {
+                        cwd: projectRoot,
+                        stdio: 'pipe',
+                    });
+                }
+                catch {
+                    // Ignore - we'll force delete below
+                }
+            }
+            // Always try to force delete the folder
+            if (fs.existsSync(wt.path)) {
+                try {
+                    (0, child_process_1.execSync)(`/bin/rm -rf "${wt.path}"`, { stdio: 'pipe', timeout: 10000 });
+                }
+                catch {
+                    try {
+                        (0, child_process_1.execSync)(`rm -rf "${wt.path}"`, { shell: '/bin/bash', stdio: 'pipe', timeout: 10000 });
+                    }
+                    catch {
+                        try {
+                            fs.rmSync(wt.path, { recursive: true, force: true, maxRetries: 5, retryDelay: 200 });
+                        }
+                        catch {
+                            // Will report failure below
+                        }
+                    }
+                }
+            }
+            // Prune git worktrees
+            try {
+                (0, child_process_1.execSync)('git worktree prune', { cwd: projectRoot, stdio: 'pipe' });
+            }
+            catch {
+                // Ignore
+            }
+            // Delete branch (if we have one)
+            if (wt.branch) {
+                try {
+                    (0, child_process_1.execSync)(`git branch -D "${wt.branch}"`, {
+                        cwd: projectRoot,
+                        stdio: 'pipe',
+                    });
+                }
+                catch {
+                    // Branch may already be deleted
+                }
+            }
+            // Check if cleanup was successful
+            if (fs.existsSync(wt.path)) {
+                spinner.warn(`Cleaned issue #${wt.issueNumber} (folder may remain: ${wt.path})`);
+            }
+            else {
+                spinner.succeed(`Cleaned issue #${wt.issueNumber}`);
+            }
+        }
+        catch (error) {
+            spinner.fail(`Failed to clean issue #${wt.issueNumber}: ${error}`);
+        }
+    }
+    // Prune stale worktrees
+    (0, child_process_1.execSync)('git worktree prune', { cwd: projectRoot, stdio: 'pipe' });
+    console.log();
+    console.log(chalk_1.default.green(`✅ Cleaned up ${mergedWorktrees.length} merged worktree(s)!`));
+}

package/dist/index.js

@@ -76,9 +76,13 @@ program
     .command('clean [issue]')
     .alias('rm')
     .option('-a, --all', 'Clean all issue worktrees')
-    .description('Remove worktree and branch for an issue (or all with --all)')
+    .option('-m, --merged', 'Clean only worktrees with merged PRs (no confirmation)')
+    .description('Remove worktree and branch for an issue (or all with --all, or merged with --merged)')
     .action(async (issue, options) => {
-    if (options.all) {
+    if (options.merged) {
+        await (0, clean_1.cleanMergedCommand)();
+    }
+    else if (options.all) {
         await (0, clean_1.cleanAllCommand)();
     }
     else if (issue) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-issue-solver",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "Automatically solve GitHub issues using Claude Code",
   "main": "dist/index.js",
   "bin": {