jettypod 4.4.35 → 4.4.36

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/package.json

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