claude-issue-solver 1.6.5 → 1.6.6

package/dist/commands/clean.js

@@ -215,25 +215,42 @@ async function cleanAllCommand() {
             catch {
                 // Ignore errors closing windows
             }
-            // Remove worktree
+            // Remove worktree/folder
+            const isOrphaned = !wt.branch;
             if (fs.existsSync(wt.path)) {
-                try {
-                    (0, child_process_1.execSync)(`git worktree remove "${wt.path}" --force`, {
-                        cwd: projectRoot,
-                        stdio: 'pipe',
-                    });
+                // 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
+                    }
                 }
-                catch {
-                    // If git worktree remove fails, try removing directory manually with rm -rf
-                    // This handles locked files better than fs.rmSync
+                // If folder still exists, force delete it
+                if (fs.existsSync(wt.path)) {
                     try {
-                        (0, child_process_1.execSync)(`rm -rf "${wt.path}"`, { stdio: 'pipe' });
+                        (0, child_process_1.execSync)(`/bin/rm -rf "${wt.path}"`, { stdio: 'pipe' });
                     }
                     catch {
-                        fs.rmSync(wt.path, { recursive: true, force: true });
+                        try {
+                            fs.rmSync(wt.path, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
+                        }
+                        catch {
+                            // Ignore - will check at end
+                        }
                     }
+                }
+                // 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) {
@@ -335,34 +352,52 @@ async function cleanCommand(issueNumber) {
     catch {
         windowSpinner.warn('Could not close some windows');
     }
-    // Remove worktree
+    // Remove worktree/folder
     if (fs.existsSync(worktreePath)) {
         const worktreeSpinner = (0, ora_1.default)('Removing worktree...').start();
-        try {
-            (0, child_process_1.execSync)(`git worktree remove "${worktreePath}" --force`, {
-                cwd: projectRoot,
-                stdio: 'pipe',
-            });
-            worktreeSpinner.succeed('Worktree removed');
+        // Try git worktree remove first (only if not orphaned)
+        if (!isOrphaned) {
+            try {
+                (0, child_process_1.execSync)(`git worktree remove "${worktreePath}" --force`, {
+                    cwd: projectRoot,
+                    stdio: 'pipe',
+                });
+            }
+            catch {
+                // Ignore - we'll force delete below if needed
+            }
         }
-        catch {
-            // If git worktree remove fails, try removing directory manually with rm -rf
+        // If folder still exists, force delete it
+        if (fs.existsSync(worktreePath)) {
             try {
-                (0, child_process_1.execSync)(`rm -rf "${worktreePath}"`, { stdio: 'pipe' });
-                (0, child_process_1.execSync)('git worktree prune', { cwd: projectRoot, stdio: 'pipe' });
-                worktreeSpinner.succeed('Worktree removed (manually)');
+                // Use rm -rf with full path
+                (0, child_process_1.execSync)(`/bin/rm -rf "${worktreePath}"`, { stdio: 'pipe' });
             }
             catch {
+                // Try Node's rmSync as fallback
                 try {
-                    fs.rmSync(worktreePath, { recursive: true, force: true });
-                    (0, child_process_1.execSync)('git worktree prune', { cwd: projectRoot, stdio: 'pipe' });
-                    worktreeSpinner.succeed('Worktree removed (manually)');
+                    fs.rmSync(worktreePath, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
                 }
                 catch {
-                    worktreeSpinner.warn('Could not remove worktree directory');
+                    // Last resort - try with sudo hint
+                    worktreeSpinner.warn(`Could not remove directory. Try manually: rm -rf "${worktreePath}"`);
                 }
             }
         }
+        // Prune git worktrees
+        try {
+            (0, child_process_1.execSync)('git worktree prune', { cwd: projectRoot, stdio: 'pipe' });
+        }
+        catch {
+            // Ignore
+        }
+        // Check final result
+        if (fs.existsSync(worktreePath)) {
+            worktreeSpinner.warn(`Could not fully remove directory: ${worktreePath}`);
+        }
+        else {
+            worktreeSpinner.succeed(isOrphaned ? 'Folder removed' : 'Worktree removed');
+        }
     }
     // Delete branch (if we have one)
     if (branchName) {

package/package.json

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