claude-issue-solver 1.6.3 → 1.6.5

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"
@@ -112,30 +124,57 @@ function getIssueWorktrees() {
     const projectName = (0, git_1.getProjectName)();
     const parentDir = path.dirname(projectRoot);
     const worktrees = [];
+    const foundPaths = new Set();
     // Get all worktrees from git
     const output = (0, git_1.exec)('git worktree list --porcelain', projectRoot);
-    if (!output)
-        return worktrees;
-    const lines = output.split('\n');
-    let currentPath = '';
-    let currentBranch = '';
-    for (const line of lines) {
-        if (line.startsWith('worktree ')) {
-            currentPath = line.replace('worktree ', '');
+    if (output) {
+        const lines = output.split('\n');
+        let currentPath = '';
+        let currentBranch = '';
+        for (const line of lines) {
+            if (line.startsWith('worktree ')) {
+                currentPath = line.replace('worktree ', '');
+            }
+            else if (line.startsWith('branch refs/heads/')) {
+                currentBranch = line.replace('branch refs/heads/', '');
+                // Check if this is an issue branch
+                const match = currentBranch.match(/^issue-(\d+)-/);
+                if (match && currentPath.includes(`${projectName}-issue-`)) {
+                    worktrees.push({
+                        path: currentPath,
+                        branch: currentBranch,
+                        issueNumber: match[1],
+                    });
+                    foundPaths.add(currentPath);
+                }
+            }
         }
-        else if (line.startsWith('branch refs/heads/')) {
-            currentBranch = line.replace('branch refs/heads/', '');
-            // Check if this is an issue branch
-            const match = currentBranch.match(/^issue-(\d+)-/);
-            if (match && currentPath.includes(`${projectName}-issue-`)) {
-                worktrees.push({
-                    path: currentPath,
-                    branch: currentBranch,
-                    issueNumber: match[1],
-                });
+    }
+    // Also check for orphaned folders (folders that exist but aren't in git worktree list)
+    // This can happen when git worktree remove fails but the folder remains
+    try {
+        const folderPattern = `${projectName}-issue-`;
+        const entries = fs.readdirSync(parentDir, { withFileTypes: true });
+        for (const entry of entries) {
+            if (entry.isDirectory() && entry.name.startsWith(folderPattern)) {
+                const folderPath = path.join(parentDir, entry.name);
+                if (!foundPaths.has(folderPath)) {
+                    // Extract issue number from folder name (e.g., "project-issue-38-slug")
+                    const match = entry.name.match(new RegExp(`${projectName}-issue-(\\d+)-`));
+                    if (match) {
+                        worktrees.push({
+                            path: folderPath,
+                            branch: '', // No branch known for orphaned folders
+                            issueNumber: match[1],
+                        });
+                    }
+                }
             }
         }
     }
+    catch {
+        // Ignore errors reading parent directory
+    }
     return worktrees;
 }
 async function cleanAllCommand() {
@@ -147,7 +186,7 @@ async function cleanAllCommand() {
     }
     console.log(chalk_1.default.bold('\n🧹 Found issue worktrees:\n'));
     for (const wt of worktrees) {
-        console.log(`  ${chalk_1.default.cyan(`#${wt.issueNumber}`)}\t${wt.branch}`);
+        console.log(`  ${chalk_1.default.cyan(`#${wt.issueNumber}`)}\t${wt.branch || chalk_1.default.yellow('(orphaned folder)')}`);
         console.log(chalk_1.default.dim(`  \t${wt.path}`));
         console.log();
     }
@@ -169,7 +208,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,20 +224,28 @@ 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' });
                 }
             }
-            // Delete branch
-            try {
-                (0, child_process_1.execSync)(`git branch -D "${wt.branch}"`, {
-                    cwd: projectRoot,
-                    stdio: 'pipe',
-                });
-            }
-            catch {
-                // Branch may already be deleted
+            // Delete branch (if we have one)
+            if (wt.branch) {
+                try {
+                    (0, child_process_1.execSync)(`git branch -D "${wt.branch}"`, {
+                        cwd: projectRoot,
+                        stdio: 'pipe',
+                    });
+                }
+                catch {
+                    // Branch may already be deleted
+                }
             }
             spinner.succeed(`Cleaned issue #${wt.issueNumber}`);
         }
@@ -212,7 +261,9 @@ async function cleanAllCommand() {
 async function cleanCommand(issueNumber) {
     const projectRoot = (0, git_1.getProjectRoot)();
     const projectName = (0, git_1.getProjectName)();
+    const parentDir = path.dirname(projectRoot);
     // Find the worktree for this issue number (don't need to fetch from GitHub)
+    // This now also includes orphaned folders
     const worktrees = getIssueWorktrees();
     const worktree = worktrees.find((wt) => wt.issueNumber === String(issueNumber));
     if (!worktree) {
@@ -222,7 +273,7 @@ async function cleanCommand(issueNumber) {
         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}`));
+            console.log(chalk_1.default.red(`\n❌ No worktree, folder, or branch found for issue #${issueNumber}`));
             return;
         }
         // Found a branch but no worktree - just delete the branch
@@ -250,16 +301,22 @@ async function cleanCommand(issueNumber) {
     }
     const branchName = worktree.branch;
     const worktreePath = worktree.path;
+    const isOrphaned = !branchName;
     console.log();
     console.log(chalk_1.default.bold(`🧹 Cleaning up issue #${issueNumber}`));
-    console.log(chalk_1.default.dim(`   Branch: ${branchName}`));
-    console.log(chalk_1.default.dim(`   Worktree: ${worktreePath}`));
+    if (isOrphaned) {
+        console.log(chalk_1.default.yellow(`   (Orphaned folder - no git worktree reference)`));
+    }
+    else {
+        console.log(chalk_1.default.dim(`   Branch: ${branchName}`));
+    }
+    console.log(chalk_1.default.dim(`   Folder: ${worktreePath}`));
     console.log();
     const { confirm } = await inquirer_1.default.prompt([
         {
             type: 'confirm',
             name: 'confirm',
-            message: 'Remove worktree and delete branch?',
+            message: isOrphaned ? 'Remove orphaned folder?' : 'Remove worktree and delete branch?',
             default: false,
         },
     ]);
@@ -268,11 +325,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,28 +346,37 @@ 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');
+                }
             }
         }
     }
-    // Delete branch
-    const branchSpinner = (0, ora_1.default)('Deleting branch...').start();
-    try {
-        (0, child_process_1.execSync)(`git branch -D "${branchName}"`, {
-            cwd: projectRoot,
-            stdio: 'pipe',
-        });
-        branchSpinner.succeed('Branch deleted');
-    }
-    catch {
-        branchSpinner.warn('Could not delete branch (may already be deleted)');
+    // Delete branch (if we have one)
+    if (branchName) {
+        const branchSpinner = (0, ora_1.default)('Deleting branch...').start();
+        try {
+            (0, child_process_1.execSync)(`git branch -D "${branchName}"`, {
+                cwd: projectRoot,
+                stdio: 'pipe',
+            });
+            branchSpinner.succeed('Branch deleted');
+        }
+        catch {
+            branchSpinner.warn('Could not delete branch (may already be deleted)');
+        }
     }
     console.log();
     console.log(chalk_1.default.green('✅ Cleanup complete!'));

package/package.json

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