claude-issue-solver 1.26.1 → 1.26.3

package/dist/commands/merge.js

@@ -248,6 +248,13 @@ async function mergeCommand() {
     for (const pr of selected) {
         const prSpinner = (0, ora_1.default)(`Merging PR #${pr.number}...`).start();
         try {
+            // Clean up worktree FIRST (before merge) to avoid branch deletion issues
+            try {
+                cleanupWorktree(projectRoot, pr.headRefName, pr.issueNumber?.toString() || null);
+            }
+            catch {
+                // Worktree may not exist, continue with merge
+            }
             // Merge the PR
             (0, child_process_1.execSync)(`gh pr merge ${pr.number} --squash --delete-branch`, {
                 cwd: projectRoot,
@@ -255,15 +262,6 @@ async function mergeCommand() {
                 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) {

package/dist/utils/github.js

@@ -14,15 +14,19 @@ const util_1 = require("util");
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
 function createIssue(title, body, labels) {
     try {
-        let cmd = `gh issue create --title "${title.replace(/"/g, '\\"')}"`;
+        // Build args array to avoid shell escaping issues
+        const args = ['issue', 'create', '--title', title];
         if (body) {
-            cmd += ` --body "${body.replace(/"/g, '\\"')}"`;
+            args.push('--body', body);
         }
         if (labels && labels.length > 0) {
             for (const label of labels) {
-                cmd += ` --label "${label.replace(/"/g, '\\"')}"`;
+                args.push('--label', label);
             }
         }
+        // Use spawn-like approach with shell: false would be ideal, but execSync doesn't support it well
+        // Instead, use -- to prevent argument parsing issues and proper quoting
+        const cmd = `gh ${args.map(arg => `'${arg.replace(/'/g, "'\\''")}'`).join(' ')}`;
         const output = (0, child_process_1.execSync)(cmd, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
         // Output is the issue URL, extract the number
         const match = output.trim().match(/\/issues\/(\d+)$/);
@@ -31,7 +35,11 @@ function createIssue(title, body, labels) {
         }
         return null;
     }
-    catch {
+    catch (error) {
+        // Log error for debugging
+        if (process.env.DEBUG) {
+            console.error('createIssue error:', error.stderr?.toString() || error.message);
+        }
         return null;
     }
 }

package/package.json

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