claude-issue-solver 1.6.3 → 1.6.4

package/dist/commands/clean.js

@@ -46,11 +46,12 @@ const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 const child_process_1 = require("child_process");
 const git_1 = require("../utils/git");
-function closeWindowsWithPath(folderPath) {
+function closeWindowsWithPath(folderPath, issueNumber) {
     if (os.platform() !== 'darwin')
         return;
     const folderName = path.basename(folderPath);
-    // Try to close iTerm2 tabs/windows with this path
+    const issuePattern = `Issue #${issueNumber}`;
+    // Try to close iTerm2 tabs/windows with this path or issue number
     try {
         (0, child_process_1.execSync)(`osascript -e '
       tell application "iTerm"
@@ -58,7 +59,7 @@ function closeWindowsWithPath(folderPath) {
           repeat with t in tabs of w
             repeat with s in sessions of t
               set sessionName to name of s
-              if sessionName contains "${folderName}" then
+              if sessionName contains "${folderName}" or sessionName contains "${issuePattern}" then
                 close s
               end if
             end repeat
@@ -70,12 +71,13 @@ function closeWindowsWithPath(folderPath) {
     catch {
         // iTerm not running or no matching sessions
     }
-    // Try to close Terminal.app windows with this path
+    // Try to close Terminal.app windows with this path or issue number
     try {
         (0, child_process_1.execSync)(`osascript -e '
       tell application "Terminal"
         repeat with w in windows
-          if name of w contains "${folderName}" then
+          set windowName to name of w
+          if windowName contains "${folderName}" or windowName contains "${issuePattern}" then
             close w
           end if
         end repeat
@@ -86,6 +88,16 @@ function closeWindowsWithPath(folderPath) {
         // Terminal not running or no matching windows
     }
     // Try to close VS Code windows with this path
+    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
+        });
+    }
+    catch {
+        // VS Code CLI method failed, try AppleScript
+    }
     try {
         (0, child_process_1.execSync)(`osascript -e '
       tell application "System Events"
@@ -169,7 +181,9 @@ async function cleanAllCommand() {
         try {
             // Close terminal and VS Code windows for this worktree
             try {
-                closeWindowsWithPath(wt.path);
+                closeWindowsWithPath(wt.path, wt.issueNumber);
+                // Give windows time to close before removing folder
+                await new Promise((resolve) => setTimeout(resolve, 500));
             }
             catch {
                 // Ignore errors closing windows
@@ -183,8 +197,14 @@ async function cleanAllCommand() {
                     });
                 }
                 catch {
-                    // If git worktree remove fails, try removing directory manually
-                    fs.rmSync(wt.path, { recursive: true, force: true });
+                    // If git worktree remove fails, try removing directory manually with rm -rf
+                    // This handles locked files better than fs.rmSync
+                    try {
+                        (0, child_process_1.execSync)(`rm -rf "${wt.path}"`, { stdio: 'pipe' });
+                    }
+                    catch {
+                        fs.rmSync(wt.path, { recursive: true, force: true });
+                    }
                     (0, child_process_1.execSync)('git worktree prune', { cwd: projectRoot, stdio: 'pipe' });
                 }
             }
@@ -268,11 +288,15 @@ async function cleanCommand(issueNumber) {
         return;
     }
     // Close terminal and VS Code windows for this worktree
+    const windowSpinner = (0, ora_1.default)('Closing terminal and VS Code windows...').start();
     try {
-        closeWindowsWithPath(worktreePath);
+        closeWindowsWithPath(worktreePath, String(issueNumber));
+        // Give windows time to close before removing folder
+        await new Promise((resolve) => setTimeout(resolve, 500));
+        windowSpinner.succeed('Windows closed');
     }
     catch {
-        // Ignore errors closing windows
+        windowSpinner.warn('Could not close some windows');
     }
     // Remove worktree
     if (fs.existsSync(worktreePath)) {
@@ -285,14 +309,21 @@ async function cleanCommand(issueNumber) {
             worktreeSpinner.succeed('Worktree removed');
         }
         catch {
-            // If git worktree remove fails, try removing directory manually
+            // If git worktree remove fails, try removing directory manually with rm -rf
             try {
-                fs.rmSync(worktreePath, { recursive: true, force: true });
+                (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)');
             }
             catch {
-                worktreeSpinner.warn('Could not remove worktree directory');
+                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)');
+                }
+                catch {
+                    worktreeSpinner.warn('Could not remove worktree directory');
+                }
             }
         }
     }

package/package.json

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