claude-issue-solver 1.24.0 → 1.24.2

package/dist/commands/config.js

@@ -81,6 +81,18 @@ function validateToken(token) {
         return { valid: false, error: error.message };
     }
 }
+function getCurrentUser() {
+    try {
+        const output = (0, child_process_1.execSync)('gh api user --jq .login', {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        return output.trim();
+    }
+    catch {
+        return null;
+    }
+}
 async function configCommand(action, value) {
     // Handle clear action
     if (action === '--clear' || action === 'clear') {
@@ -244,6 +256,21 @@ async function promptForToken() {
     console.log(chalk_1.default.dim('\nValidating token...'));
     const result = validateToken(token);
     if (result.valid) {
+        // Check if token belongs to the same user as current gh auth
+        const currentUser = getCurrentUser();
+        if (currentUser && result.login === currentUser) {
+            console.log(chalk_1.default.red(`\n❌ This token belongs to your current account (${currentUser}).`));
+            console.log(chalk_1.default.yellow('\n⚠️  To approve your own PRs, you need a DIFFERENT account.'));
+            console.log(chalk_1.default.dim('\nGitHub doesn\'t allow approving your own PRs, even with a different token.'));
+            console.log(chalk_1.default.dim('The bot must be a separate GitHub account.\n'));
+            console.log('Steps to create a bot account:');
+            console.log(chalk_1.default.dim('  1. Sign out of GitHub (or use incognito)'));
+            console.log(chalk_1.default.dim(`  2. Create new account (e.g., ${currentUser}-bot)`));
+            console.log(chalk_1.default.dim('  3. Add the bot as collaborator to your repos'));
+            console.log(chalk_1.default.dim('  4. Create a token from the bot account'));
+            console.log(chalk_1.default.dim('  5. Run `cis config bot-token` again\n'));
+            return;
+        }
         const config = getConfig();
         config.botToken = token;
         saveConfig(config);

package/dist/commands/review.js

@@ -152,6 +152,9 @@ async function reviewCommand(issueNumber) {
     catch {
         console.log(chalk_1.default.yellow('Could not fetch PR diff, Claude will review the files directly.'));
     }
+    // Check for bot token early to include in prompt
+    const botToken = (0, config_1.getBotToken)();
+    const ghCmd = botToken ? `GH_TOKEN=\${BOT_TOKEN} gh` : 'gh';
     // Build the review prompt
     const prompt = `You are reviewing PR #${prNumber} for issue #${issueNumber}: ${issue.title}
 
@@ -168,7 +171,33 @@ Review the code changes in this PR. Look for:
 6. Performance problems
 
 ## How to Leave Feedback
+${botToken ? `
+**IMPORTANT: A bot token is configured. Use this prefix for ALL gh commands:**
+\`\`\`bash
+GH_TOKEN=\${BOT_TOKEN} gh pr review ...
+GH_TOKEN=\${BOT_TOKEN} gh pr comment ...
+\`\`\`
+The BOT_TOKEN environment variable is already set in this terminal.
 
+You can use formal reviews (approve/request-changes):
+
+\`\`\`bash
+# Post suggestions as review comments
+GH_TOKEN=\${BOT_TOKEN} gh pr review ${prNumber} --comment --body "**File: path/to/file.ts**
+
+Description of the issue...
+
+\\\`\\\`\\\`suggestion
+// Your suggested fix here
+\\\`\\\`\\\`
+"
+
+# Final verdict
+GH_TOKEN=\${BOT_TOKEN} gh pr review ${prNumber} --approve --body "LGTM! Code looks good."
+# OR
+GH_TOKEN=\${BOT_TOKEN} gh pr review ${prNumber} --request-changes --body "Please address the issues above."
+\`\`\`
+` : `
 First, check if you can post formal reviews by running these commands:
 \`\`\`bash
 # Get PR author
@@ -211,7 +240,7 @@ Description of the issue...
 \\\`\\\`\\\`
 "
 \`\`\`
-
+`}
 The \`suggestion\` code block creates a "Commit suggestion" button on GitHub.
 
 ## PR Diff
@@ -221,9 +250,8 @@ 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');
     fs.writeFileSync(promptFile, prompt);
-    // Check for bot token
-    const botToken = (0, config_1.getBotToken)();
-    const botTokenEnv = botToken ? `export GH_TOKEN="${botToken}"` : '# No bot token configured';
+    // Bot token already fetched above
+    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)';
@@ -420,6 +448,8 @@ async function launchReviewForPR(pr, projectRoot, projectName) {
             issueBody = issue.body;
         }
     }
+    // Check for bot token
+    const botToken = (0, config_1.getBotToken)();
     // Build the review prompt
     const prompt = `You are reviewing PR #${pr.number}: ${pr.title}
 ${pr.issueNumber ? `\n## Related Issue #${pr.issueNumber}\n${issueBody}\n` : ''}
@@ -433,7 +463,33 @@ Review the code changes in this PR. Look for:
 6. Performance problems
 
 ## How to Leave Feedback
+${botToken ? `
+**IMPORTANT: A bot token is configured. Use this prefix for ALL gh commands:**
+\`\`\`bash
+GH_TOKEN=\${BOT_TOKEN} gh pr review ...
+GH_TOKEN=\${BOT_TOKEN} gh pr comment ...
+\`\`\`
+The BOT_TOKEN environment variable is already set in this terminal.
+
+You can use formal reviews (approve/request-changes):
+
+\`\`\`bash
+# Post suggestions as review comments
+GH_TOKEN=\${BOT_TOKEN} gh pr review ${pr.number} --comment --body "**File: path/to/file.ts**
+
+Description of the issue...
+
+\\\`\\\`\\\`suggestion
+// Your suggested fix here
+\\\`\\\`\\\`
+"
 
+# Final verdict
+GH_TOKEN=\${BOT_TOKEN} gh pr review ${pr.number} --approve --body "LGTM! Code looks good."
+# OR
+GH_TOKEN=\${BOT_TOKEN} gh pr review ${pr.number} --request-changes --body "Please address the issues above."
+\`\`\`
+` : `
 First, check if you can post formal reviews by running these commands:
 \`\`\`bash
 # Get PR author
@@ -476,7 +532,7 @@ Description of the issue...
 \\\`\\\`\\\`
 "
 \`\`\`
-
+`}
 The \`suggestion\` code block creates a "Commit suggestion" button on GitHub.
 
 ## PR Diff
@@ -486,9 +542,7 @@ 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');
     fs.writeFileSync(promptFile, prompt);
-    // Check for bot token
-    const botToken = (0, config_1.getBotToken)();
-    const botTokenEnv = botToken ? `export GH_TOKEN="${botToken}"` : '# No bot token configured';
+    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)';

package/package.json

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