claude-issue-solver 1.30.2 → 1.32.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

@@ -48,7 +48,7 @@ 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) {
@@ -275,6 +275,7 @@ 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 ""
 
@@ -288,7 +289,32 @@ echo ""
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo "Review session ended."
 echo ""
-echo "View PR: gh pr view ${prNumber} --web"
+
+# Check if PR was approved
+REVIEW_STATUS=$(gh pr view ${prNumber} --json reviewDecision --jq '.reviewDecision' 2>/dev/null)
+
+if [ "$REVIEW_STATUS" = "APPROVED" ]; then
+  echo "✅ PR #${prNumber} is approved!"
+  echo ""
+${options.merge ? `  echo "📤 Auto-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 "View PR: gh pr view ${prNumber} --web"
+  echo "To merge: cis merge"`}
+else
+  echo "View PR: gh pr view ${prNumber} --web"
+fi
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo ""
 
@@ -341,7 +367,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`));
@@ -392,13 +418,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) {
+async function launchReviewForPR(pr, projectRoot, projectName, options = {}) {
     const baseBranch = (0, git_1.getDefaultBranch)();
     const branchName = pr.headRefName;
     const worktreePath = path.join(path.dirname(projectRoot), `${projectName}-${branchName}`);
@@ -582,6 +608,7 @@ 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 ""
 
@@ -595,7 +622,32 @@ echo ""
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo "Review session ended."
 echo ""
-echo "View PR: gh pr view ${pr.number} --web"
+
+# Check if PR was approved
+REVIEW_STATUS=$(gh pr view ${pr.number} --json reviewDecision --jq '.reviewDecision' 2>/dev/null)
+
+if [ "$REVIEW_STATUS" = "APPROVED" ]; then
+  echo "✅ PR #${pr.number} is approved!"
+  echo ""
+${options.merge ? `  echo "📤 Auto-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 "View PR: gh pr view ${pr.number} --web"
+  echo "To merge: cis merge"`}
+else
+  echo "View PR: gh pr view ${pr.number} --web"
+fi
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo ""
 

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.30.2",
+  "version": "1.32.0",
   "description": "Automatically solve GitHub issues using Claude Code",
   "main": "dist/index.js",
   "bin": {