jettypod 4.1.6 → 4.2.0

package/lib/claudemd.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const config = require('./config');
 const { getBugWorkflowForClaudeMd } = require('./bug-workflow');
+const { writeSessionFile } = require('./session-writer');
 
 /**
  * Get absolute path to CLAUDE.md file
@@ -41,7 +42,8 @@ function validateCurrentWork(currentWork) {
 // See .claude/skills/ directory for skill implementations
 
 /**
- * Update current work section in CLAUDE.md
+ * Update current work - writes to session file instead of CLAUDE.md
+ * Session file is gitignored to prevent merge conflicts and stale context
  * @param {Object} currentWork - Current work item to display
  * @param {string|null} mode - Work item mode (null for epics, undefined to read from config)
  * @throws {Error} If currentWork is invalid or file cannot be written
@@ -49,19 +51,6 @@ function validateCurrentWork(currentWork) {
 function updateCurrentWork(currentWork, mode) {
   validateCurrentWork(currentWork);
 
-  const claudePath = getClaudeMdPath();
-
-  if (!fs.existsSync(claudePath)) {
-    return;
-  }
-
-  let content;
-  try {
-    content = fs.readFileSync(claudePath, 'utf-8');
-  } catch (err) {
-    throw new Error(`Failed to read CLAUDE.md: ${err.message}`);
-  }
-
   // Use provided mode
   // null = epic (no mode), undefined = fallback to config for backwards compatibility
   let currentMode = mode;
@@ -74,53 +63,13 @@ function updateCurrentWork(currentWork, mode) {
     }
   }
 
-  // Build new current_work section
-  let newCurrentWork = `<current_work>
-Working on: [#${currentWork.id}] ${currentWork.title} (${currentWork.type})`;
-
-  if (currentWork.epic_title && currentWork.epic_id !== currentWork.id) {
-    newCurrentWork += `
-Epic: [#${currentWork.epic_id}] ${currentWork.epic_title}`;
-  }
-
-  // Only add Mode line if mode is not null (epics don't have modes)
-  if (currentMode !== null) {
-    newCurrentWork += `
-Mode: ${currentMode}`;
-  }
-
-  newCurrentWork += `
-Status: ${currentWork.status}
-</current_work>`;
-
-  // Replace existing current_work section or add after project context
-  if (content.includes('<current_work>')) {
-    content = content.replace(/<current_work>[\s\S]*?<\/current_work>/, newCurrentWork);
-  } else {
-    // Insert after <claude_context> opening
-    if (!content.includes('<claude_context')) {
-      throw new Error('CLAUDE.md does not contain <claude_context> tag');
-    }
-    content = content.replace(/(<claude_context[^>]*>)/, `$1\n\n${newCurrentWork}`);
-  }
-
-  // Remove both <bug_workflow> and <mode_behavior> sections
-  // Skills now provide all mode-specific guidance via activation messages
-  content = content.replace(/<bug_workflow>[\s\S]*?<\/bug_workflow>/, '');
-  content = content.replace(/<mode_behavior>[\s\S]*?<\/mode_behavior>/, '');
-
-  // Update <mode> tag
+  // Write to session file (gitignored) instead of CLAUDE.md
+  // This prevents merge conflicts and stale context on main branch
   if (currentMode !== null) {
-    content = content.replace(/<mode>.*?<\/mode>/, `<mode>${currentMode}</mode>`);
-  } else {
-    // Remove <mode> tag for epics
-    content = content.replace(/<mode>.*?<\/mode>\n?/, '');
-  }
-
-  try {
-    fs.writeFileSync(claudePath, content);
-  } catch (err) {
-    throw new Error(`Failed to write CLAUDE.md: ${err.message}`);
+    writeSessionFile(currentWork, currentMode, {
+      epicId: currentWork.epic_id,
+      epicTitle: currentWork.epic_title
+    });
   }
 }
 

package/lib/session-writer.js

@@ -0,0 +1,150 @@
+/**
+ * Session File Writer
+ *
+ * Writes session-specific context to .claude/session.md (gitignored)
+ * instead of CLAUDE.md to prevent merge conflicts and stale context.
+ *
+ * Includes skill invocation directives for auto-invoking mode skills
+ * when resuming work on chores.
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Get absolute path to session file
+ * @returns {string} Absolute path to .claude/session.md
+ */
+function getSessionFilePath() {
+  return path.join(process.cwd(), '.claude', 'session.md');
+}
+
+/**
+ * Ensure .claude directory exists
+ */
+function ensureClaudeDir() {
+  const claudeDir = path.join(process.cwd(), '.claude');
+  if (!fs.existsSync(claudeDir)) {
+    fs.mkdirSync(claudeDir, { recursive: true });
+  }
+}
+
+/**
+ * Map mode to skill name
+ * @param {string} mode - Work item mode
+ * @returns {string} Skill name
+ */
+function modeToSkillName(mode) {
+  const mapping = {
+    'speed': 'speed-mode',
+    'stable': 'stable-mode',
+    'production': 'production-mode'
+  };
+  return mapping[mode] || `${mode}-mode`;
+}
+
+/**
+ * Write session file with current work context and skill invocation directive
+ *
+ * @param {Object} workItem - Work item object with id, title, type, status
+ * @param {string} mode - Work item mode (speed, stable, production)
+ * @param {Object} options - Additional options
+ * @param {number} options.epicId - Parent epic ID
+ * @param {string} options.epicTitle - Parent epic title
+ */
+function writeSessionFile(workItem, mode, options = {}) {
+  if (!workItem || typeof workItem !== 'object') {
+    throw new Error('Work item must be an object');
+  }
+  if (!workItem.id || typeof workItem.id !== 'number') {
+    throw new Error('Work item must have a numeric id');
+  }
+  if (!workItem.title || typeof workItem.title !== 'string') {
+    throw new Error('Work item must have a string title');
+  }
+  if (!workItem.type || typeof workItem.type !== 'string') {
+    throw new Error('Work item must have a string type');
+  }
+  if (!workItem.status || typeof workItem.status !== 'string') {
+    throw new Error('Work item must have a string status');
+  }
+
+  ensureClaudeDir();
+
+  const skillName = modeToSkillName(mode);
+
+  // Build session file content
+  let content = `# Current Work Session
+
+## Work Context
+
+Working on: [#${workItem.id}] ${workItem.title} (${workItem.type})
+`;
+
+  if (options.epicId && options.epicTitle) {
+    content += `Epic: [#${options.epicId}] ${options.epicTitle}
+`;
+  }
+
+  content += `Mode: ${mode}
+Status: ${workItem.status}
+
+## IMMEDIATE ACTION REQUIRED
+
+You are resuming work on a chore in ${mode} mode.
+
+**Invoke the ${skillName} skill now to continue the workflow.**
+
+This directive ensures the correct mode skill is activated automatically
+when Claude Code starts a new session in this worktree.
+`;
+
+  const sessionPath = getSessionFilePath();
+
+  try {
+    fs.writeFileSync(sessionPath, content);
+  } catch (err) {
+    throw new Error(`Failed to write session file: ${err.message}`);
+  }
+}
+
+/**
+ * Clear the session file (delete it)
+ */
+function clearSessionFile() {
+  const sessionPath = getSessionFilePath();
+
+  if (fs.existsSync(sessionPath)) {
+    try {
+      fs.unlinkSync(sessionPath);
+    } catch (err) {
+      throw new Error(`Failed to clear session file: ${err.message}`);
+    }
+  }
+}
+
+/**
+ * Read the session file content
+ * @returns {string|null} Session file content or null if not found
+ */
+function readSessionFile() {
+  const sessionPath = getSessionFilePath();
+
+  if (!fs.existsSync(sessionPath)) {
+    return null;
+  }
+
+  try {
+    return fs.readFileSync(sessionPath, 'utf-8');
+  } catch (err) {
+    throw new Error(`Failed to read session file: ${err.message}`);
+  }
+}
+
+module.exports = {
+  writeSessionFile,
+  clearSessionFile,
+  readSessionFile,
+  getSessionFilePath,
+  modeToSkillName
+};

package/package.json

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

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

@@ -683,7 +683,7 @@ console.log(`Next step: Elevate to stable mode using 'jettypod work set-mode <fe
 **Display:**
 ```
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-✅ SPEED MODE COMPLETE - GREEN STATE ACHIEVED
+✅ GREEN STATE ACHIEVED - Now Creating Stable Chores
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 🎉 Happy path scenario: ALL TESTS PASSING
@@ -700,7 +700,8 @@ Files modified:
   ✏️  src/app.js
   ✏️  src/index.html
 
-Next step: Elevate to stable mode using 'node jettypod.js work set-mode <feature-id> stable'
+⚠️  Speed mode is NOT complete until stable chores exist.
+Proceeding to Step 4 to create stable mode chores...
 ```
 
 **On FAILURE (max iterations or timeout):**
@@ -781,14 +782,18 @@ What to do:
 DO NOT proceed to generate stable mode chores until GREEN is achieved.
 ```
 
-**Move to Step 4 only if GREEN achieved.**
+**Move to Step 4 IMMEDIATELY if GREEN achieved.**
+
+**CRITICAL: GREEN is NOT completion - it's just a checkpoint. Speed mode is INCOMPLETE until stable mode chores are created. You MUST continue to Step 4.**
 
 <!-- ═══════════════════════════════════════════════════════════════════════════
      PHASE 4: STABLE CHORE GENERATION
      ⚡ ASYNC BOUNDARY - Must wait for user to confirm proposed chores
      ═══════════════════════════════════════════════════════════════════════════ -->
 
-### Step 4: Generate Stable Mode Chores
+### Step 4: Generate Stable Mode Chores (REQUIRED - Do Not Skip)
+
+**CRITICAL:** This step is MANDATORY. Speed mode is NOT complete until stable mode chores exist. Without them, users cannot resume work on this feature.
 
 **Two phases: Analyze and propose → Get confirmation → Create autonomously**
 
@@ -984,15 +989,18 @@ Stable mode adds:
 
 ```
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-🎯 Speed Mode Chore Complete!
+🎯 Speed Mode Chore Done - Stable Chores Created
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 What we accomplished:
 ✅ Happy path scenario passes for this chore
-✅ Stable mode chores created
+✅ Stable mode chores created for when speed mode finishes
 
 Remaining speed mode chores: [count]
 
+⚠️  Speed mode is NOT complete yet - [count] chores remain.
+You can take a break here - stable mode chores exist and work can resume.
+
 **Next step:** Continue with next speed mode chore
   jettypod work start [next-speed-chore-id]
 ```