* fix(#1445,#1446): exclude 999.x backlog phases from milestone totals; allow total_phases downward correction #1445: deriveProgressFromRoadmap (phase-lifecycle.cts), the roadmapPhaseCount loop (state.cts), and getMilestonePhaseFilter (roadmap-parser.cts) all now skip phase tokens matching /^999\b/ — consistent with the existing init.cts filter. 999.x backlog dirs are consequently excluded from phaseDirs too. #1446: shouldPreserveExistingProgress (state-document.cts) no longer includes total_phases in its ratchet check. total_phases always takes the freshly derived value; only completed_phases, total_plans, and completed_plans retain ratchet behaviour. Regression tests added for both bugs. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * chore: add changeset for #1445/#1446 progress-backlog-exclusion-and-ratchet Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(#1445,#1446): rename test files to fix-NNN convention; fix changeset pr: null Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
90 lines
3.8 KiB
TypeScript
90 lines
3.8 KiB
TypeScript
/**
|
|
* Phase Lifecycle Pure Helpers — pure-computation functions extracted from
|
|
* the phase-lifecycle SDK handler (ADR-457 build-at-publish: the hand-written
|
|
* bin/lib/phase-lifecycle.cjs collapsed to a TypeScript source of truth).
|
|
* Behaviour is preserved byte-for-behaviour from the prior hand-written .cjs;
|
|
* only types are added.
|
|
*
|
|
* I/O adapter pattern (ADR-3524 Section 4): each side supplies its own I/O
|
|
* (sync readFileSync for CJS, async readFile for SDK); the pure computation
|
|
* logic is shared via this generated artifact.
|
|
*
|
|
* Scope:
|
|
* - deriveProgressFromRoadmap(roadmapContent): count Complete rows => idempotent
|
|
* - clampPercent(completed, total): percent with 100 ceiling
|
|
*
|
|
* These two functions are the root-cause fix for issue #4.
|
|
*
|
|
* References:
|
|
* - ADR-3524 (docs/adr/3524-cjs-sdk-hard-seam.md)
|
|
* - Issue #4 (open-gsd/gsd-core)
|
|
*/
|
|
|
|
/** Result of deriveProgressFromRoadmap. */
|
|
export interface RoadmapProgress {
|
|
completedPhases: number | null;
|
|
totalPhases: number | null;
|
|
totalPlans: number | null;
|
|
}
|
|
|
|
/**
|
|
* Derive completed_phases, total_phases, and total_plans from ROADMAP content.
|
|
* Root cause fix for issue #4 — see gen-phase-lifecycle.mjs for full documentation.
|
|
*/
|
|
export function deriveProgressFromRoadmap(roadmapContent: string): RoadmapProgress {
|
|
let completedPhases: number | null = null;
|
|
let totalPhases: number | null = null;
|
|
let totalPlans: number | null = null;
|
|
|
|
try {
|
|
// Count Complete rows in the progress table (Status column = "Complete").
|
|
// Pattern: row where the phase cell starts with a digit (data row, not header),
|
|
// followed by any cell content, then a "Complete" status cell.
|
|
// Handles both short form ("| 4. |") and long form ("| 01. Foundation |").
|
|
// See phase-lifecycle.ts ~line 1655 for the original SDK pattern.
|
|
const tableCompletePattern = /\|\s*\d+[^|]*\|\s*[^|]*\|\s*Complete\s*\|/gi;
|
|
const completeMatches = roadmapContent.match(tableCompletePattern);
|
|
completedPhases = completeMatches ? completeMatches.length : null;
|
|
|
|
// Count total phase rows in the progress table.
|
|
// Identify the table by looking for Phase|...|Status|...|Completed header.
|
|
const progressTableMatch = roadmapContent.match(
|
|
// allow-adhoc-markdown: table-scoped regex with heading lookahead as stop; table parsing, out of seam scope; pending #1372
|
|
/\|\s*Phase\s*\|[^|]*\|[^|]*Status[^|]*\|[^|]*Completed[^|]*\|[\s\S]*?(?=\n\n|\n##|$)/i,
|
|
);
|
|
if (progressTableMatch) {
|
|
const tableText = progressTableMatch[0];
|
|
// Count data rows (rows starting with pipe then a phase number),
|
|
// excluding 999.x backlog phases. Mirrors init.cts /^999(?:\.|$)/ filter.
|
|
const dataRowPattern = /^\|\s*(\d+[^|]*)\|/gm;
|
|
let dataRowCount = 0;
|
|
let drm: RegExpExecArray | null;
|
|
while ((drm = dataRowPattern.exec(tableText)) !== null) {
|
|
if (/^999\b/.test(drm[1].trim())) continue;
|
|
dataRowCount++;
|
|
}
|
|
totalPhases = dataRowCount > 0 ? dataRowCount : null;
|
|
}
|
|
|
|
// Sum plan counts from M/N columns in progress table
|
|
let totalPlansSum = 0;
|
|
const planCellPattern = /\|\s*\d+[^|]*\|\s*(\d+)\/(\d+)\s*\|/gi;
|
|
let pm: RegExpExecArray | null;
|
|
while ((pm = planCellPattern.exec(roadmapContent)) !== null) {
|
|
totalPlansSum += parseInt(pm[2], 10);
|
|
}
|
|
if (totalPlansSum > 0) totalPlans = totalPlansSum;
|
|
} catch { /* intentionally empty — fall through to existing values */ }
|
|
|
|
return { completedPhases, totalPhases, totalPlans };
|
|
}
|
|
|
|
/**
|
|
* Compute progress percent clamped to 100.
|
|
* Root cause fix for issue #4 — see gen-phase-lifecycle.mjs for full documentation.
|
|
*/
|
|
export function clampPercent(completed: number, total: number): number {
|
|
if (!total || total <= 0) return 0;
|
|
return Math.min(100, Math.round((completed / total) * 100));
|
|
}
|