jettypod 4.4.98 → 4.4.99

package/lib/git-hooks/pre-commit

@@ -59,6 +59,12 @@ if (!checkBranchRestriction()) {
 
 // Export database snapshots (runs for all commits where .jettypod exists)
 async function exportSnapshots() {
+  // Skip in worktrees - snapshots only matter for commits on main
+  // Worktrees can't git add files from main repo ("outside repository" error)
+  if (process.cwd().includes('.jettypod-work')) {
+    return;
+  }
+
   const jettypodDir = path.join(process.cwd(), '.jettypod');
   if (!fs.existsSync(jettypodDir)) {
     return; // No JettyPod directory, skip export

package/lib/work-commands/index.js

@@ -1508,9 +1508,20 @@ async function mergeWork(options = {}) {
       return Promise.reject(new Error(`Failed to check git status: ${err.message}`));
     }
   
+    // Validate work item type BEFORE git operations
+    // Only chores, bugs, and test worktrees can be merged directly
+    const isTestWorktree = currentBranch.startsWith('tests/');
+    if (!isTestWorktree && !['chore', 'bug'].includes(currentWork.type)) {
+      return Promise.reject(new Error(
+        `Cannot merge ${currentWork.type} #${currentWork.id} directly.\n\n` +
+        `Only chores and bugs can be merged. Features complete when all their chores are done.\n` +
+        `Test worktrees (tests/* branches) merge BDD scenarios without completing the feature.`
+      ));
+    }
+
     console.log(`Merging work item #${currentWork.id}: ${currentWork.title}`);
     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.
@@ -1724,10 +1735,8 @@ async function mergeWork(options = {}) {
   
     console.log(`✓ Successfully merged work item #${currentWork.id}`);
 
-    // Check if this is a test worktree (tests/ prefix) - only set scenario_file, don't mark done
-    const isTestWorktree = currentBranch.startsWith('tests/');
-
     // Get worktree info from database (needed for cleanup message)
+    // Note: isTestWorktree was already set before git operations for early validation
     const worktree = await new Promise((resolve, reject) => {
       db.get(
         `SELECT id, worktree_path, branch_name FROM worktrees WHERE work_item_id = ? AND status = 'active'`,
@@ -1775,16 +1784,17 @@ async function mergeWork(options = {}) {
 
       console.log(`✅ BDD tests merged for feature #${currentWork.id}`);
       console.log('   Feature remains in discovery phase - create chores to continue');
-    } else if (currentWork.type !== 'chore') {
-      // Non-test branch for a non-chore - this shouldn't happen
+    } else if (!['chore', 'bug'].includes(currentWork.type)) {
+      // Non-test branch for a non-mergeable type - should have been caught by early validation
+      // but kept as defensive check
       return Promise.reject(new Error(
         `Cannot merge ${currentWork.type} #${currentWork.id} directly.\n\n` +
-        `Only chores can be merged. Features complete when all their chores are done.\n` +
+        `Only chores and bugs can be merged. Features complete when all their chores are done.\n` +
         `Test worktrees (tests/* branches) merge BDD scenarios without completing the feature.`
       ));
     } else {
-      // Chore worktree: mark as done (existing behavior)
-      console.log('Marking chore as done...');
+      // Chore or bug worktree: mark as done
+      console.log(`Marking ${currentWork.type} as done...`);
       const completedAt = new Date().toISOString();
       await new Promise((resolve, reject) => {
         db.run(
@@ -1796,7 +1806,7 @@ async function mergeWork(options = {}) {
           }
         );
       });
-      console.log(`✅ Chore #${currentWork.id} marked as done`);
+      console.log(`✅ ${currentWork.type.charAt(0).toUpperCase() + currentWork.type.slice(1)} #${currentWork.id} marked as done`);
     }
 
     // Mark worktree as merged but DON'T delete it yet

package/package.json

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

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

@@ -13,16 +13,20 @@ When this skill is activated, you are helping discover the best approach for a f
 
 ## 🔑 Critical Command Distinction
 
-**Four different commands, four different purposes:**
+**Six commands in workflow order:**
 
 | Command | Used For | When | Phase |
 |---------|----------|------|-------|
+| `work prototype start <feature-id> [approach]` | Create worktree for UX prototyping | After UX approaches proposed (Step 4) | Feature Planning |
+| `work prototype merge <feature-id>` | Merge prototype to main | After user tests prototype (Step 4) | Feature Planning |
 | `work tests start <feature-id>` | Create worktree for test authoring | After Integration Contract (Step 7) | Feature Planning |
-| `work tests merge` → `cd` → `work cleanup` | Merge tests to main, then cleanup worktree | After chores created (Step 12) | Feature Planning |
 | `work implement <feature-id>` | Transition feature to implementation phase | After chores created (Step 11) | Feature Planning |
+| `work tests merge` → `cd` → `work cleanup` | Merge tests to main, then cleanup worktree | After transition (Step 12) | Feature Planning |
 | `work start <chore-id>` | Start implementing a specific chore | After tests merged (Step 13) | Speed Mode |
 
 **CRITICAL:** All commands are run by **Claude**, not the user. The distinction is:
+- `work prototype start` = Creates isolated worktree for UX prototyping (Step 4, optional)
+- `work prototype merge` = Land prototype files on main (Step 4)
 - `work tests start` = Creates isolated worktree for BDD test authoring (Step 7)
 - `work implement` = Ends feature planning, transitions to implementation phase
 - `work tests merge` = Land BDD tests on main

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

@@ -192,10 +192,34 @@ Do NOT proceed to Step 3 until chore is successfully created.
 jettypod work start <chore-id>
 ```
 
+**🛑 STOP AND CHECK:** Verify worktree was created successfully before proceeding.
+
+```bash
+sqlite3 .jettypod/work.db "SELECT worktree_path FROM worktrees WHERE work_item_id = <chore-id> AND status = 'active'"
+```
+
+**If empty or error:** Stop and investigate. Do NOT proceed without a valid worktree.
+
+**Capture the worktree path:**
+- `WORKTREE_PATH` - the absolute path from the query result (e.g., `/path/to/.jettypod-work/42-fix-button-text`)
+
+**Display confirmation:**
+
+```
+📁 Worktree created: ${WORKTREE_PATH}
+
+From this point forward, ALL file operations MUST use paths starting with:
+${WORKTREE_PATH}/
+```
+
+**🔒 WORKTREE PATH LOCK:** Store `WORKTREE_PATH` - all file operations in this skill MUST use this path prefix.
+
+---
+
 **Then implement the change directly:**
 
-1. Read the file(s) that need modification
-2. Make the specific change requested
+1. Read the file(s) that need modification (using `${WORKTREE_PATH}/...`)
+2. Make the specific change requested (using `${WORKTREE_PATH}/...`)
 3. Verify the change looks correct
 
 **Display progress:**
@@ -203,7 +227,7 @@ jettypod work start <chore-id>
 ```
 📝 Implementing change...
 
-Modified: [file path]
+Modified: ${WORKTREE_PATH}/[relative path]
 Change: [what was changed]
 
 Verifying...
@@ -224,9 +248,11 @@ Verifying...
 
 **If verification passes:**
 
+**🔒 WORKTREE PATH REQUIRED:** Use the `WORKTREE_PATH` captured in Step 3.
+
 ```bash
 # Commit the change
-cd <worktree-path>
+cd ${WORKTREE_PATH}
 git add .
 git commit -m "fix: [brief description]