@opengsd/gsd-core 1.5.0 → 1.6.0-rc.2

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

@@ -34,6 +34,7 @@ const { extractFrontmatter, reconstructFrontmatter } = frontmatter;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const scanPhasePlans = require("./plan-scan.cjs");
 const state_document_cjs_1 = require("./state-document.cjs");
+const markdown_sectionizer_cjs_1 = require("./markdown-sectionizer.cjs");
 const STATE_PROGRESS_RESYNC_FIELDS = new Set([
     'Progress',
     'Total Plans in Phase',
@@ -66,6 +67,14 @@ process.on('exit', () => {
 });
 // Hoisted to module scope — compiled once, not per call (#320). Stateless (/i, used with .match).
 const byPhaseTablePattern = /(\|\s*Phase\s*\|\s*Plans\s*\|\s*Total\s*\|\s*Avg\/Plan\s*\|[ \t]*\n\|(?:[- :\t]+\|)+[ \t]*\n)((?:[ \t]*\|[^\n]*\n)*)(?=\n|$)/i;
+// ─── ADR-1372 T6: seam-based section splice helper ───────────────────────────
+// Shared stop predicates corresponding to the regex lookaheads used in state.cts:
+//   STOP_H2_PLUS : (?=\n##|$)            — stops at any heading with level ≥ 2
+//   STOP_H2_H3   : (?=\n###?|\n##[^#]|$) — stops at level 2 or 3
+//   STOP_H2_ONLY : (?=\n##[^#]|$)        — stops at level 2 only
+const STOP_H2_PLUS = (lv) => lv >= 2;
+const STOP_H2_H3 = (lv) => lv === 2 || lv === 3;
+const STOP_H2_ONLY = (lv) => lv === 2;
 function cmdStateLoad(cwd, raw) {
     const config = loadConfig(cwd);
     const planDir = planningPaths(cwd).planning;
@@ -261,11 +270,25 @@ function stateReplaceFieldWithFallback(content, primary, fallback, value) {
  * Fixes #1365: advance-plan could not update Status/Last activity after begin-phase.
  */
 function updateCurrentPositionFields(content, fields) {
-    const posPattern = /(##\s*Current Position\s*\n)([\s\S]*?)(?=\n##|$)/i;
-    const posMatch = content.match(posPattern);
-    if (!posMatch)
+    // ADR-1372 T6: locate ## Current Position using tokenizeHeadings, extract the
+    // untrimmed body span, apply field edits, then splice the modified body back in.
+    // Stop predicate mirrors (?=\n##|$): any heading with level ≥ 2.
+    const headings = (0, markdown_sectionizer_cjs_1.tokenizeHeadings)(content);
+    const posIdx = headings.findIndex(h => h.level === 2 && /^current\s+position$/i.test(h.text));
+    if (posIdx === -1)
         return content;
-    let posBody = posMatch[2];
+    const posHeading = headings[posIdx];
+    const lines = content.split('\n');
+    const posHeadingLine = lines[posHeading.line - 1];
+    const posBodyStart = posHeading.offset + posHeadingLine.length + 1;
+    let posBodyEnd = content.length;
+    for (let j = posIdx + 1; j < headings.length; j++) {
+        if (STOP_H2_PLUS(headings[j].level)) {
+            posBodyEnd = headings[j].offset - 1;
+            break;
+        }
+    }
+    let posBody = content.slice(posBodyStart, posBodyEnd);
     const statusDefaults = state_document_cjs_1.KNOWN_TEMPLATE_DEFAULTS['Status'];
     const lastActivityDefaults = state_document_cjs_1.KNOWN_TEMPLATE_DEFAULTS['Last Activity'];
     if (fields.status) {
@@ -339,7 +362,8 @@ function updateCurrentPositionFields(content, fields) {
                 posBody = replaced;
         }
     }
-    return content.replace(posPattern, () => `${posMatch[1]}${posBody}`);
+    // Splice the modified body back in place of the original untrimmed span.
+    return content.slice(0, posBodyStart) + posBody + content.slice(posBodyEnd);
 }
 function cmdStateAdvancePlan(cwd, raw) {
     const statePath = planningPaths(cwd).state;
@@ -435,7 +459,7 @@ function cmdStateRecordMetric(cwd, options, raw) {
     let created = false;
     readModifyWriteStateMd(statePath, (content) => {
         // Find Performance Metrics section and its table
-        const metricsPattern = /(##\s*Performance Metrics[\s\S]*?\n\|[^\n]+\n\|[-|\s]+\n)([\s\S]*?)(?=\n##|\n$|$)/i;
+        const metricsPattern = /(##\s*Performance Metrics[\s\S]*?\n\|[^\n]+\n\|[-|\s]+\n)([\s\S]*?)(?=\n##|\n$|$)/i; // allow-adhoc-markdown: metrics-table write-path section-collect in state.cts; pending collectSection migration #1372
         const metricsMatch = content.match(metricsPattern);
         const newRow = `| Phase ${phase} P${plan} | ${duration} | ${tasks || '-'} tasks | ${files || '-'} files |`;
         if (metricsMatch) {
@@ -545,16 +569,34 @@ function cmdStateAddDecision(cwd, options, raw) {
     let _added = false;
     let created = false;
     readModifyWriteStateMd(statePath, (content) => {
-        // Find Decisions section (various heading patterns)
-        const sectionPattern = /(###?\s*(?:Decisions|Decisions Made|Accumulated.*Decisions)\s*\n)([\s\S]*?)(?=\n###?|\n##[^#]|$)/i;
-        const match = content.match(sectionPattern);
-        if (match) {
-            let sectionBody = match[2];
+        // ADR-1372 T6: find Decisions section via tokenizeHeadings; stop at level 2 or 3.
+        // Mirrors /(###?\s*(?:Decisions|Decisions Made|Accumulated.*Decisions)\s*\n)([\s\S]*?)(?=\n###?|\n##[^#]|$)/i
+        const decisionsPred = (lv, text) => (lv === 2 || lv === 3) && /^(?:Decisions|Decisions Made|Accumulated.*Decisions)$/i.test(text);
+        const sectionBody = (() => {
+            const hs = (0, markdown_sectionizer_cjs_1.tokenizeHeadings)(content);
+            const i = hs.findIndex(h => decisionsPred(h.level, h.text));
+            if (i === -1)
+                return null;
+            const h = hs[i];
+            const ls = content.split('\n');
+            const hl = ls[h.line - 1];
+            const bs = h.offset + hl.length + 1;
+            let se = content.length;
+            for (let j = i + 1; j < hs.length; j++) {
+                if (STOP_H2_H3(hs[j].level)) {
+                    se = hs[j].offset - 1;
+                    break;
+                }
+            }
+            return { bodyStart: bs, bodyEnd: se, body: content.slice(bs, se) };
+        })();
+        if (sectionBody !== null) {
+            let newBody = sectionBody.body;
             // Remove placeholders
-            sectionBody = sectionBody.replace(/None yet\.?\s*\n?/gi, '').replace(/No decisions yet\.?\s*\n?/gi, '');
-            sectionBody = sectionBody.trimEnd() + '\n' + entry + '\n';
+            newBody = newBody.replace(/None yet\.?\s*\n?/gi, '').replace(/No decisions yet\.?\s*\n?/gi, '');
+            newBody = newBody.trimEnd() + '\n' + entry + '\n';
             _added = true;
-            return content.replace(sectionPattern, (_match, header) => `${header}${sectionBody}`);
+            return content.slice(0, sectionBody.bodyStart) + newBody + content.slice(sectionBody.bodyEnd);
         }
         // Section absent — DWIM: auto-create canonical ## Decisions scaffold,
         // then append the entry. Matches state begin-phase / advance-plan DWIM behavior.
@@ -598,14 +640,33 @@ function cmdStateAddBlocker(cwd, text, raw) {
     let _added = false;
     let created = false;
     readModifyWriteStateMd(statePath, (content) => {
-        const sectionPattern = /(###?\s*(?:Blockers|Blockers\/Concerns|Concerns)\s*\n)([\s\S]*?)(?=\n###?|\n##[^#]|$)/i;
-        const match = content.match(sectionPattern);
-        if (match) {
-            let sectionBody = match[2];
+        // ADR-1372 T6: find Blockers/Concerns section via tokenizeHeadings; stop at level 2 or 3.
+        // Mirrors /(###?\s*(?:Blockers|Blockers\/Concerns|Concerns)\s*\n)([\s\S]*?)(?=\n###?|\n##[^#]|$)/i
+        const blockersPred = (lv, text) => (lv === 2 || lv === 3) && /^(?:Blockers|Blockers\/Concerns|Concerns)$/i.test(text);
+        const sectionSpan = (() => {
+            const hs = (0, markdown_sectionizer_cjs_1.tokenizeHeadings)(content);
+            const i = hs.findIndex(h => blockersPred(h.level, h.text));
+            if (i === -1)
+                return null;
+            const h = hs[i];
+            const ls = content.split('\n');
+            const hl = ls[h.line - 1];
+            const bs = h.offset + hl.length + 1;
+            let se = content.length;
+            for (let j = i + 1; j < hs.length; j++) {
+                if (STOP_H2_H3(hs[j].level)) {
+                    se = hs[j].offset - 1;
+                    break;
+                }
+            }
+            return { bodyStart: bs, bodyEnd: se, body: content.slice(bs, se) };
+        })();
+        if (sectionSpan !== null) {
+            let sectionBody = sectionSpan.body;
             sectionBody = sectionBody.replace(/None\.?\s*\n?/gi, '').replace(/None yet\.?\s*\n?/gi, '');
             sectionBody = sectionBody.trimEnd() + '\n' + entry + '\n';
             _added = true;
-            return content.replace(sectionPattern, (_match, header) => `${header}${sectionBody}`);
+            return content.slice(0, sectionSpan.bodyStart) + sectionBody + content.slice(sectionSpan.bodyEnd);
         }
         // Section absent — DWIM: auto-create canonical ### Blockers scaffold.
         const scaffold = [
@@ -666,18 +727,47 @@ function cmdStateAddRoadmapEvolution(cwd, options, raw) {
     // Section boundaries mirror the sibling handlers (add-decision/add-blocker):
     // a trailing CR on a CRLF STATE.md is absorbed by the lazy body and trimmed,
     // so following sections are preserved without data loss (see the CRLF test).
+    //
+    // ADR-1372 T6: accPattern and subPattern migrated to tokenizeHeadings.
+    // accPattern  = /(##\s*Accumulated Context\s*\n)([\s\S]*?)(?=\n##[^#]|$)/i
+    //               → stop at level 2 only (STOP_H2_ONLY)
+    // subPattern  = /(###\s*Roadmap Evolution\s*\n)([\s\S]*?)(?=\n###?|$)/i
+    //               → applied to accBody; stop at level 2 or 3 (STOP_H2_H3)
     readModifyWriteStateMd(statePath, (content) => {
-        const accPattern = /(##\s*Accumulated Context\s*\n)([\s\S]*?)(?=\n##[^#]|$)/i;
-        const accMatch = content.match(accPattern);
-        if (accMatch) {
-            const accHeader = accMatch[1];
-            const accBody = accMatch[2];
+        // Locate ## Accumulated Context and extract its untrimmed body span.
+        const accHs = (0, markdown_sectionizer_cjs_1.tokenizeHeadings)(content);
+        const accIdx = accHs.findIndex(h => h.level === 2 && /^accumulated\s+context$/i.test(h.text));
+        if (accIdx !== -1) {
+            const accH = accHs[accIdx];
+            const contentLines = content.split('\n');
+            const accHL = contentLines[accH.line - 1];
+            const accBodyStart = accH.offset + accHL.length + 1;
+            let accBodyEnd = content.length;
+            for (let j = accIdx + 1; j < accHs.length; j++) {
+                if (STOP_H2_ONLY(accHs[j].level)) {
+                    accBodyEnd = accHs[j].offset - 1;
+                    break;
+                }
+            }
+            const accBody = content.slice(accBodyStart, accBodyEnd);
             // Find `### Roadmap Evolution` WITHIN the Accumulated Context body only.
-            // Bounded by the next h3/h2 or the end of the section body.
-            const subPattern = /(###\s*Roadmap Evolution\s*\n)([\s\S]*?)(?=\n###?|$)/i;
-            const subMatch = accBody.match(subPattern);
-            if (subMatch) {
-                let subBody = subMatch[2];
+            // tokenizeHeadings is applied to accBody to scope the search.
+            // Stop predicate mirrors (?=\n###?|$): level 2 or 3.
+            const subHs = (0, markdown_sectionizer_cjs_1.tokenizeHeadings)(accBody);
+            const subIdx = subHs.findIndex(h => h.level === 3 && /^roadmap\s+evolution$/i.test(h.text));
+            if (subIdx !== -1) {
+                const subH = subHs[subIdx];
+                const accLines = accBody.split('\n');
+                const subHL = accLines[subH.line - 1];
+                const subBodyStart = subH.offset + subHL.length + 1;
+                let subBodyEnd = accBody.length;
+                for (let j = subIdx + 1; j < subHs.length; j++) {
+                    if (STOP_H2_H3(subHs[j].level)) {
+                        subBodyEnd = subHs[j].offset - 1;
+                        break;
+                    }
+                }
+                let subBody = accBody.slice(subBodyStart, subBodyEnd);
                 // Dedupe: exact (trimmed) line already present is a no-op replay.
                 if (subBody.split('\n').some((line) => line.trim() === entry.trim())) {
                     duplicate = true;
@@ -685,14 +775,15 @@ function cmdStateAddRoadmapEvolution(cwd, options, raw) {
                 }
                 subBody = subBody.replace(/None yet\.?\s*\n?/gi, '');
                 subBody = subBody.trimEnd() + '\n' + entry + '\n';
-                const newAccBody = accBody.replace(subPattern, (_m, header) => `${header}${subBody}`);
-                return content.replace(accPattern, () => `${accHeader}${newAccBody}`);
+                // Splice subBody into accBody, then splice newAccBody into content.
+                const newAccBody = accBody.slice(0, subBodyStart) + subBody + accBody.slice(subBodyEnd);
+                return content.slice(0, accBodyStart) + newAccBody + content.slice(accBodyEnd);
             }
             // Subsection missing — append it at the end of the Accumulated Context body.
             subsectionCreated = true;
             const trimmedAcc = accBody.trimEnd();
             const block = `${trimmedAcc ? `${trimmedAcc}\n\n` : ''}### Roadmap Evolution\n\n${entry}\n`;
-            return content.replace(accPattern, () => `${accHeader}${block}`);
+            return content.slice(0, accBodyStart) + block + content.slice(accBodyEnd);
         }
         // No `## Accumulated Context` — DWIM: create both at end of file.
         // Mirrors the add-decision / add-blocker auto-create behavior.
@@ -732,25 +823,37 @@ function cmdStateResolveBlocker(cwd, text, raw) {
     }
     let resolved = false;
     readModifyWriteStateMd(statePath, (content) => {
-        const sectionPattern = /(###?\s*(?:Blockers|Blockers\/Concerns|Concerns)\s*\n)([\s\S]*?)(?=\n###?|\n##[^#]|$)/i;
-        const match = content.match(sectionPattern);
-        if (match) {
-            const sectionBody = match[2];
-            const lines = sectionBody.split('\n');
-            const filtered = lines.filter(line => {
-                if (!line.startsWith('- '))
-                    return true;
-                return !line.toLowerCase().includes(text.toLowerCase());
-            });
-            let newBody = filtered.join('\n');
-            // If section is now empty, add placeholder
-            if (!newBody.trim() || !newBody.includes('- ')) {
-                newBody = 'None\n';
+        // ADR-1372 T6: find Blockers/Concerns section via tokenizeHeadings; stop at level 2 or 3.
+        // Mirrors /(###?\s*(?:Blockers|Blockers\/Concerns|Concerns)\s*\n)([\s\S]*?)(?=\n###?|\n##[^#]|$)/i
+        const hs = (0, markdown_sectionizer_cjs_1.tokenizeHeadings)(content);
+        const i = hs.findIndex(h => (h.level === 2 || h.level === 3) && /^(?:Blockers|Blockers\/Concerns|Concerns)$/i.test(h.text));
+        if (i === -1)
+            return content;
+        const h = hs[i];
+        const ls = content.split('\n');
+        const hl = ls[h.line - 1];
+        const bs = h.offset + hl.length + 1;
+        let se = content.length;
+        for (let j = i + 1; j < hs.length; j++) {
+            if (STOP_H2_H3(hs[j].level)) {
+                se = hs[j].offset - 1;
+                break;
             }
-            resolved = true;
-            return content.replace(sectionPattern, (_match, header) => `${header}${newBody}`);
         }
-        return content;
+        const sectionBody = content.slice(bs, se);
+        const lines = sectionBody.split('\n');
+        const filtered = lines.filter(line => {
+            if (!line.startsWith('- '))
+                return true;
+            return !line.toLowerCase().includes(text.toLowerCase());
+        });
+        let newBody = filtered.join('\n');
+        // If section is now empty, add placeholder
+        if (!newBody.trim() || !newBody.includes('- ')) {
+            newBody = 'None\n';
+        }
+        resolved = true;
+        return content.slice(0, bs) + newBody + content.slice(se);
     }, cwd);
     if (resolved) {
         output({ resolved: true, blocker: text }, raw, 'true');
@@ -942,8 +1045,8 @@ function cmdStateRecordSession(cwd, options, raw) {
  * Returns the match whose group 1 is the section body, or null.
  */
 function matchSessionSection(body) {
-    return body.match(/(?:^|\n)##[ \t]*Session[ \t]*\n([\s\S]*?)(?=\n##|$)/i)
-        || body.match(/(?:^|\n)##[ \t]*Session Continuity[ \t]*\n([\s\S]*?)(?=\n##|$)/i);
+    return body.match(/(?:^|\n)##[ \t]*Session[ \t]*\n([\s\S]*?)(?=\n##|$)/i) // allow-adhoc-markdown: read-only session-section extract in state.cts; pending collectSection migration #1372
+        || body.match(/(?:^|\n)##[ \t]*Session Continuity[ \t]*\n([\s\S]*?)(?=\n##|$)/i); // allow-adhoc-markdown: read-only session-continuity section extract in state.cts; pending collectSection migration #1372
 }
 function parseProsePhaseField(value) {
     if (!value)
@@ -1018,7 +1121,7 @@ function cmdStateSnapshot(cwd, raw) {
     const progressPercent = progressRaw ? parseInt(progressRaw.replace('%', ''), 10) : null;
     // Extract decisions table
     const decisions = [];
-    const decisionsMatch = body.match(/##\s*Decisions Made[\s\S]*?\n\|[^\n]+\n\|[-|\s]+\n([\s\S]*?)(?=\n##|\n$|$)/i);
+    const decisionsMatch = body.match(/##\s*Decisions Made[\s\S]*?\n\|[^\n]+\n\|[-|\s]+\n([\s\S]*?)(?=\n##|\n$|$)/i); // allow-adhoc-markdown: read-only decisions-table section-collect in state.cts; pending collectSection migration #1372
     if (decisionsMatch) {
         const tableBody = decisionsMatch[1];
         const rows = tableBody.trim().split('\n').filter(r => r.includes('|'));
@@ -1035,7 +1138,7 @@ function cmdStateSnapshot(cwd, raw) {
     }
     // Extract blockers list
     const blockers = [];
-    const blockersMatch = body.match(/##\s*Blockers\s*\n([\s\S]*?)(?=\n##|$)/i);
+    const blockersMatch = body.match(/##\s*Blockers\s*\n([\s\S]*?)(?=\n##|$)/i); // allow-adhoc-markdown: read-only blockers section-collect in state.cts; pending collectSection migration #1372
     if (blockersMatch) {
         const blockersSection = blockersMatch[1];
         const items = blockersSection.match(/^-\s+(.+)$/gm) || [];
@@ -1195,7 +1298,8 @@ function buildStateFrontmatter(bodyContent, cwd) {
                                 // Only count tokens that contain at least one digit — excludes
                                 // pure-word section headings (Overview, Details) while keeping
                                 // numeric phases (01, 05.1) and project-code IDs (PROJ-42).
-                                if (/\d/.test(m[1]))
+                                // Also exclude 999.x backlog phases. Mirrors init.cts filter.
+                                if (/\d/.test(m[1]) && !/^999\b/.test(m[1]))
                                     roadmapPhaseCount++;
                             }
                         }
@@ -1759,11 +1863,23 @@ function cmdStateBeginPhase(cwd, phaseNumber, phaseName, planCount, raw) {
                 updated.push('Current focus');
             }
             // Update ## Current Position section (#1104, #1365)
-            const positionPattern = /(##\s*Current Position\s*\n)([\s\S]*?)(?=\n##|$)/i;
-            const positionMatch = body.match(positionPattern);
-            if (positionMatch) {
-                const header = positionMatch[1];
-                let posBody = positionMatch[2];
+            // ADR-1372 T6: positionPattern → tokenizeHeadings + spliceStateSection.
+            // Mirrors /(##\s*Current Position\s*\n)([\s\S]*?)(?=\n##|$)/i; stop at level ≥ 2.
+            const posHs = (0, markdown_sectionizer_cjs_1.tokenizeHeadings)(body);
+            const posIdx = posHs.findIndex(h => h.level === 2 && /^current\s+position$/i.test(h.text));
+            if (posIdx !== -1) {
+                const posH = posHs[posIdx];
+                const bodyLines = body.split('\n');
+                const posHL = bodyLines[posH.line - 1];
+                const posBodyStart = posH.offset + posHL.length + 1;
+                let posBodyEnd = body.length;
+                for (let j = posIdx + 1; j < posHs.length; j++) {
+                    if (STOP_H2_PLUS(posHs[j].level)) {
+                        posBodyEnd = posHs[j].offset - 1;
+                        break;
+                    }
+                }
+                let posBody = body.slice(posBodyStart, posBodyEnd);
                 // Update or insert Phase line
                 const newPhase = `Phase: ${phaseNumber}${phaseName ? ` (${phaseName})` : ''} — EXECUTING`;
                 if (/^Phase:/m.test(posBody)) {
@@ -1816,22 +1932,33 @@ function cmdStateBeginPhase(cwd, phaseNumber, phaseName, planCount, raw) {
                     if (replaced !== null)
                         posBody = replaced;
                 }
-                body = body.replace(positionPattern, () => `${header}${posBody}`);
+                body = body.slice(0, posBodyStart) + posBody + body.slice(posBodyEnd);
                 updated.push('Current Position');
             }
         }
         else {
             // Resume path: only update Last activity timestamp in Current Position
             // (do not touch Plan:, stopped_at, progress.percent, or plan counter)
-            const positionPattern = /(##\s*Current Position\s*\n)([\s\S]*?)(?=\n##|$)/i;
-            const positionMatch = body.match(positionPattern);
-            if (positionMatch) {
-                const header = positionMatch[1];
-                let posBody = positionMatch[2];
+            // ADR-1372 T6: positionPattern → tokenizeHeadings; stop at level ≥ 2.
+            const posHsR = (0, markdown_sectionizer_cjs_1.tokenizeHeadings)(body);
+            const posIdxR = posHsR.findIndex(h => h.level === 2 && /^current\s+position$/i.test(h.text));
+            if (posIdxR !== -1) {
+                const posHR = posHsR[posIdxR];
+                const bodyLinesR = body.split('\n');
+                const posHLR = bodyLinesR[posHR.line - 1];
+                const posBodyStartR = posHR.offset + posHLR.length + 1;
+                let posBodyEndR = body.length;
+                for (let j = posIdxR + 1; j < posHsR.length; j++) {
+                    if (STOP_H2_PLUS(posHsR[j].level)) {
+                        posBodyEndR = posHsR[j].offset - 1;
+                        break;
+                    }
+                }
+                let posBody = body.slice(posBodyStartR, posBodyEndR);
                 const resumeActivity = `Last activity: ${today} — Phase ${phaseNumber} execution resumed (wave continue)`;
                 if (/^Last activity:/im.test(posBody)) {
                     posBody = posBody.replace(/^Last activity:.*$/im, resumeActivity);
-                    body = body.replace(positionPattern, () => `${header}${posBody}`);
+                    body = body.slice(0, posBodyStartR) + posBody + body.slice(posBodyEndR);
                     updated.push('Last activity (resume)');
                 }
                 else {
@@ -1840,7 +1967,7 @@ function cmdStateBeginPhase(cwd, phaseNumber, phaseName, planCount, raw) {
                         ?? (0, state_document_cjs_1.stateReplaceField)(posBody, 'Last activity', resumeActivity);
                     if (replaced !== null) {
                         posBody = replaced;
-                        body = body.replace(positionPattern, () => `${header}${posBody}`);
+                        body = body.slice(0, posBodyStartR) + posBody + body.slice(posBodyEndR);
                         updated.push('Last activity (resume)');
                     }
                 }
@@ -2016,14 +2143,28 @@ function cmdStateMilestoneSwitch(cwd, version, name, raw) {
         const content = (0, shell_command_projection_cjs_1.platformReadSync)(statePath) || '';
         const existingFm = extractFrontmatter(content);
         const body = stripFrontmatter(content);
-        const positionPattern = /(##\s*Current Position\s*\n)([\s\S]*?)(?=\n##|$)/i;
+        // ADR-1372 T6: positionPattern → tokenizeHeadings + spliceStateSection.
+        // Mirrors /(##\s*Current Position\s*\n)([\s\S]*?)(?=\n##|$)/i; stop at level ≥ 2.
         const resetPositionBody = `\nPhase: Not started (defining requirements)\n` +
             `Plan: —\n` +
             `Status: Defining requirements\n` +
             `Last activity: ${today} — Milestone ${version} started\n\n`;
         let newBody;
-        if (positionPattern.test(body)) {
-            newBody = body.replace(positionPattern, (_m, header) => `${header}${resetPositionBody}`);
+        const msPosHs = (0, markdown_sectionizer_cjs_1.tokenizeHeadings)(body);
+        const msPosIdx = msPosHs.findIndex(h => h.level === 2 && /^current\s+position$/i.test(h.text));
+        if (msPosIdx !== -1) {
+            const msPosH = msPosHs[msPosIdx];
+            const msBodyLines = body.split('\n');
+            const msPosHL = msBodyLines[msPosH.line - 1];
+            const msPosBodyStart = msPosH.offset + msPosHL.length + 1;
+            let msPosBodyEnd = body.length;
+            for (let j = msPosIdx + 1; j < msPosHs.length; j++) {
+                if (STOP_H2_PLUS(msPosHs[j].level)) {
+                    msPosBodyEnd = msPosHs[j].offset - 1;
+                    break;
+                }
+            }
+            newBody = body.slice(0, msPosBodyStart) + resetPositionBody + body.slice(msPosBodyEnd);
         }
         else {
             const preface = body.trim().length > 0 ? body : '# Project State\n';
@@ -2284,16 +2425,41 @@ function cmdStatePrune(cwd, options, raw) {
     const archived = [];
     // Shared pruning logic applied to both dry-run and real passes.
     // Returns { newContent, archivedSections }.
+    // ADR-1372 T6: all four inline section-collect regexes replaced with
+    // tokenizeHeadings + untrimmed-span splicing for byte-identical writes.
     function prunePass(content) {
         const sections = [];
+        // Helper: locate a heading matching pred, extract untrimmed body [bs, se),
+        // apply transform, and splice back. Returns updated content.
+        // All prune-section patterns stop at level 2 or 3 (STOP_H2_H3).
+        function pruneSectionSpan(c, pred, transform, sectionName) {
+            const hs = (0, markdown_sectionizer_cjs_1.tokenizeHeadings)(c);
+            const i = hs.findIndex(h => pred(h.level, h.text));
+            if (i === -1)
+                return c;
+            const h = hs[i];
+            const ls = c.split('\n');
+            const hl = ls[h.line - 1];
+            const bs = h.offset + hl.length + 1;
+            let se = c.length;
+            for (let j = i + 1; j < hs.length; j++) {
+                if (STOP_H2_H3(hs[j].level)) {
+                    se = hs[j].offset - 1;
+                    break;
+                }
+            }
+            const body = c.slice(bs, se);
+            const { keep, archive } = transform(body);
+            if (archive.length > 0) {
+                sections.push({ section: sectionName, count: archive.length, lines: archive });
+                return c.slice(0, bs) + keep.join('\n') + c.slice(se);
+            }
+            return c;
+        }
         // Prune Decisions section: entries like "- [Phase N]: ..."
-        const decisionPattern = /(###?\s*(?:Decisions|Decisions Made|Accumulated.*Decisions)\s*\n)([\s\S]*?)(?=\n###?|\n##[^#]|$)/i;
-        const decMatch = content.match(decisionPattern);
-        if (decMatch) {
-            const lines = decMatch[2].split('\n');
-            const keep = [];
-            const archive = [];
-            for (const line of lines) {
+        content = pruneSectionSpan(content, (lv, text) => (lv === 2 || lv === 3) && /^(?:Decisions|Decisions Made|Accumulated.*Decisions)$/i.test(text), (body) => {
+            const keep = [], archive = [];
+            for (const line of body.split('\n')) {
                 const phaseMatch = line.match(/^\s*-\s*\[Phase\s+(\d+)/i);
                 if (phaseMatch && parseInt(phaseMatch[1], 10) <= cutoff) {
                     archive.push(line);
@@ -2302,19 +2468,12 @@ function cmdStatePrune(cwd, options, raw) {
                     keep.push(line);
                 }
             }
-            if (archive.length > 0) {
-                sections.push({ section: 'Decisions', count: archive.length, lines: archive });
-                content = content.replace(decisionPattern, (_m, header) => `${header}${keep.join('\n')}`);
-            }
-        }
+            return { keep, archive };
+        }, 'Decisions');
         // Prune Recently Completed section: entries mentioning phase numbers
-        const recentPattern = /(###?\s*Recently Completed\s*\n)([\s\S]*?)(?=\n###?|\n##[^#]|$)/i;
-        const recMatch = content.match(recentPattern);
-        if (recMatch) {
-            const lines = recMatch[2].split('\n');
-            const keep = [];
-            const archive = [];
-            for (const line of lines) {
+        content = pruneSectionSpan(content, (lv, text) => (lv === 2 || lv === 3) && /^recently\s+completed$/i.test(text), (body) => {
+            const keep = [], archive = [];
+            for (const line of body.split('\n')) {
                 const phaseMatch = line.match(/Phase\s+(\d+)/i);
                 if (phaseMatch && parseInt(phaseMatch[1], 10) <= cutoff) {
                     archive.push(line);
@@ -2323,20 +2482,13 @@ function cmdStatePrune(cwd, options, raw) {
                     keep.push(line);
                 }
             }
-            if (archive.length > 0) {
-                sections.push({ section: 'Recently Completed', count: archive.length, lines: archive });
-                content = content.replace(recentPattern, (_m, header) => `${header}${keep.join('\n')}`);
-            }
-        }
+            return { keep, archive };
+        }, 'Recently Completed');
         // Prune resolved blockers: lines marked as resolved (strikethrough ~~text~~
         // or "[RESOLVED]" prefix) with a phase reference older than cutoff
-        const blockersPattern = /(###?\s*(?:Blockers|Blockers\/Concerns|Blockers\s*&\s*Concerns)\s*\n)([\s\S]*?)(?=\n###?|\n##[^#]|$)/i;
-        const blockersMatch = content.match(blockersPattern);
-        if (blockersMatch) {
-            const lines = blockersMatch[2].split('\n');
-            const keep = [];
-            const archive = [];
-            for (const line of lines) {
+        content = pruneSectionSpan(content, (lv, text) => (lv === 2 || lv === 3) && /^(?:Blockers|Blockers\/Concerns|Blockers\s*&\s*Concerns)$/i.test(text), (body) => {
+            const keep = [], archive = [];
+            for (const line of body.split('\n')) {
                 const isResolved = /~~.*~~|\[RESOLVED\]/i.test(line);
                 const phaseMatch = line.match(/Phase\s+(\d+)/i);
                 if (isResolved && phaseMatch && parseInt(phaseMatch[1], 10) <= cutoff) {
@@ -2346,20 +2498,13 @@ function cmdStatePrune(cwd, options, raw) {
                     keep.push(line);
                 }
             }
-            if (archive.length > 0) {
-                sections.push({ section: 'Blockers (resolved)', count: archive.length, lines: archive });
-                content = content.replace(blockersPattern, (_m, header) => `${header}${keep.join('\n')}`);
-            }
-        }
+            return { keep, archive };
+        }, 'Blockers (resolved)');
         // Prune Performance Metrics table rows: keep only rows for phases > cutoff.
         // Preserves header rows (| Phase | ... and |---|...) and any prose around the table.
-        const metricsPattern = /(###?\s*Performance Metrics\s*\n)([\s\S]*?)(?=\n###?|\n##[^#]|$)/i;
-        const metricsMatch = content.match(metricsPattern);
-        if (metricsMatch) {
-            const sectionLines = metricsMatch[2].split('\n');
-            const keep = [];
-            const archive = [];
-            for (const line of sectionLines) {
+        content = pruneSectionSpan(content, (lv, text) => (lv === 2 || lv === 3) && /^performance\s+metrics$/i.test(text), (body) => {
+            const keep = [], archive = [];
+            for (const line of body.split('\n')) {
                 // Table data row: starts with | followed by a number (phase)
                 const tableRowMatch = line.match(/^\|\s*(\d+)\s*\|/);
                 if (tableRowMatch) {
@@ -2376,11 +2521,8 @@ function cmdStatePrune(cwd, options, raw) {
                     keep.push(line);
                 }
             }
-            if (archive.length > 0) {
-                sections.push({ section: 'Performance Metrics', count: archive.length, lines: archive });
-                content = content.replace(metricsPattern, (_m, header) => `${header}${keep.join('\n')}`);
-            }
-        }
+            return { keep, archive };
+        }, 'Performance Metrics');
         return { newContent: content, archivedSections: sections };
     }
     if (dryRun) {
@@ -2501,50 +2643,64 @@ function cmdStateCompletePhase(cwd, raw, overridePhase) {
             updated.push('Last Activity Description');
         }
         // Update ## Current Position section
-        const positionPattern = /(##\s*Current Position\s*\n)([\s\S]*?)(?=\n##|$)/i;
-        const positionMatch = body.match(positionPattern);
-        if (positionMatch) {
-            const header = positionMatch[1];
-            let posBody = positionMatch[2];
-            // Update Phase line to show COMPLETE
-            const newPhase = `Phase: ${currentPhase} — COMPLETE`;
-            if (/^Phase:/m.test(posBody)) {
-                posBody = posBody.replace(/^Phase:.*$/m, newPhase);
-            }
-            else {
-                // Pipe-table format in Current Position (#1255)
-                // Value cell must be bare (no "Phase:" label prefix) — the column header already provides the label.
-                const replaced = (0, state_document_cjs_1.stateReplaceField)(posBody, 'Phase', `${currentPhase} — COMPLETE`);
-                if (replaced !== null)
-                    posBody = replaced;
-            }
-            // Update Status line if present
-            const newStatus = `Status: Phase ${currentPhase} complete`;
-            if (/^Status:/m.test(posBody)) {
-                posBody = posBody.replace(/^Status:.*$/m, newStatus);
-            }
-            else {
-                // Pipe-table format in Current Position (#1255)
-                const replaced = (0, state_document_cjs_1.stateReplaceField)(posBody, 'Status', `Phase ${currentPhase} complete`);
-                if (replaced !== null)
-                    posBody = replaced;
-            }
-            // Update Last activity line if present
-            const newActivity = `Last activity: ${today} — Phase ${currentPhase} marked complete`;
-            if (/^Last activity:/im.test(posBody)) {
-                posBody = posBody.replace(/^Last activity:.*$/im, newActivity);
-            }
-            else {
-                // Pipe-table format in Current Position (#1255)
-                // Value must match the inline branch (date + narrative), not bare date.
-                const activityValue = `${today} — Phase ${currentPhase} marked complete`;
-                const replaced = (0, state_document_cjs_1.stateReplaceField)(posBody, 'Last Activity', activityValue)
-                    ?? (0, state_document_cjs_1.stateReplaceField)(posBody, 'Last activity', activityValue);
-                if (replaced !== null)
-                    posBody = replaced;
+        // ADR-1372 T6: positionPattern → tokenizeHeadings; stop at level ≥ 2.
+        // Mirrors /(##\s*Current Position\s*\n)([\s\S]*?)(?=\n##|$)/i
+        {
+            const cpHs = (0, markdown_sectionizer_cjs_1.tokenizeHeadings)(body);
+            const cpIdx = cpHs.findIndex(h => h.level === 2 && /^current\s+position$/i.test(h.text));
+            if (cpIdx !== -1) {
+                const cpH = cpHs[cpIdx];
+                const cpBodyLines = body.split('\n');
+                const cpHL = cpBodyLines[cpH.line - 1];
+                const cpBodyStart = cpH.offset + cpHL.length + 1;
+                let cpBodyEnd = body.length;
+                for (let j = cpIdx + 1; j < cpHs.length; j++) {
+                    if (STOP_H2_PLUS(cpHs[j].level)) {
+                        cpBodyEnd = cpHs[j].offset - 1;
+                        break;
+                    }
+                }
+                let posBody = body.slice(cpBodyStart, cpBodyEnd);
+                // Update Phase line to show COMPLETE
+                const newPhase = `Phase: ${currentPhase} — COMPLETE`;
+                if (/^Phase:/m.test(posBody)) {
+                    posBody = posBody.replace(/^Phase:.*$/m, newPhase);
+                }
+                else {
+                    // Pipe-table format in Current Position (#1255)
+                    // Value cell must be bare (no "Phase:" label prefix) — the column header already provides the label.
+                    const replaced = (0, state_document_cjs_1.stateReplaceField)(posBody, 'Phase', `${currentPhase} — COMPLETE`);
+                    if (replaced !== null)
+                        posBody = replaced;
+                }
+                // Update Status line if present
+                const newStatus = `Status: Phase ${currentPhase} complete`;
+                if (/^Status:/m.test(posBody)) {
+                    posBody = posBody.replace(/^Status:.*$/m, newStatus);
+                }
+                else {
+                    // Pipe-table format in Current Position (#1255)
+                    const replaced = (0, state_document_cjs_1.stateReplaceField)(posBody, 'Status', `Phase ${currentPhase} complete`);
+                    if (replaced !== null)
+                        posBody = replaced;
+                }
+                // Update Last activity line if present
+                const newActivity = `Last activity: ${today} — Phase ${currentPhase} marked complete`;
+                if (/^Last activity:/im.test(posBody)) {
+                    posBody = posBody.replace(/^Last activity:.*$/im, newActivity);
+                }
+                else {
+                    // Pipe-table format in Current Position (#1255)
+                    // Value must match the inline branch (date + narrative), not bare date.
+                    const activityValue = `${today} — Phase ${currentPhase} marked complete`;
+                    const replaced = (0, state_document_cjs_1.stateReplaceField)(posBody, 'Last Activity', activityValue)
+                        ?? (0, state_document_cjs_1.stateReplaceField)(posBody, 'Last activity', activityValue);
+                    if (replaced !== null)
+                        posBody = replaced;
+                }
+                body = body.slice(0, cpBodyStart) + posBody + body.slice(cpBodyEnd);
+                updated.push('Current Position');
             }
-            body = body.replace(positionPattern, () => `${header}${posBody}`);
-            updated.push('Current Position');
         }
         return reassemble(body);
     }, cwd);