@opengsd/gsd-core 1.19.0 → 1.20.1

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

@@ -15,7 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PATH_ACTION_REASON = void 0;
+exports.scrubGitLocationEnv = exports.GIT_LOCATION_ENV_VARS = exports.PATH_ACTION_REASON = void 0;
 exports.toPosixPath = toPosixPath;
 exports.toNativePath = toNativePath;
 exports.posixNormalize = posixNormalize;
@@ -37,6 +37,7 @@ exports.projectCodexHookTomlCommand = projectCodexHookTomlCommand;
 exports.escapePowerShellSingleQuoted = escapePowerShellSingleQuoted;
 exports.escapePosixDoubleQuoted = escapePosixDoubleQuoted;
 exports.escapeSingleQuotedShellLiteral = escapeSingleQuotedShellLiteral;
+exports.shellSingleQuote = shellSingleQuote;
 exports.projectPathExportLine = projectPathExportLine;
 exports.renderShellActionLines = renderShellActionLines;
 exports.projectPathActionProjection = projectPathActionProjection;
@@ -64,6 +65,7 @@ const node_fs_1 = __importDefault(require("node:fs"));
 // at load time and become un-mockable.
 const node_child_process_1 = __importDefault(require("node:child_process"));
 const pattern_cjs_1 = require("./pattern.cjs");
+const markdown_sectionizer_cjs_1 = require("./markdown-sectionizer.cjs");
 const frontmatter_fence_cjs_1 = require("./frontmatter-fence.cjs");
 const markdown_line_diff_cjs_1 = require("./markdown-line-diff.cjs");
 const runtime_name_policy_cjs_1 = require("./runtime-name-policy.cjs");
@@ -458,6 +460,18 @@ function escapePosixDoubleQuoted(value) {
 function escapeSingleQuotedShellLiteral(value) {
     return String(value).replace(/'/g, "'\\''");
 }
+/**
+ * #1460 / #4039: POSIX single-quote an arbitrary string as ONE shell token. A path such as a
+ * hook script's absolute install location commonly sits under a home directory containing
+ * spaces or other metacharacters (e.g. "/Users/Bob Smith/.claude/..."); written unquoted it
+ * would word-split and, with a hostile prefix, could inject. Wrapping in single quotes — with
+ * each embedded `'` escaped as `'\''` by escapeSingleQuotedShellLiteral — makes the whole value a
+ * single token no metacharacter inside it can break. This is the one implementation of that rule;
+ * do not re-implement it in a caller.
+ */
+function shellSingleQuote(value) {
+    return "'" + escapeSingleQuotedShellLiteral(value) + "'";
+}
 /**
  * The `export PATH="<dir>:$PATH"` line every persistence lane appends, plus the escaped directory
  * token it embeds. One builder because three lanes emit this line: a lane that re-escapes it
@@ -615,6 +629,10 @@ function _spawnResult(result, program) {
         timedOut: isSpawnTimeout({ error }),
     };
 }
+// #5548: owned by read-only-git-env.cts (its default base is scrubbed); re-exported for callers.
+var read_only_git_env_cjs_2 = require("./read-only-git-env.cjs");
+Object.defineProperty(exports, "GIT_LOCATION_ENV_VARS", { enumerable: true, get: function () { return read_only_git_env_cjs_2.GIT_LOCATION_ENV_VARS; } });
+Object.defineProperty(exports, "scrubGitLocationEnv", { enumerable: true, get: function () { return read_only_git_env_cjs_2.scrubGitLocationEnv; } });
 function execGit(args, opts = {}) {
     // Non-interactive defaults: a hung credential prompt or terminal-input
     // probe must surface as a timeout, not block the tool forever. Callers
@@ -1055,7 +1073,6 @@ function probeTty(opts = {}) {
         return null;
     }
 }
-// ─── Platform file I/O ────────────────────────────────────────────────────────
 /**
  * How many leading lines of LF-only `text` are its closed YAML frontmatter block (opening
  * fence through closing fence), or 0 when there is none (an unterminated block is not
@@ -1075,7 +1092,7 @@ function leadingFrontmatterLineCount(text) {
 function withoutBom(line) {
     return line !== undefined && line.charCodeAt(0) === 0xFEFF ? line.slice(1) : (line ?? '');
 }
-function _normalizeMd(content, prior) {
+function _normalizeMd(content, prior, preserveFencedStructure = false) {
     if (!content || typeof content !== 'string')
         return content;
     let text = content.replace(/\r\n/g, '\n');
@@ -1107,6 +1124,7 @@ function _normalizeMd(content, prior) {
     };
     const fenceRegex = /^```/;
     const insideFence = new Array(lines.length);
+    const insideSharedFence = new Array(lines.length).fill(false);
     let fenceOpen = false;
     for (let i = 0; i < lines.length; i++) {
         if (i < frontmatterLines) {
@@ -1127,6 +1145,13 @@ function _normalizeMd(content, prior) {
             insideFence[i] = fenceOpen;
         }
     }
+    if (preserveFencedStructure) {
+        for (const block of (0, markdown_sectionizer_cjs_1.scanFencedBlocks)(lines)) {
+            const end = block.closeLineIdx === -1 ? lines.length : block.closeLineIdx;
+            for (let i = block.openLineIdx + 1; i < end; i++)
+                insideSharedFence[i] = true;
+        }
+    }
     for (let i = 0; i < lines.length; i++) {
         const line = lines[i];
         if (i < frontmatterLines) {
@@ -1137,6 +1162,8 @@ function _normalizeMd(content, prior) {
         const prevTrimmed = prev.trimEnd();
         const trimmed = line.trimEnd();
         const isFenceLine = fenceRegex.test(trimmed);
+        // Bracket writers preserve literal headings and lists inside fenced examples.
+        const normalizeStructuralLine = !preserveFencedStructure || !insideSharedFence[i];
         // A heading or fence line the write authored brings its own separation, even
         // where it replaced a prose line in place (#5165). One that replaced a heading
         // or fence (a rename, a renumber) inherits the spacing around it instead.
@@ -1149,7 +1176,7 @@ function _normalizeMd(content, prior) {
         // A blank-line run is collapsed only where the write made it (#5165).
         if (scope !== null && line === '' && result.length > 0 && result[result.length - 1] === '' && !keptBefore)
             continue;
-        if (/^#{1,6}\s/.test(trimmed) && i > 0 && prevTrimmed !== '' && prevTrimmed !== '---' && !keptBefore)
+        if (normalizeStructuralLine && /^#{1,6}\s/.test(trimmed) && i > 0 && prevTrimmed !== '' && prevTrimmed !== '---' && !keptBefore)
             blank();
         if (isFenceLine && i > 0 && prevTrimmed !== '' && !insideFence[i] && (i === 0 || !insideFence[i - 1] || isFenceLine) && !keptBefore) {
             if (i === 0 || !insideFence[i - 1])
@@ -1165,11 +1192,11 @@ function _normalizeMd(content, prior) {
         // from the after-heading rule below. The after-a-bullet rule at the end
         // of this loop is a different transition (list→prose) and is unaffected.
         result.push(line);
-        if (/^#{1,6}\s/.test(trimmed) && i < lines.length - 1 && (lines[i + 1] ?? '').trimEnd() !== '' && !keptAfter)
+        if (normalizeStructuralLine && /^#{1,6}\s/.test(trimmed) && i < lines.length - 1 && (lines[i + 1] ?? '').trimEnd() !== '' && !keptAfter)
             blank();
         if (/^```\s*$/.test(trimmed) && i > 0 && insideFence[i - 1] && i < lines.length - 1 && (lines[i + 1] ?? '').trimEnd() !== '' && !keptAfter)
             blank();
-        if (/^(\s*[-*+]\s|\s*\d+\.\s)/.test(line) && i < lines.length - 1 && !keptAfter) {
+        if (normalizeStructuralLine && /^(\s*[-*+]\s|\s*\d+\.\s)/.test(line) && i < lines.length - 1 && !keptAfter) {
             const next = lines[i + 1];
             if (next !== undefined && next.trimEnd() !== '' && !/^(\s*[-*+]\s|\s*\d+\.\s)/.test(next) && !/^\s/.test(next))
                 blank();
@@ -1190,7 +1217,7 @@ function normalizeContent(filePath, content, opts = {}) {
     const isMd = node_path_1.default.extname(filePath).toLowerCase() === '.md';
     let normalized;
     if (isMd) {
-        normalized = _normalizeMd(content, opts.prior);
+        normalized = _normalizeMd(content, opts.prior, opts.preserveFencedMarkdownStructure === true);
     }
     else {
         normalized = (content ?? '').replace(/\r\n/g, '\n').replace(/\n*$/, '\n');
@@ -1211,8 +1238,8 @@ function normalizeContent(filePath, content, opts = {}) {
  * post-write re-read of the actual on-disk bytes) instead of a raw `!==` —
  * do not simplify this back to a direct string comparison.
  */
-function contentChangedAfterNormalize(filePath, before, after) {
-    return normalizeContent(filePath, after, { prior: before }).content !== normalizeContent(filePath, before, { prior: before }).content;
+function contentChangedAfterNormalize(filePath, before, after, opts = {}) {
+    return normalizeContent(filePath, after, { ...opts, prior: before }).content !== normalizeContent(filePath, before, { ...opts, prior: before }).content;
 }
 // Rename errnos that are transient on Windows: a concurrent reader (or an AV
 // scanner / indexer) holding the target open makes renameSync fail briefly.

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

@@ -69,11 +69,14 @@ 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, parsePhaseFromProse, stripProjectCodePrefix } = phaseId;
+const { comparePhaseNum, extractPhaseToken, customPhaseQuery, customDirectoryOwner, parsePhaseFromProse, stripProjectCodePrefix } = phaseId;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const stateMod = require("./state.cjs");
 const { readStateHeadFreshness } = stateMod;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
+const phaseLocatorMod = require("./phase-locator.cjs");
+const { phaseDirectoryOptions, resolvePhaseDirectoryLookup, matchPhaseDirsForLookup } = phaseLocatorMod;
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 const unusableInput = require("./unusable-input.cjs");
 const { warnUnusableInput, UNUSABLE_REASON } = unusableInput;
 // #5118: the verification-status owner's frontmatter-only report check.
@@ -120,8 +123,8 @@ function parseIntOrNull(s) {
     const n = Number.parseInt(cleaned, 10);
     return Number.isFinite(n) ? n : null;
 }
-function phaseTokenFromDirName(name) {
-    const token = extractPhaseToken(name);
+function phaseTokenFromDirName(name, convention) {
+    const token = extractPhaseToken(name, convention);
     // #2528: the shape probe runs on the PROJECT-CODE-STRIPPED token. A prefixed
     // directory tokenizes to `MEM-05-80-20`, which does not start with a digit,
     // so the unstripped probe rejected it and the entry was dropped before any
@@ -252,9 +255,9 @@ function readGitSignals(cwd) {
     const unpushed = run(['log', '@{u}..HEAD', '--oneline']).trim().length > 0;
     return { has_git: true, dirty, unpushed };
 }
-/** Leading numeric phase token from a STATE.md scalar or body `Phase:` value. */
-function phaseTokenFromState(raw) {
-    return parsePhaseFromProse(raw).phase;
+/** Phase identity from a STATE.md scalar or body `Phase:` value, honoring custom naming when a context is supplied. */
+function phaseTokenFromState(raw, context) {
+    return parsePhaseFromProse(raw, undefined, context).phase;
 }
 /**
  * Detect whether the current phase's verify report indicates failure. The
@@ -264,12 +267,20 @@ function phaseTokenFromState(raw) {
  */
 function detectVerifyFailed(cwd, currentPhaseRaw) {
     const phasesDir = node_path_1.default.join(planningPaths(cwd).phases);
+    // #4304: both the directory admission scan and the later selector must read
+    // the same current-checkout grammar. Bracket is the only opt-in widening.
+    const convention = resolvePhaseIdConvention(cwd) === 'bracket' ? 'bracket' : undefined;
+    const directoryContext = phaseDirectoryOptions(cwd);
     let entries = [];
     try {
         entries = node_fs_1.default.readdirSync(phasesDir)
-            .map((name) => ({ name, phaseToken: phaseTokenFromDirName(name) }))
+            .map((name) => {
+            const custom = customPhaseQuery(name, directoryContext);
+            const parts = custom && customDirectoryOwner(name, custom);
+            return { name, phaseToken: parts ? parts.id : phaseTokenFromDirName(name, convention) };
+        })
             .filter((entry) => entry.phaseToken !== null)
-            .sort((a, b) => comparePhaseNum(a.phaseToken, b.phaseToken) || a.name.localeCompare(b.name))
+            .sort((a, b) => comparePhaseNum(a.phaseToken, b.phaseToken, directoryContext) || a.name.localeCompare(b.name))
             .map((entry) => entry.name);
     }
     catch {
@@ -277,10 +288,10 @@ function detectVerifyFailed(cwd, currentPhaseRaw) {
     }
     if (entries.length === 0)
         return false;
-    const phaseToken = phaseTokenFromState(currentPhaseRaw);
+    const phaseToken = phaseTokenFromState(currentPhaseRaw, directoryContext);
     let targetDir;
     if (phaseToken) {
-        const normalized = normalizePhaseName(phaseToken);
+        const lookup = resolvePhaseDirectoryLookup(cwd, phaseToken, undefined, directoryContext);
         // #2528: the fourth directory-resolution site, and the one where a miss is
         // silent — a phase whose directory cannot be found reports "not failed",
         // which reads identically to a healthy phase. It must therefore apply the
@@ -289,7 +300,7 @@ function detectVerifyFailed(cwd, currentPhaseRaw) {
         // surfaces its own failed verification. `entries` is already sorted, and
         // `matchPhaseDirs` filters without reordering, so taking the first match
         // preserves the previous `.find()` selection exactly.
-        const { matches } = matchPhaseDirs(entries, normalized);
+        const { matches } = matchPhaseDirsForLookup(entries, lookup, undefined, directoryContext);
         targetDir = matches[0];
         if (!targetDir)
             return false;

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

@@ -8,7 +8,8 @@
  * already answers:
  *   - `planning-workspace.cjs`'s `planningPaths` for every `.planning/` path
  *     (workstream-aware — never re-derived here).
- *   - `phase-lifecycle.cjs`'s `locateProgressTable` (this issue's Edit 1) for
+ *   - `roadmap-progress.cjs`'s `locateRoadmapProgress` (#5761; was
+ *     `phase-lifecycle`'s `locateProgressTable`) for
  *     "where is the Progress table" — the SAME table
  *     `deriveProgressFromRoadmap` counts from, so `phases[]` and
  *     `deriveProgressFromRoadmap`'s `totalPhases` can never disagree about
@@ -79,6 +80,7 @@ const node_fs_1 = __importDefault(require("node:fs"));
 // documented `state.cjs -> state-contract.cjs -> smart-entry.cjs -> state.cjs`
 // require cycle the file header warns about.
 const phase_status_cjs_1 = require("./phase-status.cjs");
+const phase_entry_grammar_cjs_1 = require("./phase-entry-grammar.cjs");
 // ─── Public wire vocabulary ────────────────────────────────────────────────
 exports.STATE_CONTRACT_VERSION = '1.0.0';
 exports.STATE_CONTRACT_FLAVOR = 'core';
@@ -114,7 +116,7 @@ function owners() {
     /* eslint-disable @typescript-eslint/no-require-imports */
     const planningWorkspaceMod = require('./planning-workspace.cjs');
     const shellCommandProjectionMod = require('./shell-command-projection.cjs');
-    const phaseLifecycleMod = require('./phase-lifecycle.cjs');
+    const roadmapProgressMod = require('./roadmap-progress.cjs');
     const phaseIdMod = require('./phase-id.cjs');
     const roadmapParserMod = require('./roadmap-parser.cjs');
     const markdownSectionizerMod = require('./markdown-sectionizer.cjs');
@@ -126,7 +128,7 @@ function owners() {
         planningPaths: planningWorkspaceMod.planningPaths,
         platformReadSync: shellCommandProjectionMod.platformReadSync,
         platformWriteSync: shellCommandProjectionMod.platformWriteSync,
-        locateProgressTable: phaseLifecycleMod.locateProgressTable,
+        locateRoadmapProgress: roadmapProgressMod.locateRoadmapProgress,
         isSentinelPhaseId: phaseIdMod.isSentinelPhaseId,
         parsePhaseFromProse: phaseIdMod.parsePhaseFromProse,
         resolvePhaseIdConvention: planningWorkspaceMod.resolvePhaseIdConvention,
@@ -188,9 +190,11 @@ function phasesFromProgressTable(table, convention) {
 }
 // ─── phases: `## Phases` checkbox fallback ─────────────────────────────────
 // `- [x] **Phase 1: Foundation**` / `- [ ] **Phase 2.1: Hardening**`.
-const PHASE_BULLET_RE = /^[ \t]*[-*][ \t]+\[([ xX])\][ \t]+\*\*Phase[ \t]+(\d+(?:\.\d+)*)[ \t]*:?[ \t]*([^*\n]*)\*\*/gm;
+// The entry prefix (marker, box, bold token) is the phase-entry grammar's (#5764): capture
+// group 1 is the box character, 2 the number, 3 the name.
+const PHASE_BULLET_RE = (0, phase_entry_grammar_cjs_1.phaseEntryRegExp)(`Phase[ \\t]+(\\d+(?:\\.\\d+)*)[ \\t]*:?[ \\t]*([^*\\n]*)${phase_entry_grammar_cjs_1.PHASE_ENTRY_BOLD_CLOSE_SRC}`, 'g', { state: 'captured', bold: 'required' });
 // #5626: the same bullet under `milestone-prefixed`: the number capture takes one optional `-NN` segment.
-const PHASE_BULLET_MILESTONE_RE = /^[ \t]*[-*][ \t]+\[([ xX])\][ \t]+\*\*Phase[ \t]+(\d+(?:-\d+)?(?:\.\d+)*)[ \t]*:?[ \t]*([^*\n]*)\*\*/gm;
+const PHASE_BULLET_MILESTONE_RE = (0, phase_entry_grammar_cjs_1.phaseEntryRegExp)(`Phase[ \\t]+(\\d+(?:-\\d+)?(?:\\.\\d+)*)[ \\t]*:?[ \\t]*([^*\\n]*)${phase_entry_grammar_cjs_1.PHASE_ENTRY_BOLD_CLOSE_SRC}`, 'g', { state: 'captured', bold: 'required' });
 /**
  * STATE.md's current phase, via the same frontmatter-then-body chain
  * `cmdStateCompletePhase` uses (`stateFieldValue` owns the #1760 fallback
@@ -249,7 +253,7 @@ function phasesFromChecklist(roadmapContent, cwd, statePath, convention) {
     return phases;
 }
 function buildPhases(cwd, paths) {
-    const { platformReadSync, locateProgressTable } = owners();
+    const { platformReadSync, locateRoadmapProgress } = owners();
     try {
         let content = platformReadSync(paths.roadmap);
         if (content === null)
@@ -257,7 +261,7 @@ function buildPhases(cwd, paths) {
         if (content.charCodeAt(0) === 0xfeff)
             content = content.slice(1); // strip leading BOM
         const convention = phaseIdConventionOf(cwd);
-        const table = locateProgressTable(content);
+        const { table } = locateRoadmapProgress(content);
         if (table)
             return phasesFromProgressTable(table, convention);
         return phasesFromChecklist(content, cwd, paths.state, convention);