jettypod 4.4.61 → 4.4.63

package/lib/work-commands/index.js

@@ -1171,19 +1171,12 @@ async function mergeWork(options = {}) {
     }
   }
 
-  // CRITICAL: Refuse to run from inside a worktree
-  // Running merge from inside the worktree that will be deleted poisons the shell session
+  // Auto-chdir to main repo if running from inside a worktree
   const cwd = process.cwd();
   if (cwd.includes('.jettypod-work')) {
     const mainRepo = getGitRoot();
-    console.error('❌ Cannot merge from inside a worktree.');
-    console.error('');
-    console.error('   The merge will delete this worktree, breaking your shell session.');
-    console.error('');
-    console.error('   Run from the main repository instead:');
-    console.error(`   cd ${mainRepo}`);
-    console.error('   jettypod work merge');
-    return Promise.reject(new Error('Cannot merge from inside a worktree'));
+    console.log('📂 Changing to main repository for merge...');
+    process.chdir(mainRepo);
   }
 
   // Get current work - either from explicit ID or branch detection
@@ -1360,11 +1353,13 @@ async function mergeWork(options = {}) {
     console.log(`Branch: ${currentBranch}`);
   
     // Step 1: Push feature branch to remote
+    // NOTE: Use ['pipe', 'inherit', 'inherit'] instead of 'inherit' to avoid stealing stdin
+    // from Claude Code's shell. Using 'inherit' for stdin breaks the shell when run interactively.
     try {
       console.log('Pushing feature branch to remote...');
       execSync(`git push -u origin ${currentBranch}`, {
         cwd: gitRoot,
-        stdio: 'inherit'
+        stdio: ['pipe', 'inherit', 'inherit']
       });
     } catch (err) {
       const errorMsg = err.message.toLowerCase();
@@ -1416,7 +1411,7 @@ async function mergeWork(options = {}) {
       console.log(`Checking out ${defaultBranch}...`);
       execSync(`git checkout ${defaultBranch}`, {
         cwd: gitRoot,
-        stdio: 'inherit'
+        stdio: ['pipe', 'inherit', 'inherit']
       });
     } catch (err) {
       return Promise.reject(new Error(`Failed to checkout ${defaultBranch}: ${err.message}`));
@@ -1455,7 +1450,7 @@ async function mergeWork(options = {}) {
       console.log(`Updating ${defaultBranch} from remote...`);
       execSync(`git pull origin ${defaultBranch}`, {
         cwd: gitRoot,
-        stdio: 'inherit'
+        stdio: ['pipe', 'inherit', 'inherit']
       });
     } catch (err) {
       const errorMsg = err.message.toLowerCase();
@@ -1492,12 +1487,12 @@ async function mergeWork(options = {}) {
       return Promise.reject(new Error(`Failed to pull ${defaultBranch}: ${err.message}`));
     }
   
-    // Step 4: Merge feature branch into default branch
+    // Step 5: Merge feature branch into default branch
     try {
       console.log(`Merging ${currentBranch} into ${defaultBranch}...`);
       execSync(`git merge --no-ff ${currentBranch} -m "Merge work item #${currentWork.id}"`, {
         cwd: gitRoot,
-        stdio: 'inherit'
+        stdio: ['pipe', 'inherit', 'inherit']
       });
     } catch (err) {
       // Check if merge failed due to conflicts
@@ -1538,12 +1533,12 @@ async function mergeWork(options = {}) {
       return Promise.reject(new Error(`Failed to merge ${currentBranch}: ${err.message}`));
     }
   
-    // Step 5: Push default branch to remote
+    // Step 6: Push default branch to remote
     try {
       console.log(`Pushing ${defaultBranch} to remote...`);
       execSync(`git push origin ${defaultBranch}`, {
         cwd: gitRoot,
-        stdio: 'inherit'
+        stdio: ['pipe', 'inherit', 'inherit']
       });
     } catch (err) {
       const errorMsg = err.message.toLowerCase();
@@ -1735,18 +1730,12 @@ async function testsMerge(featureId) {
     return Promise.reject(new Error('Invalid feature ID'));
   }
 
-  // CRITICAL: Refuse to run from inside a worktree
+  // Auto-chdir to main repo if running from inside a worktree
   const cwd = process.cwd();
   if (cwd.includes('.jettypod-work')) {
     const mainRepo = getGitRoot();
-    console.error('❌ Cannot merge from inside a worktree.');
-    console.error('');
-    console.error('   The merge will delete this worktree, breaking your shell session.');
-    console.error('');
-    console.error('   Run from the main repository instead:');
-    console.error(`   cd ${mainRepo}`);
-    console.error(`   jettypod work tests merge ${featureId}`);
-    return Promise.reject(new Error('Cannot merge from inside a worktree'));
+    console.log('📂 Changing to main repository for merge...');
+    process.chdir(mainRepo);
   }
 
   const db = getDb();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jettypod",
-  "version": "4.4.61",
+  "version": "4.4.63",
   "description": "AI-powered development workflow manager with TDD, BDD, and automatic test generation",
   "main": "jettypod.js",
   "bin": {