claude-issue-solver 1.31.0 → 1.33.0

package/dist/commands/review.d.ts

@@ -1,2 +1,6 @@
-export declare function reviewCommand(issueNumber: number): Promise<void>;
-export declare function selectReviewCommand(): Promise<void>;
+export declare function reviewCommand(issueNumber: number, options?: {
+    merge?: boolean;
+}): Promise<void>;
+export declare function selectReviewCommand(options?: {
+    merge?: boolean;
+}): Promise<void>;

package/dist/commands/review.js

@@ -43,12 +43,13 @@ 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 github_1 = require("../utils/github");
 const git_1 = require("../utils/git");
 const helpers_1 = require("../utils/helpers");
 const config_1 = require("./config");
-async function reviewCommand(issueNumber) {
+async function reviewCommand(issueNumber, options = {}) {
     const spinner = (0, ora_1.default)(`Fetching issue #${issueNumber}...`).start();
     const issue = (0, github_1.getIssue)(issueNumber);
     if (!issue) {
@@ -57,22 +58,21 @@ async function reviewCommand(issueNumber) {
     }
     spinner.succeed(`Found issue #${issueNumber}`);
     const projectRoot = (0, git_1.getProjectRoot)();
-    const projectName = (0, git_1.getProjectName)();
-    const baseBranch = (0, git_1.getDefaultBranch)();
-    const branchSlug = (0, helpers_1.slugify)(issue.title);
-    const branchName = `issue-${issueNumber}-${branchSlug}`;
-    const worktreePath = path.join(path.dirname(projectRoot), `${projectName}-${branchName}`);
-    // Check if there's a PR for this issue
+    // Check if there's a PR for this issue - search by issue number in all PRs
     const prCheckSpinner = (0, ora_1.default)('Checking for PR...').start();
     let prNumber = null;
+    let branchName = null;
     try {
-        const prOutput = (0, child_process_1.execSync)(`gh pr list --head "${branchName}" --json number --jq '.[0].number'`, {
+        // Search for PRs that mention the issue number in their branch name
+        const prOutput = (0, child_process_1.execSync)(`gh pr list --state open --json number,headRefName --jq '.[] | select(.headRefName | test("issue-${issueNumber}-")) | "\\(.number) \\(.headRefName)"'`, {
             cwd: projectRoot,
             encoding: 'utf-8',
             stdio: ['pipe', 'pipe', 'pipe'],
         }).trim();
         if (prOutput) {
-            prNumber = prOutput;
+            const [num, branch] = prOutput.split(' ');
+            prNumber = num;
+            branchName = branch;
             prCheckSpinner.succeed(`Found PR #${prNumber}`);
         }
         else {
@@ -90,55 +90,6 @@ async function reviewCommand(issueNumber) {
     console.log(chalk_1.default.bold(`📌 Reviewing: ${issue.title}`));
     console.log(chalk_1.default.dim(`🔗 PR: https://github.com/${getRepoName(projectRoot)}/pull/${prNumber}`));
     console.log();
-    // Fetch latest
-    const fetchSpinner = (0, ora_1.default)(`Fetching latest changes...`).start();
-    try {
-        (0, child_process_1.execSync)(`git fetch origin ${branchName} --quiet`, { cwd: projectRoot, stdio: 'pipe' });
-        fetchSpinner.succeed('Fetched latest changes');
-    }
-    catch {
-        fetchSpinner.warn('Could not fetch branch');
-    }
-    // Check if worktree already exists
-    if (fs.existsSync(worktreePath)) {
-        console.log(chalk_1.default.yellow(`\n🌿 Using existing worktree at: ${worktreePath}`));
-        // Pull latest changes
-        try {
-            (0, child_process_1.execSync)('git pull --quiet', { cwd: worktreePath, stdio: 'pipe' });
-        }
-        catch {
-            // Ignore pull errors
-        }
-    }
-    else {
-        const worktreeSpinner = (0, ora_1.default)(`Creating worktree for review...`).start();
-        try {
-            if ((0, git_1.branchExists)(branchName)) {
-                (0, child_process_1.execSync)(`git worktree add "${worktreePath}" "${branchName}"`, {
-                    cwd: projectRoot,
-                    stdio: 'pipe',
-                });
-            }
-            else {
-                // Branch should exist if PR exists, but handle edge case
-                (0, child_process_1.execSync)(`git worktree add "${worktreePath}" "origin/${branchName}"`, {
-                    cwd: projectRoot,
-                    stdio: 'pipe',
-                });
-            }
-            worktreeSpinner.succeed(`Created worktree at: ${worktreePath}`);
-        }
-        catch (error) {
-            worktreeSpinner.fail('Failed to create worktree');
-            console.error(error);
-            process.exit(1);
-        }
-        // Copy env files and symlink node_modules
-        const setupSpinner = (0, ora_1.default)('Setting up worktree...').start();
-        (0, helpers_1.copyEnvFiles)(projectRoot, worktreePath);
-        (0, helpers_1.symlinkNodeModules)(projectRoot, worktreePath);
-        setupSpinner.succeed('Worktree setup complete');
-    }
     // Get the diff for context
     let diffContent = '';
     try {
@@ -247,8 +198,9 @@ The \`suggestion\` code block creates a "Commit suggestion" button on GitHub.
 ${diffContent ? `\n\`\`\`diff\n${diffContent.slice(0, 50000)}\n\`\`\`\n` : 'Run `gh pr diff ' + prNumber + '` to see the changes.'}
 
 Start by examining the diff and the changed files, then provide your review.`;
-    // Write prompt to a file
-    const promptFile = path.join(worktreePath, '.claude-review-prompt.txt');
+    // Write prompt and runner script to temp directory
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'cis-review-'));
+    const promptFile = path.join(tempDir, '.claude-review-prompt.txt');
     fs.writeFileSync(promptFile, prompt);
     // Bot token already fetched above
     const botTokenEnv = botToken ? `export BOT_TOKEN="${botToken}"\nexport GH_TOKEN="${botToken}"` : '# No bot token configured';
@@ -256,9 +208,9 @@ Start by examining the diff and the changed files, then provide your review.`;
         ? 'Using bot token for reviews (can approve/request changes)'
         : 'No bot token - using your account (may have limitations on own PRs)';
     // Create runner script for review
-    const runnerScript = path.join(worktreePath, '.claude-review-runner.sh');
+    const runnerScript = path.join(tempDir, '.claude-review-runner.sh');
     const runnerContent = `#!/bin/bash
-cd "${worktreePath}"
+cd "${projectRoot}"
 
 # Set bot token if configured
 ${botTokenEnv}
@@ -275,14 +227,15 @@ echo "${botNote}"
 echo ""
 echo "Claude will review the PR and post suggestions."
 echo "You can commit suggestions directly on GitHub."
+${options.merge ? 'echo "\\n🔄 Auto-merge enabled: will merge if approved."' : ''}
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo ""
 
 # Run Claude interactively
 claude --dangerously-skip-permissions "$(cat '${promptFile}')"
 
-# Clean up prompt file
-rm -f '${promptFile}'
+# Clean up temp files
+rm -rf '${tempDir}'
 
 echo ""
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
@@ -295,30 +248,15 @@ REVIEW_STATUS=$(gh pr view ${prNumber} --json reviewDecision --jq '.reviewDecisi
 if [ "$REVIEW_STATUS" = "APPROVED" ]; then
   echo "✅ PR #${prNumber} is approved!"
   echo ""
-  read -p "Would you like to merge and clean up? [y/N] " -n 1 -r
-  echo ""
-  if [[ \\$REPLY =~ ^[Yy]$ ]]; then
+${options.merge ? `  echo "📤 Auto-merging PR #${prNumber}..."
+  if gh pr merge ${prNumber} --squash --delete-branch; then
     echo ""
-    echo "📤 Merging PR #${prNumber}..."
-    if gh pr merge ${prNumber} --squash --delete-branch; then
-      echo ""
-      echo "✅ PR merged successfully!"
-      echo ""
-      echo "Cleaning up worktree..."
-      cd "${projectRoot}"
-      git worktree remove "${worktreePath}" --force 2>/dev/null || rm -rf "${worktreePath}"
-      git worktree prune 2>/dev/null
-      git branch -D "${branchName}" 2>/dev/null
-      echo "✅ Cleanup complete!"
-    else
-      echo ""
-      echo "⚠️  Merge failed. You can try manually: gh pr merge ${prNumber} --squash"
-    fi
+    echo "✅ PR merged successfully!"
   else
     echo ""
-    echo "View PR: gh pr view ${prNumber} --web"
-    echo "To merge later: cis merge"
-  fi
+    echo "⚠️  Merge failed. You can try manually: gh pr merge ${prNumber} --squash"
+  fi` : `  echo "View PR: gh pr view ${prNumber} --web"
+  echo "To merge: cis merge"`}
 else
   echo "View PR: gh pr view ${prNumber} --web"
 fi
@@ -337,7 +275,6 @@ exec bash
     console.log(chalk_1.default.dim(`   Claude is reviewing in a new terminal window.`));
     console.log();
     console.log(chalk_1.default.dim(`   View PR: gh pr view ${prNumber} --web`));
-    console.log(chalk_1.default.dim(`   To clean up later: claude-issue clean ${issueNumber}`));
 }
 function getRepoName(projectRoot) {
     try {
@@ -374,7 +311,7 @@ function getOpenPRs(projectRoot) {
         return [];
     }
 }
-async function selectReviewCommand() {
+async function selectReviewCommand(options = {}) {
     const projectRoot = (0, git_1.getProjectRoot)();
     const projectName = (0, git_1.getProjectName)();
     console.log(chalk_1.default.bold(`\nOpen PRs for ${projectName}:\n`));
@@ -425,56 +362,13 @@ async function selectReviewCommand() {
     console.log();
     // Launch reviews in parallel
     for (const pr of selected) {
-        await launchReviewForPR(pr, projectRoot, projectName);
+        await launchReviewForPR(pr, projectRoot, projectName, options);
     }
     console.log();
     console.log(chalk_1.default.green(`✅ Started ${selected.length} review session(s)!`));
     console.log(chalk_1.default.dim('   Each review is running in its own terminal window.'));
 }
-async function launchReviewForPR(pr, projectRoot, projectName) {
-    const baseBranch = (0, git_1.getDefaultBranch)();
-    const branchName = pr.headRefName;
-    const worktreePath = path.join(path.dirname(projectRoot), `${projectName}-${branchName}`);
-    // Fetch latest
-    try {
-        (0, child_process_1.execSync)(`git fetch origin ${branchName} --quiet`, { cwd: projectRoot, stdio: 'pipe' });
-    }
-    catch {
-        // Ignore fetch errors
-    }
-    // Check if worktree already exists
-    if (!fs.existsSync(worktreePath)) {
-        try {
-            if ((0, git_1.branchExists)(branchName)) {
-                (0, child_process_1.execSync)(`git worktree add "${worktreePath}" "${branchName}"`, {
-                    cwd: projectRoot,
-                    stdio: 'pipe',
-                });
-            }
-            else {
-                (0, child_process_1.execSync)(`git worktree add "${worktreePath}" "origin/${branchName}"`, {
-                    cwd: projectRoot,
-                    stdio: 'pipe',
-                });
-            }
-            // Copy env files and symlink node_modules
-            (0, helpers_1.copyEnvFiles)(projectRoot, worktreePath);
-            (0, helpers_1.symlinkNodeModules)(projectRoot, worktreePath);
-        }
-        catch (error) {
-            console.log(chalk_1.default.yellow(`⚠️  Could not create worktree for PR #${pr.number}`));
-            return;
-        }
-    }
-    else {
-        // Pull latest changes
-        try {
-            (0, child_process_1.execSync)('git pull --quiet', { cwd: worktreePath, stdio: 'pipe' });
-        }
-        catch {
-            // Ignore pull errors
-        }
-    }
+async function launchReviewForPR(pr, projectRoot, _projectName, options = {}) {
     // Get the diff for context
     let diffContent = '';
     try {
@@ -587,18 +481,19 @@ The \`suggestion\` code block creates a "Commit suggestion" button on GitHub.
 ${diffContent ? `\n\`\`\`diff\n${diffContent.slice(0, 50000)}\n\`\`\`\n` : 'Run `gh pr diff ' + pr.number + '` to see the changes.'}
 
 Start by examining the diff and the changed files, then provide your review.`;
-    // Write prompt to a file
-    const promptFile = path.join(worktreePath, '.claude-review-prompt.txt');
+    // Write prompt and runner script to temp directory
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'cis-review-'));
+    const promptFile = path.join(tempDir, '.claude-review-prompt.txt');
     fs.writeFileSync(promptFile, prompt);
     const botTokenEnv = botToken ? `export BOT_TOKEN="${botToken}"\nexport GH_TOKEN="${botToken}"` : '# No bot token configured';
     const botNote = botToken
         ? 'Using bot token for reviews (can approve/request changes)'
         : 'No bot token - using your account (may have limitations on own PRs)';
     // Create runner script for review
-    const runnerScript = path.join(worktreePath, '.claude-review-runner.sh');
+    const runnerScript = path.join(tempDir, '.claude-review-runner.sh');
     const escapedTitle = pr.title.replace(/"/g, '\\"').slice(0, 50);
     const runnerContent = `#!/bin/bash
-cd "${worktreePath}"
+cd "${projectRoot}"
 
 # Set bot token if configured
 ${botTokenEnv}
@@ -615,14 +510,15 @@ echo "${botNote}"
 echo ""
 echo "Claude will review the PR and post suggestions."
 echo "You can commit suggestions directly on GitHub."
+${options.merge ? 'echo "\\n🔄 Auto-merge enabled: will merge if approved."' : ''}
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo ""
 
 # Run Claude interactively
 claude --dangerously-skip-permissions "$(cat '${promptFile}')"
 
-# Clean up prompt file
-rm -f '${promptFile}'
+# Clean up temp files
+rm -rf '${tempDir}'
 
 echo ""
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
@@ -635,30 +531,15 @@ REVIEW_STATUS=$(gh pr view ${pr.number} --json reviewDecision --jq '.reviewDecis
 if [ "$REVIEW_STATUS" = "APPROVED" ]; then
   echo "✅ PR #${pr.number} is approved!"
   echo ""
-  read -p "Would you like to merge and clean up? [y/N] " -n 1 -r
-  echo ""
-  if [[ \\$REPLY =~ ^[Yy]$ ]]; then
+${options.merge ? `  echo "📤 Auto-merging PR #${pr.number}..."
+  if gh pr merge ${pr.number} --squash --delete-branch; then
     echo ""
-    echo "📤 Merging PR #${pr.number}..."
-    if gh pr merge ${pr.number} --squash --delete-branch; then
-      echo ""
-      echo "✅ PR merged successfully!"
-      echo ""
-      echo "Cleaning up worktree..."
-      cd "${projectRoot}"
-      git worktree remove "${worktreePath}" --force 2>/dev/null || rm -rf "${worktreePath}"
-      git worktree prune 2>/dev/null
-      git branch -D "${branchName}" 2>/dev/null
-      echo "✅ Cleanup complete!"
-    else
-      echo ""
-      echo "⚠️  Merge failed. You can try manually: gh pr merge ${pr.number} --squash"
-    fi
+    echo "✅ PR merged successfully!"
   else
     echo ""
-    echo "View PR: gh pr view ${pr.number} --web"
-    echo "To merge later: cis merge"
-  fi
+    echo "⚠️  Merge failed. You can try manually: gh pr merge ${pr.number} --squash"
+  fi` : `  echo "View PR: gh pr view ${pr.number} --web"
+  echo "To merge: cis merge"`}
 else
   echo "View PR: gh pr view ${pr.number} --web"
 fi

package/dist/index.js

@@ -157,17 +157,18 @@ program
 program
     .command('review [issue]')
     .description('Review PRs with Claude and post suggestions')
-    .action(async (issue) => {
+    .option('-m, --merge', 'Automatically merge PR if approved')
+    .action(async (issue, options) => {
     if (issue) {
         const issueNumber = parseInt(issue, 10);
         if (isNaN(issueNumber)) {
             console.log(chalk_1.default.red(`❌ Invalid issue number: ${issue}`));
             process.exit(1);
         }
-        await (0, review_1.reviewCommand)(issueNumber);
+        await (0, review_1.reviewCommand)(issueNumber, { merge: options.merge });
     }
     else {
-        await (0, review_1.selectReviewCommand)();
+        await (0, review_1.selectReviewCommand)({ merge: options.merge });
     }
 });
 // Config command - manage settings

package/package.json

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