@opengsd/gsd-core 1.19.0 → 1.20.1

package/gsd-core/bin/lib/workstream-inventory.cjs

@@ -25,12 +25,12 @@ const { readSubdirectories } = coreUtilsMod;
 const planScan = require("./plan-scan.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const planningWorkspace = require("./planning-workspace.cjs");
-const { planningPaths, planningRoot, getActiveWorkstream } = planningWorkspace;
+const { planningPaths, planningRoot, getActiveWorkstream, resolvePhaseIdConvention } = planningWorkspace;
 const state_document_cjs_1 = require("./state-document.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports -- frontmatter.cjs is an export= CommonJS module
 const frontmatterMod = require("./frontmatter.cjs");
 const { extractFrontmatter, stripFrontmatter } = frontmatterMod;
-const markdown_table_cjs_1 = require("./markdown-table.cjs");
+const roadmap_progress_cjs_1 = require("./roadmap-progress.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports -- verification.cjs is an export= CommonJS module
 const verificationMod = require("./verification.cjs");
 const { isPhaseComplete, isVerificationStatus, VERIFICATION_STATUS } = verificationMod;
@@ -41,6 +41,9 @@ const { phaseKeyFromDir, phaseKeyFromProse, parentPhaseKey } = phaseIdMod;
 const roadmapParserMod = require("./roadmap-parser.cjs");
 const { getMilestonePhaseFilter, isMilestoneShippedInRoadmap } = roadmapParserMod;
 const workstream_inventory_builder_cjs_1 = require("./workstream-inventory-builder.cjs");
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const phaseLocatorMod = require("./phase-locator.cjs");
+const { phaseDirectoryOptions } = phaseLocatorMod;
 // ─── Implementation ───────────────────────────────────────────────────────────
 function workstreamsRoot(cwd) {
     return node_path_1.default.join(planningRoot(cwd), 'workstreams');
@@ -75,7 +78,7 @@ function countRoadmapPhases(roadmapPath, fallbackCount, cwd, ws, versionOverride
         // `null` -> 0 (fallback), `undefined` -> 3. A non-bracket workstream
         // resolves to a value that compiles the same base grammar `null` did, so
         // its count is unchanged (verified against a legacy control).
-        const filter = getMilestonePhaseFilter(cwd, versionOverride ?? null, undefined, ws ?? null);
+        const filter = getMilestonePhaseFilter(cwd, versionOverride ?? null, undefined, ws ?? null, phaseDirectoryOptions(cwd, undefined, undefined, ws ?? null));
         // A pass-all degrade (phaseCount 0) means the window declared no phases —
         // fall back rather than reporting a confident zero.
         return filter.phaseCount > 0 ? filter.phaseCount : fallbackCount;
@@ -98,25 +101,22 @@ function countRoadmapPhases(roadmapPath, fallbackCount, cwd, ws, versionOverride
  * `phaseKeyFromDir` uses for directories, so a `| 01. … |` row and a `1-slug`
  * directory cannot land in different key spaces (the padding-asymmetry defect).
  */
-function parseRoadmapProgressRows(roadmapPath) {
-    let content;
-    try {
-        content = node_fs_1.default.readFileSync(roadmapPath, 'utf-8');
-    }
-    catch {
-        return []; /* no roadmap */
-    }
+function parseRoadmapProgressRows(content, directoryContext, convention) {
     // Milestone-ATTRIBUTING shape first. Both shapes carry `Plans Complete`, so
     // probing that column first would pick a flat table appearing earlier in the
     // document over a milestone-grouped one later — every row would come back
     // unattributed and be treated as current-milestone, silently over-including.
-    const table = (0, markdown_table_cjs_1.findTableWithColumns)(content, ['Phase', 'Milestone'])
-        ?? (0, markdown_table_cjs_1.findTableWithColumns)(content, ['Phase', 'Plans Complete']);
-    if (!table)
-        return [];
+    // #5761: the roadmap-progress owner picks the table (heading-scoped, so a
+    // decoy table elsewhere cannot be mistaken for it); this reader only supplies
+    // the probe order. A table outside a table-less `## Progress` section has
+    // always been read here (#5692: no behavior change), hence `sectionMiss`.
+    const { rows: tableRows } = (0, roadmap_progress_cjs_1.locateRoadmapProgress)(content, {
+        columns: [['Phase', 'Milestone'], ['Phase', 'Plans Complete']],
+        sectionMiss: 'document',
+    });
     const rows = [];
-    for (const row of table.rows) {
-        const key = phaseKeyFromProse(row['Phase']);
+    for (const row of tableRows) {
+        const key = phaseKeyFromProse(row['Phase'], directoryContext, convention);
         if (key === null)
             continue;
         const cell = (row['Milestone'] ?? '').trim();
@@ -428,12 +428,18 @@ function inspectWorkstream(cwd, name, options = {}) {
     const writeDiagnostic = options.writeDiagnostic ?? ((message) => process.stderr.write(message));
     const p = planningPaths(cwd, name);
     const phaseDirNames = readSubdirectories(p.phases);
+    let roadmap = '';
+    try {
+        roadmap = node_fs_1.default.readFileSync(p.roadmap, 'utf8');
+    }
+    catch { /* no roadmap */ }
+    const directoryContext = phaseDirectoryOptions(cwd, undefined, roadmap, name);
     // #2562: scope progress to the CURRENT milestone. Membership and the
     // denominator are derived in ONE key space (`phaseKeyFromDir` /
     // `phaseKeyFromProse`, both from the phase-id owner module) so the two sides
     // of the rollup cannot disagree.
     const currentVersion = readCurrentMilestoneVersion(p.state, p.roadmap);
-    const progressRows = parseRoadmapProgressRows(p.roadmap);
+    const progressRows = parseRoadmapProgressRows(roadmap, directoryContext, resolvePhaseIdConvention(cwd, name));
     // Phase keys the ROADMAP attributes to the current milestone. A row whose
     // Milestone cell is blank or malformed is INCLUDED rather than dropped: a
     // phase we cannot attribute must still be visible to the rollup. Dropping it
@@ -458,7 +464,7 @@ function inspectWorkstream(cwd, name, options = {}) {
     // it is exactly the caller that cannot set `GSD_WORKSTREAM`; spelling `null`
     // pinned every workstream to the legacy grammar and made `headingScoped`
     // unreachable (`phaseCount > 0` never held) on a bracket workstream.
-    const headingFilter = getMilestonePhaseFilter(cwd, currentVersion, undefined, name);
+    const headingFilter = getMilestonePhaseFilter(cwd, currentVersion, undefined, name, directoryContext);
     const headingScoped = headingFilter.versionScoped && headingFilter.phaseCount > 0;
     // Phase keys the ROADMAP attributes to some OTHER milestone. A row carrying an
     // explicit version that is not the current one is a positive claim by a prior
@@ -507,7 +513,7 @@ function inspectWorkstream(cwd, name, options = {}) {
     const isDirInCurrentMilestone = (dir) => {
         if (!scoped)
             return true;
-        const key = phaseKeyFromDir(dir);
+        const key = phaseKeyFromDir(dir, undefined, directoryContext);
         if (currentMilestoneKeys.has(key))
             return true;
         const parent = parentPhaseKey(key);
@@ -563,7 +569,7 @@ function inspectWorkstream(cwd, name, options = {}) {
         }
         return {
             directory: dir,
-            phaseKey: phaseKeyFromDir(dir),
+            phaseKey: phaseKeyFromDir(dir, undefined, directoryContext),
             mtimeMs: phaseDirMtime(phaseDir),
             planCount: counts.planCount,
             summaryCount: counts.summaryCount,

package/gsd-core/bin/lib/worktree-base-ref.cjs

@@ -24,8 +24,10 @@ exports.cmdWorktreeSetBaseRef = cmdWorktreeSetBaseRef;
 exports.classifyGitHead = classifyGitHead;
 exports.observeHarnessForkFromHead = observeHarnessForkFromHead;
 exports.evaluateWorktreeBaseDegrade = evaluateWorktreeBaseDegrade;
+const node_crypto_1 = __importDefault(require("node:crypto"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+const gsd_tool_dir_cjs_1 = require("./gsd-tool-dir.cjs");
 const shell_command_projection_cjs_1 = require("./shell-command-projection.cjs");
 const runtime_homes_cjs_1 = require("./runtime-homes.cjs");
 // ─── Internal helpers ─────────────────────────────────────────────────────────
@@ -572,13 +574,41 @@ function observeHarnessForkFromHead(deps) {
         }
     });
     const stateWrite = deps.stateWrite ?? ((file, content) => {
+        let tmpPath = null;
         try {
-            node_fs_1.default.mkdirSync(node_path_1.default.dirname(file), { recursive: true });
-            node_fs_1.default.writeFileSync(file, content, 'utf8');
+            // #5757: the shared owner refuses a symlinked/escaping .gsd and keeps the
+            // directory git-ignored; the write is an exclusive random tmp + rename so
+            // a planted cache-file symlink is replaced, never followed.
+            const dir = (0, gsd_tool_dir_cjs_1.ensureToolOwnedGsdDir)(cwd, {
+                marker: '# gsd-core harness fork probe',
+                rules: ['/harness-fork-probe.json', '/harness-fork-probe.json.tmp-*', '/.gitignore'],
+            });
+            const target = node_path_1.default.join(dir, node_path_1.default.basename(file));
+            // `tmpPath` is assigned only once the exclusive create succeeded, so an
+            // EEXIST never unlinks an entry this process did not create.
+            const candidateTmp = `${target}.tmp-${process.pid}-${node_crypto_1.default.randomBytes(6).toString('hex')}`;
+            const tmpFd = node_fs_1.default.openSync(candidateTmp, 'wx');
+            tmpPath = candidateTmp;
+            try {
+                node_fs_1.default.writeFileSync(tmpFd, content, 'utf8');
+            }
+            finally {
+                node_fs_1.default.closeSync(tmpFd);
+            }
+            (0, shell_command_projection_cjs_1.retryRenameSync)(tmpPath, target);
+            tmpPath = null;
         }
         catch {
             // A cache write must never break the check that produced the verdict.
         }
+        finally {
+            if (tmpPath) {
+                try {
+                    node_fs_1.default.unlinkSync(tmpPath);
+                }
+                catch { /* best-effort cleanup */ }
+            }
+        }
     });
     // 1. Cache — trusted only while the orchestrator HEAD is unchanged.
     try {