jettypod 4.4.63 → 4.4.64

package/claude-hooks/global-guardrails.js

@@ -185,6 +185,19 @@ function evaluateBashCommand(command, inputRef, cwd) {
     }
   }
 
+  // BLOCKED: work merge or tests merge from inside a worktree
+  // This prevents shell CWD corruption when worktree is deleted
+  if (/jettypod\s+(work|tests)\s+merge\b/.test(strippedCommand)) {
+    const isInWorktree = cwd && cwd.includes('.jettypod-work');
+    if (isInWorktree) {
+      return {
+        allowed: false,
+        message: 'Cannot merge from inside a worktree',
+        hint: 'Merging deletes the worktree. Run from main repo: cd <main-repo-path> && jettypod work merge'
+      };
+    }
+  }
+
 
   // ALLOWED: Git read-only commands
   if (/git\s+(status|log|diff|show|branch\s*$|remote|fetch)\b/.test(strippedCommand)) {
@@ -222,7 +235,7 @@ function findDatabasePath(cwd) {
  * @param {string} cwd - Current working directory
  * @returns {string|null} Active worktree path or null
  */
-function getActiveWorktreePathFromDB(cwd) {
+function getActiveWorktreePathFromDB(cwd, filePath) {
   const dbPath = findDatabasePath(cwd);
   if (!dbPath) {
     debug('db_lookup', { status: 'no_db_found', cwd });
@@ -240,7 +253,8 @@ function getActiveWorktreePathFromDB(cwd) {
     db.close();
 
     // Find the worktree whose path is a prefix of cwd (we're inside it)
-    const matchingWorktree = rows.find(row => cwd.startsWith(row.worktree_path));
+    const normalizedFilePath = filePath ? path.resolve(cwd, filePath) : null;
+    const matchingWorktree = rows.find(row => cwd.startsWith(row.worktree_path) || (normalizedFilePath && normalizedFilePath.startsWith(row.worktree_path + path.sep)));
     const result = matchingWorktree ? matchingWorktree.worktree_path : null;
     debug('db_lookup', { status: 'success', method: 'better-sqlite3', worktree: result, candidates: rows.length });
     return result;
@@ -260,7 +274,8 @@ function getActiveWorktreePathFromDB(cwd) {
     }
     // Parse all worktree paths and find the one containing cwd
     const paths = result.stdout.trim().split('\n').filter(Boolean);
-    const matchingPath = paths.find(p => cwd.startsWith(p));
+    const normalizedFilePath2 = filePath ? path.resolve(cwd, filePath) : null;
+    const matchingPath = paths.find(p => cwd.startsWith(p) || (normalizedFilePath2 && normalizedFilePath2.startsWith(p + path.sep)));
     const worktree = matchingPath || null;
     debug('db_lookup', { status: 'success', method: 'sqlite3-cli', worktree, candidates: paths.length });
     return worktree;
@@ -272,7 +287,7 @@ function getActiveWorktreePathFromDB(cwd) {
  */
 function evaluateWriteOperation(filePath, inputWorktreePath, cwd) {
   // Query database for active worktree, fall back to input if provided
-  const activeWorktreePath = getActiveWorktreePathFromDB(cwd) || inputWorktreePath;
+  const activeWorktreePath = getActiveWorktreePathFromDB(cwd, filePath) || inputWorktreePath;
 
   // Normalize paths
   const normalizedPath = path.resolve(cwd || '.', filePath);
@@ -285,24 +300,8 @@ function evaluateWriteOperation(filePath, inputWorktreePath, cwd) {
     normalizedWorktree
   });
 
-  // BLOCKED: Protected files (skills, hooks)
-  const protectedPatterns = [
-    /\.claude\/skills\//i,
-    /claude-hooks\//i,
-    /\.jettypod\/hooks\//i
-  ];
-
-  for (const pattern of protectedPatterns) {
-    if (pattern.test(normalizedPath) || pattern.test(filePath)) {
-      return {
-        allowed: false,
-        message: 'Protected file - cannot modify',
-        hint: 'Skill and hook files are protected. Modify them through proper channels.'
-      };
-    }
-  }
-
-  // Check if path is in a worktree
+  // Check if path is in a worktree FIRST
+  // This allows editing protected files (hooks, skills) in worktrees
   const isInWorktree = /\.jettypod-work\//.test(filePath) || /\.jettypod-work\//.test(normalizedPath);
 
   if (isInWorktree) {
@@ -331,6 +330,23 @@ function evaluateWriteOperation(filePath, inputWorktreePath, cwd) {
     };
   }
 
+  // BLOCKED: Protected files in main repo (skills, hooks)
+  const protectedPatterns = [
+    /\.claude\/skills\//i,
+    /claude-hooks\//i,
+    /\.jettypod\/hooks\//i
+  ];
+
+  for (const pattern of protectedPatterns) {
+    if (pattern.test(normalizedPath) || pattern.test(filePath)) {
+      return {
+        allowed: false,
+        message: 'Protected file - cannot modify',
+        hint: 'Skill and hook files are protected. Use jettypod work start to create a worktree first.'
+      };
+    }
+  }
+
   // BLOCKED: Write to main repo (not in worktree)
   return {
     allowed: false,

package/jettypod.js

@@ -244,11 +244,17 @@ Status: ${currentWork.status}
 <jettypod_essentials>
 JettyPod: Structured workflow system with skills that guide complex workflows.
 
+## ⚠️ CRITICAL: All Work Requires a Work Item
+**Claude CANNOT write code directly to main branch.**
+- All work requires: \`work create\` → \`work start\` → skill workflow → \`work merge\`
+- If user asks to implement something without a work item, create one first and invoke the matching skill
+- Pre-commit hooks block direct commits to main
+
 ## ⚠️ CRITICAL: Skills are MANDATORY for workflows
 Skills auto-activate and MUST complete their full workflow:
 - epic-planning: Guides architectural decisions
 - feature-planning: Guides UX discovery + BDD scenarios
-- speed-mode: Implements happy path, THEN auto-generates stable chores
+- speed-mode: Implements happy path, THEN auto-invokes stable-mode
 - stable-mode: Adds error handling to speed implementation
 - external-transition: Guides launch preparation
 
@@ -260,10 +266,14 @@ Skills auto-activate and MUST complete their full workflow:
 ## Basic Commands (for non-workflow operations)
 jettypod work create epic "<title>"
 jettypod work create feature "<title>" --parent=<id>
-jettypod work start <id>
+jettypod work create chore "<title>" --parent=<id>
+jettypod work start <id>              # Creates worktree branch
+jettypod work merge                   # Merges worktree back to main
+jettypod work tests <feature-id>      # Create test worktree for BDD
+jettypod work tests merge <id>        # Merge tests to main
 jettypod work status <id> cancelled
 jettypod backlog
-jettypod impact <file>    # Show tests/features affected by changing a file
+jettypod impact <file>                # Show tests/features affected
 
 ## Advanced Commands
 For mode management, decisions, project state: docs/COMMAND_REFERENCE.md

package/package.json

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