claude-issue-solver 1.17.0 → 1.18.0

package/dist/commands/pr.js

@@ -105,7 +105,8 @@ ${commitList}
 ---
 
 🤖 Generated with [Claude Code](https://claude.com/claude-code)`;
-        const prUrl = (0, child_process_1.execSync)(`gh pr create --title "Fix #${issueNumber}: ${issue.title.replace(/"/g, '\\"')}" --body "${prBody.replace(/"/g, '\\"')}" --head "${branchName}" --base main`, { cwd: worktreePath, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+        const baseBranch = (0, git_1.getDefaultBranch)();
+        const prUrl = (0, child_process_1.execSync)(`gh pr create --title "Fix #${issueNumber}: ${issue.title.replace(/"/g, '\\"')}" --body "${prBody.replace(/"/g, '\\"')}" --head "${branchName}" --base ${baseBranch}`, { cwd: worktreePath, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
         pushSpinner.succeed('PR created!');
         console.log();
         console.log(chalk_1.default.green(`✅ PR created: ${prUrl}`));

package/dist/commands/solve.js

@@ -59,17 +59,18 @@ async function solveCommand(issueNumber) {
     console.log();
     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}`);
-    // Fetch latest main
-    const fetchSpinner = (0, ora_1.default)('Fetching latest main...').start();
+    // Fetch latest base branch
+    const fetchSpinner = (0, ora_1.default)(`Fetching latest ${baseBranch}...`).start();
     try {
-        (0, child_process_1.execSync)('git fetch origin main --quiet', { cwd: projectRoot, stdio: 'pipe' });
-        fetchSpinner.succeed('Fetched latest main');
+        (0, child_process_1.execSync)(`git fetch origin ${baseBranch} --quiet`, { cwd: projectRoot, stdio: 'pipe' });
+        fetchSpinner.succeed(`Fetched latest ${baseBranch}`);
     }
     catch {
-        fetchSpinner.warn('Could not fetch origin/main');
+        fetchSpinner.warn(`Could not fetch origin/${baseBranch}`);
     }
     // Check if worktree already exists
     if (fs.existsSync(worktreePath)) {
@@ -86,7 +87,7 @@ async function solveCommand(issueNumber) {
                 });
             }
             else {
-                (0, child_process_1.execSync)(`git worktree add "${worktreePath}" -b "${branchName}" origin/main`, {
+                (0, child_process_1.execSync)(`git worktree add "${worktreePath}" -b "${branchName}" origin/${baseBranch}`, {
                     cwd: projectRoot,
                     stdio: 'pipe',
                 });
@@ -139,7 +140,7 @@ echo ""
 
 # Function to create PR
 create_pr() {
-  COMMITS=$(git log origin/main..HEAD --oneline 2>/dev/null | wc -l | tr -d ' ')
+  COMMITS=$(git log origin/${baseBranch}..HEAD --oneline 2>/dev/null | wc -l | tr -d ' ')
 
   if [ "$COMMITS" -gt 0 ]; then
     # Check if PR already exists
@@ -151,7 +152,7 @@ create_pr() {
 
       git push -u origin "${branchName}" 2>/dev/null
 
-      COMMIT_LIST=$(git log origin/main..HEAD --pretty=format:'- %s' | head -10)
+      COMMIT_LIST=$(git log origin/${baseBranch}..HEAD --pretty=format:'- %s' | head -10)
 
       PR_URL=$(gh pr create \\
         --title "Fix #${issueNumber}: ${issue.title.replace(/"/g, '\\"')}" \\
@@ -167,7 +168,7 @@ $COMMIT_LIST
 
 🤖 Generated with [Claude Code](https://claude.com/claude-code)" \\
         --head "${branchName}" \\
-        --base main 2>/dev/null)
+        --base ${baseBranch} 2>/dev/null)
 
       if [ -n "$PR_URL" ]; then
         echo ""

package/dist/utils/git.d.ts

@@ -4,5 +4,6 @@ export declare function getProjectRoot(): string;
 export declare function getProjectName(): string;
 export declare function isGitRepo(): boolean;
 export declare function branchExists(branchName: string): boolean;
+export declare function getDefaultBranch(): string;
 export declare function getCommitCount(worktreePath: string): number;
 export declare function getCommitList(worktreePath: string, limit?: number): string;

package/dist/utils/git.js

@@ -6,6 +6,7 @@ exports.getProjectRoot = getProjectRoot;
 exports.getProjectName = getProjectName;
 exports.isGitRepo = isGitRepo;
 exports.branchExists = branchExists;
+exports.getDefaultBranch = getDefaultBranch;
 exports.getCommitCount = getCommitCount;
 exports.getCommitList = getCommitList;
 const child_process_1 = require("child_process");
@@ -69,9 +70,31 @@ function branchExists(branchName) {
         return false;
     }
 }
+function getDefaultBranch() {
+    // Try to get from remote HEAD
+    try {
+        const output = exec('git symbolic-ref refs/remotes/origin/HEAD');
+        if (output) {
+            // Output is like "refs/remotes/origin/main" or "refs/remotes/origin/develop"
+            const match = output.match(/refs\/remotes\/origin\/(.+)/);
+            if (match) {
+                return match[1];
+            }
+        }
+    }
+    catch {
+        // Ignore
+    }
+    // Fallback: check if develop exists, otherwise main
+    if (branchExists('develop') || exec('git ls-remote --heads origin develop')) {
+        return 'develop';
+    }
+    return 'main';
+}
 function getCommitCount(worktreePath) {
     try {
-        const output = exec('git log origin/main..HEAD --oneline', worktreePath);
+        const baseBranch = getDefaultBranch();
+        const output = exec(`git log origin/${baseBranch}..HEAD --oneline`, worktreePath);
         if (!output)
             return 0;
         return output.split('\n').filter(Boolean).length;
@@ -81,5 +104,6 @@ function getCommitCount(worktreePath) {
     }
 }
 function getCommitList(worktreePath, limit = 10) {
-    return exec(`git log origin/main..HEAD --pretty=format:'- %s' | head -${limit}`, worktreePath);
+    const baseBranch = getDefaultBranch();
+    return exec(`git log origin/${baseBranch}..HEAD --pretty=format:'- %s' | head -${limit}`, worktreePath);
 }

package/package.json

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