claude-issue-solver 1.39.1 → 1.40.0

package/dist/commands/solve.js

@@ -135,10 +135,28 @@ echo ""
 
 # Remove worktree (need to cd out first)
 cd "${projectRoot}"
+
+# Try git worktree remove first
 git worktree remove "${worktreePath}" --force 2>/dev/null
 
-echo "✅ Worktree removed. Branch '${branchName}' preserved on remote."
-echo "   Fetch it in main repo: git fetch origin ${branchName}"
+# If folder still exists, force delete it
+if [ -d "${worktreePath}" ]; then
+  echo "Git worktree remove didn't fully clean up, force deleting..."
+  /bin/rm -rf "${worktreePath}" 2>/dev/null || rm -rf "${worktreePath}" 2>/dev/null
+fi
+
+# Prune any stale worktree references
+git worktree prune 2>/dev/null
+
+# Verify cleanup
+if [ -d "${worktreePath}" ]; then
+  echo "⚠️  Could not fully remove worktree. You may need to manually delete:"
+  echo "   rm -rf '${worktreePath}'"
+else
+  echo "✅ Worktree removed. Branch '${branchName}' preserved on remote."
+  echo "   Fetch it in main repo: git fetch origin ${branchName}"
+fi
+
 echo ""
 echo "Terminal will close in 3 seconds..."
 sleep 3
@@ -156,8 +174,8 @@ exit 0
     const interactiveEnding = `
 echo ""
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-echo "Claude session ended. Terminal staying open."
-echo "To clean up after merge: claude-issue clean ${issueNumber}"
+echo "Claude session ended. Terminal staying open (--keep mode)."
+echo "To clean up: claude-issue clean ${issueNumber}"
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo ""
 
@@ -165,8 +183,8 @@ echo ""
 exec bash --norc --noprofile
 `;
     const modeMessage = autoClose
-        ? 'Terminal will close after PR is created.'
-        : 'The terminal stays open for follow-up changes.';
+        ? 'Worktree will be cleaned up after session ends.'
+        : 'Terminal and worktree will stay open (--keep mode).';
     const runnerContent = `#!/bin/bash
 cd "${worktreePath}"
 

package/dist/index.js

@@ -52,18 +52,19 @@ program.hook('preAction', (thisCommand) => {
 // Default command - interactive selection
 program
     .argument('[issue]', 'Issue number to solve')
-    .option('-c, --auto-close', 'Close terminal and clean up worktree after PR is created')
+    .option('-k, --keep', 'Keep terminal and worktree open after PR is created (default: auto-close)')
     .action(async (issue, options) => {
+    const solveOptions = { autoClose: !options.keep };
     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, solve_1.solveCommand)(issueNumber, { autoClose: options.autoClose });
+        await (0, solve_1.solveCommand)(issueNumber, solveOptions);
     }
     else {
-        await (0, select_1.selectCommand)(options);
+        await (0, select_1.selectCommand)(solveOptions);
     }
 });
 // List command

package/package.json

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