jettypod 4.4.52 → 4.4.54

package/package.json

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

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

@@ -45,6 +45,22 @@ When this skill is activated, you are executing a standalone chore. The chore-pl
 
 ---
 
+## 🚨 SHELL CWD RECOVERY
+
+**If ALL bash commands start failing with "Error: Exit code 1" and no output:**
+
+Your shell's working directory was likely inside a worktree that was deleted. The CWD no longer exists.
+
+**Recovery steps:**
+1. Get the main repo path from your session context (look for the project path in earlier messages)
+2. Run: `cd <main-repo-path>`
+3. Verify: `pwd && ls .jettypod`
+4. Resume your work
+
+**Why this happens:** When a worktree is merged, it gets deleted. If your shell was inside that worktree directory, all subsequent commands fail because the CWD doesn't exist.
+
+---
+
 ## Implementation Steps
 
 ### Step 1: Receive and Display Context
@@ -355,12 +371,20 @@ Go back to Step 5 to fix issues.
 git add .
 git commit -m "chore: [brief description]"
 git push
+```
+
+**🚨 CRITICAL: Shell CWD Corruption Prevention**
+
+The merge will delete the worktree. Chain commands to ensure shell is in main repo BEFORE deletion.
 
-# Switch to main repo before merging (merge cannot run from inside worktree)
-cd $(git rev-parse --show-toplevel)/..
+```bash
+# CRITICAL: cd to main repo AND merge in SAME command
+cd $(git rev-parse --show-toplevel)/.. && jettypod work merge [chore-id]
+```
 
-# Merge to main (auto-marks chore done)
-jettypod work merge [chore-id]
+```bash
+# MANDATORY: Verify shell is in main repo
+pwd && ls .jettypod
 ```
 
 **Display:**

package/skills-templates/feature-planning/SKILL.md

@@ -19,7 +19,7 @@ When this skill is activated, you are helping discover the best approach for a f
 |---------|----------|------|-------|
 | `work implement <feature-id>` | Transition feature to implementation phase | After chores created (Step 8C) | Feature Planning |
 | `work tests start <feature-id>` | Create worktree for test authoring | After transition (Step 8D) | Feature Planning |
-| `work tests merge <feature-id>` | Merge tests to main, cleanup worktree | After tests validated (Step 8D) | Feature Planning |
+| `cd <main-repo> && work tests merge <feature-id>` | Merge tests to main, cleanup worktree | After tests validated (Step 8D) | Feature Planning |
 | `work start <chore-id>` | Start implementing a specific chore | After tests merged (Step 8E) | Speed Mode |
 
 **CRITICAL:** All commands are run by **Claude**, not the user. The distinction is:
@@ -653,7 +653,8 @@ Write your BDD files to:
   <worktree>/features/email-login.feature
   <worktree>/features/step_definitions/email-login.steps.js
 
-When done, run: jettypod work tests merge 42
+When done, cd to main repo and merge:
+  cd /path/to/main/repo && jettypod work tests merge 42
 ```
 
 **🛑 STOP AND CHECK:** Verify worktree was created successfully. If you see an error, investigate before continuing.
@@ -735,10 +736,16 @@ sqlite3 .jettypod/work.db "UPDATE work_items SET scenario_file = 'features/${FEA
 
 **Sub-step 5: Merge tests to main**
 
+**⚠️ CRITICAL: The merge will delete the worktree.** Your shell is currently inside it. Chain commands to ensure shell is in main repo BEFORE deletion:
+
 ```bash
-jettypod work tests merge ${FEATURE_ID}
+# CRITICAL: cd to main repo AND merge in SAME command
+# This ensures shell is in main repo BEFORE worktree deletion
+cd <main-repo-path> && jettypod work tests merge ${FEATURE_ID}
 ```
 
+If you run the merge while your shell is in the worktree, subsequent commands will fail with "No such file or directory".
+
 This will:
 - Commit changes in the worktree
 - Merge to main
@@ -913,6 +920,6 @@ Before completing feature planning, ensure:
 - [ ] **Test worktree created** with `work tests start` (Step 8D)
 - [ ] **BDD files written** in worktree (Step 8D)
 - [ ] **BDD infrastructure validated** with dry-run (Step 8D)
-- [ ] **Tests merged to main** with `work tests merge` (Step 8D)
+- [ ] **Tests merged to main** with `cd <main-repo> && work tests merge` (Step 8D)
 - [ ] First chore started with `work start [chore-id]` (Step 8E)
 - [ ] **Speed-mode skill invoked using Skill tool** (Step 8E)

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

@@ -48,6 +48,27 @@ When this skill is activated, you are helping implement a speed mode chore to ma
 
 ---
 
+## 🚨 SHELL CWD RECOVERY
+
+**If ALL bash commands start failing with "Error: Exit code 1" and no output:**
+
+Your shell's working directory was likely inside a worktree that was deleted. The CWD no longer exists.
+
+**Recovery steps:**
+1. Get the main repo path from your session context (look for the project path in earlier messages)
+2. Run: `cd <main-repo-path>`
+3. Verify: `pwd && ls .jettypod`
+4. Resume your work
+
+**Example:**
+```bash
+cd /Users/erikspangenberg/personal-assistant && pwd
+```
+
+**Why this happens:** When a worktree is merged, it gets deleted. If your shell was inside that worktree directory, all subsequent commands fail because the CWD doesn't exist.
+
+---
+
 ## 🛑 PRE-FLIGHT VALIDATION (REQUIRED)
 
 **Before proceeding with ANY implementation, you MUST validate the worktree exists.**
@@ -592,16 +613,23 @@ More speed mode chores remain. Starting next chore:
 
 **Merge and start next:**
 
+**🚨 CRITICAL: Shell CWD Corruption Prevention**
+
+The merge will delete the worktree. Chain commands to ensure shell is in main repo BEFORE deletion.
+
 ```bash
 # Commit changes in the worktree
 git add . && git commit -m "feat: [brief description of what was implemented]"
+```
 
-# Return to main repo and merge (cannot merge from inside worktree)
-cd $(git rev-parse --show-toplevel)/..  # Exit worktree to main repo
-jettypod work merge [current-chore-id]
+```bash
+# CRITICAL: cd to main repo AND merge in SAME command
+cd $(git rev-parse --show-toplevel)/.. && jettypod work merge [current-chore-id]
+```
 
-# Start next speed chore
-jettypod work start [next-chore-id]
+```bash
+# Verify shell is valid, then start next chore
+pwd && jettypod work start [next-chore-id]
 ```
 
 The speed-mode skill will automatically re-invoke for the next chore.
@@ -640,15 +668,28 @@ npx cucumber-js <scenario-file-path> --name "User can reach" --format progress
 
 #### Step 7B: Merge Final Speed Chore
 
+**🚨 CRITICAL: Shell CWD Corruption Prevention**
+
+The merge will delete the worktree. Chain commands to ensure shell is in main repo BEFORE deletion.
+
 ```bash
 # Commit changes in the worktree
 git add . && git commit -m "feat: [brief description of what was implemented]"
+```
 
-# Return to main repo and merge (cannot merge from inside worktree)
-cd $(git rev-parse --show-toplevel)/..  # Exit worktree to main repo
-jettypod work merge [current-chore-id] --with-transition
+```bash
+# CRITICAL: cd to main repo AND merge in SAME command
+# Using $(git rev-parse --show-toplevel)/.. exits worktree to main repo
+cd $(git rev-parse --show-toplevel)/.. && jettypod work merge [current-chore-id] --with-transition
 ```
 
+```bash
+# MANDATORY: Verify shell is in main repo (run immediately after merge)
+pwd && ls .jettypod
+```
+
+**If you see "No such file or directory" errors:** Your shell CWD was corrupted. Get the main repo path from your session context and run `cd <main-repo-path>`.
+
 After merge, you are on main branch. Ready to generate stable mode scenarios.
 
 #### Step 7C: Generate and Propose Stable Mode Chores
@@ -708,19 +749,35 @@ Scenario: [Edge case title]
 
 **6. Commit and merge the test worktree:**
 
+**🚨 CRITICAL: Shell CWD Corruption Prevention**
+
+The merge will delete the test worktree. If your shell is inside that worktree, ALL subsequent commands will fail. You MUST:
+1. Chain the cd and merge in a SINGLE bash command
+2. Verify your shell is in main repo AFTER merge
+
 ```bash
-# Commit in the test worktree
-cd <worktree-path>
-git add features/
-git commit -m "test: Add stable mode BDD scenarios and step definitions
+# First: Commit in the test worktree (separate command is OK here)
+cd <worktree-path> && git add features/ && git commit -m "test: Add stable mode BDD scenarios and step definitions
 
 Added error handling and edge case scenarios for stable mode.
 - [N] new stable mode scenarios
 - Step definitions for validation and error handling"
+```
+
+```bash
+# CRITICAL: cd to main repo AND merge in SAME command
+# This ensures shell is in main repo BEFORE worktree deletion
+cd <main-repo-path> && jettypod work tests merge <feature-id>
+```
 
-# Return to main repo and merge
+```bash
+# MANDATORY: Verify shell is in main repo (run this immediately after merge)
+pwd && ls .jettypod
+```
+
+**If you see "No such file or directory" errors:** Your shell CWD was corrupted. Run:
+```bash
 cd <main-repo-path>
-jettypod work tests merge <feature-id>
 ```
 
 **7. Present proposal to user:**
@@ -770,7 +827,7 @@ Repeat for each confirmed chore. **Do NOT use `--mode` flag** - chores inherit m
 **3. Release merge lock:**
 
 ```bash
-jettypod work merge --release-lock
+cd <main-repo> && jettypod work merge --release-lock
 ```
 
 **🔄 WORKFLOW COMPLETE: Speed mode finished**
@@ -869,12 +926,12 @@ Before ending speed-mode skill, ensure:
 
 ## Command Reference
 
-**Complete chores (run from main repo, not worktree):**
+**Complete chores (CRITICAL: cd to main repo BEFORE merge - worktree will be deleted):**
 ```bash
-jettypod work merge <id>         # Merge chore by ID (recommended)
-jettypod work merge              # Merge current chore (requires being on feature branch)
-jettypod work merge --with-transition  # Hold lock for transition phase
-jettypod work merge --release-lock     # Release held lock
+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
 ```
 
 **Start chores:**
@@ -885,7 +942,8 @@ jettypod work start <chore-id>   # Create worktree and start chore
 **Create test worktree (for writing BDD scenarios):**
 ```bash
 jettypod work tests <feature-id>        # Create worktree for writing tests
-jettypod work tests merge <feature-id>  # Merge tests back to main
+# CRITICAL: cd to main repo BEFORE merge (worktree will be deleted)
+cd <main-repo> && jettypod work tests merge <feature-id>
 ```
 
 **Set feature mode (BEFORE creating chores):**

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

@@ -52,6 +52,22 @@ When this skill is activated, you are helping implement a stable mode chore to a
 
 ---
 
+## 🚨 SHELL CWD RECOVERY
+
+**If ALL bash commands start failing with "Error: Exit code 1" and no output:**
+
+Your shell's working directory was likely inside a worktree that was deleted. The CWD no longer exists.
+
+**Recovery steps:**
+1. Get the main repo path from your session context (look for the project path in earlier messages)
+2. Run: `cd <main-repo-path>`
+3. Verify: `pwd && ls .jettypod`
+4. Resume your work
+
+**Why this happens:** When a worktree is merged, it gets deleted. If your shell was inside that worktree directory, all subsequent commands fail because the CWD doesn't exist.
+
+---
+
 ## 🛑 PRE-FLIGHT VALIDATION (REQUIRED)
 
 **Before proceeding with ANY implementation, you MUST validate the worktree exists.**
@@ -556,16 +572,23 @@ More stable mode chores remain. Starting next chore:
 
 **Merge and start next:**
 
+**🚨 CRITICAL: Shell CWD Corruption Prevention**
+
+The merge will delete the worktree. Chain commands to ensure shell is in main repo BEFORE deletion.
+
 ```bash
 # Commit changes in the worktree
 git add . && git commit -m "feat: [brief description of error handling added]"
+```
 
-# Return to main repo and merge (cannot merge from inside worktree)
-cd $(git rev-parse --show-toplevel)/..  # Exit worktree to main repo
-jettypod work merge [current-chore-id]
+```bash
+# CRITICAL: cd to main repo AND merge in SAME command
+cd $(git rev-parse --show-toplevel)/.. && jettypod work merge [current-chore-id]
+```
 
-# Start next stable chore
-jettypod work start [next-chore-id]
+```bash
+# Verify shell is valid, then start next chore
+pwd && jettypod work start [next-chore-id]
 ```
 
 The stable-mode skill will automatically re-invoke for the next chore.
@@ -584,10 +607,20 @@ If the query returns no remaining chores, proceed to Step 7.
 
 **First, merge the final stable chore:**
 
+**🚨 CRITICAL: Shell CWD Corruption Prevention**
+
 ```bash
 git add . && git commit -m "feat: [brief description of error handling added]"
-cd $(git rev-parse --show-toplevel)/..  # Exit worktree to main repo
-jettypod work merge [current-chore-id]
+```
+
+```bash
+# CRITICAL: cd to main repo AND merge in SAME command
+cd $(git rev-parse --show-toplevel)/.. && jettypod work merge [current-chore-id]
+```
+
+```bash
+# MANDATORY: Verify shell is in main repo
+pwd && ls .jettypod
 ```
 
 **Then check project state:**
@@ -710,10 +743,10 @@ Before ending stable-mode skill, ensure:
 
 ## Command Reference
 
-**Complete chores (run from main repo, not worktree):**
+**Complete chores (CRITICAL: cd to main repo BEFORE merge - worktree will be deleted):**
 ```bash
-jettypod work merge <id>         # Merge chore by ID (recommended)
-jettypod work merge              # Merge current chore (requires being on feature branch)
+cd <main-repo> && jettypod work merge <id>   # Merge chore by ID (recommended)
+cd <main-repo> && jettypod work merge        # Merge current chore
 ```
 
 **Start chores:**
@@ -743,7 +776,7 @@ jettypod work set-mode <feature-id> production  # Set feature to production mode
 - Parallel worktrees branch from main independently
 
 **Process:**
-1. Complete chore → `jettypod work merge`
+1. Complete chore → `cd <main-repo> && jettypod work merge` (CRITICAL: cd first!)
 2. Start next chore → `jettypod work start <next-id>`
 3. Repeat