jettypod 4.4.86 → 4.4.88

package/apps/dashboard/components/KanbanBoard.tsx

@@ -105,6 +105,11 @@ function KanbanCard({ item, epicTitle, showEpic = false, isInFlight = false, onT
   const hasChores = allChores.length > 0;
   const hasIncompleteChores = incompleteChores.length > 0;
 
+  // Calculate bugs for expandable section
+  const allBugs = item.bugs || [];
+  const incompleteBugs = allBugs.filter(b => b.status !== 'done');
+  const hasBugs = allBugs.length > 0;
+
   const handleCardClick = () => {
     router.push(`/work/${item.id}`);
   };
@@ -186,24 +191,40 @@ function KanbanCard({ item, epicTitle, showEpic = false, isInFlight = false, onT
           )}
         </div>
       </div>
-      {/* Show expandable chores section for features with chores */}
-      {hasChores && (
+      {/* Show expandable section for features with chores or bugs */}
+      {(hasChores || hasBugs) && (
         <div className={`border-t ${isDone ? 'border-green-200 dark:border-green-800' : 'border-zinc-200 dark:border-zinc-700'}`}>
           <button
             onClick={() => setExpanded(!expanded)}
-            className={`w-full px-3 py-1.5 flex items-center gap-1.5 text-xs transition-colors ${
+            className={`w-full px-3 py-1.5 flex items-start gap-1.5 text-xs transition-colors ${
               isDone
                 ? 'text-green-700 dark:text-green-400 hover:bg-green-100 dark:hover:bg-green-900/30'
                 : 'text-zinc-600 dark:text-zinc-300 hover:bg-zinc-50 dark:hover:bg-zinc-700/50'
             }`}
           >
-            <span>{expanded ? '▼' : '▶'}</span>
-            <span>🔧</span>
-            <span>
-              {isDone
-                ? `${allChores.length === 0 ? 'no' : allChores.length} chore${allChores.length !== 1 ? 's' : ''}`
-                : `${incompleteChores.length === 0 ? 'no' : incompleteChores.length}${item.mode ? ` ${item.mode} mode` : ''} chore${incompleteChores.length !== 1 ? 's' : ''} left`}
-            </span>
+            <span className="mt-0.5">{expanded ? '▼' : '▶'}</span>
+            <div className="flex flex-col gap-0.5">
+              {hasChores && (
+                <div className="flex items-center gap-1.5">
+                  <span>🔧</span>
+                  <span>
+                    {isDone
+                      ? `${allChores.length === 0 ? 'no' : allChores.length} chore${allChores.length !== 1 ? 's' : ''}`
+                      : `${incompleteChores.length === 0 ? 'no' : incompleteChores.length}${item.mode ? ` ${item.mode} mode` : ''} chore${incompleteChores.length !== 1 ? 's' : ''} left`}
+                  </span>
+                </div>
+              )}
+              {hasBugs && (
+                <div className="flex items-center gap-1.5">
+                  <span>🐛</span>
+                  <span>
+                    {isDone
+                      ? `${allBugs.length === 0 ? 'no' : allBugs.length} bug${allBugs.length !== 1 ? 's' : ''}`
+                      : `${incompleteBugs.length === 0 ? 'no' : incompleteBugs.length} bug${incompleteBugs.length !== 1 ? 's' : ''} left`}
+                  </span>
+                </div>
+              )}
+            </div>
           </button>
           {expanded && (
             <div className="px-3 pb-2 space-y-1">
@@ -237,6 +258,32 @@ function KanbanCard({ item, epicTitle, showEpic = false, isInFlight = false, onT
                   </Link>
                 );
               })}
+              {allBugs.map((bug) => {
+                const isComplete = bug.status === 'done';
+                return (
+                  <Link
+                    key={bug.id}
+                    href={`/work/${bug.id}`}
+                    className={`block py-1 px-2 text-xs rounded transition-colors ${
+                      isComplete
+                        ? 'bg-green-100 dark:bg-green-900/30 border border-green-200 dark:border-green-800/50'
+                        : 'hover:bg-zinc-100 dark:hover:bg-zinc-700'
+                    }`}
+                  >
+                    <div className="flex items-center gap-2">
+                      <span className={`font-mono ${isComplete ? 'text-zinc-500' : 'text-zinc-400'}`}>#{bug.id}</span>
+                      <span>🐛</span>
+                      <span className={`truncate ${
+                        isComplete
+                          ? 'text-zinc-500'
+                          : 'text-zinc-700 dark:text-zinc-300'
+                      }`}>
+                        {bug.title || <span className="text-zinc-400 italic">(Untitled)</span>}
+                      </span>
+                    </div>
+                  </Link>
+                );
+              })}
             </div>
           )}
         </div>

package/apps/dashboard/lib/db.ts

@@ -23,6 +23,7 @@ export interface WorkItem {
   display_order: number | null;
   children?: WorkItem[];
   chores?: WorkItem[];
+  bugs?: WorkItem[];
   current_step?: number | null;
   total_steps?: number | null;
 }
@@ -279,6 +280,26 @@ export function getKanbanData(doneLimit: number = 50): KanbanData {
       }
     }
 
+    // Get all bugs that belong to features (for bug expansion)
+    const featureBugs = db.prepare(`
+      SELECT b.id, b.type, b.title, b.description, b.status, b.parent_id, b.epic_id,
+             b.branch_name, b.mode, b.phase, b.completed_at, b.created_at
+      FROM work_items b
+      INNER JOIN work_items f ON b.parent_id = f.id
+      WHERE b.type = 'bug' AND f.type = 'feature'
+      ORDER BY b.id
+    `).all() as WorkItem[];
+
+    // Group bugs by parent feature ID
+    const bugsByFeature = new Map<number, WorkItem[]>();
+    for (const bug of featureBugs) {
+      if (bug.parent_id) {
+        const existing = bugsByFeature.get(bug.parent_id) || [];
+        existing.push(bug);
+        bugsByFeature.set(bug.parent_id, existing);
+      }
+    }
+
     // Get kanban-eligible items:
     // - Features (type = 'feature')
     // - Chores that are NOT children of features (parent is null, or parent is an epic)
@@ -319,9 +340,10 @@ export function getKanbanData(doneLimit: number = 50): KanbanData {
       // Strip parent_type from the item
       const { parent_type, ...cleanItem } = item;
 
-      // Attach chores to features
+      // Attach chores and bugs to features
       if (cleanItem.type === 'feature') {
         cleanItem.chores = choresByFeature.get(cleanItem.id) || [];
+        cleanItem.bugs = bugsByFeature.get(cleanItem.id) || [];
       }
 
       if (cleanItem.status === 'in_progress') {

package/jettypod.js

@@ -701,8 +701,29 @@ async function generateClaude(options = {}) {
   const currentConfig = config.read();
 
   const content = await claude.generate(currentConfig, options);
+
+  // Check if content actually changed
+  const existingContent = fs.existsSync('CLAUDE.md') ? fs.readFileSync('CLAUDE.md', 'utf-8') : '';
+  const contentChanged = content !== existingContent;
+
+  if (!contentChanged) {
+    return; // No changes needed
+  }
+
   fs.writeFileSync('CLAUDE.md', content);
   console.log('📝 CLAUDE.md generated');
+
+  // Auto-commit if requested (for commands that legitimately update CLAUDE.md)
+  if (options.autoCommit) {
+    try {
+      const { execSync } = require('child_process');
+      execSync('git add CLAUDE.md', { stdio: 'ignore' });
+      execSync('git commit -m "chore: update CLAUDE.md"', { stdio: 'ignore' });
+      console.log('✅ CLAUDE.md changes committed');
+    } catch (err) {
+      // Commit may fail if nothing staged or not in a git repo - that's ok
+    }
+  }
 }
 
 // Ensure Claude Code hooks are up to date (called on every jettypod launch)
@@ -767,9 +788,9 @@ function ensureClaudeHooks() {
     }
   }
 
-  // Write updated settings
-  fs.writeFileSync(claudeSettingsPath, JSON.stringify(claudeSettings, null, 2));
+  // Only write settings if hooks were actually updated (avoid untracked changes in main)
   if (hooksUpdated) {
+    fs.writeFileSync(claudeSettingsPath, JSON.stringify(claudeSettings, null, 2));
     console.log('⚙️  Claude Code hooks updated');
   }
 
@@ -1263,6 +1284,21 @@ switch (command) {
 
       // Ensure session.md is gitignored (fixes existing projects)
       ensureJettypodGitignores();
+
+      // Auto-commit any changes made by update (skills, hooks, gitignore, etc.)
+      // This prevents untracked changes from breaking worktree merges
+      try {
+        const { execSync } = require('child_process');
+        // Check if there are any changes to commit
+        const status = execSync('git status --porcelain', { encoding: 'utf-8' });
+        if (status.trim()) {
+          execSync('git add -A', { stdio: 'ignore' });
+          execSync('git commit -m "chore: jettypod update - refresh skills and hooks"', { stdio: 'ignore' });
+          console.log('✅ Update changes committed');
+        }
+      } catch (err) {
+        // Commit may fail if not in a git repo or nothing to commit - that's ok
+      }
     }
 
     process.exit(success ? 0 : 1);
@@ -1282,12 +1318,12 @@ switch (command) {
     }
     config.update({ description });
     console.log('✅ Project description updated');
-    await generateClaude();
+    await generateClaude({ autoCommit: true });
     break;
 
   case 'generate':
     // Show directive only when explicitly using generate command
-    await generateClaude({ showDirective: true });
+    await generateClaude({ showDirective: true, autoCommit: true });
     break;
 
   case 'work':
@@ -1914,7 +1950,7 @@ switch (command) {
         console.log('⚠️  Remember: Customer-facing features MUST use Production mode');
         console.log('');
 
-        await generateClaude();
+        await generateClaude({ autoCommit: true });
       } catch (err) {
         console.error(`Error: ${err.message}`);
         process.exit(1);
@@ -1977,7 +2013,7 @@ switch (command) {
           console.log('  4. Run: jettypod project discover complete --winner=<path> --rationale="<reason>"');
           console.log('');
 
-          await generateClaude();
+          await generateClaude({ autoCommit: true });
           console.log('📝 CLAUDE.md updated with discovery context');
 
         } catch (err) {
@@ -2062,7 +2098,7 @@ switch (command) {
           const checkpoint = require('./lib/discovery-checkpoint');
           checkpoint.clearCheckpoint();
 
-          await generateClaude();
+          await generateClaude({ autoCommit: true });
 
           console.log('✅ Project discovery complete!');
           console.log('');
@@ -2070,7 +2106,7 @@ switch (command) {
           console.log(`Rationale: ${rationale}`);
           console.log('');
 
-          await generateClaude();
+          // Note: duplicate call removed - generateClaude already called above
           console.log('📝 CLAUDE.md updated');
           console.log('');
 
@@ -2123,11 +2159,15 @@ switch (command) {
       // New project - auto-initialize
       await initializeProject();
     } else {
-      // Project exists - launch dashboard and regenerate CLAUDE.md
+      // Project exists - launch dashboard
       const currentConfig = config.read();
-      await generateClaude();
 
-      // Ensure Claude Code hooks are up to date on every launch
+      // Only generate CLAUDE.md if it doesn't exist (avoid untracked changes in main)
+      if (!fs.existsSync('CLAUDE.md')) {
+        await generateClaude();
+      }
+
+      // Ensure Claude Code hooks are up to date on every launch (only writes if changed)
       ensureClaudeHooks();
 
       // Launch dashboard
@@ -3170,7 +3210,10 @@ Quick commands:
     } else {
       // Already initialized - show smart guidance
       const currentConfig = config.read();
-      await generateClaude();
+      // Only generate CLAUDE.md if it doesn't exist (avoid untracked changes)
+      if (!fs.existsSync('CLAUDE.md')) {
+        await generateClaude();
+      }
 
       const discovery = currentConfig.project_discovery;
 

package/package.json

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

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. Invoked by plan-routing when user reports a bug, mentions unexpected behavior, or describes something broken. (project)
+description: Guide structured bug investigation with symptom capture, hypothesis testing, and root cause identification. Invoked by request-routing when user reports a bug, mentions unexpected behavior, or describes something broken. (project)
 ---
 
 # Bug Planning Skill

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

@@ -1,6 +1,6 @@
 ---
 name: chore-planning
-description: Guide standalone chore planning with automatic type classification and routing to chore-mode. Invoked by plan-routing for substantial technical work - refactoring, infrastructure, migrations, or enhancements where the implementation approach is obvious. (project)
+description: Guide standalone chore planning with automatic type classification and routing to chore-mode. Invoked by request-routing for substantial technical work - refactoring, infrastructure, migrations, or enhancements where the implementation approach is obvious. (project)
 ---
 
 # Chore Planning Skill

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

@@ -1,6 +1,6 @@
 ---
 name: epic-planning
-description: Guide epic planning with feature brainstorming and optional architectural decision prototyping. Invoked by plan-routing for large multi-feature initiatives that need to be broken down into features. (project)
+description: Guide epic planning with feature brainstorming and optional architectural decision prototyping. Invoked by request-routing for large multi-feature initiatives that need to be broken down into features. (project)
 ---
 
 # Epic Planning Skill

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

@@ -1,6 +1,6 @@
 ---
 name: feature-planning
-description: Guide feature planning with UX approach exploration and BDD scenario generation. Invoked by plan-routing when implementing NEW user-facing behavior that requires UX decisions (multiple valid approaches to explore). (project)
+description: Guide feature planning with UX approach exploration and BDD scenario generation. Invoked by request-routing when implementing NEW user-facing behavior that requires UX decisions (multiple valid approaches to explore). (project)
 ---
 
 # Feature Planning Skill

package/skills-templates/{plan-routing → request-routing}/SKILL.md

@@ -1,9 +1,9 @@
 ---
-name: plan-routing
+name: request-routing
 description: "⚡ ENTRY POINT FOR ALL WORK REQUESTS. Invoke this skill FIRST when user describes ANY work - 'build X', 'fix Y', 'add Z', 'create feature', 'implement'. Do NOT create work items or invoke other planning skills directly. This skill analyzes intent and routes to the correct workflow. (project)"
 ---
 
-# Plan Routing Skill
+# Request Routing Skill
 
 **⚡ UNIVERSAL ENTRY POINT** - This skill MUST be invoked FIRST when a user describes work they want done.
 

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

@@ -1,6 +1,6 @@
 ---
 name: simple-improvement
-description: Guide implementation of simple improvements to existing functionality. Invoked by plan-routing for straightforward changes like copy changes, styling tweaks, or minor behavior adjustments where the implementation is obvious. (project)
+description: Guide implementation of simple improvements to existing functionality. Invoked by request-routing for straightforward changes like copy changes, styling tweaks, or minor behavior adjustments where the implementation is obvious. (project)
 ---
 
 # Simple Improvement Skill
@@ -22,7 +22,7 @@ Lightweight workflow for basic enhancements to existing functionality. Bypasses
 
 ## When to Use
 
-This skill is invoked by plan-routing when work is identified as a **simple improvement**:
+This skill is invoked by request-routing when work is identified as a **simple improvement**:
 - Copy/text changes
 - Styling tweaks
 - Minor behavior adjustments
@@ -30,7 +30,7 @@ This skill is invoked by plan-routing when work is identified as a **simple impr
 
 ## When NOT to Use
 
-Route back to plan-routing for:
+Route back to request-routing for:
 - New functionality (even if small)
 - Changes requiring new data models
 - Complex logic changes
@@ -96,7 +96,7 @@ Scan the user's description for these patterns:
 | Multiple components | mentions 3+ different files/areas, "also need to" |
 | Architectural changes | "refactor", "restructure", "new system" |
 
-❌ **Route back to plan-routing if ANY complexity signal detected:**
+❌ **Route back to request-routing if ANY complexity signal detected:**
 - New database tables/columns needed
 - New API endpoints required
 - Complex conditional logic
@@ -114,11 +114,11 @@ Scan the user's description for these patterns:
 ```
 ⚠️ This change appears to require new data models or architectural changes. This is more than a simple improvement.
 
-I'm routing you back to plan-routing for proper planning.
+I'm routing you back to request-routing for proper planning.
 ```
 
 **Then IMMEDIATELY:**
-1. Invoke plan-routing skill using the Skill tool
+1. Invoke request-routing skill using the Skill tool
 2. END this skill (do not continue)
 
 **If confirmed simple:**