golem15/msd-core
3
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(#3213): segment-boundary membership for letter-named phase dirs (#3368)

Browse Source 
* test(#3213): add letter-named phase regression for getMilestonePhaseFilter

The custom-ID branch's greedy capture excluded every letter-named phase
directory (Phase A:..Phase L:) from the milestone, fabricating counts.
Add two failing-first regression tests: a single letter phase + numeric
control, and the full A..L + 00 tree from the issue's reproduction.

RED — fails on next; fix follows in a separate fix: commit.

* fix(#3213): segment-boundary membership for letter-named phase dirs

The custom-ID branch of isDirInMilestone (getMilestonePhaseFilter) used a
greedy capture ^([A-Za-z][A-Za-z0-9]*(?:-[A-Za-z0-9]+)*) that swallowed the
whole hyphenated directory name (A-tool-output-contract was captured as
'A-tool-output-contract', not 'A'). The set lookup then failed and every
letter-named phase directory (Phase A:..Phase L: — GSD's own convention,
ADR-612 first-class non-numeric IDs) fell out of the milestone, silently
fabricating progress/plan counts over whatever numeric dir survived.

Replace the capture-then-lookup with a segment-boundary membership test: a
directory belongs if its lowercased name EQUALS a declared phase ID or BEGINS
with that ID followed by '-' (so 'A-tool-output-contract' matches ID 'a';
'PROJ-42-description' matches ID 'proj-42'; 'AB-combined' does NOT match
'a'). IDs are sorted longest-first so a hyphenated id (proj-42) is tested
before a prefix of it (proj). Additive only — numericRe still handles every
leading-digit dir first, and this can only ADMIT a dir the greedy capture
wrongly excluded, never exclude one already matched.

* chore(#3213): add changeset fragment

* chore(#3213): backfill changeset PR number (#3368)

---------

Co-authored-by: sim <sim@local>
This commit is contained in:
Tom Boucher
2026-08-11 19:18:08 -04:00
committed by GitHub
parent e7993d77bf
commit bfd749cb9a
3 changed files with 77 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/roadmap-parser.cts
View File

@@ -1366,6 +1366,10 @@ function getMilestonePhaseFilter(cwd: string, versionOverride?: string | null, p
);
const roadmapUsesHyphenedIds = [...normalized].some(n => n.includes('-'));
// #3213: longest-first so a hyphenated declared ID (e.g. "proj-42") is tested
// before a prefix of it (e.g. "proj") in the segment-boundary membership loop
// below — otherwise the shorter id would admit a dir that belongs to the longer.
const normalizedIdsLongestFirst = [...normalized].sort((a, b) => b.length - a.length);
// #2043: milestone-prefixed sub-phase components must be zero-padded — so a
// single-digit slug word after the phase
// number (e.g. dir "46-6-rs-…") captures "46" and is not silently excluded from
@@ -1383,8 +1387,27 @@ function getMilestonePhaseFilter(cwd: string, versionOverride?: string | null, p
function isDirInMilestone(dirName: string): boolean {
const m2 = dirName.match(numericRe);
if (m2 && normalized.has(normalizePhaseIdSegments(m2[1]).toLowerCase())) return true;
const customMatch = dirName.match(/^([A-Za-z][A-Za-z0-9]*(?:-[A-Za-z0-9]+)*)/);
if (customMatch && normalized.has(customMatch[1].toLowerCase())) return true;
// #3213: segment-boundary membership test, scoped to LETTER-LEADING (custom-
// ID) directories only. The prior greedy capture
// `^([A-Za-z][A-Za-z0-9]*(?:-[A-Za-z0-9]+)*)` swallowed the WHOLE hyphenated
// directory name (A-tool-output-contract was captured as
// "A-tool-output-contract", not "A"), so every letter-named phase directory
// (Phase A:..Phase L: — GSD's own convention, ADR-612 first-class non-numeric
// IDs) fell out of the milestone and counts were silently fabricated over
// whatever numeric directory survived. A letter-leading directory belongs if
// its lowercased name EQUALS a declared phase ID, or BEGINS with that ID
// followed by "-" (so "A-tool-output-contract" matches ID "a";
// "PROJ-42-description" matches ID "proj-42"; "AB-combined" does NOT match
// "a"). SCOPED TO LETTER-LEADING DIRS because numeric dirs are owned by
// numericRe above, which respects the #2232 continuation grammar — a bare
// startsWith here would wrongly admit "14-02-photos-…" to phase "14" when its
// real token is "14-02" (continuation-absorbed, not declared).
if (/^[A-Za-z]/.test(dirName)) {
const lowerDir = dirName.toLowerCase();
for (const id of normalizedIdsLongestFirst) {
if (lowerDir === id || lowerDir.startsWith(id + '-')) return true;
}
}
const stripped = stripProjectCodePrefix(dirName);
if (stripped !== dirName) {
const sm = stripped.match(numericRe);