jettypod 4.4.87 → 4.4.88

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.87",
+  "version": "4.4.88",
   "description": "AI-powered development workflow manager with TDD, BDD, and automatic test generation",
   "main": "jettypod.js",
   "bin": {