claude-issue-solver 1.6.2 → 1.6.4

package/dist/commands/clean.js

@@ -45,14 +45,13 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 const child_process_1 = require("child_process");
-const github_1 = require("../utils/github");
 const git_1 = require("../utils/git");
-const helpers_1 = require("../utils/helpers");
-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"
@@ -60,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
@@ -72,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
@@ -88,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"
@@ -170,13 +180,33 @@ async function cleanAllCommand() {
         const spinner = (0, ora_1.default)(`Cleaning issue #${wt.issueNumber}...`).start();
         try {
             // Close terminal and VS Code windows for this worktree
-            closeWindowsWithPath(wt.path);
+            try {
+                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
+            }
             // Remove worktree
             if (fs.existsSync(wt.path)) {
-                (0, child_process_1.execSync)(`git worktree remove "${wt.path}" --force`, {
-                    cwd: projectRoot,
-                    stdio: 'pipe',
-                });
+                try {
+                    (0, child_process_1.execSync)(`git worktree remove "${wt.path}" --force`, {
+                        cwd: projectRoot,
+                        stdio: 'pipe',
+                    });
+                }
+                catch {
+                    // 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' });
+                }
             }
             // Delete branch
             try {
@@ -191,7 +221,7 @@ async function cleanAllCommand() {
             spinner.succeed(`Cleaned issue #${wt.issueNumber}`);
         }
         catch (error) {
-            spinner.fail(`Failed to clean issue #${wt.issueNumber}`);
+            spinner.fail(`Failed to clean issue #${wt.issueNumber}: ${error}`);
         }
     }
     // Prune stale worktrees
@@ -200,18 +230,46 @@ async function cleanAllCommand() {
     console.log(chalk_1.default.green(`✅ Cleaned up ${worktrees.length} issue worktree(s)!`));
 }
 async function cleanCommand(issueNumber) {
-    const spinner = (0, ora_1.default)(`Fetching issue #${issueNumber}...`).start();
-    const issue = (0, github_1.getIssue)(issueNumber);
-    if (!issue) {
-        spinner.fail(`Could not find issue #${issueNumber}`);
-        process.exit(1);
-    }
-    spinner.succeed(`Found issue #${issueNumber}`);
     const projectRoot = (0, git_1.getProjectRoot)();
     const projectName = (0, git_1.getProjectName)();
-    const branchSlug = (0, helpers_1.slugify)(issue.title);
-    const branchName = `issue-${issueNumber}-${branchSlug}`;
-    const worktreePath = path.join(path.dirname(projectRoot), `${projectName}-${branchName}`);
+    // Find the worktree for this issue number (don't need to fetch from GitHub)
+    const worktrees = getIssueWorktrees();
+    const worktree = worktrees.find((wt) => wt.issueNumber === String(issueNumber));
+    if (!worktree) {
+        // Try to find by looking for the branch pattern
+        const branchPattern = `issue-${issueNumber}-`;
+        const output = (0, git_1.exec)('git branch', projectRoot);
+        const branches = output.split('\n').map((b) => b.trim().replace('* ', ''));
+        const matchingBranch = branches.find((b) => b.startsWith(branchPattern));
+        if (!matchingBranch) {
+            console.log(chalk_1.default.red(`\n❌ No worktree or branch found for issue #${issueNumber}`));
+            return;
+        }
+        // Found a branch but no worktree - just delete the branch
+        console.log(chalk_1.default.bold(`\n🧹 Cleaning up issue #${issueNumber}`));
+        console.log(chalk_1.default.dim(`   Branch: ${matchingBranch}`));
+        console.log(chalk_1.default.dim(`   (No worktree found)`));
+        const { confirm } = await inquirer_1.default.prompt([
+            {
+                type: 'confirm',
+                name: 'confirm',
+                message: 'Delete branch?',
+                default: false,
+            },
+        ]);
+        if (confirm) {
+            try {
+                (0, child_process_1.execSync)(`git branch -D "${matchingBranch}"`, { cwd: projectRoot, stdio: 'pipe' });
+                console.log(chalk_1.default.green('\n✅ Branch deleted!'));
+            }
+            catch {
+                console.log(chalk_1.default.yellow('\n⚠️  Could not delete branch'));
+            }
+        }
+        return;
+    }
+    const branchName = worktree.branch;
+    const worktreePath = worktree.path;
     console.log();
     console.log(chalk_1.default.bold(`🧹 Cleaning up issue #${issueNumber}`));
     console.log(chalk_1.default.dim(`   Branch: ${branchName}`));
@@ -230,7 +288,16 @@ async function cleanCommand(issueNumber) {
         return;
     }
     // Close terminal and VS Code windows for this worktree
-    closeWindowsWithPath(worktreePath);
+    const windowSpinner = (0, ora_1.default)('Closing terminal and VS Code windows...').start();
+    try {
+        closeWindowsWithPath(worktreePath, String(issueNumber));
+        // Give windows time to close before removing folder
+        await new Promise((resolve) => setTimeout(resolve, 500));
+        windowSpinner.succeed('Windows closed');
+    }
+    catch {
+        windowSpinner.warn('Could not close some windows');
+    }
     // Remove worktree
     if (fs.existsSync(worktreePath)) {
         const worktreeSpinner = (0, ora_1.default)('Removing worktree...').start();
@@ -242,7 +309,22 @@ async function cleanCommand(issueNumber) {
             worktreeSpinner.succeed('Worktree removed');
         }
         catch {
-            worktreeSpinner.warn('Could not remove worktree (may already be removed)');
+            // If git worktree remove fails, try removing directory manually with rm -rf
+            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)');
+            }
+            catch {
+                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');
+                }
+            }
         }
     }
     // Delete branch

package/package.json

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