@sienklogic/plan-build-run 2.1.0 → 2.1.1

package/plugins/pbr/scripts/check-state-sync.js

@@ -26,7 +26,25 @@ const fs = require('fs');
 const path = require('path');
 const { logHook } = require('./hook-logger');
 const { logEvent } = require('./event-logger');
-const { atomicWrite } = require('./pbr-tools');
+
+/**
+ * Write content to a file atomically using write-then-rename.
+ * Writes to a PID-stamped temp file, then renames over the original.
+ * If the rename fails, cleans up the temp file and re-throws.
+ *
+ * @param {string} filePath - Target file path
+ * @param {string} content - Content to write
+ */
+function atomicWriteFile(filePath, content) {
+  const tmpPath = filePath + '.tmp.' + process.pid;
+  try {
+    fs.writeFileSync(tmpPath, content, 'utf8');
+    fs.renameSync(tmpPath, filePath);
+  } catch (e) {
+    try { fs.unlinkSync(tmpPath); } catch (_) { /* best effort cleanup */ }
+    throw e;
+  }
+}
 
 /**
  * Extract phase number from a phase directory name.
@@ -49,7 +67,7 @@ function extractPhaseNum(dirName) {
 function countPhaseArtifacts(phaseDir) {
   try {
     const files = fs.readdirSync(phaseDir);
-    const plans = files.filter(f => /-PLAN\.md$/.test(f));
+    const plans = files.filter(f => /PLAN.*\.md$/i.test(f));
     const summaries = files.filter(f => /SUMMARY.*\.md$/.test(f) || /.*SUMMARY.*\.md$/.test(f));
 
     // Filter for summaries that have status: complete in frontmatter
@@ -161,6 +179,10 @@ function updateStatePosition(content, updates) {
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i];
 
+    if (updates.phaseLine !== undefined && /^Phase:\s/.test(line)) {
+      lines[i] = `Phase: ${updates.phaseLine}`;
+    }
+
     if (updates.planLine !== undefined && /^Plan:\s/.test(line)) {
       lines[i] = `Plan: ${updates.planLine}`;
     }
@@ -185,17 +207,26 @@ function updateStatePosition(content, updates) {
       let fm = content.substring(0, fmEnd + 3);
       const body = content.substring(fmEnd + 3);
 
+      if (updates.fmCurrentPhase !== undefined) {
+        fm = fm.replace(/^(current_phase:\s*).*/m, (_, p) => `${p}${updates.fmCurrentPhase}`);
+      }
+      if (updates.fmPhaseSlug !== undefined) {
+        fm = fm.replace(/^(phase_slug:\s*).*/m, (_, p) => `${p}"${updates.fmPhaseSlug}"`);
+      }
+      if (updates.fmPhaseName !== undefined) {
+        fm = fm.replace(/^(phase_name:\s*).*/m, (_, p) => `${p}"${updates.fmPhaseName}"`);
+      }
       if (updates.fmPlansComplete !== undefined) {
-        fm = fm.replace(/^(plans_complete:\s*).*/m, `$1${updates.fmPlansComplete}`);
+        fm = fm.replace(/^(plans_complete:\s*).*/m, (_, p) => `${p}${updates.fmPlansComplete}`);
       }
       if (updates.fmStatus !== undefined) {
-        fm = fm.replace(/^(status:\s*).*/m, `$1"${updates.fmStatus}"`);
+        fm = fm.replace(/^(status:\s*).*/m, (_, p) => `${p}"${updates.fmStatus}"`);
       }
       if (updates.fmLastActivity !== undefined) {
-        fm = fm.replace(/^(last_activity:\s*).*/m, `$1"${updates.fmLastActivity}"`);
+        fm = fm.replace(/^(last_activity:\s*).*/m, (_, p) => `${p}"${updates.fmLastActivity}"`);
       }
       if (updates.fmProgressPct !== undefined) {
-        fm = fm.replace(/^(progress_percent:\s*).*/m, `$1${updates.fmProgressPct}`);
+        fm = fm.replace(/^(progress_percent:\s*).*/m, (_, p) => `${p}${updates.fmProgressPct}`);
       }
 
       // Reconstruct with updated frontmatter + body with line updates
@@ -216,6 +247,9 @@ function updateStatePositionBody(body, updates) {
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i];
 
+    if (updates.phaseLine !== undefined && /^Phase:\s/.test(line)) {
+      lines[i] = `Phase: ${updates.phaseLine}`;
+    }
     if (updates.planLine !== undefined && /^Plan:\s/.test(line)) {
       lines[i] = `Plan: ${updates.planLine}`;
     }
@@ -286,11 +320,12 @@ function checkStateSync(data) {
   // Guard: skip STATE.md and ROADMAP.md writes (prevents circular trigger)
   if (basename === 'STATE.md' || basename === 'ROADMAP.md') return null;
 
-  // Determine if this is a SUMMARY or VERIFICATION write
+  // Determine if this is a SUMMARY, VERIFICATION, or PLAN write
   const isSummary = basename.includes('SUMMARY') && basename.endsWith('.md');
   const isVerification = basename === 'VERIFICATION.md';
+  const isPlan = /PLAN.*\.md$/i.test(basename) && !basename.includes('SUMMARY');
 
-  if (!isSummary && !isVerification) return null;
+  if (!isSummary && !isVerification && !isPlan) return null;
 
   // Guard: must be inside .planning/phases/
   const normalizedPath = filePath.replace(/\\/g, '/');
@@ -306,7 +341,7 @@ function checkStateSync(data) {
     return null;
   }
 
-  const cwd = process.cwd();
+  const cwd = process.env.PBR_PROJECT_ROOT || process.cwd();
   const planningDir = path.join(cwd, '.planning');
   const roadmapPath = path.join(planningDir, 'ROADMAP.md');
   const statePath = path.join(planningDir, 'STATE.md');
@@ -323,6 +358,17 @@ function checkStateSync(data) {
   const today = new Date().toISOString().slice(0, 10);
   const messages = [];
 
+  // Derive phase metadata for potential phase-line sync
+  const phaseNumInt = parseInt(phaseNum, 10);
+  const phaseSlug = phaseDirName.replace(/^\d+-/, '');
+  const phaseName = phaseSlug.replace(/-/g, ' ')
+    .replace(/\b\w/g, c => c.toUpperCase());
+  let totalPhases = 0;
+  try {
+    totalPhases = fs.readdirSync(phasesDir, { withFileTypes: true })
+      .filter(e => e.isDirectory() && /^\d+-/.test(e.name)).length;
+  } catch (_e) { /* leave as 0 */ }
+
   if (isSummary) {
     const plansComplete = `${artifacts.completeSummaries}/${artifacts.plans}`;
     const allComplete = artifacts.completeSummaries >= artifacts.plans;
@@ -333,10 +379,15 @@ function checkStateSync(data) {
     if (fs.existsSync(roadmapPath)) {
       try {
         const roadmapContent = fs.readFileSync(roadmapPath, 'utf8');
-        const updatedRoadmap = updateProgressTable(roadmapContent, phaseNum, plansComplete, newStatus, completedDate);
-        if (updatedRoadmap !== roadmapContent) {
-          atomicWrite(roadmapPath, updatedRoadmap);
-          messages.push(`ROADMAP.md: Phase ${phaseNum} → ${plansComplete} plans, ${newStatus}`);
+        const hasProgressTable = /Plans\s*Complete/i.test(roadmapContent);
+        if (!hasProgressTable) {
+          messages.push(`ROADMAP.md: No Progress table found. Add a table with columns: | Phase | Plans Complete | Status | Completed | for the current milestone phases.`);
+        } else {
+          const updatedRoadmap = updateProgressTable(roadmapContent, phaseNum, plansComplete, newStatus, completedDate);
+          if (updatedRoadmap !== roadmapContent) {
+            atomicWriteFile(roadmapPath, updatedRoadmap);
+            messages.push(`ROADMAP.md: Phase ${phaseNum} → ${plansComplete} plans, ${newStatus}`);
+          }
         }
       } catch (e) {
         logHook('check-state-sync', 'PostToolUse', 'error', { reason: 'ROADMAP.md update failed', error: e.message });
@@ -358,9 +409,22 @@ function checkStateSync(data) {
           fmLastActivity: today,
           fmProgressPct: overallPct
         };
+
+        // Detect phase mismatch and add phase updates
+        const currentPhaseMatch = stateContent.match(/^current_phase:\s*(\d+)/m)
+          || stateContent.match(/^Phase:\s*(\d+)\s/m);
+        const currentPhase = currentPhaseMatch ? parseInt(currentPhaseMatch[1], 10) : null;
+        if (currentPhase !== null && currentPhase !== phaseNumInt) {
+          stateUpdates.phaseLine = `${phaseNumInt} of ${totalPhases} (${phaseName})`;
+          stateUpdates.fmCurrentPhase = phaseNumInt;
+          stateUpdates.fmPhaseSlug = phaseSlug;
+          stateUpdates.fmPhaseName = phaseName;
+          messages.push(`STATE.md: Phase ${currentPhase} → ${phaseNumInt}`);
+        }
+
         const updatedState = updateStatePosition(stateContent, stateUpdates);
         if (updatedState !== stateContent) {
-          atomicWrite(statePath, updatedState);
+          atomicWriteFile(statePath, updatedState);
           messages.push(`STATE.md: ${artifacts.completeSummaries}/${artifacts.plans} plans, ${overallPct}%`);
         }
       } catch (e) {
@@ -399,10 +463,15 @@ function checkStateSync(data) {
     if (fs.existsSync(roadmapPath)) {
       try {
         const roadmapContent = fs.readFileSync(roadmapPath, 'utf8');
-        const updatedRoadmap = updateProgressTable(roadmapContent, phaseNum, plansComplete, roadmapStatus, completedDate);
-        if (updatedRoadmap !== roadmapContent) {
-          atomicWrite(roadmapPath, updatedRoadmap);
-          messages.push(`ROADMAP.md: Phase ${phaseNum} → ${roadmapStatus}`);
+        const hasProgressTable = /Plans\s*Complete/i.test(roadmapContent);
+        if (!hasProgressTable) {
+          messages.push(`ROADMAP.md: No Progress table found. Add a table with columns: | Phase | Plans Complete | Status | Completed | for the current milestone phases.`);
+        } else {
+          const updatedRoadmap = updateProgressTable(roadmapContent, phaseNum, plansComplete, roadmapStatus, completedDate);
+          if (updatedRoadmap !== roadmapContent) {
+            atomicWriteFile(roadmapPath, updatedRoadmap);
+            messages.push(`ROADMAP.md: Phase ${phaseNum} → ${roadmapStatus}`);
+          }
         }
       } catch (e) {
         logHook('check-state-sync', 'PostToolUse', 'error', { reason: 'ROADMAP.md update failed', error: e.message });
@@ -422,9 +491,22 @@ function checkStateSync(data) {
           fmLastActivity: today,
           fmProgressPct: overallPct
         };
+
+        // Detect phase mismatch and add phase updates
+        const currentPhaseMatch = stateContent.match(/^current_phase:\s*(\d+)/m)
+          || stateContent.match(/^Phase:\s*(\d+)\s/m);
+        const currentPhase = currentPhaseMatch ? parseInt(currentPhaseMatch[1], 10) : null;
+        if (currentPhase !== null && currentPhase !== phaseNumInt) {
+          stateUpdates.phaseLine = `${phaseNumInt} of ${totalPhases} (${phaseName})`;
+          stateUpdates.fmCurrentPhase = phaseNumInt;
+          stateUpdates.fmPhaseSlug = phaseSlug;
+          stateUpdates.fmPhaseName = phaseName;
+          messages.push(`STATE.md: Phase ${currentPhase} → ${phaseNumInt}`);
+        }
+
         const updatedState = updateStatePosition(stateContent, stateUpdates);
         if (updatedState !== stateContent) {
-          atomicWrite(statePath, updatedState);
+          atomicWriteFile(statePath, updatedState);
           messages.push(`STATE.md: ${stateStatus}, ${overallPct}%`);
         }
       } catch (e) {
@@ -433,10 +515,63 @@ function checkStateSync(data) {
     }
   }
 
+  if (isPlan) {
+    // Status ordering: only set Planning if current status is lower
+    const statusOrder = { 'not started': 0, '': 0, 'planning': 1, 'in progress': 2, 'complete': 3, 'needs fixes': 4 };
+
+    if (fs.existsSync(roadmapPath)) {
+      try {
+        const roadmapContent = fs.readFileSync(roadmapPath, 'utf8');
+        const hasProgressTable = /Plans\s*Complete/i.test(roadmapContent);
+        if (!hasProgressTable) {
+          messages.push(`ROADMAP.md: No Progress table found. Add a table with columns: | Phase | Plans Complete | Status | Completed | for the current milestone phases.`);
+        } else {
+          // Read current status from the Progress table for this phase
+          const lines = roadmapContent.split('\n');
+          const paddedPhase = phaseNum.padStart(2, '0');
+          let currentStatus = '';
+          let inTable = false;
+          for (const line of lines) {
+            if (!inTable) {
+              if (line.includes('|') && /Plans\s*Complete/i.test(line)) inTable = true;
+              continue;
+            }
+            if (/^\s*\|[\s-:|]+\|\s*$/.test(line)) continue;
+            if (!line.includes('|')) break;
+            const parts = line.split('|');
+            if (parts.length < 5) continue;
+            const phaseCol = (parts[1] || '').trim();
+            const phaseMatch = phaseCol.match(/^(\d+)\./);
+            if (!phaseMatch) continue;
+            if (phaseMatch[1] === paddedPhase || String(parseInt(phaseMatch[1], 10)) === String(parseInt(phaseNum, 10))) {
+              currentStatus = (parts[3] || '').trim().toLowerCase();
+              break;
+            }
+          }
+
+          // Only update to "Planning" if current status is lower
+          const currentOrder = statusOrder[currentStatus] !== undefined ? statusOrder[currentStatus] : 0;
+          const planningOrder = statusOrder['planning'];
+          if (currentOrder < planningOrder) {
+            const plansComplete = `${artifacts.completeSummaries}/${artifacts.plans}`;
+            const updatedRoadmap = updateProgressTable(roadmapContent, phaseNum, plansComplete, 'Planning', null);
+            if (updatedRoadmap !== roadmapContent) {
+              atomicWriteFile(roadmapPath, updatedRoadmap);
+              messages.push(`ROADMAP.md: Phase ${phaseNum} → Planning`);
+            }
+          }
+        }
+      } catch (e) {
+        logHook('check-state-sync', 'PostToolUse', 'error', { reason: 'ROADMAP.md update failed', error: e.message });
+      }
+    }
+  }
+
   if (messages.length > 0) {
     const msg = `Auto-synced tracking files: ${messages.join('; ')}`;
     logHook('check-state-sync', 'PostToolUse', 'sync', { phase: phaseNum, updates: messages });
-    logEvent('workflow', 'state-sync', { phase: phaseNum, trigger: isSummary ? 'summary' : 'verification', updates: messages });
+    const trigger = isSummary ? 'summary' : isVerification ? 'verification' : 'plan';
+    logEvent('workflow', 'state-sync', { phase: phaseNum, trigger, updates: messages });
     return { output: { additionalContext: msg } };
   }
 
@@ -466,6 +601,7 @@ function main() {
 
 if (require.main === module || process.argv[1] === __filename) { main(); }
 module.exports = {
+  atomicWriteFile,
   extractPhaseNum,
   countPhaseArtifacts,
   updateProgressTable,