jettypod 4.4.79 → 4.4.80

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

@@ -1,6 +1,6 @@
 ---
 name: bug-mode
-description: Guide implementation of standalone chores with type-appropriate guidance, verification steps, and test handling. Receives enriched context from chore-planning and executes with iteration until verification passes.
+description: Guide implementation of bug fixes with comprehensive fix, regression test creation, and verification. Receives enriched context from bug-planning and executes with iteration until verification passes.
 ---
 
 # Bug Mode Skill
@@ -33,22 +33,21 @@ Why? A bug fix should:
 
 ---
 
-Guides Claude Code through comprehensive bug fix implementation. Receives context from bug-planning skill (root cause, breadcrumbs, regression test).
+Guides Claude Code through comprehensive bug fix implementation. Receives context from bug-planning skill (root cause, breadcrumbs).
 
 ## Instructions
 
-When this skill is activated, you are implementing a bug fix chore. The bug-planning skill has already:
+When this skill is activated, you are implementing a bug fix directly on the bug work item. The bug-planning skill has already:
 - Identified root cause
-- Created the bug work item and fix chore
-- Written a regression test (currently failing)
+- Created the bug work item with breadcrumbs
 - Started the worktree with `work start`
 
-Your job: Make the regression test pass with a comprehensive fix.
+Your job: Implement the fix, write a regression test, and verify everything passes.
 
 ## 🔑 Critical Context
 
 **You are working in an isolated git worktree:**
-- `work start [chore-id]` already created a dedicated worktree
+- `work start [bug-id]` already created a dedicated worktree
 - All file operations must use **absolute paths** from the worktree
 - The worktree has its own branch - changes are isolated from main
 
@@ -75,7 +74,7 @@ Your shell's working directory was likely inside a worktree that was deleted. Th
 **Before proceeding, validate the worktree exists.**
 
 ```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'"
+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 = 'bug'"
 ```
 
 **Check the result:**
@@ -83,8 +82,8 @@ sqlite3 .jettypod/work.db "SELECT wi.id, wi.title, wi.status, wt.worktree_path,
 | worktree_path | What it means | Action |
 |---------------|---------------|--------|
 | **Has a path** | ✅ 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`** |
+| **NULL or empty** | ❌ `work start` was not called | **STOP - run `jettypod work start [bug-id]` first** |
+| **No rows returned** | ❌ No bug is in progress | **STOP - verify the bug exists and run `work start`** |
 
 ---
 
@@ -95,14 +94,10 @@ sqlite3 .jettypod/work.db "SELECT wi.id, wi.title, wi.status, wt.worktree_path,
 **Get the current work context:**
 
 ```bash
-sqlite3 .jettypod/work.db "SELECT wi.id, wi.title, wi.description, wi.parent_id, parent.title as parent_title, parent.type as parent_type, wt.worktree_path, wt.branch_name FROM work_items wi LEFT JOIN work_items parent ON wi.parent_id = parent.id LEFT JOIN worktrees wt ON wi.id = wt.work_item_id WHERE wi.status = 'in_progress' AND wi.type = 'chore'"
+sqlite3 .jettypod/work.db "SELECT wi.id, wi.title, wi.description, 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 = 'bug'"
 ```
 
-**Verify parent is a bug:**
-- `parent_type` should be `bug`
-- If not, this skill may not be appropriate
-
-**Extract breadcrumbs from chore description:**
+**Extract breadcrumbs from bug description:**
 The bug-planning skill embedded implementation guidance:
 - Root cause location (file:line)
 - Fix approach (steps)
@@ -116,8 +111,7 @@ The bug-planning skill embedded implementation guidance:
 🐛 BUG MODE: Fixing #[bug-id]
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-Chore: [title]
-Bug: #[parent-id] [parent-title]
+Bug: #[id] [title]
 Worktree: [worktree_path]
 Branch: [branch_name]
 
@@ -127,53 +121,14 @@ Root Cause:
 Fix Approach:
 [From breadcrumbs - steps to fix]
 
-Establishing RED baseline...
+Starting implementation...
 ```
 
 **Proceed to Step 1.**
 
 ---
 
-### Step 1: Establish RED Baseline
-
-**Run the regression test to confirm it fails:**
-
-```bash
-# Find the regression test file
-sqlite3 .jettypod/work.db "SELECT id FROM work_items WHERE id = <bug-id>"
-# Look for features/*<bug-id>*.feature or features/*<bug-slug>*.feature
-```
-
-```bash
-# Run the regression test
-npx cucumber-js features/<bug-slug>.feature --format progress
-```
-
-**Confirm RED state:**
-- The regression test should FAIL
-- This proves the bug exists and the test catches it
-
-**Display RED baseline:**
-
-```
-🔴 RED Baseline Confirmed
-
-Regression test: features/<bug-slug>.feature
-Status: FAILING (as expected)
-
-Error:
-[Error message from test]
-
-🎯 Goal: Make the regression test pass with a comprehensive fix
-
-Now implementing fix...
-```
-
-**Proceed to Step 2.**
-
----
-
-### Step 2: Implement Comprehensive Fix
+### Step 1: Implement Comprehensive Fix
 
 **CRITICAL:** Bug fixes must be comprehensive from the start.
 
@@ -213,32 +168,71 @@ sqlite3 .jettypod/work.db "SELECT project_state FROM project_config WHERE id = 1
 🔧 Change: [what you're fixing]
 ```
 
-**After each change, run the regression test:**
+**After implementation:**
 
-```bash
-npx cucumber-js features/<bug-slug>.feature --format progress
 ```
+🎉 Fix Implemented
 
-**Track progress:**
+Changes made:
+- [Change 1]
+- [Change 2]
+- [Error handling added]
 
+Now writing regression test...
 ```
-━━━ Iteration 2 ━━━
-🧪 Running regression test...
-📊 Status: Still failing
-🔧 Next: [what else needs to change]
+
+**Proceed to Step 2.**
+
+---
+
+### Step 2: Write Regression Test
+
+**Goal:** Create a test that verifies the bug is fixed and prevents regression.
+
+**Derive feature slug** from bug title (lowercase, hyphens, no special chars).
+
+**Write regression test in worktree:**
+
+Feature file at `<worktree>/features/<bug-slug>.feature`:
+
+```gherkin
+Feature: [Bug title] - Regression Test
+  Prevents regression of bug #<bug-id>
+
+  Root cause: [Brief description]
+
+  Scenario: [Description of correct behavior]
+    Given [setup that triggers the bug condition]
+    When [action that previously caused the bug]
+    Then [expected correct behavior]
+    And [additional verifications]
 ```
 
-**Continue until GREEN:**
+Step definitions at `<worktree>/features/step_definitions/<bug-slug>.steps.js`
+
+**Validate with dry-run:**
 
+```bash
+cd <worktree> && npx cucumber-js --dry-run features/<bug-slug>.feature
 ```
-🎉 GREEN: Regression test passing!
 
-Fix implemented:
-- [Change 1]
-- [Change 2]
-- [Error handling added]
+Fix any undefined steps or syntax errors.
+
+**Run the regression test:**
 
-Now verifying no regressions...
+```bash
+npx cucumber-js features/<bug-slug>.feature --format progress
+```
+
+**Confirm test passes:**
+
+```
+✅ Regression Test Passing
+
+Test: features/<bug-slug>.feature
+Status: PASSING
+
+The fix is verified by the regression test.
 ```
 
 **Proceed to Step 3.**
@@ -318,7 +312,7 @@ pwd && ls .jettypod  # verify
 
 ```bash
 # Step 3: Clean up the worktree
-jettypod work cleanup <chore-id>
+jettypod work cleanup <bug-id>
 ```
 
 **Proceed to Step 5.**
@@ -327,7 +321,7 @@ jettypod work cleanup <chore-id>
 
 ### Step 5: Mark Bug as Done
 
-**After the fix chore is merged, mark the parent bug as done:**
+**After the fix is merged, mark the bug as done:**
 
 ```bash
 jettypod work status <bug-id> done
@@ -341,8 +335,7 @@ jettypod work status <bug-id> done
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 🐛 Bug: #[bug-id] [title]
-🔧 Fix: #[chore-id] [title]
-🧪 Regression test: ✅ Passing
+🧪 Regression test: ✅ features/<bug-slug>.feature
 
 What was fixed:
 - Root cause: [brief description]
@@ -359,12 +352,11 @@ The bug is now fixed and protected by a regression test.
 ## Validation Checklist
 
 Before ending bug-mode skill, ensure:
-- [ ] Regression test was failing (RED baseline confirmed)
 - [ ] Fix implemented comprehensively (not just happy path)
-- [ ] Regression test now passes (GREEN)
+- [ ] Regression test written and passing
 - [ ] No other tests broken (no regressions)
 - [ ] Fix committed with descriptive message
-- [ ] Chore merged to main
+- [ ] Bug merged to main
 - [ ] Worktree cleaned up
 - [ ] Bug marked as done
 
@@ -374,19 +366,15 @@ Before ending bug-mode skill, ensure:
 
 **Merge fix (CRITICAL: cd to main repo separately):**
 ```bash
-jettypod work merge              # Merge current chore
+jettypod work merge              # Merge current bug
 ```
 
 ```bash
 cd <main-repo>                   # Change to main repo
-jettypod work cleanup <id>       # Clean up worktree
+jettypod work cleanup <bug-id>   # Clean up worktree
 ```
 
 **Mark bug complete:**
 ```bash
 jettypod work status <bug-id> done
 ```
-
-**❌ DO NOT use these to complete chores:**
-- `jettypod work status <chore-id> done`
-- `jettypod work complete <id>`

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

@@ -1,6 +1,6 @@
 ---
 name: bug-planning
-description: Guide structured bug investigation with symptom capture, hypothesis testing, and root cause identification. Creates bug work item with fix chore and regression tests. Use when user reports a bug, mentions unexpected behavior, or says "investigate bug".
+description: Guide structured bug investigation with symptom capture, hypothesis testing, and root cause identification. Creates bug work item for direct implementation. Use when user reports a bug, mentions unexpected behavior, or says "investigate bug".
 ---
 
 # Bug Planning Skill
@@ -9,13 +9,13 @@ description: Guide structured bug investigation with symptom capture, hypothesis
 ┌─────────────────────────────────────────────────────────────────────┐
 │  Bug Planning Flow                                                  │
 │                                                                     │
-│  Symptom → Hypothesis → Evidence → Root Cause → Chore → Tests       │
+│  Symptom → Hypothesis → Evidence → Root Cause → Bug Work Item       │
 │                                                                     │
-│  Output: Bug work item, fix chore with breadcrumbs, regression test │
+│  Output: Bug work item with root cause breadcrumbs                  │
 └─────────────────────────────────────────────────────────────────────┘
 ```
 
-Guides Claude through systematic bug investigation. Produces actionable fix chores with clear breadcrumbs.
+Guides Claude through systematic bug investigation. Produces a bug work item with clear breadcrumbs for implementation.
 
 ## Instructions
 
@@ -180,7 +180,7 @@ Loop back to Phase 2 with new information.
 
 ## Phase 4: Root Cause Confirmation
 
-**Goal:** Confirm root cause with user before creating work items.
+**Goal:** Confirm root cause with user before creating work item.
 
 **⚡ ASYNC BOUNDARY - Wait for user confirmation**
 
@@ -197,7 +197,7 @@ Loop back to Phase 2 with new information.
 **Proposed fix:**
 [Brief description of how to fix it]
 
-Does this match your understanding? Ready to create the fix chore?
+Does this match your understanding? Ready to create the bug work item?
 ```
 
 **WAIT for user confirmation.**
@@ -208,39 +208,14 @@ If user disagrees or adds context, revise understanding and confirm again.
 
 ---
 
-## Phase 5: Create Bug Work Item and Chore
+## Phase 5: Create Bug Work Item
 
-**Goal:** Create tracked work items for the fix.
+**Goal:** Create tracked bug work item with breadcrumbs for implementation.
 
-**Check for parent context:**
+**Create bug work item with description:**
 
 ```bash
-# If bug is related to a feature/epic, user may specify parent
-# Otherwise create standalone bug
-```
-
-**Create bug work item:**
-
-```bash
-# Standalone bug
-jettypod work create bug "[Bug title - brief description]"
-
-# OR with parent
-jettypod work create bug "[Bug title]" --parent=<feature-or-epic-id>
-```
-
-**Capture the bug ID from output.**
-
-**Create fix chore with breadcrumbs:**
-
-```bash
-jettypod work create chore "Fix: [brief description]" "[Full description with breadcrumbs]" --parent=<bug-id>
-```
-
-**Chore description must include:**
-
-```
-Root cause: [What's broken and why]
+jettypod work create bug "[Bug title - brief description]" "Root cause: [What's broken and why]
 Location: [file:line]
 
 Fix approach:
@@ -254,87 +229,18 @@ Files to modify:
 Verification:
 - Regression test passes
 - Original bug no longer reproduces
-- [Any other checks]
+- [Any other checks]"
 ```
 
+**Capture the bug ID from output.**
+
 **Proceed to Phase 6.**
 
 ---
 
-## Phase 6: Write Regression Test
-
-**Goal:** Create BDD scenario that fails now, passes after fix.
-
-**🚫 FORBIDDEN: Writing directly to main**
-```
-❌ Write to features/*.feature on main
-❌ Manual git commands for worktrees
-```
-
-**Create test worktree:**
-
-```bash
-jettypod work tests start <bug-id>
-```
-
-**Capture worktree path from output.**
-
-**Derive feature slug** from bug title (lowercase, hyphens, no special chars).
-
-**Write regression test in worktree:**
-
-Feature file at `<worktree>/features/<bug-slug>.feature`:
-
-```gherkin
-Feature: [Bug title] - Regression Test
-  Prevents regression of bug #<bug-id>
-
-  Root cause: [Brief description]
-
-  Scenario: [Description of correct behavior]
-    Given [setup that triggers the bug condition]
-    When [action that previously caused the bug]
-    Then [expected correct behavior]
-    And [additional verifications]
-```
-
-Step definitions at `<worktree>/features/step_definitions/<bug-slug>.steps.js`
-
-**Validate with dry-run:**
-
-```bash
-cd <worktree> && npx cucumber-js --dry-run features/<bug-slug>.feature
-```
-
-Fix any undefined steps or syntax errors.
-
-**Merge tests:**
-
-```bash
-# Commit
-cd <worktree> && git add features/ && git commit -m "test: Add regression test for bug #<bug-id>"
-```
-
-```bash
-# Merge (from worktree is OK)
-jettypod work tests merge <bug-id>
-```
-
-```bash
-# cd to main repo
-cd <main-repo-path>
-```
-
-```bash
-# Cleanup worktree
-jettypod work cleanup <bug-id>
-```
-
-**Proceed to Phase 7.**
-
----
+## Phase 6: Hand Off to Bug Mode
 
-## Phase 7: Hand Off to Bug Mode
+**Goal:** Start the bug worktree and hand off to implementation.
 
 **Display completion:**
 
@@ -344,8 +250,8 @@ jettypod work cleanup <bug-id>
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 📋 Bug: #<bug-id> [title]
-🔧 Fix chore: #<chore-id> [title]
-🧪 Regression test: features/<bug-slug>.feature
+📍 Root cause: [file:line]
+🔧 Fix approach: [brief summary]
 
 Ready to implement the fix?
 ```
@@ -355,13 +261,13 @@ Ready to implement the fix?
 **If user confirms:**
 
 ```bash
-jettypod work start <chore-id>
+jettypod work start <bug-id>
 ```
 
 **Verify worktree created:**
 
 ```bash
-sqlite3 .jettypod/work.db "SELECT worktree_path FROM worktrees WHERE work_item_id = <chore-id> AND status = 'active'"
+sqlite3 .jettypod/work.db "SELECT worktree_path FROM worktrees WHERE work_item_id = <bug-id> AND status = 'active'"
 ```
 
 **Then invoke bug-mode:**
@@ -380,8 +286,6 @@ Before completing bug-planning:
 - [ ] Symptoms clearly documented
 - [ ] Root cause confirmed with evidence
 - [ ] User confirmed root cause
-- [ ] Bug work item created
-- [ ] Fix chore created with breadcrumbs
-- [ ] Regression test written and merged
-- [ ] Fix chore started with `work start`
+- [ ] Bug work item created with breadcrumbs
+- [ ] Bug worktree started with `work start`
 - [ ] bug-mode skill invoked