claude-issue-solver 1.26.0 → 1.26.2

package/dist/commands/clean.js

@@ -527,10 +527,12 @@ async function cleanMergedCommand() {
         prStatus: wt.branch ? await (0, github_1.getPRForBranchAsync)(wt.branch) : null,
     })));
     statusSpinner.stop();
-    // Filter to only merged PRs
+    // Filter to merged PRs and orphaned folders
     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.'));
+    const orphanedWorktrees = worktreesWithStatus.filter((wt) => !wt.branch);
+    const toClean = [...mergedWorktrees, ...orphanedWorktrees];
+    if (toClean.length === 0) {
+        console.log(chalk_1.default.yellow('\nNo worktrees with merged PRs or orphaned folders found.'));
         // Show what's available
         if (worktreesWithStatus.length > 0) {
             console.log(chalk_1.default.dim('\nExisting worktrees:'));
@@ -541,15 +543,16 @@ async function cleanMergedCommand() {
         }
         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')}`);
+    console.log(chalk_1.default.bold(`\n🧹 Cleaning ${toClean.length} worktree(s):\n`));
+    for (const wt of toClean) {
+        const status = getStatusLabel(wt);
+        console.log(`  ${chalk_1.default.cyan(`#${wt.issueNumber}`)}\t${status}`);
         if (wt.branch) {
             console.log(chalk_1.default.dim(`  \t${wt.branch}`));
         }
     }
     console.log();
-    for (const wt of mergedWorktrees) {
+    for (const wt of toClean) {
         const spinner = (0, ora_1.default)(`Cleaning issue #${wt.issueNumber}...`).start();
         try {
             // Close terminal and VS Code windows for this worktree
@@ -632,5 +635,5 @@ async function cleanMergedCommand() {
         // May fail if current directory was deleted
     }
     console.log();
-    console.log(chalk_1.default.green(`✅ Cleaned up ${mergedWorktrees.length} merged worktree(s)!`));
+    console.log(chalk_1.default.green(`✅ Cleaned up ${toClean.length} worktree(s)!`));
 }

package/dist/commands/merge.js

@@ -248,6 +248,13 @@ async function mergeCommand() {
     for (const pr of selected) {
         const prSpinner = (0, ora_1.default)(`Merging PR #${pr.number}...`).start();
         try {
+            // Clean up worktree FIRST (before merge) to avoid branch deletion issues
+            try {
+                cleanupWorktree(projectRoot, pr.headRefName, pr.issueNumber?.toString() || null);
+            }
+            catch {
+                // Worktree may not exist, continue with merge
+            }
             // Merge the PR
             (0, child_process_1.execSync)(`gh pr merge ${pr.number} --squash --delete-branch`, {
                 cwd: projectRoot,
@@ -255,15 +262,6 @@ async function mergeCommand() {
                 stdio: ['pipe', 'pipe', 'pipe'],
             });
             prSpinner.succeed(`Merged PR #${pr.number}: ${pr.title.slice(0, 50)}`);
-            // Clean up worktree
-            const cleanSpinner = (0, ora_1.default)(`  Cleaning up worktree...`).start();
-            try {
-                cleanupWorktree(projectRoot, pr.headRefName, pr.issueNumber?.toString() || null);
-                cleanSpinner.succeed(`  Cleaned up worktree`);
-            }
-            catch {
-                cleanSpinner.warn(`  Could not clean worktree (may not exist)`);
-            }
             merged++;
         }
         catch (error) {

package/package.json

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