jettypod 4.4.35 → 4.4.37

package/hooks/pre-commit

@@ -1,30 +1,61 @@
 #!/usr/bin/env node
 
-const { exportAll } = require('jettypod/lib/db-export');
+// JettyPod pre-commit hook: Block direct commits to main branch
+// This is the standalone version used for BDD testing
+// The production version is in lib/git-hooks/pre-commit
+
 const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
 
-(async () => {
+// Check if direct commits to main should be blocked
+function checkBranchRestriction() {
   try {
-    // Export databases to JSON
-    await exportAll();
-
-    // Stage the JSON files
-    try {
-      execSync('git add .jettypod/snapshots/work.json', { stdio: 'inherit' });
-      execSync('git add .jettypod/snapshots/database.json', { stdio: 'inherit' });
-    } catch (gitErr) {
-      // Log warning but don't block commit
-      console.error('Pre-commit hook warning: Failed to stage snapshot files');
-      console.error(`  ${gitErr.message}`);
-      console.error('  Commit will proceed but snapshots may not be included');
+    // Get current branch name
+    const branch = execSync('git symbolic-ref --short HEAD', {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe']
+    }).trim();
+
+    // Only restrict main/master branches
+    if (branch !== 'main' && branch !== 'master') {
+      return true; // Allow commits on feature branches
     }
 
-    // Always exit successfully to allow commit to proceed
-    process.exit(0);
+    // Check if this is a merge commit (MERGE_HEAD exists)
+    const gitDir = execSync('git rev-parse --git-dir', {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe']
+    }).trim();
+
+    if (fs.existsSync(path.join(gitDir, 'MERGE_HEAD'))) {
+      return true; // Allow merge commits on main
+    }
+
+    // Block direct commits to main
+    console.error('');
+    console.error('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+    console.error('❌ Direct commits to main are not allowed');
+    console.error('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+    console.error('');
+    console.error('Use the JettyPod workflow instead:');
+    console.error('');
+    console.error('  jettypod work start <work-item-id>');
+    console.error('');
+    console.error('This creates a feature branch where you can commit freely.');
+    console.error('When done, use \'jettypod work done\' to merge back to main.');
+    console.error('');
+    return false;
   } catch (err) {
-    // Log warning but don't block commit
-    console.error('Pre-commit hook warning:', err.message);
-    console.error('  Commit will proceed but snapshots were not updated');
-    process.exit(0);
+    // If we can't determine branch (detached HEAD, etc.), allow the commit
+    return true;
   }
-})();
+}
+
+// Check branch restriction first
+if (!checkBranchRestriction()) {
+  process.exit(1);
+}
+
+// Allow commit
+process.exit(0);

package/lib/git-hooks/pre-commit

@@ -1,11 +1,60 @@
 #!/usr/bin/env node
 
-// Pre-commit hook: Run tests before allowing commit
+// Pre-commit hook: Block direct commits to main + run tests
 
 const { execSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 
+// Check if direct commits to main should be blocked
+function checkBranchRestriction() {
+  try {
+    // Get current branch name
+    const branch = execSync('git symbolic-ref --short HEAD', {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe']
+    }).trim();
+
+    // Only restrict main/master branches
+    if (branch !== 'main' && branch !== 'master') {
+      return true; // Allow commits on feature branches
+    }
+
+    // Check if this is a merge commit (MERGE_HEAD exists)
+    const gitDir = execSync('git rev-parse --git-dir', {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe']
+    }).trim();
+
+    if (fs.existsSync(path.join(gitDir, 'MERGE_HEAD'))) {
+      return true; // Allow merge commits on main
+    }
+
+    // Block direct commits to main
+    console.error('');
+    console.error('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+    console.error('❌ Direct commits to main are not allowed');
+    console.error('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+    console.error('');
+    console.error('Use the JettyPod workflow instead:');
+    console.error('');
+    console.error('  jettypod work start <work-item-id>');
+    console.error('');
+    console.error('This creates a feature branch where you can commit freely.');
+    console.error('When done, use \'jettypod work done\' to merge back to main.');
+    console.error('');
+    return false;
+  } catch (err) {
+    // If we can't determine branch (detached HEAD, etc.), allow the commit
+    return true;
+  }
+}
+
+// First check branch restriction
+if (!checkBranchRestriction()) {
+  process.exit(1);
+}
+
 // Check if we're in a real project (not a test directory)
 const packageJsonPath = path.join(process.cwd(), 'package.json');
 if (!fs.existsSync(packageJsonPath)) {

package/lib/work-commands/index.js

@@ -101,11 +101,31 @@ async function startWork(id) {
                   errorMsg += `  jettypod work start ${c.id}  # ${c.title}\n`;
                 });
               } else if (inProgressChores.length === 0) {
-                errorMsg += `No chores available. Create chores first or check if feature is complete.`;
+                const doneChores = chores.filter(c => c.status === 'done');
+                if (doneChores.length === chores.length) {
+                  errorMsg += `All chores are complete. This feature is done.\n`;
+                  errorMsg += `Use: jettypod work status ${id} done  # to mark the feature as done`;
+                } else {
+                  errorMsg += `No chores available to start.\n`;
+                  errorMsg += `Use: jettypod backlog  # to see work item status`;
+                }
               }
             } else {
-              errorMsg += `This feature has no chores yet. Use the feature-planning skill to plan it:\n`;
-              errorMsg += `  Tell Claude: "Help me plan feature #${id}"`;
+              // No chores - check feature phase to give accurate guidance
+              if (workItem.status === 'done') {
+                errorMsg += `This feature is already done. No action needed.`;
+              } else if (workItem.phase === 'implementation') {
+                // Feature is in implementation but has no chores - unusual state
+                errorMsg += `This feature is in implementation phase but has no chores.\n`;
+                errorMsg += `The feature-planning skill should have generated chores.\n\n`;
+                errorMsg += `To regenerate chores, use the feature-planning skill:\n`;
+                errorMsg += `  Invoke skill: feature-planning`;
+              } else {
+                // Feature needs planning
+                errorMsg += `This feature needs planning first.\n\n`;
+                errorMsg += `Use the feature-planning skill to plan it:\n`;
+                errorMsg += `  Invoke skill: feature-planning`;
+              }
             }
 
             return reject(new Error(errorMsg));
@@ -116,7 +136,7 @@ async function startWork(id) {
 
       // Prevent starting epics directly
       if (workItem.type === 'epic') {
-        return reject(new Error(`Cannot start epic #${id} directly. Start a feature or chore instead.\n\nUse: jettypod backlog  # to see available work items`));
+        return reject(new Error(`Cannot start epic #${id} directly.\n\nTo plan this epic's features, use the epic-planning skill:\n  Invoke skill: epic-planning\n\nOr start an existing feature/chore:\n  jettypod backlog  # to see available work items`));
       }
 
       // Update status to in_progress if currently todo

package/lib/work-tracking/index.js

@@ -1077,16 +1077,14 @@ async function main() {
           console.log('🎯 Plan this epic now?');
           console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
           console.log('');
-          console.log('Ask Claude Code:');
-          console.log(`  "Help me plan epic #${newId}"`);
+          console.log('Use the epic-planning skill:');
+          console.log('  Invoke skill: epic-planning');
           console.log('');
-          console.log('Claude will help you:');
+          console.log('The skill will guide you to:');
           console.log('  • Brainstorm features for this epic');
           console.log('  • Identify architectural decisions (if needed)');
           console.log('  • Create features automatically');
           console.log('');
-          console.log('Or run: jettypod work epic-planning ' + newId);
-          console.log('');
           console.log('💡 You can also plan later when ready');
         }
 
@@ -1101,10 +1099,8 @@ async function main() {
                   console.log('');
                   console.log('💡 Tip: Consider planning this epic first');
                   console.log('');
-                  console.log('Ask Claude Code:');
-                  console.log(`  "Help me plan epic #${parentId}"`);
-                  console.log('');
-                  console.log(`Or run: jettypod work epic-planning ${parentId}`);
+                  console.log('Use the epic-planning skill:');
+                  console.log('  Invoke skill: epic-planning');
                 }
               });
             }
@@ -1831,16 +1827,14 @@ async function main() {
             console.log(`Description: ${epic.description || 'Not provided'}`);
             console.log('Needs Discovery: true');
             console.log('');
-            console.log('💬 Now ask Claude Code:');
-            console.log(`   "Help me with epic discovery for #${epicId}"`);
+            console.log('Use the epic-planning skill:');
+            console.log('  Invoke skill: epic-planning');
             console.log('');
-            console.log('Claude will use the epic-planning skill to guide you through:');
+            console.log('The skill will guide you through:');
             console.log('  1. Feature brainstorming');
             console.log('  2. Architectural decisions (if needed)');
             console.log('  3. Prototype validation (optional)');
             console.log('  4. Feature creation');
-            console.log('');
-            console.log('📋 The skill is at: .claude/skills/epic-planning/SKILL.md');
           }
         );
       });
@@ -2236,17 +2230,15 @@ async function main() {
                   }
                 }
                 console.log('');
-                console.log('💬 Now ask Claude Code:');
-                console.log(`   "Help me with feature discovery for #${featureId}"`);
+                console.log('Use the feature-planning skill:');
+                console.log('  Invoke skill: feature-planning');
                 console.log('');
-                console.log('Claude will use the feature-planning skill to guide you through:');
+                console.log('The skill will guide you through:');
                 console.log('  1. Suggesting 3 UX approaches');
                 console.log('  2. Optional prototyping');
                 console.log('  3. Choosing the winner');
                 console.log('  4. Generating BDD scenarios');
                 console.log('  5. Transitioning to implementation');
-                console.log('');
-                console.log('📋 The skill is at: .claude/skills/feature-planning/SKILL.md');
               }
             );
           } else {
@@ -2261,17 +2253,15 @@ async function main() {
             console.log(`Title: ${feature.title}`);
             console.log(`Description: ${feature.description || 'Not provided'}`);
             console.log('');
-            console.log('💬 Now ask Claude Code:');
-            console.log(`   "Help me with feature discovery for #${featureId}"`);
+            console.log('Use the feature-planning skill:');
+            console.log('  Invoke skill: feature-planning');
             console.log('');
-            console.log('Claude will use the feature-planning skill to guide you through:');
+            console.log('The skill will guide you through:');
             console.log('  1. Suggesting 3 UX approaches');
             console.log('  2. Optional prototyping');
             console.log('  3. Choosing the winner');
             console.log('  4. Generating BDD scenarios');
             console.log('  5. Transitioning to implementation');
-            console.log('');
-            console.log('📋 The skill is at: .claude/skills/feature-planning/SKILL.md');
           }
         });
       });

package/package.json

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