jettypod 4.4.39 → 4.4.40

package/package.json

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

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

@@ -84,14 +84,36 @@ jettypod work start [chore-id]
 
 This creates a worktree at `.jettypod-work/[id]-[title-slug]` and switches to a new branch.
 
-**Display:**
+**🛑 VALIDATION REQUIRED:** After running `work start`, verify the worktree was created:
+
+```bash
+sqlite3 .jettypod/work.db "SELECT worktree_path FROM worktrees WHERE work_item_id = [chore-id] AND status = 'active'"
+```
+
+| Result | What it means | Action |
+|--------|---------------|--------|
+| **Has a path** | ✅ Worktree created successfully | Continue to Step 3 |
+| **Empty/no rows** | ❌ Worktree creation failed | **STOP - check the error output from `work start` and resolve before continuing** |
+
+**Display (on success):**
 
 ```
 📁 Worktree created: .jettypod-work/[id]-[title-slug]
 Branch: chore-[id]-[title-slug]
 ```
 
-**Move to Step 3 automatically.**
+**Display (on failure):**
+
+```
+❌ Worktree creation failed. Check:
+  - Are there uncommitted changes? Run: git status
+  - Does the branch already exist? Run: git branch -a | grep [chore-id]
+  - Is there a worktree conflict? Run: git worktree list
+
+Resolve the issue before continuing.
+```
+
+**Move to Step 3 only if worktree was created successfully.**
 
 ### Step 3: Establish Test Baseline
 

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

@@ -449,10 +449,40 @@ Multiple step definitions match
 **If validation succeeds:**
 Display: "✅ BDD infrastructure validated - all steps have definitions"
 
-**Proceed to Step 7.**
+**Proceed to Step 6.6.**
 
 **Note:** Unit tests are created during speed mode implementation, not during feature planning. Feature planning focuses on BDD scenarios (user experience); speed mode handles unit tests (implementation details).
 
+### Step 6.6: Commit BDD Files to Main
+
+**CRITICAL:** The BDD files must be committed to main BEFORE creating worktrees. If you skip this step, worktrees won't have the scenario files and speed-mode will fail.
+
+**Commit the BDD files:**
+
+```bash
+git add features/${FEATURE_SLUG}.feature features/steps/${FEATURE_SLUG}.* features/step_definitions/${FEATURE_SLUG}.*
+git commit -m "test: Add BDD scenarios for ${FEATURE_TITLE}
+
+- Feature file: features/${FEATURE_SLUG}.feature
+- Step definitions for speed mode scenarios"
+```
+
+Replace `${FEATURE_SLUG}` and `${FEATURE_TITLE}` with actual values. Example:
+```bash
+git add features/email-password-login.feature features/steps/email-password-login.* features/step_definitions/email-password-login.*
+git commit -m "test: Add BDD scenarios for Email Password Login
+
+- Feature file: features/email-password-login.feature
+- Step definitions for speed mode scenarios"
+```
+
+**Why this matters:**
+- Worktrees are created from the current branch (usually main)
+- If BDD files aren't committed, they won't exist in the worktree
+- Speed-mode will fail trying to run tests against non-existent files
+
+**Proceed to Step 7.**
+
 ### Step 7: Propose Speed Mode Chores
 
 **CRITICAL:** After BDD validation passes, analyze the codebase and propose technical implementation chores. **DO NOT CREATE CHORES YET** - the feature must transition to implementation mode first (Step 8).
@@ -538,30 +568,9 @@ Does this rationale capture why you chose this approach? (You can edit it if nee
 
 **WAIT for user to confirm or provide edited rationale.**
 
-#### Step 8B: Execute Transition
-
-**CRITICAL: After user confirms, use Bash tool to EXECUTE the work implement command:**
+#### Step 8B: Create the Chores
 
-```bash
-jettypod work implement ${FEATURE_ID} \
-  --winner="[approach-name or prototypes/winner-file]" \
-  --rationale="[user's confirmed/edited rationale]"
-```
-
-Replace `${FEATURE_ID}` with actual ID. Example:
-```bash
-jettypod work implement 42 --winner="Simple inline form" --rationale="Fastest UX, cleanest implementation"
-```
-
-**DO NOT display this as example text. EXECUTE IT using the Bash tool.**
-
-**If the command fails**, check the error message:
-- "Feature not found" → Verify the feature ID
-- "Already in implementation" → Feature was already transitioned, proceed to Step 8C
-
-#### Step 8C: Create the Chores
-
-**CRITICAL: NOW create the chores.** The feature has transitioned to implementation mode, so chore creation will succeed.
+**CRITICAL: Create chores BEFORE running `work implement`.** The system validates that chores exist before allowing the transition.
 
 For each chore that the user confirmed in Step 7, use the Bash tool to create it:
 
@@ -574,10 +583,6 @@ Replace `${FEATURE_ID}` with actual ID. Example:
 jettypod work create chore "Set up auth routes" "Create login/logout endpoints..." --parent=42
 ```
 
-**If chore creation fails**, check:
-- "Parent not found" → Verify the feature ID
-- "Parent not in implementation phase" → Run Step 8B first
-
 **CRITICAL: Copy the EXACT proposal from Step 7 into each chore description.** Do not paraphrase or summarize - the implementation guidance must be preserved verbatim:
 
 ```
@@ -595,7 +600,29 @@ Verification:
 • [EXACT step definitions from Step 7]
 ```
 
-After creating all chores, display:
+#### Step 8C: Execute Transition
+
+**After ALL chores are created, use Bash tool to EXECUTE the work implement command:**
+
+```bash
+jettypod work implement ${FEATURE_ID} \
+  --winner="[approach-name or prototypes/winner-file]" \
+  --rationale="[user's confirmed/edited rationale]"
+```
+
+Replace `${FEATURE_ID}` with actual ID. Example:
+```bash
+jettypod work implement 42 --winner="Simple inline form" --rationale="Fastest UX, cleanest implementation"
+```
+
+**DO NOT display this as example text. EXECUTE IT using the Bash tool.**
+
+**If the command fails**, check the error message:
+- "Feature not found" → Verify the feature ID
+- "No chores exist" → You skipped Step 8B - go back and create chores first
+- "Already in implementation" → Feature was already transitioned, proceed to Step 8D
+
+After successful transition, display:
 
 ```
 ✅ Feature transitioned to implementation phase
@@ -648,15 +675,39 @@ End feature-planning skill without starting a chore. Do NOT invoke speed-mode.
 jettypod work start [chore-id]
 ```
 
-**Step 2: State the chore ID clearly in your response:**
+**🛑 STOP AND CHECK:** Look at the output of `work start`. You should see:
+```
+✅ Created worktree: /path/to/.jettypod-work/[id]-[title-slug]
+Branch: feature/work-[id]-[title-slug]
+```
+
+**If you see `⚠️ Working in main repository (worktree creation failed)`:**
+- **DO NOT proceed to speed-mode**
+- Investigate why worktree failed (uncommitted changes? branch conflict?)
+- Fix the issue and re-run `work start`
+- Only continue after seeing `✅ Created worktree`
+
+**Step 2: Verify worktree exists before invoking speed-mode:**
+```bash
+sqlite3 .jettypod/work.db "SELECT worktree_path FROM worktrees WHERE work_item_id = [chore-id] AND status = 'active'"
+```
+
+If this returns empty/no rows, **STOP** - the worktree wasn't created properly.
+
+**Step 3: State the chore ID clearly in your response:**
 > "I'll start implementing Chore #[id]: [title]"
 
-**Step 3: IMMEDIATELY invoke speed-mode using the Skill tool:**
+**Step 4: IMMEDIATELY invoke speed-mode using the Skill tool:**
 ```
 Use the Skill tool with skill: "speed-mode"
 ```
 
-**🛑 CRITICAL:** You MUST use the Skill tool to invoke speed-mode. The `work start` command only sets up the worktree - it does NOT automatically start the skill. If you skip this step, the user will be left without guidance.
+**🛑 CRITICAL:** You MUST:
+1. Run `work start` first
+2. Verify the worktree was created (not fallback to main)
+3. THEN invoke speed-mode using the Skill tool
+
+If you skip `work start` or proceed when worktree creation failed, the merge workflow will break later.
 
 **Feature-planning skill is now complete.** Speed-mode takes over and handles the implementation.
 

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

@@ -48,6 +48,39 @@ When this skill is activated, you are helping implement a speed mode chore to ma
 
 ---
 
+## 🛑 PRE-FLIGHT VALIDATION (REQUIRED)
+
+**Before proceeding with ANY implementation, you MUST validate the worktree exists.**
+
+Run this query FIRST:
+
+```bash
+sqlite3 .jettypod/work.db "SELECT wi.id, wi.title, wi.status, wt.worktree_path, wt.branch_name FROM work_items wi LEFT JOIN worktrees wt ON wi.id = wt.work_item_id WHERE wi.status = 'in_progress' AND wi.type = 'chore'"
+```
+
+**Check the result:**
+
+| worktree_path | What it means | Action |
+|---------------|---------------|--------|
+| **Has a path** (e.g., `/path/to/.jettypod-work/...`) | ✅ Worktree exists, ready to proceed | Continue to Step 0 |
+| **NULL or empty** | ❌ `work start` was not called | **STOP - run `jettypod work start [chore-id]` first** |
+| **No rows returned** | ❌ No chore is in progress | **STOP - verify the chore exists and run `work start`** |
+
+**🛑 STOP GATE:** If `worktree_path` is NULL or no rows returned, you MUST run `jettypod work start [chore-id]` before continuing. DO NOT proceed without a valid worktree.
+
+**Example of valid output:**
+```
+4|Add nav link|in_progress|/Users/erik/project/.jettypod-work/4-add-nav-link|feature/work-4-add-nav-link
+```
+
+**Example of INVALID output (missing worktree):**
+```
+4|Add nav link|in_progress||
+```
+↑ Empty worktree_path means `work start` was never called. Run it now.
+
+---
+
 ### Overview
 
 **Speed Mode Goal:** Make it work - implement ALL functionality (integration + required + optional features) to make success scenarios pass, assuming everything works correctly.

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

@@ -52,6 +52,39 @@ When this skill is activated, you are helping implement a stable mode chore to a
 
 ---
 
+## 🛑 PRE-FLIGHT VALIDATION (REQUIRED)
+
+**Before proceeding with ANY implementation, you MUST validate the worktree exists.**
+
+Run this query FIRST:
+
+```bash
+sqlite3 .jettypod/work.db "SELECT wi.id, wi.title, wi.status, wt.worktree_path, wt.branch_name FROM work_items wi LEFT JOIN worktrees wt ON wi.id = wt.work_item_id WHERE wi.status = 'in_progress' AND wi.type = 'chore'"
+```
+
+**Check the result:**
+
+| worktree_path | What it means | Action |
+|---------------|---------------|--------|
+| **Has a path** (e.g., `/path/to/.jettypod-work/...`) | ✅ Worktree exists, ready to proceed | Continue to Step 0 |
+| **NULL or empty** | ❌ `work start` was not called | **STOP - run `jettypod work start [chore-id]` first** |
+| **No rows returned** | ❌ No chore is in progress | **STOP - verify the chore exists and run `work start`** |
+
+**🛑 STOP GATE:** If `worktree_path` is NULL or no rows returned, you MUST run `jettypod work start [chore-id]` before continuing. DO NOT proceed without a valid worktree.
+
+**Example of valid output:**
+```
+4|Add error handling|in_progress|/Users/erik/project/.jettypod-work/4-add-error-handling|feature/work-4-add-error-handling
+```
+
+**Example of INVALID output (missing worktree):**
+```
+4|Add error handling|in_progress||
+```
+↑ Empty worktree_path means `work start` was never called. Run it now.
+
+---
+
 ### Overview
 
 **Stable Mode Goal:** Transform speed mode's "make it work" implementation into robust, reliable code with comprehensive error handling and validation.