@opengsd/gsd-core 1.12.0 → 1.14.0

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

@@ -22,10 +22,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MARKDOWN_LINK_PATTERNS = exports.INJECTION_PATTERNS = void 0;
-exports.validatePath = validatePath;
+exports.MARKDOWN_LINK_PATTERNS = exports.INJECTION_PATTERNS = exports.PathAcceptance = void 0;
+exports.isContainedIn = isContainedIn;
 exports.loadTrustedGlobalRoots = loadTrustedGlobalRoots;
+exports.assertWithinRoot = assertWithinRoot;
+exports.tryWithinRoot = tryWithinRoot;
 exports.requireSafePath = requireSafePath;
+exports.tryWithinRootLexical = tryWithinRootLexical;
+exports.assertWithinRootLexical = assertWithinRootLexical;
 exports.scanForInjection = scanForInjection;
 exports.sanitizeForPrompt = sanitizeForPrompt;
 exports.sanitizeForDisplay = sanitizeForDisplay;
@@ -39,6 +43,31 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
 // ─── Path Traversal Prevention ──────────────────────────────────────────────
+/**
+ * THE containment comparison — the single place this repo decides whether an
+ * already-resolved path lies inside an already-resolved root (ADR-4650).
+ *
+ * Separator-aware on purpose: comparing the bare strings would accept a
+ * sibling that merely shares a prefix (`<root>-evil` against `<root>`), so both
+ * sides get a trailing separator before the prefix test. `target === root` is
+ * contained.
+ *
+ * `pathImpl` lets a caller supply `path.win32` / `path.posix` instead of the
+ * ambient module, so win32 separator semantics are testable off Windows.
+ *
+ * Exported for callers that have ALREADY resolved both operands themselves
+ * and need only this comparison step (e.g. a caller that owns its own
+ * `fs.realpathSync` calls to preserve an exists-vs-escaped tri-state). A
+ * caller that has NOT resolved its operands must NOT reach for this function
+ * directly — the comparison alone is not a containment check — and should use
+ * `assertWithinRoot` / `tryWithinRoot` (or the `assertWithinRootLexical` /
+ * `tryWithinRootLexical` pair) instead.
+ */
+function isContainedIn(resolvedTarget, resolvedRoot, pathImpl = node_path_1.default) {
+    if (resolvedTarget === resolvedRoot)
+        return true;
+    return (resolvedTarget + pathImpl.sep).startsWith(resolvedRoot + pathImpl.sep); // allow-handrolled-containment: this IS the canonical comparison every other site routes through
+}
 /**
  * Validate that a file path resolves within an allowed base directory.
  * Prevents path traversal attacks via ../ sequences, symlinks, or absolute paths.
@@ -122,9 +151,7 @@ function validatePath(filePath, baseDir, opts = {}) {
             }
         }
     }
-    const normalizedBase = resolvedBase + node_path_1.default.sep;
-    const normalizedPath = resolvedPath + node_path_1.default.sep;
-    if (resolvedPath !== resolvedBase && !normalizedPath.startsWith(normalizedBase)) {
+    if (!isContainedIn(resolvedPath, resolvedBase)) {
         return {
             safe: false,
             resolved: resolvedPath,
@@ -204,17 +231,109 @@ function loadTrustedGlobalRoots(config) {
     }
     return result;
 }
+/**
+ * Named acceptance policy for what kind of candidate path is even considered.
+ *
+ * This replaces the old per-call-site `{ allowAbsolute: true }` boolean flag.
+ * At a call site, `{ allowAbsolute: true }` reads as "containment is relaxed
+ * here" — which is FALSE. An absolute path that resolves OUTSIDE the root is
+ * still rejected; the flag only ever controlled whether an absolute candidate
+ * was considered at all. `AbsoluteInsideRoot` states the real contract: an
+ * absolute candidate is accepted for consideration, but containment is
+ * enforced exactly as it is for a relative one.
+ */
+exports.PathAcceptance = {
+    /** Relative candidates only; an absolute candidate is rejected outright. */
+    RelativeOnly: 'relative-only',
+    /**
+     * An absolute candidate is accepted — but ONLY if it still resolves inside the
+     * root. Containment is NOT relaxed by this policy; an absolute path outside the
+     * root is rejected exactly as a traversal is. This is the distinction the old
+     * `{ allowAbsolute: true }` flag failed to make at its call sites.
+     */
+    AbsoluteInsideRoot: 'absolute-inside-root',
+};
 /**
  * Validate a file path and throw on traversal attempt.
  * Convenience wrapper around validatePath for use in CLI commands.
  */
-function requireSafePath(filePath, baseDir, label, opts = {}) {
-    const result = validatePath(filePath, baseDir, opts);
+function assertWithinRoot(candidate, root, label, policy = exports.PathAcceptance.RelativeOnly) {
+    const result = validatePath(candidate, root, { allowAbsolute: policy === exports.PathAcceptance.AbsoluteInsideRoot });
     if (!result.safe) {
         throw new Error(`${label || 'Path'} validation failed: ${result.error}`);
     }
     return result.resolved;
 }
+/**
+ * Validate a file path and return null on traversal attempt (no throw).
+ *
+ * Returns exactly `null` when unsafe — never `''`, never `result.resolved`.
+ * `validatePath` populates `resolved` with the ESCAPING path on the
+ * traversal branch, so returning it here would reproduce the defect this
+ * narrowing exists to remove.
+ */
+function tryWithinRoot(candidate, root, policy = exports.PathAcceptance.RelativeOnly) {
+    const result = validatePath(candidate, root, { allowAbsolute: policy === exports.PathAcceptance.AbsoluteInsideRoot });
+    if (!result.safe) {
+        return null;
+    }
+    return result.resolved;
+}
+/**
+ * Validate a file path and throw on traversal attempt.
+ * Convenience wrapper around validatePath for use in CLI commands.
+ *
+ * Delegates to assertWithinRoot so there is one implementation beneath both
+ * names; its declared return type is ContainedPath (a branded string, still
+ * assignable to string) so existing callers keep compiling untouched.
+ */
+function requireSafePath(filePath, baseDir, label, policy = exports.PathAcceptance.RelativeOnly) {
+    return assertWithinRoot(filePath, baseDir, label, policy);
+}
+/**
+ * LEXICAL containment — `path.resolve` only, never any filesystem access.
+ *
+ * Shares `isContainedIn` with the realpath-based predicate, so there is ONE
+ * containment decision in this repo; these differ only in how a path is
+ * RESOLVED before that decision, never in the decision itself (ADR-4650
+ * decisions 1 and 6).
+ *
+ * Use this — and say why at the call site — only where a symlink must be
+ * PRESERVED rather than resolved, or where the target legitimately does not
+ * exist yet. Three such cases exist: a destination validated before the
+ * `mkdirSync` that creates it, a migration that snapshots and restores a
+ * symlinked path AS A LINK, and a restore gate that refuses links outright.
+ * Everywhere else the realpath-based `assertWithinRoot` / `tryWithinRoot` is
+ * the correct predicate, because a lexical check CANNOT SEE A SYMLINK: a
+ * caller relying on one for a write-confinement guarantee must pair it with
+ * its own symlink refusal.
+ *
+ * `candidate` is resolved RELATIVE TO `root` (so an absolute candidate is
+ * taken as-is, matching `path.resolve` semantics). `target === root` is
+ * contained.
+ *
+ * DELIBERATELY ABSENT: no NUL-byte rejection here. The existing lexical
+ * callers do not reject NUL at this layer (one of them checks NUL itself,
+ * separately), and adding it here would change their behavior. Callers that
+ * need it keep their own check.
+ */
+function tryWithinRootLexical(candidate, root, opts = {}) {
+    const p = opts.pathImpl || node_path_1.default;
+    if (typeof candidate !== 'string' || candidate === '')
+        return null;
+    if (typeof root !== 'string' || root === '')
+        return null;
+    const rootResolved = p.resolve(root);
+    const targetResolved = p.resolve(root, candidate);
+    return isContainedIn(targetResolved, rootResolved, p) ? targetResolved : null;
+}
+function assertWithinRootLexical(candidate, root, label, opts = {}) {
+    const contained = tryWithinRootLexical(candidate, root, opts);
+    if (contained === null) {
+        throw new Error(`${label || 'Path'} validation failed: lexical containment check failed`);
+    }
+    return contained;
+}
 // ─── Prompt Injection Detection ────────────────────────────────────────────────────
 /**
  * Patterns that indicate prompt injection attempts in user-supplied text.

package/gsd-core/bin/lib/shell-command-projection.cjs

@@ -242,6 +242,8 @@ const MANAGED_HOOK_BASENAMES_BY_SURFACE = {
         'gsd-write-guard.js',
         'gsd-agent-isolation-guard.js',
         'gsd-worktree-path-guard.js',
+        // #4221: secret-file read guard (Read|Grep|Bash).
+        'gsd-secret-read-guard.js',
     ]),
     'codex-toml': new Set([
         'gsd-check-update.js',
@@ -269,6 +271,8 @@ const MANAGED_HOOK_COMMAND_BASENAMES_BY_SURFACE = {
         'gsd-write-guard.js',
         'gsd-agent-isolation-guard.js',
         'gsd-worktree-path-guard.js',
+        // #4221: secret-file read guard (Read|Grep|Bash).
+        'gsd-secret-read-guard.js',
     ]),
     'codex-toml': new Set([
         'gsd-check-update.js',

package/gsd-core/bin/lib/smart-entry.cjs

@@ -64,7 +64,7 @@ const stateDocument = require("./state-document.cjs");
 const { stateFieldValue } = stateDocument;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const phaseId = require("./phase-id.cjs");
-const { comparePhaseNum, extractPhaseToken, matchPhaseDirs, normalizePhaseName, stripProjectCodePrefix } = phaseId;
+const { comparePhaseNum, extractPhaseToken, matchPhaseDirs, normalizePhaseName, parsePhaseFromProse, stripProjectCodePrefix } = phaseId;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const stateMod = require("./state.cjs");
 const { readStateHeadFreshness } = stateMod;
@@ -233,10 +233,7 @@ function readGitSignals(cwd) {
 }
 /** Leading numeric phase token from a STATE.md scalar or body `Phase:` value. */
 function phaseTokenFromState(raw) {
-    if (!raw?.trim())
-        return null;
-    const match = raw.trim().match(/^(\d+(?:[A-Z])?(?:\.\d+)*)/i);
-    return match ? match[1] : null;
+    return parsePhaseFromProse(raw).phase;
 }
 /**
  * Detect whether the current phase's verify report indicates failure. The
@@ -429,7 +426,7 @@ function detectSignals(cwd, now = Date.now) {
     const stateHeadRaw = stateFieldValue(fm, body, 'state_head', 'State Head').value;
     const freshness = readStateHeadFreshness(cwd, stateHeadRaw);
     return {
-        current_phase: parseIntOrNull(currentPhaseRaw),
+        current_phase: phaseTokenFromState(currentPhaseRaw),
         total_phases: parseIntOrNull(totalPhasesRaw),
         status: (statusRaw || '').toLowerCase(),
         progress: parseIntOrNull(progressRaw),
@@ -472,11 +469,12 @@ function isComplete(s) {
             return false;
     }
     else {
-        // Legacy path: STATE.md comparison. Still subject to the two-scale bug,
-        // but only fires when ROADMAP.md is absent or has no Progress table.
+        // Legacy path: STATE.md comparison. It only fires when ROADMAP.md is
+        // absent or has no Progress table, and uses canonical phase-id ordering
+        // so dotted phase ids are never coerced to JavaScript numbers.
         if (s.total_phases === null || s.current_phase === null)
             return false;
-        if (s.current_phase < s.total_phases)
+        if (comparePhaseNum(s.current_phase, s.total_phases) < 0)
             return false;
     }
     // Status regex: require milestone-level completion language. The pre-fix

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

@@ -8,7 +8,7 @@
  * from the prior hand-written .cjs; only types are added.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KNOWN_STATUS_PATTERNS = exports.KNOWN_TEMPLATE_DEFAULTS = void 0;
+exports.KNOWN_STATUS_PATTERNS = exports.KNOWN_TEMPLATE_DEFAULTS = exports.STATUS_ANCHORED_PATTERNS = exports.STATUS_EXACT_TOKENS = void 0;
 exports.toFiniteNumber = toFiniteNumber;
 exports.isUnfilledFieldValue = isUnfilledFieldValue;
 exports.leadingCalendarDate = leadingCalendarDate;
@@ -364,7 +364,7 @@ function stateFieldContinuation(content, fieldName) {
     // this locates exactly the line whose value it returned. The pipe-table rung
     // is deliberately absent: a `| Field | value |` row is bounded by its closing
     // pipe and cannot wrap.
-    const match = new RegExp(`\\*\\*${escaped}:\\*\\*[ \\t]*(.+)`, 'i').exec(content) ??
+    const match = new RegExp(`^[ \\t]*\\*\\*${escaped}:\\*\\*[ \\t]*(.+)`, 'im').exec(content) ??
         new RegExp(`^${escaped}:[ \\t]*(.+)`, 'im').exec(content);
     if (!match)
         return null;
@@ -396,8 +396,9 @@ function stateFieldContinuation(content, fieldName) {
 }
 function stateExtractField(content, fieldName) {
     const escaped = (0, pattern_cjs_1.escapeRegex)(fieldName);
-    // Bold inline format: **FieldName:** value
-    const boldPattern = new RegExp(`\\*\\*${escaped}:\\*\\*[ \\t]*(.+)`, 'i');
+    // Bold line-start format: **FieldName:** value. Leading same-line whitespace
+    // matches the writer's established indented-field tolerance.
+    const boldPattern = new RegExp(`^[ \\t]*\\*\\*${escaped}:\\*\\*[ \\t]*(.+)`, 'im');
     const boldMatch = content.match(boldPattern);
     if (boldMatch)
         return boldMatch[1].trim();
@@ -512,17 +513,57 @@ function stateCurrentPositionSlice(body) {
     const section = (0, markdown_sectionizer_cjs_1.collectSection)(body, isCurrentPosition, { levelBounded: true });
     return section ? section.body : null;
 }
+/**
+ * Join a matched `**Field:**`/`Field:` label prefix to its new value, inserting a
+ * single space when the prefix does not already end in same-line whitespace.
+ *
+ * On an empty field the same-line `[ \t]*` gap (below) captures nothing, so the
+ * bare `prefix + value` would glue the value to the label (`**Status:**value`);
+ * this inserts the missing separator. A non-empty field whose label-to-value
+ * separator is ordinary space/tab keeps that separator in the prefix, so `[ \t]$`
+ * is true and the output stays byte-identical to prior behaviour. The one
+ * exception is a non-empty field written with NO separator at all (a hand-edited
+ * `**Status:**value`): the narrowed gap captures nothing, `[ \t]$` is false, and a
+ * single space is inserted — an intentional normalization, not byte-identical, and
+ * with no GSD-template trigger. An empty new value inserts no separator, avoiding a
+ * dangling trailing space. See #4010.
+ */
+function joinFieldReplacement(prefix, newValue) {
+    const value = `${newValue}`;
+    const needsSeparator = value.length > 0 && !/[ \t]$/.test(prefix);
+    return `${prefix}${needsSeparator ? ' ' : ''}${value}`;
+}
 function stateReplaceField(content, fieldName, newValue) {
     const escaped = (0, pattern_cjs_1.escapeRegex)(fieldName);
     // Bold inline format: **FieldName:** value
-    const boldPattern = new RegExp(`(\\*\\*${escaped}:\\*\\*\\s*)(.*)`, 'i');
+    // The label-to-value gap is same-line whitespace only (`[ \t]*`, mirroring the
+    // read side at stateExtractField). `\s*` here matched `\n`, so on an empty field
+    // `(.*)` captured the following line and the rebuild discarded it — the #4010
+    // data-loss. ADR-3180 §7.7 makes stateExtractField the same-line-confined owner;
+    // this aligns the writer to it.
+    //
+    // #4243: the bold form is also ANCHORED to line start, with same-line leading
+    // whitespace only. The pre-fix pattern carried no `^` and no `m` flag, so a
+    // bold label quoted MID-SENTENCE inside prose — an Accumulated Context bullet
+    // mentioning `**Status:**` — captured the rewrite and destroyed the rest of
+    // its line, silently, whenever a whole-body caller fed this function every
+    // section (beginPhaseCore's tryField, advancePlanCore's Status/Current Plan
+    // writes). The plain branch below was always line-anchored; only the bold
+    // branch lagged. Anchoring reuses #4010's same-line confinement idiom (the
+    // leading class is `[ \t]*`, deliberately NOT the `\s*` the issue suggested —
+    // `^\s*\*\*` can consume the newlines before the label into the match and
+    // drop them on rebuild) and #4186's recognition-by-anchoring discipline: a
+    // write target must BE the whole declared line shape, never a substring
+    // guess inside prose. `$` is explicit-and-inert (`.` never crosses line
+    // terminators) and documents that the match ends at end-of-line.
+    const boldPattern = new RegExp(`^([ \\t]*\\*\\*${escaped}:\\*\\*[ \\t]*)(.*)$`, 'im');
     if (boldPattern.test(content)) {
-        return content.replace(boldPattern, (_match, prefix) => `${prefix}${newValue}`);
+        return content.replace(boldPattern, (_match, prefix) => joinFieldReplacement(prefix, newValue));
     }
-    // Plain line-start format: FieldName: value
-    const plainPattern = new RegExp(`(^${escaped}:\\s*)(.*)`, 'im');
+    // Plain line-start format: FieldName: value (same same-line confinement as above)
+    const plainPattern = new RegExp(`(^${escaped}:[ \\t]*)(.*)`, 'im');
     if (plainPattern.test(content)) {
-        return content.replace(plainPattern, (_match, prefix) => `${prefix}${newValue}`);
+        return content.replace(plainPattern, (_match, prefix) => joinFieldReplacement(prefix, newValue));
     }
     // Pipe-table format: | FieldName | value |
     // Preserve the surrounding pipe/whitespace structure; only swap the value cell.
@@ -570,31 +611,117 @@ function stateReplaceFieldInSession(content, primary, fallback, value) {
     const target = hasCanonicalSession ? isSession : isSessionContinuity;
     return (0, markdown_sectionizer_cjs_1.withSection)(content, target, (sectionBody) => stateReplaceFieldWithFallback(sectionBody, primary, fallback, value));
 }
+/**
+ * #4186: the DECLARED raw-status vocabulary `normalizeStateStatus` recognizes.
+ * Keys are whole-field values, compared against the caller's input after
+ * lowercasing, trimming, and collapsing internal whitespace runs to single
+ * spaces — so case and whitespace variants the vocabulary documents
+ * (`EXECUTING PHASE 5`, `  Paused  `, `In   progress`) keep normalizing.
+ * Values are members of `STATUS_LIFECYCLE_ENUM` (`src/state-md-schema.cts`)
+ * — the set the normalizer maps recognized input ONTO.
+ *
+ * The mapping preserves the PRE-#4186 branch ORDER's observable artifacts for
+ * every value the old substring chain recognized: `Planning complete` →
+ * `planning` (the `planning` branch outranked `complete`) and
+ * `Phase complete — ready for verification` → `verifying` (`verif` outranked
+ * `complete`; pinned by tests/state.test.cjs's advance-plan case-5 comment).
+ *
+ * Everything else — prose that merely CONTAINS a status word — falls through
+ * to the caller's raw value (the recorded lenient fallback, #3873 phase-3
+ * row 26). A token guessed from a substring inside a sentence is worse than
+ * a visible paragraph: the paragraph is visibly prose, the wrong token is
+ * not (a `.planning/` path in Italian prose silently produced
+ * `status: planning`; `verificata` produced `verifying`; `completezza`
+ * produced `completed`).
+ */
+exports.STATUS_EXACT_TOKENS = Object.freeze({
+    paused: 'paused',
+    stopped: 'paused',
+    executing: 'executing',
+    'in progress': 'executing',
+    'ready to execute': 'executing',
+    planning: 'planning',
+    'ready to plan': 'planning',
+    'planning complete': 'planning',
+    discussing: 'discussing',
+    verifying: 'verifying',
+    completed: 'completed',
+    done: 'completed',
+    complete: 'completed',
+    'phase complete': 'completed',
+    // advance-plan's phase-complete write (state-transition.cts:1812) — maps
+    // to `verifying`, preserving the pre-#4186 branch order where `verif`
+    // outranked `complete`.
+    'phase complete — ready for verification': 'verifying',
+    'all phases complete': 'completed',
+    // Legacy bare terminal form. ADR-2207/#2204 removed it from every WRITER
+    // (phase verbs write `All phases complete`; milestone close writes
+    // `<version> milestone complete`) — kept here as READER recognition so a
+    // legacy STATE.md still normalizes, exactly the way KNOWN_TEMPLATE_DEFAULTS
+    // keeps the other legacy Status strings.
+    'milestone complete': 'completed',
+    unknown: 'unknown',
+});
+/**
+ * #4186: ANCHORED patterns for handler-written raw statuses whose text
+ * carries a variable component (a phase number, a milestone version, a
+ * #1070 completion glyph). Each pattern is matched against the same
+ * normalized key as `STATUS_EXACT_TOKENS` (lowercased, trimmed,
+ * whitespace-collapsed) and must match the WHOLE value — never a substring —
+ * mirroring how `KNOWN_STATUS_PATTERNS` anchors its template-default checks.
+ * `Executing Phase 5 — final stretch` (executor-appended prose) matches
+ * NOTHING and passes through verbatim, the same discipline #1070 applies to
+ * "Complete but needs manual QA".
+ */
+exports.STATUS_ANCHORED_PATTERNS = Object.freeze([
+    // begin-phase / planned transitions write `Executing Phase ${N}`.
+    [/^executing phase\s+\S+$/, 'executing'],
+    [/^planning phase\s+\S+$/, 'planning'],
+    [/^verifying phase\s+\S+$/, 'verifying'],
+    // phase-complete verbs write `Phase ${N} complete` (state.cts) — the exact
+    // shape the #3578 demote guard then re-checks against the disk counters.
+    [/^phase\s+\S+\s+complete$/, 'completed'],
+    // milestoneCompleteCore writes `${version} milestone complete` (terminal,
+    // ADR-2207); the version label is a single token (milestone.cts's charset
+    // validation admits letters, digits, '.', '-', '_').
+    [/^\S+\s+milestone complete$/, 'completed'],
+    // #1070: LLM executors may write "Complete ✓" or bare "Complete" when
+    // finishing a phase.
+    [/^complete\s*[✓✔✅☑]?$/, 'completed'],
+]);
+/**
+ * Normalize a raw `Status` body-field value to the canonical status token.
+ *
+ * #4186: recognition is ANCHORED — the whole field value (lowercased,
+ * trimmed, whitespace-collapsed) must be a member of the declared vocabulary
+ * (`STATUS_EXACT_TOKENS` / `STATUS_ANCHORED_PATTERNS` above). The pre-#4186
+ * implementation ran a first-match-wins chain of SUBSTRING tests over the
+ * free-prose field, so any prose merely CONTAINING a trigger word was
+ * silently rewritten to a credible wrong token: a `.planning/...` path
+ * mentioned in a non-English status line landed on `planning` (the trigger
+ * word lives in the directory name and outranked the `verif`/`complete`
+ * branches), Italian `verifica*` landed on `verifying`, `completezza` and
+ * `fasi complete` landed on `completed`. The lenient FALLBACK is unchanged
+ * and recorded (#3873 phase-3 row 26): an unrecognized value passes through
+ * verbatim — visible prose, never a guessed token.
+ *
+ * `pausedAt` keeps its documented force (issue #4186: intended behavior): a
+ * truthy value yields `paused` regardless of the prose.
+ */
 function normalizeStateStatus(status, pausedAt) {
-    let normalizedStatus = status || 'unknown';
-    const statusLower = (status || '').toLowerCase();
-    if (statusLower.includes('paused') || statusLower.includes('stopped') || pausedAt) {
-        normalizedStatus = 'paused';
-    }
-    else if (statusLower.includes('executing') || statusLower.includes('in progress')) {
-        normalizedStatus = 'executing';
-    }
-    else if (statusLower.includes('planning') || statusLower.includes('ready to plan')) {
-        normalizedStatus = 'planning';
-    }
-    else if (statusLower.includes('discussing')) {
-        normalizedStatus = 'discussing';
-    }
-    else if (statusLower.includes('verif')) {
-        normalizedStatus = 'verifying';
-    }
-    else if (statusLower.includes('complete') || statusLower.includes('done')) {
-        normalizedStatus = 'completed';
-    }
-    else if (statusLower.includes('ready to execute')) {
-        normalizedStatus = 'executing';
+    if (pausedAt)
+        return 'paused';
+    if (!status)
+        return 'unknown';
+    const key = status.trim().toLowerCase().replace(/\s+/g, ' ');
+    const exact = exports.STATUS_EXACT_TOKENS[key];
+    if (exact)
+        return exact;
+    for (const [pattern, token] of exports.STATUS_ANCHORED_PATTERNS) {
+        if (pattern.test(key))
+            return token;
     }
-    return normalizedStatus;
+    return status;
 }
 /**
  * ADR-3180 §7.6 rule 4 (#3217): `scope` is the `listMilestonePhaseDirs`-owner

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

@@ -43,24 +43,31 @@ exports.STATE_FIELD_SCHEMA = exports.STATUS_LIFECYCLE_ENUM = void 0;
 /**
  * The seven CANONICAL values `normalizeStateStatus` (`src/state-document.cts`)
  * maps recognized raw status prose TO — the function's default fallback plus
- * each branch's literal output, in the order the function tests them. This is
- * NOT the raw body prose vocabulary `CONTEXT.md`'s "STATE.md Status Lifecycle
- * (ADR-2207)" entry documents (`Ready to plan` → `All phases complete` →
- * `<version> milestone complete` → `Awaiting next milestone`, plus the
- * handler-authored strings in `KNOWN_TEMPLATE_DEFAULTS['Status']`) — that is
- * free-form prose `normalizeStateStatus` READS.
+ * each vocabulary entry's literal output. This is NOT the raw body prose
+ * vocabulary `CONTEXT.md`'s "STATE.md Status Lifecycle (ADR-2207)" entry
+ * documents (`Ready to plan` → `All phases complete` → `<version> milestone
+ * complete` → `Awaiting next milestone`, plus the handler-authored strings
+ * in `KNOWN_TEMPLATE_DEFAULTS['Status']`) — that is free-form prose
+ * `normalizeStateStatus` READS.
  *
  * CORRECTED (#3873 phase-3 test-matrix row 26 — verified by executing
  * `normalizeStateStatus`, not by reading this docstring's prior claim):
  * this is NOT a closed set the `status` frontmatter key is restricted to at
- * runtime. `normalizeStateStatus` is deliberately LENIENT: its fallback is
- * `normalizedStatus = status || 'unknown'`, and when none of its
- * substring-match branches recognize the raw input, that fallback — the
- * caller's raw, UNRECOGNIZED prose — is returned unchanged. A status value
- * outside this seven-member set is not rejected, coerced, or normalized; it
- * passes straight through into the frontmatter. `STATUS_LIFECYCLE_ENUM` is
- * therefore the set of values the normalizer maps recognized input ONTO, not
- * a runtime-enforced closed vocabulary for the field.
+ * runtime. `normalizeStateStatus` is deliberately LENIENT: its fallback
+ * returns the caller's raw, UNRECOGNIZED prose unchanged — when none of its
+ * vocabulary entries recognize the whole-field input, that raw value is what
+ * the function returns. A status value outside this seven-member set is not
+ * rejected, coerced, or normalized; it passes straight through into the
+ * frontmatter. `STATUS_LIFECYCLE_ENUM` is therefore the set of values the
+ * normalizer maps recognized input ONTO, not a runtime-enforced closed
+ * vocabulary for the field.
+ *
+ * #4186: recognition is ANCHORED (whole-field match against the declared
+ * `STATUS_EXACT_TOKENS` / `STATUS_ANCHORED_PATTERNS` tables in
+ * `src/state-document.cts`), never a substring scan of the prose — prose
+ * merely CONTAINING a status word (a `.planning/` path, `verifica*`,
+ * `completezza`) passes through verbatim instead of being rewritten to a
+ * credible wrong token.
  */
 exports.STATUS_LIFECYCLE_ENUM = Object.freeze([
     'unknown',
@@ -128,19 +135,29 @@ exports.STATE_FIELD_SCHEMA = Object.freeze(Object.assign(Object.create(null), {
         // (verified: it calls `stateExtractField(bodyContent, 'Current Plan')`
         // only), so that shape is out of scope for this row regardless.
         //
-        // #3784 is the open issue for teaching `Current Plan` to read the
-        // hybrid shape; **PR #3791** ("fix(#3784): read the hybrid
-        // `Current Plan: N of M` shape, keep zero-padding, and name the
-        // accepted shapes on failure") is the in-flight fix. Do NOT widen
-        // this row speculatively — that would assert a shape the shipped
-        // parser does not accept, which is the exact defect class §8.8
-        // exists to make impossible. When #3791 merges, `acceptedShapes`
-        // MUST widen to `['N', 'N of M']` — until then, the row 23/24/25
-        // parser-shape tests (`tests/state-transition.test.cjs`) will go RED
-        // the moment the parser changes underneath it. That failure is the
-        // forcing function working as designed, not a broken test: it is
-        // what stops the schema and the parser from drifting apart silently.
-        acceptedShapes: Object.freeze(['N']),
+        // #3784/#3791 WIDENED THIS ROW. The paragraph above describes the
+        // pre-#3791 parser and is kept as the record of what the shape was
+        // before, because row 25 exists to stop exactly that reading from
+        // being re-asserted by accident.
+        //
+        // `advancePlanCore` now accepts the hybrid shape, so the declared set
+        // is `['N', 'N of M']`. Two properties of the widening matter to a
+        // future reader:
+        //
+        //   - It is ANCHORED. The parser matches `/^(\d+)\s+of\s+(\d+)\s*$/`
+        //     against the whole value, so `4 — blocked on review of 2 PRs`
+        //     is REJECTED rather than yielding a total of 2 out of prose.
+        //     Declaring `'N of M'` is a claim about that grammar, not about
+        //     "contains the word of".
+        //   - `'N/M'` stays UNDECLARED and must keep failing. Row 23 probes
+        //     the undeclared remainder of `SHAPE_EXAMPLES`, so it needs at
+        //     least one member outside the declared set to stay non-vacuous.
+        //
+        // Widening this row without widening the parser (or the reverse) goes
+        // RED on rows 23/24/25. That coupling is the forcing function, and it
+        // is the reason this row is data rather than a predicate: §8.8's
+        // "parsers are checked, not generated".
+        acceptedShapes: Object.freeze(['N', 'N of M']),
         emitted: 'when-present',
     },
     // Status / lifecycle (body-derived; #1230 delta heuristic applies)