jettypod 4.4.87 → 4.4.89

package/claude-hooks/global-guardrails.js

@@ -223,10 +223,23 @@ function evaluateBashCommand(command, inputRef, cwd) {
   if (/jettypod\s+(work|tests)\s+merge\b/.test(strippedCommand)) {
     const isInWorktree = cwd && cwd.includes('.jettypod-work');
     if (isInWorktree) {
+      // Extract main repo path and work item ID for helpful error message
+      const mainRepoPath = cwd.split('.jettypod-work')[0].replace(/\/$/, '');
+      const workIdMatch = strippedCommand.match(/merge\s+(\d+)/);
+      const workId = workIdMatch ? workIdMatch[1] : '<id>';
+
       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\n\nNote: "cd path && jettypod work merge" won\'t work - hooks check CWD before cd runs. Run cd separately first.'
+        hint: `Current CWD: ${cwd}
+Main repo:   ${mainRepoPath}
+
+Run these as TWO SEPARATE Bash calls:
+
+  1. cd ${mainRepoPath}
+  2. jettypod work merge ${workId}
+
+Why: Hooks check CWD before 'cd &&' executes, so chained commands fail.`
       };
     }
   }
@@ -384,7 +397,7 @@ function evaluateWriteOperation(filePath, inputWorktreePath, cwd) {
   return {
     allowed: false,
     message: 'Cannot write to main repository',
-    hint: 'Use jettypod work start to create a worktree first.'
+    hint: 'Invoke the request-routing skill first to plan and create work items properly.'
   };
 }
 

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
@@ -2804,9 +2844,12 @@ Quick commands:
           'speed-mode': ['feature_planning_complete'],
           'stable-mode': ['speed_mode_complete'],
           'production-mode': ['stable_mode_complete'],
+          'chore-mode': ['chore_planning_complete'],
+          'bug-mode': ['bug_planning_complete'],
           'feature-planning': [],
           'epic-planning': [],
-          'chore-planning': []
+          'chore-planning': [],
+          'bug-planning': []
         };
 
         // Validate skill name
@@ -3170,7 +3213,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.87",
+  "version": "4.4.89",
   "description": "AI-powered development workflow manager with TDD, BDD, and automatic test generation",
   "main": "jettypod.js",
   "bin": {

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

@@ -235,10 +235,17 @@ git commit -m "fix: [brief description]
 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>"
 ```
 
-**Then merge (from main repo):**
+**Then merge (CRITICAL: run as separate Bash calls):**
+
+⚠️ Shell CWD persists. You MUST run `cd` as a SEPARATE Bash tool call before merge.
 
 ```bash
+# Bash call 1: Change to main repo
 cd <main-repo-path>
+```
+
+```bash
+# Bash call 2: Merge and cleanup
 jettypod work merge <chore-id>
 jettypod work cleanup <chore-id>
 ```
@@ -316,8 +323,9 @@ jettypod work create chore "<title>" "<description>" --parent=<feature-id>
 # Start chore
 jettypod work start <chore-id>
 
-# Merge (from main repo)
-cd <main-repo> && jettypod work merge <chore-id>
+# Merge (CRITICAL: separate Bash calls - cd first, then merge)
+cd <main-repo>                      # Bash call 1
+jettypod work merge <chore-id>      # Bash call 2
 
 # Cleanup
 jettypod work cleanup <chore-id>

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

@@ -855,10 +855,14 @@ jettypod work create chore "[Chore title]" "[Description with scenarios addresse
 
 Repeat for each confirmed chore. **Do NOT use `--mode` flag** - chores inherit mode from their parent feature.
 
-**3. Release merge lock:**
+**3. Release merge lock (CRITICAL: separate Bash calls):**
 
 ```bash
-cd <main-repo> && jettypod work merge --release-lock
+cd <main-repo>                           # Bash call 1
+```
+
+```bash
+jettypod work merge --release-lock       # Bash call 2
 ```
 
 **🔄 WORKFLOW COMPLETE: Speed mode finished**
@@ -957,12 +961,17 @@ Before ending speed-mode skill, ensure:
 
 ## Command Reference
 
-**Complete chores (CRITICAL: cd to main repo BEFORE merge - worktree will be deleted):**
+**Complete chores (CRITICAL: run cd and merge as SEPARATE Bash calls):**
+```bash
+# Bash call 1: Change to main repo
+cd <main-repo>
+```
 ```bash
-cd <main-repo> && jettypod work merge <id>   # Merge chore by ID (recommended)
-cd <main-repo> && jettypod work merge        # Merge current chore
-cd <main-repo> && jettypod work merge --with-transition  # Hold lock for transition
-cd <main-repo> && jettypod work merge --release-lock     # Release held lock
+# Bash call 2: Merge (pick one)
+jettypod work merge <id>               # Merge chore by ID (recommended)
+jettypod work merge                    # Merge current chore
+jettypod work merge --with-transition  # Hold lock for transition
+jettypod work merge --release-lock     # Release held lock
 ```
 
 **Start chores:**

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

@@ -773,10 +773,15 @@ Before ending stable-mode skill, ensure:
 
 ## Command Reference
 
-**Complete chores (CRITICAL: cd to main repo BEFORE merge - worktree will be deleted):**
+**Complete chores (CRITICAL: run cd and merge as SEPARATE Bash calls):**
 ```bash
-cd <main-repo> && jettypod work merge <id>   # Merge chore by ID (recommended)
-cd <main-repo> && jettypod work merge        # Merge current chore
+# Bash call 1: Change to main repo
+cd <main-repo>
+```
+```bash
+# Bash call 2: Merge (pick one)
+jettypod work merge <id>   # Merge chore by ID (recommended)
+jettypod work merge        # Merge current chore
 ```
 
 **Start chores:**
@@ -806,7 +811,7 @@ jettypod work set-mode <feature-id> production  # Set feature to production mode
 - Parallel worktrees branch from main independently
 
 **Process:**
-1. Complete chore → `cd <main-repo> && jettypod work merge` (CRITICAL: cd first!)
+1. Complete chore → run `cd <main-repo>` then `jettypod work merge` as SEPARATE Bash calls
 2. Start next chore → `jettypod work start <next-id>`
 3. Repeat