Files
msd-core/tests/reapply-patches.test.cjs
Tom Boucher 15af0f5536 enhance(#3951): B6+B7 — widen two unreachable lint rules and make the guard ledger true (#3965)
* fix(#3951): two lint rules that could not reach the code they govern

B6 names two widenings. Measuring them first turned up a defect the criterion did
not know about, and refuted the reason it gave for one of them.

1. no-adhoc-markdown-parsing self-gates on its own filename.

   Lines 107-110 short-circuit create() to {} unless the path matches
   /(?:^|\/)src\/[^/]+\.cts$/. B6 says to widen the files: glob in
   eslint.config.mjs - but doing only that ships an INERT rule, because the gate
   still returns {} for every new path. Both halves have to change, and the gate
   is the load-bearing one.

   That same regex hides a live hole: [^/]+ is FLAT-ONLY, so it requires the file
   to sit directly in src/. The registered glob is src/**/*.cts, which includes
   subdirectories. 28 .cts files - health-diagnostic-rules/ (10),
   installer-migrations/ (11), observability/ (3), host-integration-adapters/ (2),
   vendor/ (2) - are inside the registered glob and silently skipped.

   Measured with the gate neutralized: 0 violations there today. The hole is
   hiding nothing right now, and is fixed anyway, because "no violations today" is
   not a property that keeps holding.

   The fix is not invented: require-subprocess-timeout.cjs:196 already carries the
   correct form of this guard, /(?:^|\/)src\/.*\.cts$/ with .*, one directory over.
   Checked the other 21 rules for the same bug - no-adhoc-regex-escape and
   no-private-binary-resolution short-circuit only to exempt their own seam file,
   which is the right shape, and no-crlf-fragile-split has no filename gate at
   all. This bug is unique to the one rule.

2. no-adhoc-regex-escape could not see the shape that actually occurs.

   Line 396 gated the whole UNSAFE-NEW-REGEXP arm on arg.type === 'Identifier'.
   Every check below it - the _SOURCE provenance check, the
   isSoleReturnOfOwnParameter shape - lives inside that branch, so
   new RegExp(obj['key']) and new RegExp(cfg.pattern) were never examined at all.
   Runtime data arrives as a property access far more often than as a bare
   identifier, which is exactly why this rule never fired on the #3477 ReDoS.

   Widened to MemberExpression, measured by AST walk across all five registered
   blocks rather than by grep. 27 sites, zero TSAsExpression:

     18  safe new RegExp(X.source, flags)  -> exempted, keyed strictly on the
         PROPERTY being `source`, never on the object. Keying on the object would
         wave through X.anything and buy nothing. B6 estimated ~10; that was an
         undercount.
      3  _SOURCE-suffixed constants reached through a required module namespace
         (phaseId.BRACKET_PHASE_TOKEN_SOURCE) -> the same provenance-exempt class
         the rule already recognizes for bare identifiers, extended to reach them.
         Without this the widening produces 3 false flags.
      6  real findings -> marked, each a test extracting a pattern from a shipped
         file at test time, where the runtime contract IS the product.

   Deliberately the NARROW MemberExpression form. The rule's own
   isSoleReturnOfOwnParameter doc comment records that an earlier broad
   "any non-literal identifier" heuristic produced ~25 false positives and was
   rejected; a re-run of the census after this change flags exactly the 6 above
   and nothing else.

Verified by execution, not by reading: the gate now accepts src/<subdir>/x.cts,
still accepts flat src/x.cts, and still exempts paths outside src/ - each pinned
by a test proven to fail against the old regex. build:lib, lint and lint:ci all
exit 0.

Refs #3951

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* fix(#3951): give no-adhoc-markdown-parsing its reach, and fix the 80 parses it finds

The rule self-gates on filename AND is registered on one glob, so widening either
half alone is inert. Both move here: the gate now accepts tests/**/*.cjs and
scripts/**/*.cjs alongside src/**/*.cts, and eslint.config.mjs registers it on the
same two.

A test pins that the gate and the registration AGREE, in both directions. The
original defect was a gate narrower than its registration; the failure mode of
this fix is a gate wider than its registration. Both are silent, so the test
asserts the pair rather than either half.

80 violations across 43 files, all in tests/, zero in scripts/. 70 are routed
through the existing seams - scanFencedBlocks, collectSection, stripFencedCode,
tokenizeHeadings from markdown-sectionizer; splitTableRow, parseMarkdownTable,
findTableWithColumns from markdown-table. Headerless STATE.md tables use
splitTableRow per line, because parseMarkdownTable needs a real delimiter row.

10 are suppressed, 12.5%, well under the third that would have meant the rule is
mis-scoped for tests/ rather than the tests carrying debt. Each names its reason:
three regression guards (#3873 / bug-#21) are deliberately independent of the
generator's own fence handling, and routing them through the seam would have them
test the generator against itself; one is a negative-text probe that extracts
nothing; six are a shell-pipe-to-jq detector whose regex coincidentally matches the
table fingerprint and is not markdown parsing at all.

All ten sit in tests whose subject is .md content, which is normally a reason to
prefer the seam. The marker used is allow-adhoc-markdown, distinct from
no-source-grep's allow-test-rule, and lint:ci's lint-allow-test-rule-refs reports
the same 280/280 unverified count as before - checked rather than assumed, because
those two markers are easy to conflate.

The widening earned its keep immediately: it found a test that passed for the
wrong reason.

  tests/config-field-docs.test.cjs asserted notEqual(<cell>, '600') against the
  TYPE column instead of the DEFAULT column. notEqual('number', '600') is true
  forever, so the guard against workflow.subagent_timeout regressing to the old
  seconds default could never fire. docs/CONFIGURATION.md:434 is
  `| workflow.subagent_timeout | number | 300000 | ... |`, so the default is cell
  index 2; the assertion is now row-scoped through splitTableRow and reads 300000.

That is the argument for the widening in one case: the violation was invisible to
lint, the suite was green, and the assertion was vacuous. A rule that cannot reach
a file cannot tell you the file is lying.

Not fixed here, and recorded rather than assumed: #3426/#3239 are NOT reachable by
this widening. tests/package-legitimacy-gate.test.cjs yields zero violations even
with the gate bypassed - its hand-rolled scans are real, but built from line
filters and split('|') rather than the regex-literal fingerprints this rule
detects. They need new detectors. The epic assumed a wider glob would catch them.

build:lib, lint and lint:ci all exit 0; the post-fix census across tests/** and
scripts/** is 0 violations.

Refs #3951

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* fix(#3951): B7 — and #3356's defects were still live in the code

B7 asks that each closed child be driven fail-first with a behavioral identity
test at the CONSUMER's output. Four of eleven children had no test citing their
issue number. Auditing them by BEHAVIOR rather than by number-grep changed the
answer for three of the four.

#3364 and #2540 — traceability only. Both were implemented by #3941 and their
consumer-output tests exist and were shown failing-first; neither cited its
originating issue, so an audit that greps for the number reports them uncovered.
Tagged the specific asserting test in each file, following the citation form those
files already use.

#3372 — covered, but only at helper level, and the triage narrowed it. Of the four
commands the issue names, only estimate-cli's collectCalibrationSamples actually
enumerates phase dirs from disk; smart-entry, audit and roadmap-upgrade derive from
ROADMAP/body text and never reach the sentinel path, so they are benign by
construction and were left alone rather than "fixed" into churn. The existing #3882
rows asserted the helper's return value. Added a consumer-output test driving
`query estimate-calibrate` and asserting sample_count and the persisted document.
RED proof: reverted collectCalibrationSamples to a raw readdirSync and ran the real
CLI - sample_count 3, sentinel leaked; restored - sample_count 2.

#3356 — NOT covered, and BOTH halves of the defect were still live in source. The
issue is closed; the bug was not fixed. Fixed here rather than writing tests that
document a bug as correct.

  Defect 1, the contradicted row. quick.md:627 claimed
  `quick-tasks-append` performs "the equivalent write" to the Step 7c row. It did
  not: the `#` cell was a positional ordinal and `Directory` read `—`, because the
  route had no way to receive a quick id or task directory. Added OPTIONAL
  `--quick-id` / `--slug` / `--directory`. A caller with neither - fast.md, the
  original #2133 caller - omits them and gets the byte-identical prior row, so
  nothing existing changes. A caller that HAS a real id and directory now gets the
  canonical row quick.md:632 renders. The false-equivalence sentence itself is
  corrected rather than left to mislead the next reader.

  Defect 2, the forced re-derive. The route called readModifyWriteStateMd with no
  options, so a body-only append to the Quick Tasks table triggered a full
  re-derive of the disk-derived progress.* frontmatter. Every other body-only
  writer passes { resync: false } - src/state.cts's own docstring prescribes it -
  and this route was the lone outlier. RED proof: reverted the option, seeded a
  project with 2 real phase dirs and a curated total_phases of 25, ran
  quick-tasks-append; total_phases collapsed to 2. Restored; it stayed 25.

That second one is the shape this epic exists to close: a silent write that
replaces curated state with a re-derivation nobody asked for, exit 0 throughout.

build:lib, lint and lint:ci all exit 0.

Refs #3951

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* docs(#3951): amend B6's ledger to what was measured, and document the new flags

The ADR gains a ledger amendment in its own correction style - the sixth wrong
premise it records, found the same way as the other five, by measuring before
building.

B6 says the net guard count must fall. It rose: 62 -> 69, +7, measured from the
epic's filing commit to origin/next. The attribution is the point, though. Five of
the seven came from PRs unrelated to this epic, one was added by a phase of it, and
the epic did retire something sub-file - #3884 removed a detector with an explicit
"net: -1 detector, 0 added" ledger. Every named casualty is load-bearing, two
already carry retractions in this same document, and a sweep of all 22 rules plus
every scripts/lint-* found no provably dead guard. There is no honest way to make
the count fall; forcing it would trade coverage for a number, which is the Goodhart
outcome Decision 6 exists to prevent.

The amendment also records that B6's own prescribed fix for one widening was inert.
no-adhoc-markdown-parsing self-gates on its filename, so widening only the files:
glob - which is what the criterion says to do - ships a rule that still returns {}
for every new path. And #3426/#3239 are not reachable by that widening at all;
their scans use line filters and split('|'), not the regex fingerprints the rule
detects. The roster row tracked them against the wrong mechanism.

Three roster rows updated from aspiration to fact: the two widenings are DONE with
their measured counts, and lint-phase-enumeration-drift is marked RETAINED rather
than "expected casualty - verify before retiring", because Phase 5 verified it and
kept it.

The rule Decision 6 should carry forward is stated plainly: a guard ledger is a
claim about COVERAGE, not about COUNT. "Net count must fall" is measurable and
wrong. "Every guard is reachable, and each retirement names what makes its defect
unrepresentable" is the property that was actually wanted.

CLI-TOOLS.md documents the optional --quick-id/--slug/--directory flags and says
plainly that omitting them keeps the pre-#3356 row byte-identical, plus that the
append no longer re-derives progress frontmatter.

New features fragment (id 3951); FEATURES.md regenerated rather than hand-edited.
Changeset is Changed, pr:0 pending backfill.

Refs #3951

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* test(#3951): correct four rows that pinned the lint rule's old narrow reach

The remote suite came back RED with 5 failures, all in tests/eslint-rules.test.cjs.
They are stale tests, not a regression: four rows assert that
no-adhoc-markdown-parsing is inert outside src/*.cts, which is exactly the
contract this deliverable changes.

Confirmed by reading rather than inferred from the names - the row at :1981 used
filename: 'tests/some.test.cjs' and filename: 'scripts/helper.cjs', the two roots
the rule now covers on purpose.

Worth recording WHY local gates missed this. npm run lint and lint:ci were green,
and the touched test files passed standalone. Lint only reports violations in real
files; these rows assert the rule's REACH using synthetic RuleTester filenames, so
nothing but the full suite could see them. Local green on a rule change says
nothing about the rule's own tests.

Each row is rewritten with BOTH halves rather than flipped from valid to invalid:

  - the same fingerprint under tests/ or scripts/ is now flagged, with the right
    messageId
  - the negative space is preserved - the same fingerprint under a path outside
    all three roots (gsd-core/bin/lib/foo.cjs) is still NOT flagged

The second half is the one that matters. Without it the rule has no boundary and
nothing would catch an over-wide gate later, which is the mirror image of the bug
this deliverable just fixed.

Each row is renamed to state the current contract; the old names said
"non-src/*.cts ... is not flagged" and would have been actively misleading once
the bodies changed.

Proven to test the widening rather than restate it: every flagged half was run
against HEAD~2's pre-widening rule and does NOT fire there, then against the
current rule and does. 12/12 on that probe; the full file is 178/178.

Swept for the same staleness elsewhere and found none.
require-subprocess-timeout's own "inert outside src/*.cts" row is untouched -
that rule's gate was not widened here - and no-adhoc-regex-escape's test file
already carries correctly-targeted rows.

Refs #3951

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* test(#3951): acknowledge the quick.md growth the attribution guard reported

The full suite came back RED with one failure, and it is mine:

  1 file(s) grew without an acknowledgment:
    quick.md grew 364 bytes

gsd-core/workflows/quick.md is runtime-loaded emitted content, so correcting
its false 'performs the equivalent write' claim trips emitted-attribution by
construction. This is the acknowledgment, not a workaround - there is nothing
to regenerate.

The fragment names ONE path, which is the only one the guard reported. The four
spent acknowledgments it also listed (audit-uat, plan-phase, progress, review)
belong to other fragments whose ripple the base already absorbs; they are inert,
not failures, and are deliberately NOT copied here - naming paths I did not
change would make this record false in the other direction.

Byte figure corrected before committing: the guard reported 37220 -> 37584
(+364), but origin/next has since moved and quick.md is 37232 there now, so the
measured delta is +352. The reason text says so and names the base as a moving
figure rather than pinning a number that is already stale.

Refs #3951

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* test(#3951): move the quick.md growth ack to a trailer, delete the obsolete fragment

The acknowledgment mechanism changed under this branch. Merging next brought in
the redesign - it also deleted .github/workflows/ack-fragment-sweep.yml, which
was in the merge status and which I did not register at the time - and the guard
now says so directly:

  Add a trailer to a commit in this PR (never a new file).
    Emitted-Drift-Ack-Growth: quick.md - <why this growth is deliberate>

So tests/emitted-drift-acks/3951-quick-append-equivalence.json is obsolete on
arrival. A fragment file is no longer read by anything, and leaving it would be a
dead record that looks like an active one. It is deleted here rather than kept
"just in case".

The byte figure moved again with the merge: 37232 -> 37596, +364. The earlier
fragment said +352, measured before the merge auto-merged quick.md itself. The
trailer carries no number, which is the better design - the figure was stale
twice in two attempts.

Refs #3951

Emitted-Drift-Ack-Growth: quick.md — #3356/#3951 replaces a false claim with an accurate one. Line 627 said the `quick-tasks-append` shortcut "performs the equivalent write" to the Step 7c row rendered above it; it did not, and that was the documented half of #3356 — with no quick id or task directory the route emitted a positional ordinal in `#` and an em-dash in `Directory`, a visibly different row. The corrected sentence has to carry three facts the original elided: what the shortcut actually writes when it has neither input, that this is honest behavior for its real caller (`fast.md`, which has neither), and how a caller with both now gets the byte-identical canonical row via the new optional `--quick-id`/`--slug`/`--directory` flags. Prose is the product here — an executing agent reads this line to decide whether the shortcut is safe for its case, and a shorter correction would either drop the flags (leaving the reader unable to act on the fix) or drop the limitation (recreating the false claim in gentler words).
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* chore(#3951): backfill changeset pr number

Refs #3951

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

---------

Co-authored-by: sim <sim@local>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
2026-08-27 23:10:49 -04:00

741 lines
32 KiB
JavaScript

/**
* GSD Tools Tests - reapply-patches backup logic
*
* Validates that saveLocalPatches() in the installer correctly detects
* user-modified files and saves pristine hashes for three-way merge.
*
* Closes: #1469
*/
const { test, describe, beforeEach, afterEach } = require('node:test');
const assert = require('node:assert/strict');
const fs = require('fs');
const path = require('path');
const crypto = require('crypto');
// ─── helpers ──────────────────────────────────────────────────────────────────
function sha256(content) {
return crypto.createHash('sha256').update(content).digest('hex');
}
const { cleanup } = require('./helpers.cjs');
const { collectSection } = require('../gsd-core/bin/lib/markdown-sectionizer.cjs');
function createTempDir() {
return fs.mkdtempSync(path.join(require('os').tmpdir(), 'gsd-patch-test-'));
}
/**
* Simulate what the installer does: create a manifest, modify a file,
* then run the saveLocalPatches detection logic.
*/
function simulateManifestAndPatch(configDir, files) {
// Create the GSD files
for (const [relPath, content] of Object.entries(files.original)) {
const fullPath = path.join(configDir, relPath);
fs.mkdirSync(path.dirname(fullPath), { recursive: true });
fs.writeFileSync(fullPath, content);
}
// Create manifest with hashes of original files
const manifest = {
version: '1.0.0',
timestamp: new Date().toISOString(),
files: {}
};
for (const [relPath, content] of Object.entries(files.original)) {
manifest.files[relPath] = sha256(content);
}
fs.writeFileSync(
path.join(configDir, 'gsd-file-manifest.json'),
JSON.stringify(manifest, null, 2)
);
// Now modify files to simulate user edits
for (const [relPath, content] of Object.entries(files.modified || {})) {
fs.writeFileSync(path.join(configDir, relPath), content);
}
return manifest;
}
// ─── inline saveLocalPatches (mirrors install.js logic) ──────────────────────
function fileHash(filePath) {
const content = fs.readFileSync(filePath);
return crypto.createHash('sha256').update(content).digest('hex');
}
function saveLocalPatches(configDir) {
const PATCHES_DIR_NAME = 'gsd-local-patches';
const MANIFEST_NAME = 'gsd-file-manifest.json';
const manifestPath = path.join(configDir, MANIFEST_NAME);
if (!fs.existsSync(manifestPath)) return [];
let manifest;
try { manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8')); } catch { return []; }
const patchesDir = path.join(configDir, PATCHES_DIR_NAME);
const modified = [];
for (const [relPath, originalHash] of Object.entries(manifest.files || {})) {
const fullPath = path.join(configDir, relPath);
if (!fs.existsSync(fullPath)) continue;
const currentHash = fileHash(fullPath);
if (currentHash !== originalHash) {
const backupPath = path.join(patchesDir, relPath);
fs.mkdirSync(path.dirname(backupPath), { recursive: true });
fs.copyFileSync(fullPath, backupPath);
modified.push(relPath);
}
}
if (modified.length > 0) {
const meta = {
backed_up_at: new Date().toISOString(),
from_version: manifest.version,
from_manifest_timestamp: manifest.timestamp,
files: modified,
pristine_hashes: {}
};
for (const relPath of modified) {
meta.pristine_hashes[relPath] = manifest.files[relPath];
}
fs.writeFileSync(path.join(patchesDir, 'backup-meta.json'), JSON.stringify(meta, null, 2));
}
return modified;
}
// ─── tests ───────────────────────────────────────────────────────────────────
describe('saveLocalPatches — patch backup and pristine hash tracking (#1469)', () => {
let tmpDir;
beforeEach(() => {
tmpDir = createTempDir();
});
afterEach(() => {
cleanup(tmpDir);
});
test('detects modified files and backs them up', () => {
simulateManifestAndPatch(tmpDir, {
original: {
'gsd-core/workflows/execute-phase.md': '# Execute Phase\nOriginal content\n',
'gsd-core/workflows/plan-phase.md': '# Plan Phase\nOriginal content\n',
},
modified: {
'gsd-core/workflows/execute-phase.md': '# Execute Phase\nOriginal content\n\n## My Custom Step\nDo something special\n',
},
});
const result = saveLocalPatches(tmpDir);
assert.strictEqual(result.length, 1, 'should detect exactly one modified file');
assert.ok(result.includes('gsd-core/workflows/execute-phase.md'));
// Verify backup exists
const backupPath = path.join(tmpDir, 'gsd-local-patches', 'gsd-core/workflows/execute-phase.md');
assert.ok(fs.existsSync(backupPath), 'backup file should exist');
const backupContent = fs.readFileSync(backupPath, 'utf8');
assert.ok(backupContent.includes('My Custom Step'), 'backup should contain user modification');
});
test('backup-meta.json includes pristine_hashes for three-way merge', () => {
const originalContent = '# Execute Phase\nOriginal content\n';
simulateManifestAndPatch(tmpDir, {
original: {
'gsd-core/workflows/execute-phase.md': originalContent,
},
modified: {
'gsd-core/workflows/execute-phase.md': originalContent + '\n## Custom\n',
},
});
saveLocalPatches(tmpDir);
const metaPath = path.join(tmpDir, 'gsd-local-patches', 'backup-meta.json');
assert.ok(fs.existsSync(metaPath), 'backup-meta.json should exist');
const meta = JSON.parse(fs.readFileSync(metaPath, 'utf8'));
// Verify pristine_hashes field exists and contains correct hash
assert.ok(meta.pristine_hashes, 'meta should have pristine_hashes field');
const expectedHash = sha256(originalContent);
assert.strictEqual(
meta.pristine_hashes['gsd-core/workflows/execute-phase.md'],
expectedHash,
'pristine hash should match SHA-256 of original file content'
);
});
test('backup-meta.json includes from_version and from_manifest_timestamp', () => {
simulateManifestAndPatch(tmpDir, {
original: { 'gsd-core/workflows/test.md': 'original' },
modified: { 'gsd-core/workflows/test.md': 'modified' },
});
saveLocalPatches(tmpDir);
const meta = JSON.parse(fs.readFileSync(
path.join(tmpDir, 'gsd-local-patches', 'backup-meta.json'), 'utf8'
));
assert.strictEqual(meta.from_version, '1.0.0');
assert.ok(meta.from_manifest_timestamp, 'should have from_manifest_timestamp');
assert.ok(meta.backed_up_at, 'should have backed_up_at timestamp');
});
test('unmodified files are not backed up', () => {
simulateManifestAndPatch(tmpDir, {
original: {
'gsd-core/workflows/a.md': 'content A',
'gsd-core/workflows/b.md': 'content B',
},
// No modifications
});
const result = saveLocalPatches(tmpDir);
assert.strictEqual(result.length, 0, 'no files should be detected as modified');
assert.ok(!fs.existsSync(path.join(tmpDir, 'gsd-local-patches')), 'patches dir should not be created');
});
test('multiple modified files all get pristine hashes', () => {
simulateManifestAndPatch(tmpDir, {
original: {
'gsd-core/workflows/a.md': 'original A',
'gsd-core/workflows/b.md': 'original B',
'gsd-core/workflows/c.md': 'original C',
},
modified: {
'gsd-core/workflows/a.md': 'modified A',
'gsd-core/workflows/b.md': 'modified B',
},
});
const result = saveLocalPatches(tmpDir);
assert.strictEqual(result.length, 2);
const meta = JSON.parse(fs.readFileSync(
path.join(tmpDir, 'gsd-local-patches', 'backup-meta.json'), 'utf8'
));
assert.strictEqual(Object.keys(meta.pristine_hashes).length, 2);
assert.strictEqual(meta.pristine_hashes['gsd-core/workflows/a.md'], sha256('original A'));
assert.strictEqual(meta.pristine_hashes['gsd-core/workflows/b.md'], sha256('original B'));
// c.md should NOT have a pristine hash (it wasn't modified)
assert.strictEqual(meta.pristine_hashes['gsd-core/workflows/c.md'], undefined);
});
test('returns empty array when no manifest exists', () => {
const result = saveLocalPatches(tmpDir);
assert.strictEqual(result.length, 0);
});
test('returns empty array when manifest is malformed', () => {
fs.writeFileSync(path.join(tmpDir, 'gsd-file-manifest.json'), 'not json');
const result = saveLocalPatches(tmpDir);
assert.strictEqual(result.length, 0);
});
});
// allow-test-rule: source-text-is-the-product
// update.md routing and reapply-patches.md workflow text IS the deployed behavioral contract.
/**
* Parse a field from YAML frontmatter between --- markers.
* Returns null if the frontmatter or field is absent.
*/
function parseFrontmatterField(content, field) {
const fmMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
if (!fmMatch) return null;
const fm = fmMatch[1];
const quoted = fm.match(new RegExp(`^${field}:\\s+"((?:[^"\\\\]|\\\\.)*)"\\s*$`, 'm'));
if (quoted) return quoted[1];
const plain = fm.match(new RegExp(`^${field}:\\s+(.+)$`, 'm'));
if (plain) return plain[1].trim();
return null;
}
// #2790: reapply-patches.md command was absorbed into update.md as the --reapply flag.
// The full workflow content (three-way merge, hunk verification) is in the referenced workflow.
// These tests now verify the update.md command delegates to the reapply-patches workflow correctly.
/**
* Parse a markdown pipe-table into header + rows. Returns null if no table
* with the expected header tokens is found. Used to assert structurally
* against the Hunk Verification Table without raw substring matching.
*/
function parsePipeTable(content, expectedHeaderTokens) {
const lines = content.split(/\r?\n/);
for (let i = 0; i < lines.length - 1; i++) {
const headerLine = lines[i].trim();
const sepLine = (lines[i + 1] || '').trim();
if (!headerLine.startsWith('|') || !sepLine.startsWith('|')) continue;
if (!/^\|\s*[:\- |]+\|\s*$/.test(sepLine)) continue;
const header = headerLine.slice(1, -1).split('|').map((s) => s.trim());
const headerLower = header.map((h) => h.toLowerCase());
const allFound = expectedHeaderTokens.every((tok) => headerLower.includes(tok.toLowerCase()));
if (!allFound) continue;
const rows = [];
for (let j = i + 2; j < lines.length; j++) {
const rowLine = lines[j].trim();
if (!rowLine.startsWith('|')) break;
const cells = rowLine.slice(1, -1).split('|').map((s) => s.trim());
const row = {};
header.forEach((col, idx) => { row[col] = cells[idx] !== undefined ? cells[idx] : ''; });
rows.push(row);
}
return { header, rows };
}
return null;
}
describe('reapply-patches workflow contract (#1469)', () => {
test('reapply-patches.md command file is deleted (absorbed into update.md --reapply, #2790)', () => {
const oldPath = path.join(__dirname, '..', 'commands', 'gsd', 'reapply-patches.md');
assert.ok(!fs.existsSync(oldPath), 'reapply-patches.md should be deleted (absorbed into update.md)');
});
test('update.md argument-hint declares --reapply as consolidated entry point', () => {
// Structural: parse frontmatter, then tokenize the argument-hint pipes
// and assert --reapply is one of the documented flags (no raw substring
// matching on prose, per the no-source-grep contract).
const updatePath = path.join(__dirname, '..', 'commands', 'gsd', 'update.md');
const content = fs.readFileSync(updatePath, 'utf8');
const argHint = parseFrontmatterField(content, 'argument-hint');
assert.ok(argHint, 'update.md frontmatter must declare argument-hint');
// argument-hint may include multiple bracketed segments; pull every
// `--flag` token out of any bracketed section to assert on a parsed
// flag set rather than the surrounding punctuation.
const bracketed = [...argHint.matchAll(/\[([^\]]*)\]/g)].map((m) => m[1]);
const flagList = bracketed
.flatMap((seg) => seg.split('|').map((s) => s.trim().split(/\s+/)[0]))
.filter((tok) => tok.startsWith('--'));
assert.ok(
flagList.includes('--reapply'),
`update.md argument-hint flag list must include --reapply; got: ${JSON.stringify(flagList)}`
);
});
test('update.md @-include declares the reapply-patches workflow as a dependency', () => {
// Structural: scan ALL <execution_context> and <execution_context_extended>
// blocks for an `@~/.../workflows/reapply-patches.md` include. The earlier
// substring check tolerated incidental mentions in prose; matching only the
// first context block missed the _extended block where the delegate lives.
const updatePath = path.join(__dirname, '..', 'commands', 'gsd', 'update.md');
const content = fs.readFileSync(updatePath, 'utf8');
const blocks = [
// eslint-disable-next-line local/no-unbounded-quantifier -- parses this repo's own command .md content, fixed-size author-controlled content
...content.matchAll(/<execution_context(?:_extended)?>([\s\S]*?)<\/execution_context(?:_extended)?>/g),
].map((m) => m[1]);
assert.ok(blocks.length > 0, 'update.md must define at least one <execution_context> block');
const includes = blocks
.flatMap((blk) => blk.split(/\r?\n/))
.map((l) => l.trim())
.filter((l) => l.startsWith('@'))
.map((l) => l.replace(/^@/, ''));
const declaresReapply = includes.some((p) => /(^|\/)workflows\/reapply-patches\.md$/.test(p));
assert.ok(
declaresReapply,
`update.md execution_context blocks must @-include workflows/reapply-patches.md; got: ${JSON.stringify(includes)}`
);
});
});
// #2790: reapply-patches.md (the command file which contained the inline workflow)
// was deleted. The hunk verification contract now lives in the workflow file
// gsd-core/workflows/reapply-patches.md, referenced via execution_context_extended.
describe('reapply-patches gated hunk verification (#1999)', () => {
const workflowPath = path.join(__dirname, '..', 'gsd-core', 'workflows', 'reapply-patches.md');
test('reapply-patches.md command is deleted and absorbed into update.md (#2790)', () => {
const oldPath = path.join(__dirname, '..', 'commands', 'gsd', 'reapply-patches.md');
assert.ok(!fs.existsSync(oldPath), 'reapply-patches.md should be absent (absorbed into update.md --reapply)');
});
test('reapply-patches workflow file exists (behavioral contract for --reapply)', () => {
assert.ok(fs.existsSync(workflowPath), 'gsd-core/workflows/reapply-patches.md must exist');
});
test('Step 4 declares a Hunk Verification Table with all required columns', () => {
// Structural: parse the markdown pipe-table out of the workflow and
// assert its header columns directly. Substring checks let row text
// collide with prose mentions and fail under harmless rewording.
const content = fs.readFileSync(workflowPath, 'utf8');
const required = ['file', 'hunk_id', 'signature_line', 'line_count', 'verified'];
const table = parsePipeTable(content, required);
assert.ok(
table,
`reapply-patches workflow must declare a pipe-table with header columns ${JSON.stringify(required)} (Hunk Verification Table)`
);
const headerLower = table.header.map((h) => h.toLowerCase());
for (const col of required) {
assert.ok(headerLower.includes(col.toLowerCase()), `Hunk Verification Table is missing required column "${col}"; got header ${JSON.stringify(table.header)}`);
}
});
test('Step 5 gates progression on the Hunk Verification Table', () => {
// Locate the Step 5 section structurally via heading parsing, then
// assert it both names the table and defines an explicit gate
// condition tied to the `verified` column.
const content = fs.readFileSync(workflowPath, 'utf8');
const step5Section = collectSection(content, (h) => /^Step 5\b/.test(h.text));
assert.ok(step5Section, 'reapply-patches workflow must contain a "## Step 5" section');
const step5 = step5Section.body;
assert.ok(
/Hunk Verification Table/.test(step5),
'Step 5 body must explicitly reference the Hunk Verification Table'
);
// Gate condition: must mention verified=no (or "verified: no") AND a stop
// directive (STOP / halt / abort), so missing-table or any-no-row halts.
const referencesVerifiedNo = /verified:\s*no/i.test(step5) || /verified\s*=\s*no/i.test(step5);
const referencesStop = /\bSTOP\b/.test(step5) || /\bhalt\b/i.test(step5) || /\babort\b/i.test(step5);
assert.ok(
referencesVerifiedNo,
'Step 5 gate must reference the `verified: no` failure condition (no row may slip past)'
);
assert.ok(
referencesStop,
'Step 5 gate must explicitly STOP/halt/abort when verification fails'
);
});
test('Step 5 also halts when the Hunk Verification Table is absent (Step 4 produced nothing)', () => {
// Independent gate: missing-table is a separate halt path from any-no-row.
const content = fs.readFileSync(workflowPath, 'utf8');
const step5Section = collectSection(content, (h) => /^Step 5\b/.test(h.text));
assert.ok(step5Section, 'Step 5 section must exist');
const step5 = step5Section.body;
const handlesAbsent = /(table is absent|table is missing|missing.*table|absent.*table)/i.test(step5);
assert.ok(
handlesAbsent,
'Step 5 must include an explicit "table absent / missing" halt path so Step 4 silently producing nothing cannot bypass the gate'
);
});
});
// ────────────────────────────────────────────────────────────────────────
// Folded from tests/bug-2424-reapply-patches-baseline-detection.test.cjs — consolidation epic #1969 (B3 #1972)
// ────────────────────────────────────────────────────────────────────────
{
const { describe: __foldDescribe } = require('node:test');
__foldDescribe("folded:bug-2424-reapply-patches-baseline-detection (consolidation epic #1969 B3 #1972)", () => {
/**
* Bug #2424: reapply-patches pristine-baseline detection uses first-add commit
*
* The three-way merge baseline detection previously used `git log --diff-filter=A`
* which returns the commit that FIRST added the file. On repos that have been
* through multiple GSD update cycles, this returns a stale, many-versions-old
* baseline — not the version immediately prior to the current update.
*
* Fix: Option A must prefer `pristine_hashes` from backup-meta.json to locate
* the correct baseline commit by SHA-256 matching, with a fallback to the
* first-add heuristic only when no pristine hash is recorded.
*
* #2790: reapply-patches.md (which contained the inline Option A / Option B workflow)
* was consolidated into update.md as the --reapply flag. The behavioral contract
* (pristine_hashes preference, fallback to first-add) is maintained in the
* update.md workflow's --reapply path. These tests now verify the consolidation.
*/
// allow-test-rule: source-text-is-the-product (see #2424)
// gsd-core/workflows/update.md is the installed runtime workflow —
// its text IS the deployed behavioral contract.
const { describe, test } = require('node:test');
const assert = require('node:assert/strict');
const fs = require('fs');
const path = require('path');
// #2790: reapply-patches.md (command with inline workflow) was deleted.
// The --reapply functionality is now in update.md.
const UPDATE_MD = path.join(__dirname, '..', 'commands', 'gsd', 'update.md');
/**
* Parse a field from YAML frontmatter between --- markers.
* Returns null if the frontmatter or field is absent.
*/
function parseFrontmatterField(content, field) {
const fmMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
if (!fmMatch) return null;
const fm = fmMatch[1];
const quoted = fm.match(new RegExp(`^${field}:\\s+"((?:[^"\\\\]|\\\\.)*)"\\s*$`, 'm'));
if (quoted) return quoted[1];
const plain = fm.match(new RegExp(`^${field}:\\s+(.+)$`, 'm'));
if (plain) return plain[1].trim();
return null;
}
describe('reapply-patches pristine baseline detection (#2424)', () => {
test('reapply-patches.md command is deleted (absorbed into update.md --reapply, #2790)', () => {
const oldPath = path.join(__dirname, '..', 'commands', 'gsd', 'reapply-patches.md');
assert.ok(!fs.existsSync(oldPath), 'reapply-patches.md should be absent (absorbed into update.md --reapply)');
});
test('update.md argument-hint declares --reapply as consolidated entry point', () => {
const content = fs.readFileSync(UPDATE_MD, 'utf-8');
const argHint = parseFrontmatterField(content, 'argument-hint');
assert.ok(
argHint && argHint.includes('--reapply'),
`update.md argument-hint must declare --reapply flag; got: ${argHint || '(none)'}`
);
});
test('update.md workflow references backup-meta.json for pristine-hash baseline', () => {
// #2790: The behavioral contract (pristine_hashes from backup-meta.json as primary
// baseline source) is implemented in the update.md workflow (gsd-core/workflows/update.md),
// not the command file. The command delegates via --reapply flag.
// Verify the underlying workflow has this content.
const workflowPath = path.join(__dirname, '..', 'gsd-core', 'workflows', 'update.md');
const workflowContent = fs.readFileSync(workflowPath, 'utf-8');
assert.ok(
workflowContent.includes('backup-meta.json'),
'gsd-core/workflows/update.md must reference backup-meta.json (pristine_hashes baseline source)'
);
});
test('update.md exists as consolidated entry point', () => {
assert.ok(fs.existsSync(UPDATE_MD), 'update.md must exist as consolidated entry point');
});
test('update.md argument-hint declares full consolidated flag surface (--sync | --reapply)', () => {
// Validates that both flags absorbed from the deleted micro-skills are declared
// in the command contract, not just --reapply alone.
const content = fs.readFileSync(UPDATE_MD, 'utf-8');
const argHint = parseFrontmatterField(content, 'argument-hint');
assert.ok(
argHint && argHint.includes('--sync') && argHint.includes('--reapply'),
`update.md argument-hint must declare both --sync and --reapply; got: ${argHint || '(none)'}`
);
});
});
});
}
// ────────────────────────────────────────────────────────────────────────
// Folded from tests/bug-3516-reapply-patches-gsd-update-filter.test.cjs — consolidation epic #1969 (B4 #1973)
// ────────────────────────────────────────────────────────────────────────
{
const { describe: __foldDescribe } = require('node:test');
__foldDescribe("folded:bug-3516-reapply-patches-gsd-update-filter (consolidation epic #1969 B4 #1973)", () => {
// allow-test-rule: source-text-is-the-product (see #3516)
// gsd-core/workflows/reapply-patches.md is the installed runtime workflow —
// its text IS the deployed behavioral contract for the --reapply flag.
'use strict';
/**
* Bug #3516: reapply-patches.md git-enhanced two-way merge filter misses
* commits authored by the renamed `/gsd-update` flow.
*
* The `grep -v` alternation on line 231 only included the legacy `gsd:update`
* marker. After the slash-command rename `/gsd:update` → `/gsd-update`, commits
* authored by the current flow fall through the filter and are misclassified as
* user customizations, prompting spurious merge conflicts during `--reapply`.
*
* Fix: add `gsd-update` arm to the alternation so both the legacy and current
* commit-message prefixes are excluded. `GSD update` and `gsd-install`
* exclusions are preserved.
*
* Per the repo's source-text-is-the-product exception: the workflow file's text
* IS the deployed behavioral contract. Structural assertion against the parsed
* shell command string is the correct test form here.
*/
const { describe, test, before } = require('node:test');
const assert = require('node:assert/strict');
const fs = require('node:fs');
const path = require('node:path');
const WORKFLOW_PATH = path.join(
__dirname,
'..',
'gsd-core',
'workflows',
'reapply-patches.md',
);
/**
* Extract the git log filter command from the workflow.
*
* Looks for the `grep -v "..."` shell snippet inside the Git-enhanced two-way
* merge section and returns the alternation string between the quotes.
* Returns null if the snippet is absent (signals a structural regression).
*/
function extractFilterAlternation(content) {
// Match the grep -v "..." line in the bash block
const match = content.match(/grep\s+-v\s+"([^"]+)"/);
if (!match) return null;
return match[1];
}
/**
* Parse the alternation string (pipe-delimited) into individual arms.
* Handles escaped pipes produced by shell regex syntax (`\|`).
*/
function parseAlternationArms(alternation) {
// Shell grep alternation uses \| (escaped pipe); split on that
return alternation.split(/\\\|/).map((arm) => arm.trim());
}
describe('Bug #3516: git-enhanced two-way merge filter includes gsd-update arm', () => {
let content;
let alternation;
let arms;
before(() => {
content = fs.readFileSync(WORKFLOW_PATH, 'utf8');
alternation = extractFilterAlternation(content);
arms = alternation ? parseAlternationArms(alternation) : [];
});
test('workflow file exists', () => {
assert.ok(
fs.existsSync(WORKFLOW_PATH),
'gsd-core/workflows/reapply-patches.md must exist',
);
});
test('git-enhanced two-way merge section contains a grep -v filter', () => {
assert.ok(
alternation !== null,
'reapply-patches.md must contain a `grep -v "..."` filter in the git-enhanced two-way merge section',
);
});
test('filter excludes legacy gsd:update commits (back-compat)', () => {
assert.ok(
arms.some((arm) => arm === 'gsd:update'),
`filter must include 'gsd:update' arm for back-compat; got arms: ${JSON.stringify(arms)}`,
);
});
test('filter excludes renamed gsd-update commits (primary fix)', () => {
assert.ok(
arms.some((arm) => arm === 'gsd-update'),
`filter must include 'gsd-update' arm (renamed flow); got arms: ${JSON.stringify(arms)}`,
);
});
test('filter excludes GSD update commits (no regression)', () => {
assert.ok(
arms.some((arm) => arm === 'GSD update'),
`filter must include 'GSD update' arm; got arms: ${JSON.stringify(arms)}`,
);
});
test('filter excludes gsd-install commits (no regression)', () => {
assert.ok(
arms.some((arm) => arm === 'gsd-install'),
`filter must include 'gsd-install' arm; got arms: ${JSON.stringify(arms)}`,
);
});
test('all four expected exclusion patterns are present in the filter', () => {
const required = ['gsd:update', 'gsd-update', 'GSD update', 'gsd-install'];
const missing = required.filter((p) => !arms.some((arm) => arm === p));
assert.deepEqual(
missing,
[],
`filter is missing required exclusion patterns: ${JSON.stringify(missing)}; got arms: ${JSON.stringify(arms)}`,
);
});
});
});
}
// ────────────────────────────────────────────────────────────────────────
// Folded from tests/bug-2994-verify-reapply-patches-installed-path.test.cjs — consolidation epic #1969 (B5 #1974)
// ────────────────────────────────────────────────────────────────────────
{
const { describe: __foldDescribe } = require('node:test');
__foldDescribe("folded:bug-2994-verify-reapply-patches-installed-path (consolidation epic #1969 B5 #1974)", () => {
'use strict';
process.env.GSD_TEST_MODE = '1';
/**
* Bug #2994: scripts/verify-reapply-patches.cjs ships in tarball but is
* not installed at ${GSD_HOME}/scripts/.
*
* Root cause: bin/install.js copies the gsd-core/ source tree to
* ${configDir}/gsd-core/ but does NOT copy the top-level scripts/
* directory. The verifier script lived under scripts/ so /gsd-reapply-patches
* Step 5 hit `Cannot find module …/scripts/verify-reapply-patches.cjs`.
*
* Fix: move the script to gsd-core/bin/verify-reapply-patches.cjs
* (which IS installed) and update reapply-patches.md to point there.
*
* This test enforces the structural invariant that prevents regression.
*/
const { test, describe } = require('node:test');
const assert = require('node:assert/strict');
const fs = require('node:fs');
const path = require('node:path');
const ROOT = path.join(__dirname, '..');
const RUNTIME_SCRIPT_PATH = path.join(ROOT, 'gsd-core', 'bin', 'verify-reapply-patches.cjs');
const STALE_SCRIPT_PATH = path.join(ROOT, 'scripts', 'verify-reapply-patches.cjs');
const REAPPLY_WORKFLOW = path.join(ROOT, 'gsd-core', 'workflows', 'reapply-patches.md');
describe('Bug #2994: verify-reapply-patches.cjs lives at the runtime-installed path', () => {
test('the script exists under gsd-core/bin/ (installed by copyWithPathReplacement)', () => {
assert.equal(fs.existsSync(RUNTIME_SCRIPT_PATH), true,
`Expected verifier script at ${RUNTIME_SCRIPT_PATH} -- installer copies gsd-core/ recursively`);
});
test('the script does NOT live at the legacy scripts/ path (not installed)', () => {
assert.equal(fs.existsSync(STALE_SCRIPT_PATH), false,
`scripts/ is not copied by installer; verifier must be under gsd-core/bin/ instead`);
});
test('the script is requireable (loads without throwing)', () => {
const mod = require(RUNTIME_SCRIPT_PATH);
assert.equal(typeof mod.REASON, 'object');
assert.notEqual(mod.REASON, null);
});
});
// Parse reapply-patches.md to extract every `node "${GSD_HOME}/...cjs"`
// invocation as structured records. Assertions go against the parsed
// records, not against the markdown text.
function extractScriptInvocations(markdown) {
const invocations = [];
const re = /node\s+"\$\{GSD_HOME\}\/([^"]+\.cjs)"/g;
let match;
while ((match = re.exec(markdown)) !== null) {
invocations.push({ relPath: match[1] });
}
return invocations;
}
describe('Bug #2994: reapply-patches workflow references the runtime-installed path', () => {
test('every node ${GSD_HOME}/... invocation in reapply-patches.md uses an installed runtime path', () => {
const md = fs.readFileSync(REAPPLY_WORKFLOW, 'utf-8');
const invocations = extractScriptInvocations(md);
assert.ok(invocations.length > 0, 'sanity: expected at least one node ${GSD_HOME}/... invocation in reapply-patches.md');
const violations = invocations.filter(inv => !inv.relPath.startsWith('gsd-core/'));
assert.deepEqual(violations, [], `invocations under non-installed paths: ${JSON.stringify(violations)}`);
});
test('reapply-patches.md references the verifier at gsd-core/bin/verify-reapply-patches.cjs', () => {
const md = fs.readFileSync(REAPPLY_WORKFLOW, 'utf-8');
const invocations = extractScriptInvocations(md);
const verifierInvocations = invocations.filter(inv => inv.relPath.endsWith('verify-reapply-patches.cjs'));
assert.deepEqual(
verifierInvocations.map(i => i.relPath),
['gsd-core/bin/verify-reapply-patches.cjs'],
'workflow must call the runtime-installed verifier path exactly once',
);
});
});
});
}