jettypod 4.4.88 → 4.4.90

package/claude-hooks/global-guardrails.js

@@ -223,10 +223,23 @@ function evaluateBashCommand(command, inputRef, cwd) {
   if (/jettypod\s+(work|tests)\s+merge\b/.test(strippedCommand)) {
     const isInWorktree = cwd && cwd.includes('.jettypod-work');
     if (isInWorktree) {
+      // Extract main repo path and work item ID for helpful error message
+      const mainRepoPath = cwd.split('.jettypod-work')[0].replace(/\/$/, '');
+      const workIdMatch = strippedCommand.match(/merge\s+(\d+)/);
+      const workId = workIdMatch ? workIdMatch[1] : '<id>';
+
       return {
         allowed: false,
         message: 'Cannot merge from inside a worktree',
-        hint: 'Merging deletes the worktree. Run from main repo: cd <main-repo-path> && jettypod work merge\n\nNote: "cd path && jettypod work merge" won\'t work - hooks check CWD before cd runs. Run cd separately first.'
+        hint: `Current CWD: ${cwd}
+Main repo:   ${mainRepoPath}
+
+Run these as TWO SEPARATE Bash calls:
+
+  1. cd ${mainRepoPath}
+  2. jettypod work merge ${workId}
+
+Why: Hooks check CWD before 'cd &&' executes, so chained commands fail.`
       };
     }
   }
@@ -384,7 +397,7 @@ function evaluateWriteOperation(filePath, inputWorktreePath, cwd) {
   return {
     allowed: false,
     message: 'Cannot write to main repository',
-    hint: 'Use jettypod work start to create a worktree first.'
+    hint: 'Invoke the request-routing skill first to plan and create work items properly.'
   };
 }
 

package/hooks/pre-commit

@@ -38,12 +38,14 @@ function checkBranchRestriction() {
     console.error('❌ Direct commits to main are not allowed');
     console.error('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
     console.error('');
-    console.error('Use the JettyPod workflow instead:');
+    console.error('You edited files without starting a worktree first.');
+    console.error('Your changes exist but cannot be committed here.');
     console.error('');
-    console.error('  jettypod work start <work-item-id>');
+    console.error('TO FIX:');
+    console.error('  1. Undo your edits:     git checkout .');
+    console.error('  2. Start the workflow:  Invoke request-routing skill');
     console.error('');
-    console.error('This creates a feature branch where you can commit freely.');
-    console.error('When done, use \'jettypod work done\' to merge back to main.');
+    console.error('The skill creates a worktree where commits are allowed.');
     console.error('');
     return false;
   } catch (err) {

package/jettypod.js

@@ -2844,9 +2844,12 @@ Quick commands:
           'speed-mode': ['feature_planning_complete'],
           'stable-mode': ['speed_mode_complete'],
           'production-mode': ['stable_mode_complete'],
+          'chore-mode': ['chore_planning_complete'],
+          'bug-mode': ['bug_planning_complete'],
           'feature-planning': [],
           'epic-planning': [],
-          'chore-planning': []
+          'chore-planning': [],
+          'bug-planning': []
         };
 
         // Validate skill name

package/lib/git-hooks/pre-commit

@@ -36,12 +36,14 @@ function checkBranchRestriction() {
     console.error('❌ Direct commits to main are not allowed');
     console.error('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
     console.error('');
-    console.error('Use the JettyPod workflow instead:');
+    console.error('You edited files without starting a worktree first.');
+    console.error('Your changes exist but cannot be committed here.');
     console.error('');
-    console.error('  jettypod work start <work-item-id>');
+    console.error('TO FIX:');
+    console.error('  1. Undo your edits:     git checkout .');
+    console.error('  2. Start the workflow:  Invoke request-routing skill');
     console.error('');
-    console.error('This creates a feature branch where you can commit freely.');
-    console.error('When done, use \'jettypod work done\' to merge back to main.');
+    console.error('The skill creates a worktree where commits are allowed.');
     console.error('');
     return false;
   } catch (err) {

package/package.json

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

package/skills-templates/simple-improvement/SKILL.md

@@ -235,10 +235,17 @@ git commit -m "fix: [brief description]
 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>"
 ```
 
-**Then merge (from main repo):**
+**Then merge (CRITICAL: run as separate Bash calls):**
+
+⚠️ Shell CWD persists. You MUST run `cd` as a SEPARATE Bash tool call before merge.
 
 ```bash
+# Bash call 1: Change to main repo
 cd <main-repo-path>
+```
+
+```bash
+# Bash call 2: Merge and cleanup
 jettypod work merge <chore-id>
 jettypod work cleanup <chore-id>
 ```
@@ -316,8 +323,9 @@ jettypod work create chore "<title>" "<description>" --parent=<feature-id>
 # Start chore
 jettypod work start <chore-id>
 
-# Merge (from main repo)
-cd <main-repo> && jettypod work merge <chore-id>
+# Merge (CRITICAL: separate Bash calls - cd first, then merge)
+cd <main-repo>                      # Bash call 1
+jettypod work merge <chore-id>      # Bash call 2
 
 # Cleanup
 jettypod work cleanup <chore-id>

package/skills-templates/speed-mode/SKILL.md

@@ -855,10 +855,14 @@ jettypod work create chore "[Chore title]" "[Description with scenarios addresse
 
 Repeat for each confirmed chore. **Do NOT use `--mode` flag** - chores inherit mode from their parent feature.
 
-**3. Release merge lock:**
+**3. Release merge lock (CRITICAL: separate Bash calls):**
 
 ```bash
-cd <main-repo> && jettypod work merge --release-lock
+cd <main-repo>                           # Bash call 1
+```
+
+```bash
+jettypod work merge --release-lock       # Bash call 2
 ```
 
 **🔄 WORKFLOW COMPLETE: Speed mode finished**
@@ -957,12 +961,17 @@ Before ending speed-mode skill, ensure:
 
 ## Command Reference
 
-**Complete chores (CRITICAL: cd to main repo BEFORE merge - worktree will be deleted):**
+**Complete chores (CRITICAL: run cd and merge as SEPARATE Bash calls):**
+```bash
+# Bash call 1: Change to main repo
+cd <main-repo>
+```
 ```bash
-cd <main-repo> && jettypod work merge <id>   # Merge chore by ID (recommended)
-cd <main-repo> && jettypod work merge        # Merge current chore
-cd <main-repo> && jettypod work merge --with-transition  # Hold lock for transition
-cd <main-repo> && jettypod work merge --release-lock     # Release held lock
+# Bash call 2: Merge (pick one)
+jettypod work merge <id>               # Merge chore by ID (recommended)
+jettypod work merge                    # Merge current chore
+jettypod work merge --with-transition  # Hold lock for transition
+jettypod work merge --release-lock     # Release held lock
 ```
 
 **Start chores:**

package/skills-templates/stable-mode/SKILL.md

@@ -773,10 +773,15 @@ Before ending stable-mode skill, ensure:
 
 ## Command Reference
 
-**Complete chores (CRITICAL: cd to main repo BEFORE merge - worktree will be deleted):**
+**Complete chores (CRITICAL: run cd and merge as SEPARATE Bash calls):**
 ```bash
-cd <main-repo> && jettypod work merge <id>   # Merge chore by ID (recommended)
-cd <main-repo> && jettypod work merge        # Merge current chore
+# Bash call 1: Change to main repo
+cd <main-repo>
+```
+```bash
+# Bash call 2: Merge (pick one)
+jettypod work merge <id>   # Merge chore by ID (recommended)
+jettypod work merge        # Merge current chore
 ```
 
 **Start chores:**
@@ -806,7 +811,7 @@ jettypod work set-mode <feature-id> production  # Set feature to production mode
 - Parallel worktrees branch from main independently
 
 **Process:**
-1. Complete chore → `cd <main-repo> && jettypod work merge` (CRITICAL: cd first!)
+1. Complete chore → run `cd <main-repo>` then `jettypod work merge` as SEPARATE Bash calls
 2. Start next chore → `jettypod work start <next-id>`
 3. Repeat