claude-issue-solver 1.7.1 → 1.7.2

package/dist/commands/clean.js

@@ -89,16 +89,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 +121,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 +272,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 +325,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}`);

package/package.json

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