@opengsd/gsd-core 1.7.0-rc.5 → 1.7.0

package/gsd-core/bin/lib/plan-scan.cjs

@@ -15,11 +15,14 @@ const { countMatchedSummaries } = coreUtils;
 // Excluded derivative files
 const PLAN_OUTLINE_RE = /-OUTLINE\.md$/i;
 const PLAN_PRE_BOUNCE_RE = /\.pre-bounce\.md$/i;
+const PLAN_REVIEW_RE = /-PLAN-REVIEW\.md$/i;
 function isRootPlanFile(fileName) {
     if (PLAN_OUTLINE_RE.test(fileName))
         return false;
     if (PLAN_PRE_BOUNCE_RE.test(fileName))
         return false;
+    if (PLAN_REVIEW_RE.test(fileName))
+        return false;
     if (fileName.endsWith('-PLAN.md') || fileName === 'PLAN.md')
         return true;
     // A summary is never a plan. Reject summaries before the loose /PLAN/i

package/gsd-core/bin/lib/review-reviewer-selection.cjs

@@ -15,25 +15,42 @@
  * per-instance CLI flags). An instance is available iff its base `cli` is
  * detected. The instance→cli mapping lives HERE (single source; see the parity
  * test in tests/review-reviewer-instances.test.cjs — DEFECT.GENERATIVE-FIX).
+ *
+ * KNOWN_REVIEWER_SLUGS (post-review #2092): registry-derived, not a flat
+ * hand-maintained array. Each capability-runtime descriptor that is a valid
+ * reviewer CLI declares `runtime.hostBehaviors.reviewerCli: true`
+ * (capabilities/<id>/capability.json); this module reads that flag off the
+ * generated capability-registry.cjs at require-time. A handful of reviewer
+ * CLIs are NOT install-time runtimes at all (no capabilities/<id>/ descriptor
+ * exists) — those stay a small hardcoded tail:
+ *   - `gemini` — hook-event dialect name only (see runtime-hooks-surface.cts);
+ *     the Gemini CLI reviewer is not an installable runtime (#1928 folded
+ *     gemini into antigravity's descriptor).
+ *   - `coderabbit` / `ollama` / `lm_studio` / `llama_cpp` — third-party
+ *     review/model CLIs with no GSD install surface at all.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.INSTANCE_NAME_PATTERN = exports.KNOWN_REVIEWER_SLUGS = void 0;
 exports.normalizeConfiguredDefaultReviewers = normalizeConfiguredDefaultReviewers;
 exports.normalizeReviewerInstances = normalizeReviewerInstances;
 exports.resolveReviewerSelection = resolveReviewerSelection;
-exports.KNOWN_REVIEWER_SLUGS = [
+const NON_RUNTIME_REVIEWER_SLUGS = [
     'gemini',
-    'claude',
-    'codex',
     'coderabbit',
-    'opencode',
-    'qwen',
-    'cursor',
-    'antigravity',
     'ollama',
     'lm_studio',
     'llama_cpp',
 ];
+function deriveRuntimeReviewerSlugs() {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const registry = require('./capability-registry.cjs');
+    const runtimes = registry.runtimes || {};
+    return Object.keys(runtimes).filter((id) => runtimes[id]?.runtime?.hostBehaviors?.reviewerCli === true);
+}
+exports.KNOWN_REVIEWER_SLUGS = [
+    ...deriveRuntimeReviewerSlugs(),
+    ...NON_RUNTIME_REVIEWER_SLUGS,
+];
 /** Instance names are lowercase slugs that must not shadow a built-in slug. */
 exports.INSTANCE_NAME_PATTERN = /^[a-z0-9][a-z0-9-]*$/;
 function normalizeConfiguredDefaultReviewers(rawValue) {

package/gsd-core/bin/lib/roadmap-parser.cjs

@@ -14,6 +14,7 @@
  *   - ./phase-id.cjs        (escapeRegex, phaseMarkdownRegexSource)
  *   - ./planning-workspace.cjs (planningDir)
  *   - ./shell-command-projection.cjs (platformReadSync)
+ *   - ./markdown-sectionizer.cjs (tokenizeHeadings, stripTaggedBlocks, withSection)
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -173,6 +174,56 @@ function replaceInCurrentMilestone(content, pattern, replacement) {
     const after = content.slice(offset);
     return before + after.replace(pattern, replacement);
 }
+/**
+ * Resolve a single phase's detail-section heading (`### Phase N: …`, any level
+ * 1–6, via the #2121 phase-id source) and run `edit` against ONLY that
+ * section's body. Delegates to `withSection` (markdown-sectionizer.cjs), so a
+ * per-phase ROADMAP edit is structurally bounded to that phase's own section —
+ * it cannot escape into a sibling phase, a shipped-milestone `<details>` block,
+ * or a backticked prose literal (ADR-2143 §4).
+ *
+ * `content` is expected to already be scoped to the current milestone's raw
+ * range(s) by the caller (see `currentMilestoneRawRanges`) — `withPhaseSection`
+ * composes with that milestone-level scoping rather than replacing it.
+ *
+ * The matched phase number must be delimited by whitespace, a colon, an
+ * open-paren tag, or end-of-heading — never a bare `\b`. A trailing `\b` sits
+ * between the last digit and a following `.` or letter, so it would let a
+ * query for phase `1` prefix-match a decimal sub-phase heading like
+ * `### Phase 1.1: Sub` or a distinct suffixed phase like `### Phase 1A: …`.
+ *
+ * The phase token must additionally anchor to the START of the heading text
+ * (after an optional leading `[tag]`, mirroring `findRoadmapPhaseInContent`
+ * below) — never merely appear anywhere in it. Without this anchor, a query
+ * for phase `1` would match a SIBLING phase whose own TITLE happens to
+ * mention "Phase 1" (e.g. `### Phase 3: Migrate off Phase 1 legacy pipeline`),
+ * and — because `collectSection` picks the first matching heading in document
+ * order — that sibling would be hijacked instead of the real Phase 1 section.
+ *
+ * The section body is bounded by `{ levelBounded: false }`: it ends at the
+ * next ATX heading of ANY level, not merely a heading at or above the phase
+ * heading's own level. Real ROADMAPs are not guaranteed to use a uniform
+ * phase-heading level, so a level-bounded stop could fold a deeper sibling
+ * heading (e.g. a `####` phase following a `###` phase) into this phase's
+ * body and let `edit` reach into it.
+ */
+function withPhaseSection(content, phaseId, edit) {
+    const src = phaseMarkdownRegexSource(phaseId);
+    const headingRe = new RegExp(`^\\s*(?:\\[[^\\]]{1,200}\\]\\s*)?Phase\\s+${src}(?=[\\s:(]|$)`, 'i');
+    return (0, markdown_sectionizer_cjs_1.withSection)(content, (h) => headingRe.test(h.text), edit, { levelBounded: false });
+}
+// ─── Roadmap phase lookup ─────────────────────────────────────────────────────
+// #2199: a bullet/checkbox phase entry, e.g. `- [ ] **Phase 36 — Authentication**`
+// (the bundled roadmapper emits this in bullet-house-style ROADMAPs). The number
+// is captured in group 1, the name in group 2; the separator may be an em-dash,
+// en-dash, hyphen, or colon. Used as a fallback when no ATX heading matches, and
+// to count phases in a milestone that uses the bullet form.
+const BULLET_PHASE_LINE_PATTERN = /^\s*[-*]\s+(?:\[[ xX]\]\s+)?\*\*Phase\s+([\w][\w.-]*)(?:\s*\([^)\n]{0,200}\))?\s*[—–:\-]\s*(.+?)\*\*/im;
+/** Build a bullet-phase-line regex pinned to a specific phase number (#2199). */
+function bulletPhaseLineFor(phaseNum, phaseSource) {
+    const num = phaseSource ?? phaseMarkdownRegexSource(phaseNum);
+    return new RegExp(`^\\s*[-*]\\s+(?:\\[[ xX]\\]\\s+)?\\*\\*Phase\\s+(${num})${OPTIONAL_PHASE_TAG_SOURCE}\\s*[—–:\\-]\\s*(.+?)\\*\\*`, 'im');
+}
 function findRoadmapPhaseInContent(content, phaseNum, phaseSource) {
     // #1729: OPTIONAL_PHASE_TAG_SOURCE after the number tolerates a pre-colon ( ) tag.
     const headingPattern = new RegExp(`^(?:\\[[^\\]]{1,200}\\]\\s*)?Phase\\s+${phaseSource ?? phaseMarkdownRegexSource(phaseNum)}${OPTIONAL_PHASE_TAG_SOURCE}:\\s*(.+)$`, 'i');
@@ -198,6 +249,22 @@ function findRoadmapPhaseInContent(content, phaseNum, phaseSource) {
         section,
     };
 }
+function findRoadmapBulletPhaseInContent(content, phaseNum, phaseSource) {
+    // #2199: bullet/checkbox entry fallback (`- [ ] **Phase N — name**`). Returns
+    // the single bullet line as the section (no multi-line body) — used only as a
+    // last resort, AFTER heading lookup on scoped + full content has failed, so a
+    // heading with a Requirements/Goal section always wins.
+    const bulletMatch = content.match(bulletPhaseLineFor(phaseNum, phaseSource));
+    if (!bulletMatch)
+        return null;
+    return {
+        found: true,
+        phase_number: String(phaseNum),
+        phase_name: bulletMatch[2].trim(),
+        goal: null,
+        section: bulletMatch[0].trim(),
+    };
+}
 function getRoadmapPhaseInternal(cwd, phaseNum) {
     if (!phaseNum)
         return null;
@@ -221,12 +288,35 @@ function getRoadmapPhaseInternal(cwd, phaseNum) {
             if (fullResult)
                 return fullResult;
         }
+        // #2199: no ATX heading matched on scoped or full content — fall back to a
+        // bullet/checkbox entry (em-dash/en-dash/hyphen/colon separator). Last resort
+        // so a bullet never pre-empts a heading that carries the Requirements section.
+        for (const source of roadmapPhaseLookupSources(phaseNum)) {
+            const scopedBullet = findRoadmapBulletPhaseInContent(content, phaseNum, source);
+            if (scopedBullet)
+                return scopedBullet;
+            const fullBullet = findRoadmapBulletPhaseInContent(fullContent, phaseNum, source);
+            if (fullBullet)
+                return fullBullet;
+        }
         return null;
     }
     catch {
         return null;
     }
 }
+/**
+ * Strip a leading delimiter run (whitespace, em/en-dash, colon, hyphen) from a
+ * milestone-name capture. Markdown headings commonly take the shape
+ * `## vX.Y — Name` or `## vX.Y: Name`; the raw capture includes the delimiter
+ * because `.trim()` only removes whitespace, not punctuation. A name beginning
+ * with punctuation is a delimiter-led fragment, not the curated name (#2135).
+ * NOTE: do not strip `#` — a name beginning with `#` is a heading-parse failure
+ * that should stay loud rather than be silently cleaned.
+ */
+function stripLeadingDelimiter(s) {
+    return s.replace(/^[\s—–:-]+/, '').trim();
+}
 function getMilestoneInfo(cwd) {
     try {
         const roadmap = (0, shell_command_projection_cjs_1.platformReadSync)(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md'));
@@ -243,23 +333,39 @@ function getMilestoneInfo(cwd) {
                         stateVersion = m[1].trim();
                 }
             }
-            catch { /* intentionally empty */ }
+            catch {
+                /* best-effort (#2245 audit): platformReadSync re-throws for a non-ENOENT
+                 * failure (e.g. EACCES) reading STATE.md. Consulting STATE.md's
+                 * `milestone:` field is an OPTIONAL enhancement here — on failure this
+                 * function already falls back to ROADMAP-only heuristics below, the
+                 * same fallback path taken when STATE.md simply doesn't exist. */
+            }
         }
         if (stateVersion) {
             const escapedVer = escapeRegex(stateVersion);
-            const headingMatch = roadmap.match(new RegExp(`##[^\\n]*${escapedVer}[:\\s]+([^\\n(]+)`, 'i'));
-            if (headingMatch) {
-                if (!headingMatch[0].includes('✅')) {
-                    return { version: stateVersion, name: headingMatch[1].trim() };
-                }
+            // #2135: consult the 🚧 name-bearing marker FIRST. It is the only construct
+            // guaranteed to carry the milestone's curated name adjacent to its version
+            // (the active-milestone bullet). A `##` heading is often nameless
+            // ("## vX.Y — Active Milestone") and, when unanchored, was matched
+            // spuriously on a copy quoted inside backticks in this very bullet.
+            const listMatch = roadmap.match(new RegExp(`🚧\\s*\\*?\\*?${escapedVer}\\s+([^*\\n]+)`, 'i'));
+            if (listMatch) {
+                const name = stripLeadingDelimiter(listMatch[1]);
+                if (name)
+                    return { version: stateVersion, name };
             }
-            else {
-                const listMatch = roadmap.match(new RegExp(`🚧\\s*\\*?\\*?${escapedVer}\\s+([^*\\n]+)`, 'i'));
-                if (listMatch) {
-                    return { version: stateVersion, name: listMatch[1].trim() };
-                }
-                return { version: stateVersion, name: 'milestone' };
+            // Fall back to the `##` heading — ANCHORED to line start (`^` + `m` flag)
+            // so a heading quoted inside backticks or prose mid-line can no longer
+            // match. Skip shipped (✅) headings.
+            const headingMatch = roadmap.match(new RegExp(`^##[^\\n]*${escapedVer}[:\\s]+([^\\n(]+)`, 'im'));
+            if (headingMatch && !headingMatch[0].includes('✅')) {
+                // Strip a leading delimiter — `.trim()` removes whitespace, not the
+                // em-dash/colon that conventionally separates version from name.
+                const name = stripLeadingDelimiter(headingMatch[1]);
+                if (name)
+                    return { version: stateVersion, name };
             }
+            return { version: stateVersion, name: 'milestone' };
         }
         const inProgressMatch = roadmap.match(/🚧\s*\*\*v(\d+(?:\.\d+)+)\s+([^*]+)\*\*/);
         if (inProgressMatch) {
@@ -374,8 +480,26 @@ function getMilestonePhaseFilter(cwd, versionOverride, phaseIdConvention) {
             if (pm && !/^999\b/.test(pm[1]))
                 milestonePhaseNums.add(pm[1]);
         }
+        // #2199: also count bullet/checkbox phase entries (`- [ ] **Phase N — name**`)
+        // so a bullet-house-style ROADMAP populates the milestone phase set instead of
+        // collapsing to a zero-count pass-all filter.
+        {
+            let bm;
+            const scanner = new RegExp(BULLET_PHASE_LINE_PATTERN.source, 'gim');
+            while ((bm = scanner.exec(roadmap)) !== null) {
+                if (!/^999\b/.test(bm[1]))
+                    milestonePhaseNums.add(bm[1]);
+            }
+        }
+    }
+    catch {
+        /* best-effort (#2245 audit): the real throw source is platformReadSync
+         * at the top of this try (re-throws for a non-ENOENT read failure). On
+         * any failure milestonePhaseNums stays empty, which below already
+         * degrades to the same pass-all filter this function returns when a
+         * ROADMAP genuinely has zero recognizable phase headings — a safe,
+         * non-corrupting (over-inclusive, never under-inclusive) degrade. */
     }
-    catch { /* intentionally empty */ }
     if (milestonePhaseNums.size === 0) {
         const passAll = (() => true);
         passAll.phaseCount = 0;
@@ -414,6 +538,85 @@ function getMilestonePhaseFilter(cwd, versionOverride, phaseIdConvention) {
     isDirInMilestone.missingExplicitVersion = missingExplicitVersion;
     return isDirInMilestone;
 }
+/**
+ * #2200: raw [start,end) offsets of the current milestone's region(s) in ROADMAP
+ * content, for scoping write-path mutations (phase-checkbox flip, Plans-count
+ * writer) so they cannot touch a backticked prose literal, a Backlog entry, or a
+ * same-numbered phase in a shipped milestone.
+ *
+ * Mirrors the region selection in `extractCurrentMilestone` (version detection →
+ * active heading → next milestone boundary → optional Phase Details section).
+ * Returns null when there is no versioned active milestone; callers then fall
+ * back to whole-content mutation (the prior behaviour).
+ *
+ * NOTE: keep the region logic here in sync with extractCurrentMilestone.
+ */
+function currentMilestoneRawRanges(content, cwd) {
+    if (!cwd)
+        return null;
+    let version = null;
+    try {
+        const statePath = node_path_1.default.join(planningDir(cwd), 'STATE.md');
+        const stateRaw = (0, shell_command_projection_cjs_1.platformReadSync)(statePath);
+        if (stateRaw !== null) {
+            const milestoneMatch = stateRaw.match(/^milestone:\s*(.+)/m);
+            if (milestoneMatch)
+                version = milestoneMatch[1].trim();
+        }
+    }
+    catch { /* ignore */ }
+    if (!version) {
+        const inProgressMatch = content.match(/(?:🚧|🔄)\s*\*\*v(\d+\.\d+)\s/);
+        if (inProgressMatch)
+            version = 'v' + inProgressMatch[1];
+    }
+    if (!version)
+        return null;
+    const escapedVersion = escapeRegex(version);
+    const sectionPattern = new RegExp(`(^#{1,3}\\s+(?!Phase\\s+\\S).*${escapedVersion}\\b[^\\n]*)`, 'gmi');
+    const headingMatches = [...content.matchAll(sectionPattern)];
+    if (headingMatches.length === 0)
+        return null;
+    const closedMarkerPattern = /\b(?:CLOSED|ARCHIVED|ABANDONED|SHIPPED|FAILED)\b|✅|🗄/i;
+    const activeMarkerPattern = /\b(?:STARTED|ACTIVE|WIP)\b|in\s+progress|🚧|🔄/i;
+    const isClosed = (h) => closedMarkerPattern.test(h) && !activeMarkerPattern.test(h);
+    const firstMatch = headingMatches[0];
+    const selected = headingMatches.find((m) => !isClosed(m[1])) || firstMatch;
+    const sectionStart = selected.index ?? 0;
+    const computeSectionEnd = (headingText, headingStart) => {
+        const level = (headingText.match(/^(#{1,3})\s/) ?? ['', '#'])[1].length;
+        const afterHeading = headingStart + headingText.length;
+        for (const h of (0, markdown_sectionizer_cjs_1.tokenizeHeadings)(content)) {
+            if (h.offset <= headingStart)
+                continue;
+            if (h.offset < afterHeading)
+                continue;
+            if (h.level > level)
+                continue;
+            if (/^Phase\s+\S/i.test(h.text))
+                continue;
+            if (!/v\d+\.\d+|✅|📋|🚧/i.test(h.text))
+                continue;
+            return h.offset;
+        }
+        return content.length;
+    };
+    const sectionEnd = computeSectionEnd(selected[0], sectionStart);
+    const selectedVersionToken = selected[1].match(/v\d+(?:\.\d+)+(?:[-.][A-Za-z0-9]+)*/i)?.[0];
+    const detailsVersionBoundary = selectedVersionToken
+        ? new RegExp(`${escapeRegex(selectedVersionToken)}(?![\\w.-])`, 'i')
+        : null;
+    const detailsMatch = headingMatches.find((m) => /\(Phase\s+Details\)/i.test(m[1]) &&
+        !isClosed(m[1]) &&
+        (!detailsVersionBoundary || detailsVersionBoundary.test(m[1])) &&
+        (m.index ?? 0) >= sectionEnd);
+    let details = null;
+    if (detailsMatch) {
+        const detailsStart = detailsMatch.index ?? 0;
+        details = { start: detailsStart, end: computeSectionEnd(detailsMatch[0], detailsStart) };
+    }
+    return { primary: { start: sectionStart, end: sectionEnd }, details };
+}
 module.exports = {
     stripShippedMilestones,
     extractCurrentMilestone,
@@ -421,4 +624,6 @@ module.exports = {
     getRoadmapPhaseInternal,
     getMilestoneInfo,
     getMilestonePhaseFilter,
+    currentMilestoneRawRanges,
+    withPhaseSection,
 };

package/gsd-core/bin/lib/roadmap.cjs

@@ -25,6 +25,7 @@ const { findPhaseInternal } = phaseLocatorMod;
 const roadmapParserModule = require("./roadmap-parser.cjs");
 const { stripShippedMilestones, extractCurrentMilestone, replaceInCurrentMilestone } = roadmapParserModule;
 const markdown_sectionizer_cjs_1 = require("./markdown-sectionizer.cjs");
+const markdown_table_cjs_1 = require("./markdown-table.cjs");
 const shell_command_projection_cjs_1 = require("./shell-command-projection.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const planningWorkspace = require("./planning-workspace.cjs");
@@ -297,29 +298,32 @@ function cmdRoadmapAnalyze(cwd, raw) {
         let summaryCount = 0;
         let hasContext = false;
         let hasResearch = false;
-        try {
-            const dirMatch = _phaseDirNames.find(d => phaseTokenMatches(d, normalized));
-            if (dirMatch) {
-                const counts = countPhasePlansAndSummaries(node_path_1.default.join(phasesDir, dirMatch));
-                planCount = counts.planCount;
-                summaryCount = counts.summaryCount;
-                hasContext = counts.hasContext;
-                hasResearch = counts.hasResearch;
-                if (summaryCount >= planCount && planCount > 0)
-                    diskStatus = 'complete';
-                else if (summaryCount > 0)
-                    diskStatus = 'partial';
-                else if (planCount > 0)
-                    diskStatus = 'planned';
-                else if (hasResearch)
-                    diskStatus = 'researched';
-                else if (hasContext)
-                    diskStatus = 'discussed';
-                else
-                    diskStatus = 'empty';
-            }
+        // DEAD catch removed (#2245 audit): _phaseDirNames.find(...) is a pure
+        // array lookup on an already-resolved string array, and
+        // countPhasePlansAndSummaries is itself fully defensive (its own
+        // readdirSync is self-guarded, and it delegates to scanPhasePlans, which
+        // never throws) — nothing in this block can throw, so the try/catch could
+        // never be triggered.
+        const dirMatch = _phaseDirNames.find(d => phaseTokenMatches(d, normalized));
+        if (dirMatch) {
+            const counts = countPhasePlansAndSummaries(node_path_1.default.join(phasesDir, dirMatch));
+            planCount = counts.planCount;
+            summaryCount = counts.summaryCount;
+            hasContext = counts.hasContext;
+            hasResearch = counts.hasResearch;
+            if (summaryCount >= planCount && planCount > 0)
+                diskStatus = 'complete';
+            else if (summaryCount > 0)
+                diskStatus = 'partial';
+            else if (planCount > 0)
+                diskStatus = 'planned';
+            else if (hasResearch)
+                diskStatus = 'researched';
+            else if (hasContext)
+                diskStatus = 'discussed';
+            else
+                diskStatus = 'empty';
         }
-        catch { /* intentionally empty */ }
         // Check ROADMAP checkbox status.
         // #3537: padding-tolerant fragment — the heading discovered above may use
         // a different padding than the summary-bullet checkbox below it (mixed
@@ -392,6 +396,39 @@ function cmdRoadmapAnalyze(cwd, raw) {
     output(result, raw, undefined);
 }
 // ─── cmdRoadmapUpdatePlanProgress ─────────────────────────────────────────────
+/**
+ * Scope a ROADMAP.md content string down to its "Progress table" writable
+ * slice, run `edit` against just that slice, then splice the result back into
+ * the original content (ADR-2143 §7). Layered scoping:
+ *   1. Milestone scope — everything after the LAST `</details>` close tag
+ *      (mirrors `replaceInCurrentMilestone`), so a same-numbered phase row in
+ *      an archived milestone is never touched.
+ *   2. Heading scope — within that milestone slice, the `## Progress` heading
+ *      section (up to the next `#`/`##` heading) when present, else the whole
+ *      milestone slice (mirrors phase-lifecycle.cjs's `deriveProgressFromRoadmap`
+ *      read-side scoping, #2012 decoy avoidance — a differently-headed table
+ *      sharing the same column names must not be picked up instead).
+ * `edit` always returns a string and never fails — a no-op edit (table/row not
+ * found within the scoped slice) simply returns its input unchanged, mirroring
+ * the prior regex `.replace()`'s no-match-is-a-no-op semantics.
+ */
+function editProgressTableSlice(content, edit) {
+    const lastDetailsClose = content.lastIndexOf('</details>');
+    const milestoneOffset = lastDetailsClose === -1 ? 0 : lastDetailsClose + '</details>'.length;
+    const before = content.slice(0, milestoneOffset);
+    const milestoneSlice = content.slice(milestoneOffset);
+    const progressMatch = milestoneSlice.match(/^##[ \t]+Progress\b/im);
+    if (!progressMatch || progressMatch.index === undefined) {
+        return before + edit(milestoneSlice);
+    }
+    const headingOffset = progressMatch.index;
+    const beforeHeading = milestoneSlice.slice(0, headingOffset);
+    const fromHeading = milestoneSlice.slice(headingOffset);
+    const nextHeading = fromHeading.search(/\n#{1,2}[ \t]/);
+    const scoped = nextHeading >= 0 ? fromHeading.slice(0, nextHeading) : fromHeading;
+    const after = nextHeading >= 0 ? fromHeading.slice(nextHeading) : '';
+    return before + beforeHeading + edit(scoped) + after;
+}
 function cmdRoadmapUpdatePlanProgress(cwd, phaseNum, raw) {
     if (!phaseNum) {
         error('phase number required for roadmap update-plan-progress');
@@ -418,7 +455,7 @@ function cmdRoadmapUpdatePlanProgress(cwd, phaseNum, raw) {
     const verificationPassed = readVerificationStatus(phaseDir).status === 'passed';
     const isComplete = summaryCount >= planCount && verificationPassed;
     const status = isComplete ? 'Complete' : summaryCount > 0 ? 'In Progress' : 'Planned';
-    const today = clock_cjs_1.realClock.today();
+    const today = clock_cjs_1.realClock.localToday();
     if (!node_fs_1.default.existsSync(roadmapPath)) {
         output({ updated: false, reason: 'ROADMAP.md not found', plan_count: planCount, summary_count: summaryCount }, raw, 'no roadmap');
         return;
@@ -427,32 +464,46 @@ function cmdRoadmapUpdatePlanProgress(cwd, phaseNum, raw) {
     withPlanningLock(cwd, () => {
         let roadmapContent = node_fs_1.default.readFileSync(roadmapPath, 'utf-8');
         const phasePattern = phaseMarkdownRegexSource(phaseNum);
-        // Progress table row: update Plans/Status/Date columns (handles 4 or 5 column tables)
-        const tableRowPattern = new RegExp(`^(\\|\\s*${phasePattern}\\.?\\s[^|]*(?:\\|[^\\n]*))$`, 'im');
-        roadmapContent = roadmapContent.replace(tableRowPattern, (fullRow) => {
-            const cells = fullRow.split('|').slice(1, -1); // drop leading/trailing empty from split
-            const dateShape = /^\d{4}-\d{2}-\d{2}$/;
-            if (cells.length === 5) {
-                // 5-col: Phase | Milestone | Plans | Status | Completed
-                cells[2] = ` ${summaryCount}/${planCount} `;
-                cells[3] = ` ${status.padEnd(11)}`;
-                // Preserve only a valid ISO date (#1161: idempotent; self-heal garbage)
-                const existingDate5 = cells[4].trim();
-                cells[4] = isComplete
-                    ? (dateShape.test(existingDate5) ? cells[4] : ` ${today} `)
-                    : '  ';
-            }
-            else if (cells.length === 4) {
-                // 4-col: Phase | Plans | Status | Completed
-                cells[1] = ` ${summaryCount}/${planCount} `;
-                cells[2] = ` ${status.padEnd(11)}`;
-                // Preserve only a valid ISO date (#1161: idempotent; self-heal garbage)
-                const existingDate4 = cells[3].trim();
-                cells[3] = isComplete
-                    ? (dateShape.test(existingDate4) ? cells[3] : ` ${today} `)
-                    : '  ';
-            }
-            return '|' + cells.join('|') + '|';
+        // Progress table row: update Plans Complete/Status/Completed columns BY
+        // COLUMN NAME (handles 4- or 5-column RoadmapProgress tables regardless of
+        // Milestone-column presence) via the markdown-table seam (ADR-2143 §7) —
+        // supersedes the prior ordinal cells[]-index regex. Scoped to the current
+        // milestone's `## Progress` table (editProgressTableSlice above).
+        // #2245 Blocker 4: optional dot must be followed by whitespace-or-end, not
+        // dot-OR-whitespace-OR-end as alternatives — the prior form let a bare "."
+        // satisfy the whole lookahead, so completing phase "2" over-matched a
+        // decimal sub-phase row like "2.5 Extra". Matches "2", "2.", "2 Alpha";
+        // rejects "2.5 Extra" (replicates OLD's `\.?\s` intent on the now-TRIMMED
+        // cell value, where end-of-string is the trimmed equivalent of "no more
+        // characters after the optional dot").
+        const phaseCellRe = new RegExp(`^${phasePattern}\\.?(?:\\s|$)`, 'i');
+        const rowMatch = (row) => phaseCellRe.test((row['Phase'] ?? '').trim());
+        const dateShape = /^\d{4}-\d{2}-\d{2}$/;
+        roadmapContent = editProgressTableSlice(roadmapContent, (scoped) => {
+            let text = scoped;
+            const plansResult = (0, markdown_table_cjs_1.updateTableCell)(text, rowMatch, 'Plans Complete', ` ${summaryCount}/${planCount} `);
+            if (plansResult.ok)
+                text = plansResult.value;
+            const statusResult = (0, markdown_table_cjs_1.updateTableCell)(text, rowMatch, 'Status', ` ${status.padEnd(11)}`);
+            if (statusResult.ok)
+                text = statusResult.value;
+            // Preserve only a valid ISO date (#1161: idempotent; self-heal garbage).
+            // Ragged-tolerant (#2245 Blocker 2): probe the CURRENT Completed cell via
+            // a no-op updateTableCell write (its own tolerant row scan) rather than
+            // findTableWithColumns (which requires the WHOLE table to parse — a
+            // ragged SIBLING row elsewhere used to silently no-op this row's date
+            // stamp/clear too). The decision (write vs no-op) is folded into the
+            // newValue callback so a single updateTableCell call both reads and
+            // writes.
+            const completedResult = (0, markdown_table_cjs_1.updateTableCell)(text, rowMatch, 'Completed', (current) => {
+                if (isComplete) {
+                    return dateShape.test(current.trim()) ? current : ` ${today} `;
+                }
+                return '  ';
+            });
+            if (completedResult.ok)
+                text = completedResult.value;
+            return text;
         });
         // Update plan count in phase detail section.
         // Three recognised forms (all tolerated; canonical template uses the first):