claude-issue-solver 1.25.0 → 1.26.1

package/README.md

@@ -132,6 +132,9 @@ claude-issue pr 42
 claude-issue review          # Interactive: select PRs to review in parallel
 claude-issue review 42       # Review specific issue's PR
 
+# Merge approved PRs and clean up worktrees
+claude-issue merge           # Interactive: select PRs to merge
+
 # Clean up worktree and branch
 claude-issue clean 42        # Clean specific issue
 claude-issue clean           # Interactive selection
@@ -157,6 +160,7 @@ claude-issue --help
 | `claude-issue show <number>` | - | Show full issue details |
 | `claude-issue pr <number>` | - | Create PR for solved issue |
 | `claude-issue review [number]` | - | Review PRs with AI suggestions |
+| `claude-issue merge` | - | Merge approved PRs and clean up |
 | `claude-issue config` | - | Manage settings (bot token) |
 | `claude-issue clean [number]` | `rm` | Remove worktree and branch |
 | `claude-issue go [number]` | - | Navigate to worktree |

package/dist/commands/clean.js

@@ -527,10 +527,12 @@ async function cleanMergedCommand() {
         prStatus: wt.branch ? await (0, github_1.getPRForBranchAsync)(wt.branch) : null,
     })));
     statusSpinner.stop();
-    // Filter to only merged PRs
+    // Filter to merged PRs and orphaned folders
     const mergedWorktrees = worktreesWithStatus.filter((wt) => wt.prStatus?.state === 'merged');
-    if (mergedWorktrees.length === 0) {
-        console.log(chalk_1.default.yellow('\nNo worktrees with merged PRs found.'));
+    const orphanedWorktrees = worktreesWithStatus.filter((wt) => !wt.branch);
+    const toClean = [...mergedWorktrees, ...orphanedWorktrees];
+    if (toClean.length === 0) {
+        console.log(chalk_1.default.yellow('\nNo worktrees with merged PRs or orphaned folders found.'));
         // Show what's available
         if (worktreesWithStatus.length > 0) {
             console.log(chalk_1.default.dim('\nExisting worktrees:'));
@@ -541,15 +543,16 @@ async function cleanMergedCommand() {
         }
         return;
     }
-    console.log(chalk_1.default.bold(`\n🧹 Cleaning ${mergedWorktrees.length} worktree(s) with merged PRs:\n`));
-    for (const wt of mergedWorktrees) {
-        console.log(`  ${chalk_1.default.cyan(`#${wt.issueNumber}`)}\t${chalk_1.default.green('✓ PR merged')}`);
+    console.log(chalk_1.default.bold(`\n🧹 Cleaning ${toClean.length} worktree(s):\n`));
+    for (const wt of toClean) {
+        const status = getStatusLabel(wt);
+        console.log(`  ${chalk_1.default.cyan(`#${wt.issueNumber}`)}\t${status}`);
         if (wt.branch) {
             console.log(chalk_1.default.dim(`  \t${wt.branch}`));
         }
     }
     console.log();
-    for (const wt of mergedWorktrees) {
+    for (const wt of toClean) {
         const spinner = (0, ora_1.default)(`Cleaning issue #${wt.issueNumber}...`).start();
         try {
             // Close terminal and VS Code windows for this worktree
@@ -632,5 +635,5 @@ async function cleanMergedCommand() {
         // May fail if current directory was deleted
     }
     console.log();
-    console.log(chalk_1.default.green(`✅ Cleaned up ${mergedWorktrees.length} merged worktree(s)!`));
+    console.log(chalk_1.default.green(`✅ Cleaned up ${toClean.length} worktree(s)!`));
 }

package/dist/commands/merge.d.ts

@@ -0,0 +1 @@
+export declare function mergeCommand(): Promise<void>;

package/dist/commands/merge.js

@@ -0,0 +1,282 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeCommand = mergeCommand;
+const chalk_1 = __importDefault(require("chalk"));
+const ora_1 = __importDefault(require("ora"));
+const inquirer_1 = __importDefault(require("inquirer"));
+const fs = __importStar(require("fs"));
+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, issueNumber) {
+    if (os.platform() !== 'darwin')
+        return;
+    const folderName = path.basename(folderPath);
+    const issuePattern = `Issue #${issueNumber}`;
+    // Try to close iTerm2 tabs/windows
+    try {
+        (0, child_process_1.execSync)(`osascript -e '
+      tell application "iTerm"
+        repeat with w in windows
+          repeat with t in tabs of w
+            repeat with s in sessions of t
+              set sessionName to name of s
+              if sessionName contains "${folderName}" or sessionName contains "${issuePattern}" then
+                close s
+              end if
+            end repeat
+          end repeat
+        end repeat
+      end tell
+    '`, { stdio: 'pipe' });
+    }
+    catch {
+        // iTerm not running
+    }
+    // Try to close Terminal.app windows
+    try {
+        (0, child_process_1.execSync)(`osascript -e '
+      tell application "Terminal"
+        repeat with w in windows
+          set windowName to name of w
+          if windowName contains "${folderName}" or windowName contains "${issuePattern}" then
+            close w
+          end if
+        end repeat
+      end tell
+    '`, { stdio: 'pipe' });
+    }
+    catch {
+        // Terminal not running
+    }
+    // Try to close VS Code windows
+    try {
+        (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 not running
+    }
+}
+function getOpenPRs(projectRoot) {
+    try {
+        const output = (0, child_process_1.execSync)('gh pr list --state open --json number,title,headRefName,reviewDecision,mergeable --limit 50', {
+            cwd: projectRoot,
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        const prs = JSON.parse(output);
+        return prs.map((pr) => {
+            const match = pr.headRefName.match(/^issue-(\d+)-/);
+            return {
+                ...pr,
+                issueNumber: match ? parseInt(match[1], 10) : null,
+            };
+        });
+    }
+    catch {
+        return [];
+    }
+}
+function cleanupWorktree(projectRoot, branchName, issueNumber) {
+    const projectName = (0, git_1.getProjectName)();
+    const parentDir = path.dirname(projectRoot);
+    const worktreePath = path.join(parentDir, `${projectName}-${branchName}`);
+    // Close windows
+    if (issueNumber) {
+        try {
+            closeWindowsWithPath(worktreePath, issueNumber);
+        }
+        catch {
+            // Ignore
+        }
+    }
+    // Remove worktree
+    if (fs.existsSync(worktreePath)) {
+        try {
+            (0, child_process_1.execSync)(`git worktree remove "${worktreePath}" --force`, {
+                cwd: projectRoot,
+                stdio: 'pipe',
+            });
+        }
+        catch {
+            // Try force delete
+            try {
+                (0, child_process_1.execSync)(`/bin/rm -rf "${worktreePath}"`, { stdio: 'pipe', timeout: 10000 });
+            }
+            catch {
+                // Ignore
+            }
+        }
+    }
+    // Prune worktrees
+    try {
+        (0, child_process_1.execSync)('git worktree prune', { cwd: projectRoot, stdio: 'pipe' });
+    }
+    catch {
+        // Ignore
+    }
+    // Delete local branch
+    try {
+        (0, child_process_1.execSync)(`git branch -D "${branchName}"`, { cwd: projectRoot, stdio: 'pipe' });
+    }
+    catch {
+        // Branch may not exist locally
+    }
+}
+async function mergeCommand() {
+    const projectRoot = (0, git_1.getProjectRoot)();
+    const projectName = (0, git_1.getProjectName)();
+    console.log(chalk_1.default.bold(`\nOpen PRs for ${projectName}:\n`));
+    const spinner = (0, ora_1.default)('Fetching open PRs...').start();
+    const prs = getOpenPRs(projectRoot);
+    spinner.stop();
+    if (prs.length === 0) {
+        console.log(chalk_1.default.yellow('No open PRs found.'));
+        return;
+    }
+    // Build choices with status
+    const choices = prs.map((pr) => {
+        const issueTag = pr.issueNumber ? chalk_1.default.dim(` (issue #${pr.issueNumber})`) : '';
+        let statusTag = '';
+        let canMerge = false;
+        switch (pr.reviewDecision) {
+            case 'APPROVED':
+                statusTag = chalk_1.default.green(' ✓ Approved');
+                canMerge = pr.mergeable === 'MERGEABLE';
+                break;
+            case 'CHANGES_REQUESTED':
+                statusTag = chalk_1.default.red(' ✗ Changes requested');
+                break;
+            case 'REVIEW_REQUIRED':
+                statusTag = chalk_1.default.yellow(' ○ Review required');
+                break;
+            default:
+                statusTag = chalk_1.default.dim(' ○ No reviews');
+        }
+        if (pr.mergeable === 'CONFLICTING') {
+            statusTag += chalk_1.default.red(' ⚠ Conflicts');
+        }
+        return {
+            name: `#${pr.number}\t${pr.title}${issueTag}${statusTag}`,
+            value: pr,
+            checked: canMerge, // Pre-select approved & mergeable PRs
+        };
+    });
+    const { selected } = await inquirer_1.default.prompt([
+        {
+            type: 'checkbox',
+            name: 'selected',
+            message: 'Select PRs to merge and clean up (space to toggle, enter to confirm):',
+            choices,
+        },
+    ]);
+    if (selected.length === 0) {
+        console.log(chalk_1.default.dim('No PRs selected.'));
+        return;
+    }
+    console.log();
+    // Confirm merge
+    const { confirm } = await inquirer_1.default.prompt([
+        {
+            type: 'confirm',
+            name: 'confirm',
+            message: `Merge ${selected.length} PR(s) and clean up worktrees?`,
+            default: true,
+        },
+    ]);
+    if (!confirm) {
+        console.log(chalk_1.default.dim('Cancelled.'));
+        return;
+    }
+    console.log();
+    let merged = 0;
+    let failed = 0;
+    for (const pr of selected) {
+        const prSpinner = (0, ora_1.default)(`Merging PR #${pr.number}...`).start();
+        try {
+            // Merge the PR
+            (0, child_process_1.execSync)(`gh pr merge ${pr.number} --squash --delete-branch`, {
+                cwd: projectRoot,
+                encoding: 'utf-8',
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            prSpinner.succeed(`Merged PR #${pr.number}: ${pr.title.slice(0, 50)}`);
+            // Clean up worktree
+            const cleanSpinner = (0, ora_1.default)(`  Cleaning up worktree...`).start();
+            try {
+                cleanupWorktree(projectRoot, pr.headRefName, pr.issueNumber?.toString() || null);
+                cleanSpinner.succeed(`  Cleaned up worktree`);
+            }
+            catch {
+                cleanSpinner.warn(`  Could not clean worktree (may not exist)`);
+            }
+            merged++;
+        }
+        catch (error) {
+            const errorMsg = error.stderr?.toString() || error.message || 'Unknown error';
+            prSpinner.fail(`Failed to merge PR #${pr.number}: ${errorMsg.split('\n')[0]}`);
+            failed++;
+        }
+    }
+    console.log();
+    if (merged > 0) {
+        console.log(chalk_1.default.green(`✅ Merged ${merged} PR(s)!`));
+    }
+    if (failed > 0) {
+        console.log(chalk_1.default.yellow(`⚠️  ${failed} PR(s) could not be merged.`));
+    }
+}

package/dist/index.js

@@ -19,6 +19,7 @@ const init_1 = require("./commands/init");
 const show_1 = require("./commands/show");
 const review_1 = require("./commands/review");
 const config_1 = require("./commands/config");
+const merge_1 = require("./commands/merge");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const packageJson = require('../package.json');
 const program = new commander_1.Command();
@@ -176,4 +177,11 @@ program
     .action(async (action, value) => {
     await (0, config_1.configCommand)(action, value);
 });
+// Merge command - merge PRs and clean up
+program
+    .command('merge')
+    .description('Merge approved PRs and clean up worktrees')
+    .action(async () => {
+    await (0, merge_1.mergeCommand)();
+});
 program.parse();

package/package.json

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