* 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>
657 lines
27 KiB
JavaScript
657 lines
27 KiB
JavaScript
// allow-test-rule: source-text-is-the-product (see #3311)
|
||
// Reads .planning/STATE.md (and the milestone.lock claim JSON) because the
|
||
// deployed text of those files IS the contract under test: #3311 is exactly
|
||
// about two sessions silently overwriting each other's Current Position text.
|
||
|
||
'use strict';
|
||
|
||
// #3311 — milestone lock keyed by phase + session id.
|
||
//
|
||
// The defect: two sessions running different phases in ONE working tree both
|
||
// read-modify-write the single un-scoped `## Current Position` slot in
|
||
// STATE.md. Byte-level serialization already exists (STATE.md.lock, #464), so
|
||
// no write is lost — but the SEMANTIC clobber is silent: `state.advance-plan`
|
||
// takes no phase argument and advances whatever plan the (possibly just
|
||
// clobbered) Current Position names, and nothing ever surfaces that two
|
||
// sessions claimed two different phases.
|
||
//
|
||
// The fix (maintainer decision on #3311): an advisory claim file
|
||
// `.planning/milestone.lock` holding { phase, session, pid, updated_at }.
|
||
// A second session working a DIFFERENT phase gets a visible warning
|
||
// (stderr + typed `milestone_conflict` JSON field / phase.complete's
|
||
// warnings[]) instead of a silent overwrite.
|
||
//
|
||
// Session identity comes from getWorkstreamSessionKey() (env-first). Tests
|
||
// drive it with GSD_SESSION_KEY via runGsdTools's per-call env override;
|
||
// helpers blank ambient session identity, so default runs are headless
|
||
// (null session) deterministically.
|
||
|
||
const { test, describe, beforeEach, afterEach } = require('node:test');
|
||
const assert = require('node:assert/strict');
|
||
const fs = require('fs');
|
||
const path = require('path');
|
||
const helpers = require('./helpers.cjs');
|
||
const { runGsdTools, createTempProject, cleanup, TOOLS_PATH } = helpers;
|
||
const processSeam = require('./helpers/process-seam.cjs');
|
||
const { collectSection } = require('../gsd-core/bin/lib/markdown-sectionizer.cjs');
|
||
|
||
// runGsdTools's legacy shape drops stderr on success, but the #3311 contract
|
||
// is exactly that a conflict is VISIBLE — these tests must see stderr. Drive
|
||
// the process seam directly for the conflicting invocations (same env base
|
||
// runGsdTools applies, exposed as the TEST_ENV_BASE getter).
|
||
function runToolsWithStderr(args, cwd, env = {}) {
|
||
return processSeam.runNode([TOOLS_PATH, ...args], {
|
||
cwd,
|
||
env: { ...process.env, ...helpers.TEST_ENV_BASE, ...env },
|
||
timeoutMs: 60000,
|
||
});
|
||
}
|
||
|
||
const SESSION_A = { GSD_SESSION_KEY: 'session-a' };
|
||
const SESSION_B = { GSD_SESSION_KEY: 'session-b' };
|
||
|
||
// Pinned clock base for deterministic claim freshness (realClock.now() honors
|
||
// GSD_TEST_MODE + GSD_NOW_MS in the subprocess under test).
|
||
const T0 = Date.parse('2026-08-10T09:00:00.000Z');
|
||
// A delta comfortably past any plausible claim TTL (4h) — staleness driver.
|
||
const WEEK_LATER = T0 + 7 * 24 * 60 * 60 * 1000;
|
||
|
||
function milestoneLockPath(tmpDir) {
|
||
return path.join(tmpDir, '.planning', 'milestone.lock');
|
||
}
|
||
|
||
function readClaim(tmpDir) {
|
||
return JSON.parse(fs.readFileSync(milestoneLockPath(tmpDir), 'utf-8'));
|
||
}
|
||
|
||
const BEGIN_PHASE_STATE_MD = [
|
||
'# Project State',
|
||
'',
|
||
'**Current Phase:** 1',
|
||
'**Current Phase Name:** setup',
|
||
'**Total Phases:** 5',
|
||
'**Current Plan:** 0',
|
||
'**Total Plans in Phase:** 0',
|
||
'**Status:** Ready to plan',
|
||
'**Last Activity:** 2026-03-20',
|
||
'',
|
||
'## Current Position',
|
||
'Phase: 1 of 5 (setup)',
|
||
'Plan: 0 of ? in current phase',
|
||
'Status: Ready to plan',
|
||
'Last activity: 2026-03-20 — roadmap created',
|
||
'Progress: [..........] 0%',
|
||
'',
|
||
].join('\n');
|
||
|
||
// STATE.md whose Current Position names phase 2 — the post-clobber state a
|
||
// session-A advance-plan must detect against its phase-1 claim.
|
||
const ADVANCE_POSITION_PHASE_2 = [
|
||
'# Project State',
|
||
'',
|
||
'**Current Plan:** 1',
|
||
'**Total Plans in Phase:** 3',
|
||
'**Status:** Executing',
|
||
'**Last Activity:** 2026-08-10',
|
||
'',
|
||
'## Current Position',
|
||
'Phase: 2 of 5 (api)',
|
||
'Plan: 1 of 3 in current phase',
|
||
'Status: Executing',
|
||
'Last activity: 2026-08-10 — began api work',
|
||
'',
|
||
].join('\n');
|
||
|
||
/**
|
||
* Minimal project where `phase complete <n>` reaches its transaction:
|
||
* ROADMAP with two phases, phase dir with one plan + summary + passed
|
||
* verification for phase 1, and an empty (already-verified) phase 2.
|
||
*/
|
||
function writePhaseCompleteFixture(tmpDir) {
|
||
const planningDir = path.join(tmpDir, '.planning');
|
||
const phase1Dir = path.join(planningDir, 'phases', '01-foundation');
|
||
const phase2Dir = path.join(planningDir, 'phases', '02-api');
|
||
fs.mkdirSync(phase1Dir, { recursive: true });
|
||
fs.mkdirSync(phase2Dir, { recursive: true });
|
||
|
||
fs.writeFileSync(
|
||
path.join(planningDir, 'ROADMAP.md'),
|
||
[
|
||
'# Roadmap',
|
||
'',
|
||
'- [ ] Phase 1: Foundation',
|
||
'- [ ] Phase 2: API',
|
||
'',
|
||
'### Phase 1: Foundation',
|
||
'**Goal:** Setup',
|
||
'**Plans:** 1 plans',
|
||
'',
|
||
'### Phase 2: API',
|
||
'**Goal:** Build API',
|
||
'**Plans:** 0 plans',
|
||
'',
|
||
'## Progress',
|
||
'',
|
||
'| Phase | Plans Complete | Status | Completed |',
|
||
'|-------|----------------|--------|-----------|',
|
||
'| 01. Foundation | 0/1 | Not started | - |',
|
||
'| 02. API | 0/1 | Not started | - |',
|
||
'',
|
||
].join('\n'),
|
||
);
|
||
|
||
fs.writeFileSync(
|
||
path.join(planningDir, 'STATE.md'),
|
||
[
|
||
'# State',
|
||
'',
|
||
'**Current Phase:** 01',
|
||
'**Current Phase Name:** Foundation',
|
||
'**Status:** In progress',
|
||
'**Current Plan:** 01-01',
|
||
'**Last Activity:** 2026-08-10',
|
||
'',
|
||
'## Current Position',
|
||
'Phase: 1 of 2 (Foundation)',
|
||
'Plan: 1 of 1 in current phase',
|
||
'Status: Executing',
|
||
'',
|
||
].join('\n'),
|
||
);
|
||
|
||
fs.writeFileSync(path.join(phase1Dir, '01-01-PLAN.md'), '# Plan\n');
|
||
fs.writeFileSync(path.join(phase1Dir, '01-01-SUMMARY.md'), '# Summary\n');
|
||
fs.writeFileSync(
|
||
path.join(phase1Dir, '01-VERIFICATION.md'),
|
||
['---', 'status: passed', '---', '', '# Verification', ''].join('\n'),
|
||
);
|
||
fs.writeFileSync(
|
||
path.join(phase2Dir, '02-VERIFICATION.md'),
|
||
['---', 'status: passed', '---', '', '# Verification', ''].join('\n'),
|
||
);
|
||
}
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// M1–M4, M7, M8, M11 — begin-phase claim behavior
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
|
||
describe('#3311 milestone lock: begin-phase claims', () => {
|
||
let tmpDir;
|
||
|
||
beforeEach(() => {
|
||
tmpDir = createTempProject();
|
||
fs.writeFileSync(path.join(tmpDir, '.planning', 'STATE.md'), BEGIN_PHASE_STATE_MD);
|
||
});
|
||
|
||
afterEach(() => {
|
||
cleanup(tmpDir);
|
||
});
|
||
|
||
test('M1: begin-phase records a milestone.lock claim with phase + session key', () => {
|
||
const result = runGsdTools(
|
||
['state', 'begin-phase', '--phase', '1', '--name', 'setup', '--plans', '4'],
|
||
tmpDir,
|
||
{ ...SESSION_A, GSD_TEST_MODE: '1', GSD_NOW_MS: String(T0) },
|
||
);
|
||
assert.ok(result.success, `begin-phase failed: ${result.error}`);
|
||
|
||
const claim = readClaim(tmpDir);
|
||
assert.strictEqual(claim.phase, '1', `claim phase must be 1; got ${JSON.stringify(claim)}`);
|
||
assert.ok(
|
||
typeof claim.session === 'string' && claim.session.includes('session-a'),
|
||
`claim session must carry the session key; got ${JSON.stringify(claim)}`,
|
||
);
|
||
assert.strictEqual(claim.updated_at, T0, 'claim updated_at must be the pinned now');
|
||
});
|
||
|
||
test('M2: second session beginning a DIFFERENT phase gets a visible conflict, claim left intact, STATE.md still updated', () => {
|
||
const first = runGsdTools(
|
||
['state', 'begin-phase', '--phase', '1', '--name', 'setup', '--plans', '4'],
|
||
tmpDir,
|
||
{ ...SESSION_A, GSD_TEST_MODE: '1', GSD_NOW_MS: String(T0) },
|
||
);
|
||
assert.ok(first.success, `first begin-phase failed: ${first.error}`);
|
||
|
||
const second = runToolsWithStderr(
|
||
['state', 'begin-phase', '--phase', '2', '--name', 'api', '--plans', '3'],
|
||
tmpDir,
|
||
{ ...SESSION_B, GSD_TEST_MODE: '1', GSD_NOW_MS: String(T0 + 1000) },
|
||
);
|
||
assert.strictEqual(second.exitCode, 0, `second begin-phase failed: ${second.stderr}`);
|
||
|
||
const out = JSON.parse(second.stdout);
|
||
assert.ok(
|
||
out.milestone_conflict && out.milestone_conflict.locked_phase === '1',
|
||
`output must carry milestone_conflict.locked_phase 1; got ${second.stdout}`,
|
||
);
|
||
assert.match(
|
||
second.stderr || '',
|
||
/milestone/i,
|
||
'a visible stderr warning must accompany the conflict',
|
||
);
|
||
|
||
// Warn, not block: STATE.md still moves to phase 2 …
|
||
const stateContent = fs.readFileSync(path.join(tmpDir, '.planning', 'STATE.md'), 'utf-8');
|
||
assert.match(stateContent, /^Phase:.*2.*EXECUTING/m, 'STATE.md must still be updated (warn, not block)');
|
||
|
||
// … and the first session's claim is NOT overwritten, so the conflict
|
||
// stays visible on every subsequent mutation.
|
||
const claim = readClaim(tmpDir);
|
||
assert.strictEqual(claim.phase, '1', `session A's claim must be left intact; got ${JSON.stringify(claim)}`);
|
||
assert.ok(claim.session.includes('session-a'), 'claim session must still be session A');
|
||
});
|
||
|
||
test('M3: same session re-targeting a different phase — no conflict, claim follows', () => {
|
||
const first = runGsdTools(
|
||
['state', 'begin-phase', '--phase', '1', '--name', 'setup', '--plans', '4'],
|
||
tmpDir,
|
||
{ ...SESSION_A, GSD_TEST_MODE: '1', GSD_NOW_MS: String(T0) },
|
||
);
|
||
assert.ok(first.success, `first begin-phase failed: ${first.error}`);
|
||
assert.ok(!JSON.parse(first.output).milestone_conflict, 'no conflict on fresh claim');
|
||
|
||
const second = runGsdTools(
|
||
['state', 'begin-phase', '--phase', '2', '--name', 'api', '--plans', '3'],
|
||
tmpDir,
|
||
{ ...SESSION_A, GSD_TEST_MODE: '1', GSD_NOW_MS: String(T0 + 1000) },
|
||
);
|
||
assert.ok(second.success, `second begin-phase failed: ${second.error}`);
|
||
|
||
const out = JSON.parse(second.output);
|
||
assert.ok(!out.milestone_conflict, `same session re-targeting must not conflict; got ${second.output}`);
|
||
|
||
const claim = readClaim(tmpDir);
|
||
assert.strictEqual(claim.phase, '2', `claim must follow the session's new phase; got ${JSON.stringify(claim)}`);
|
||
});
|
||
|
||
test('M4: different session, SAME phase — no conflict (keyed by phase)', () => {
|
||
const first = runGsdTools(
|
||
['state', 'begin-phase', '--phase', '1', '--name', 'setup', '--plans', '4'],
|
||
tmpDir,
|
||
{ ...SESSION_A, GSD_TEST_MODE: '1', GSD_NOW_MS: String(T0) },
|
||
);
|
||
assert.ok(first.success, `first begin-phase failed: ${first.error}`);
|
||
|
||
const second = runGsdTools(
|
||
['state', 'begin-phase', '--phase', '1', '--name', 'setup', '--plans', '4'],
|
||
tmpDir,
|
||
{ ...SESSION_B, GSD_TEST_MODE: '1', GSD_NOW_MS: String(T0 + 1000) },
|
||
);
|
||
assert.ok(second.success, `second begin-phase failed: ${second.error}`);
|
||
|
||
const out = JSON.parse(second.output);
|
||
assert.ok(!out.milestone_conflict, `same phase from another session must not conflict; got ${second.output}`);
|
||
});
|
||
|
||
test('M7: headless sessions (no session identity) still conflict across phases', () => {
|
||
// No session env at all — both invocations resolve a null session key.
|
||
// A null key must never count as "same session", or the headless parallel
|
||
// case (CI, cron) would be undetectable.
|
||
const first = runGsdTools(
|
||
['state', 'begin-phase', '--phase', '1', '--name', 'setup', '--plans', '4'],
|
||
tmpDir,
|
||
{ GSD_TEST_MODE: '1', GSD_NOW_MS: String(T0) },
|
||
);
|
||
assert.ok(first.success, `first begin-phase failed: ${first.error}`);
|
||
|
||
const second = runGsdTools(
|
||
['state', 'begin-phase', '--phase', '2', '--name', 'api', '--plans', '3'],
|
||
tmpDir,
|
||
{ GSD_TEST_MODE: '1', GSD_NOW_MS: String(T0 + 1000) },
|
||
);
|
||
assert.ok(second.success, `second begin-phase failed: ${second.error}`);
|
||
|
||
const out = JSON.parse(second.output);
|
||
assert.ok(
|
||
out.milestone_conflict && out.milestone_conflict.locked_phase === '1',
|
||
`headless cross-phase conflict must be detected; got ${second.output}`,
|
||
);
|
||
});
|
||
|
||
test('M8: a claim older than the TTL is stale — takeover without conflict', () => {
|
||
const first = runGsdTools(
|
||
['state', 'begin-phase', '--phase', '1', '--name', 'setup', '--plans', '4'],
|
||
tmpDir,
|
||
{ ...SESSION_A, GSD_TEST_MODE: '1', GSD_NOW_MS: String(T0) },
|
||
);
|
||
assert.ok(first.success, `first begin-phase failed: ${first.error}`);
|
||
|
||
// A week later, session B begins phase 2: the abandoned claim must not
|
||
// fire a false conflict.
|
||
const second = runGsdTools(
|
||
['state', 'begin-phase', '--phase', '2', '--name', 'api', '--plans', '3'],
|
||
tmpDir,
|
||
{ ...SESSION_B, GSD_TEST_MODE: '1', GSD_NOW_MS: String(WEEK_LATER) },
|
||
);
|
||
assert.ok(second.success, `second begin-phase failed: ${second.error}`);
|
||
|
||
const out = JSON.parse(second.output);
|
||
assert.ok(!out.milestone_conflict, `stale claim must not conflict; got ${second.output}`);
|
||
|
||
const claim = readClaim(tmpDir);
|
||
assert.strictEqual(claim.phase, '2', `stale claim must be taken over; got ${JSON.stringify(claim)}`);
|
||
assert.strictEqual(claim.updated_at, WEEK_LATER, 'takeover must re-stamp updated_at');
|
||
});
|
||
|
||
test('M11: a corrupt milestone.lock body is treated as no claim — no crash, no conflict', () => {
|
||
fs.writeFileSync(milestoneLockPath(tmpDir), 'not-json{garbage');
|
||
|
||
const result = runGsdTools(
|
||
['state', 'begin-phase', '--phase', '2', '--name', 'api', '--plans', '3'],
|
||
tmpDir,
|
||
{ ...SESSION_B, GSD_TEST_MODE: '1', GSD_NOW_MS: String(T0) },
|
||
);
|
||
assert.ok(result.success, `begin-phase failed on corrupt claim: ${result.error}`);
|
||
|
||
const out = JSON.parse(result.output);
|
||
assert.ok(!out.milestone_conflict, `corrupt claim must not conflict; got ${result.output}`);
|
||
|
||
const claim = readClaim(tmpDir);
|
||
assert.strictEqual(claim.phase, '2', `corrupt claim must be replaced; got ${JSON.stringify(claim)}`);
|
||
});
|
||
});
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// M5, M6 — advance-plan flip detection + heartbeat
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
|
||
describe('#3311 milestone lock: advance-plan position checks', () => {
|
||
let tmpDir;
|
||
|
||
beforeEach(() => {
|
||
tmpDir = createTempProject();
|
||
});
|
||
|
||
afterEach(() => {
|
||
cleanup(tmpDir);
|
||
});
|
||
|
||
test('M5: position phase matching the claim advances silently and heartbeats the claim', () => {
|
||
fs.writeFileSync(path.join(tmpDir, '.planning', 'STATE.md'), BEGIN_PHASE_STATE_MD);
|
||
const begin = runGsdTools(
|
||
['state', 'begin-phase', '--phase', '1', '--name', 'setup', '--plans', '3'],
|
||
tmpDir,
|
||
{ ...SESSION_A, GSD_TEST_MODE: '1', GSD_NOW_MS: String(T0) },
|
||
);
|
||
assert.ok(begin.success, `begin-phase failed: ${begin.error}`);
|
||
|
||
const before = readClaim(tmpDir);
|
||
assert.strictEqual(before.updated_at, T0);
|
||
|
||
const adv = runGsdTools(
|
||
['state', 'advance-plan'],
|
||
tmpDir,
|
||
{ ...SESSION_A, GSD_TEST_MODE: '1', GSD_NOW_MS: String(T0 + 60_000) },
|
||
);
|
||
assert.ok(adv.success, `advance-plan failed: ${adv.error}`);
|
||
|
||
const out = JSON.parse(adv.output);
|
||
assert.ok(out.advanced === true, `advance-plan must advance; got ${adv.output}`);
|
||
assert.ok(!out.milestone_conflict, `matching claim must not conflict; got ${adv.output}`);
|
||
|
||
const after = readClaim(tmpDir);
|
||
assert.strictEqual(after.phase, '1', 'claim phase unchanged');
|
||
assert.strictEqual(
|
||
after.updated_at,
|
||
T0 + 60_000,
|
||
`claim must be heartbeat-refreshed; got ${JSON.stringify(after)}`,
|
||
);
|
||
});
|
||
|
||
test('M6: Current Position naming ANOTHER session\'s claimed phase is reported as a conflict', () => {
|
||
// Session A legitimately began phase 1 …
|
||
fs.writeFileSync(path.join(tmpDir, '.planning', 'STATE.md'), BEGIN_PHASE_STATE_MD);
|
||
const begin = runGsdTools(
|
||
['state', 'begin-phase', '--phase', '1', '--name', 'setup', '--plans', '3'],
|
||
tmpDir,
|
||
{ ...SESSION_A, GSD_TEST_MODE: '1', GSD_NOW_MS: String(T0) },
|
||
);
|
||
assert.ok(begin.success, `begin-phase failed: ${begin.error}`);
|
||
|
||
// … then session B's begin-phase clobbered the single Current Position
|
||
// slot to phase 2 (the #3311 flip). Session A's next advance-plan must
|
||
// SAY SO instead of silently advancing phase 2's plan counter.
|
||
fs.writeFileSync(path.join(tmpDir, '.planning', 'STATE.md'), ADVANCE_POSITION_PHASE_2);
|
||
|
||
const adv = runToolsWithStderr(
|
||
['state', 'advance-plan'],
|
||
tmpDir,
|
||
{ ...SESSION_A, GSD_TEST_MODE: '1', GSD_NOW_MS: String(T0 + 60_000) },
|
||
);
|
||
assert.strictEqual(adv.exitCode, 0, `advance-plan failed: ${adv.stderr}`);
|
||
|
||
const out = JSON.parse(adv.stdout);
|
||
assert.ok(
|
||
out.milestone_conflict && out.milestone_conflict.locked_phase === '1',
|
||
`position/claim mismatch must surface milestone_conflict; got ${adv.stdout}`,
|
||
);
|
||
assert.match(adv.stderr || '', /milestone/i, 'a visible stderr warning must accompany the conflict');
|
||
});
|
||
});
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// M9, M10 — phase.complete conflict warning + claim release
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
|
||
describe('#3311 milestone lock: phase.complete', () => {
|
||
let tmpDir;
|
||
|
||
beforeEach(() => {
|
||
tmpDir = createTempProject();
|
||
writePhaseCompleteFixture(tmpDir);
|
||
});
|
||
|
||
afterEach(() => {
|
||
cleanup(tmpDir);
|
||
});
|
||
|
||
test('M9: completing a phase while a live claim holds a DIFFERENT phase warns via warnings[]', () => {
|
||
// Session A is mid-phase-1 (live claim) …
|
||
fs.writeFileSync(path.join(tmpDir, '.planning', 'milestone.lock'), JSON.stringify({
|
||
phase: '1',
|
||
session: 'gsd-session-key-session-a',
|
||
pid: 4242,
|
||
updated_at: Date.now(),
|
||
}));
|
||
|
||
// … and session B completes phase 2 in the same tree.
|
||
const result = runGsdTools(
|
||
['phase', 'complete', '2'],
|
||
tmpDir,
|
||
SESSION_B,
|
||
);
|
||
assert.ok(result.success, `phase complete failed: ${result.error}`);
|
||
|
||
const out = JSON.parse(result.output);
|
||
assert.ok(
|
||
Array.isArray(out.warnings) && out.warnings.some((w) => /milestone/i.test(w)),
|
||
`warnings[] must carry the milestone-lock conflict; got ${result.output}`,
|
||
);
|
||
assert.strictEqual(out.has_warnings, true, 'has_warnings must be true');
|
||
assert.ok(
|
||
out.milestone_conflict && out.milestone_conflict.locked_phase === '1',
|
||
`typed milestone_conflict must be present; got ${result.output}`,
|
||
);
|
||
|
||
// The live claim is left intact for the same reason as M2.
|
||
const claim = readClaim(tmpDir);
|
||
assert.strictEqual(claim.phase, '1', 'session A\'s claim must be left intact');
|
||
});
|
||
|
||
test('M10: completing the CLAIMED phase releases the claim', () => {
|
||
fs.writeFileSync(path.join(tmpDir, '.planning', 'milestone.lock'), JSON.stringify({
|
||
phase: '1',
|
||
session: 'gsd-session-key-session-a',
|
||
pid: 4242,
|
||
updated_at: Date.now(),
|
||
}));
|
||
|
||
const result = runGsdTools(['phase', 'complete', '1'], tmpDir, SESSION_A);
|
||
assert.ok(result.success, `phase complete failed: ${result.error}`);
|
||
|
||
const out = JSON.parse(result.output);
|
||
assert.ok(!out.milestone_conflict, `completing the claimed phase must not conflict; got ${result.output}`);
|
||
|
||
assert.ok(
|
||
!fs.existsSync(milestoneLockPath(tmpDir)),
|
||
'milestone.lock must be released when the claimed phase completes',
|
||
);
|
||
});
|
||
|
||
test('M10b: no claim file — phase.complete carries no conflict and creates no claim', () => {
|
||
const result = runGsdTools(['phase', 'complete', '1'], tmpDir, SESSION_A);
|
||
assert.ok(result.success, `phase complete failed: ${result.error}`);
|
||
|
||
const out = JSON.parse(result.output);
|
||
assert.ok(!out.milestone_conflict, `no claim must mean no conflict; got ${result.output}`);
|
||
assert.ok(
|
||
!Array.isArray(out.warnings) || !out.warnings.some((w) => /milestone/i.test(w)),
|
||
'no milestone warning without a claim',
|
||
);
|
||
assert.ok(!fs.existsSync(milestoneLockPath(tmpDir)), 'phase.complete must not create a claim');
|
||
});
|
||
});
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// G1 — lock-domain serialization guard (triage brief regression test 1)
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
|
||
describe('#3311 guard: phase.complete does not lose a concurrent STATE.md write', () => {
|
||
test('G1: a STATE.md edit landing while phase.complete waits on STATE.md.lock survives', () => {
|
||
const tmpDir = createTempProject();
|
||
try {
|
||
writePhaseCompleteFixture(tmpDir);
|
||
|
||
const stateMod = require('../gsd-core/bin/lib/state.cjs');
|
||
const phaseMod = require('../gsd-core/bin/lib/phase.cjs');
|
||
const statePath = path.join(tmpDir, '.planning', 'STATE.md');
|
||
const lockPath = statePath + '.lock';
|
||
|
||
// Pre-hold STATE.md.lock the way a concurrent `state.advance-plan`
|
||
// mid-transform would: a body with a pid the liveness probe reports as
|
||
// VERIFIED-LIVE, so the phase.complete path must WAIT, not steal.
|
||
fs.writeFileSync(lockPath, '4242');
|
||
stateMod._setLockProbes({ isPidAlive: (pid) => pid === 4242 });
|
||
|
||
let injected = false;
|
||
stateMod._setStateLockTestHooks({
|
||
onLoopIteration(ctx) {
|
||
// Gate on iteration >= 1: the hook fires at the top of EVERY loop
|
||
// iteration, so iteration 0 alone proves nothing. Injecting only
|
||
// once the first open() has hit EEXIST proves the writer is
|
||
// actually HONORING the held lock rather than bypassing it.
|
||
if (ctx.iteration < 1 || injected) return;
|
||
injected = true;
|
||
// The "advance-plan write" lands on disk while phase.complete waits …
|
||
fs.writeFileSync(
|
||
statePath,
|
||
fs.readFileSync(statePath, 'utf-8') + '\n## Concurrent Notes\nsurvived-concurrent-writer\n',
|
||
);
|
||
// … then the concurrent holder releases.
|
||
fs.unlinkSync(lockPath);
|
||
},
|
||
});
|
||
|
||
// Swallow fd-1 writes (io.output writes JSON straight to fd 1).
|
||
const origWriteSync = fs.writeSync;
|
||
const captured = [];
|
||
fs.writeSync = function patchedWriteSync(fd, data, ...rest) {
|
||
if (fd === 1) {
|
||
captured.push(String(data));
|
||
return String(data).length;
|
||
}
|
||
return origWriteSync(fd, data, ...rest);
|
||
};
|
||
|
||
let threw = null;
|
||
try {
|
||
phaseMod.cmdPhaseComplete(tmpDir, '1', true);
|
||
} catch (e) {
|
||
threw = e;
|
||
} finally {
|
||
fs.writeSync = origWriteSync;
|
||
stateMod._resetStateLockTestHooks();
|
||
stateMod._resetLockProbes();
|
||
}
|
||
assert.ok(!threw, `phase.complete must succeed under contention: ${threw && threw.message}`);
|
||
assert.ok(injected, 'the EEXIST contention path must have been reached (lock honored)');
|
||
|
||
const finalContent = fs.readFileSync(statePath, 'utf-8');
|
||
assert.ok(
|
||
finalContent.includes('survived-concurrent-writer'),
|
||
`the concurrent writer's STATE.md edit must NOT be lost; got:\n${finalContent}`,
|
||
);
|
||
// And the completion itself also landed (both writes present).
|
||
const payload = JSON.parse(captured.join('') || '{}');
|
||
assert.strictEqual(payload.completed_phase, '1', `completion result must be phase 1; got ${captured.join('')}`);
|
||
} finally {
|
||
cleanup(tmpDir);
|
||
}
|
||
});
|
||
});
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// G2 — targeted-field-replace guard (triage brief regression test 3)
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
|
||
describe('#3311 guard: advancePlan stays a targeted field replace', () => {
|
||
test('G2: only Status / Last Activity / Plan lines change inside ## Current Position', () => {
|
||
const { transitionCore } = require('../gsd-core/bin/lib/state-transition.cjs');
|
||
|
||
const fixedClock = Object.freeze({
|
||
today: () => '2026-08-10',
|
||
localToday: () => '2026-08-10',
|
||
nowIso: () => '2026-08-10T12:00:00.000Z',
|
||
});
|
||
|
||
const before = [
|
||
'# Project State',
|
||
'',
|
||
'**Current Plan:** 1',
|
||
'**Total Plans in Phase:** 3',
|
||
'**Status:** Executing',
|
||
'**Last Activity:** 2026-08-09',
|
||
'',
|
||
'## Current Position',
|
||
'Phase: 2 of 5 (api)',
|
||
'Plan: 1 of 3 in current phase',
|
||
'Status: Executing',
|
||
// Bare date = handler-generated shape, so advancePlan's template-aware
|
||
// replace is permitted to update it (an executor-authored value like
|
||
// "2026-08-09 — began api work" is deliberately preserved instead).
|
||
'Last activity: 2026-08-09',
|
||
'Owner: alice',
|
||
'',
|
||
'## Next Steps',
|
||
'',
|
||
'Do the thing.',
|
||
'',
|
||
].join('\n');
|
||
|
||
const result = transitionCore(before, { kind: 'advancePlan' }, { clock: fixedClock, sourcePath: 'STATE.md' });
|
||
const after = result.content;
|
||
|
||
const section = (text) => {
|
||
const s = collectSection(text, (h) => /^Current Position$/i.test(h.text));
|
||
assert.ok(s, 'Current Position section must exist');
|
||
return s.body;
|
||
};
|
||
const beforeSection = section(before);
|
||
assert.ok(beforeSection.length > 0, 'before-section must be non-empty');
|
||
const afterSection = section(after);
|
||
|
||
// Untouched lines — the triage's "must not turn into a whole-block rewrite".
|
||
assert.match(afterSection, /^Phase: 2 of 5 \(api\)$/m, 'Phase line must be byte-identical');
|
||
assert.match(afterSection, /^Owner: alice$/m, 'unrelated custom line must be byte-identical');
|
||
assert.ok(
|
||
after.includes('## Next Steps\n\nDo the thing.'),
|
||
'the sibling ## Next Steps section must be untouched',
|
||
);
|
||
|
||
// Mutated lines.
|
||
assert.match(afterSection, /^Plan: 2 of 3/m, 'Plan line must advance');
|
||
assert.match(afterSection, /^Status: Ready to execute$/m, 'Status line must update');
|
||
assert.match(afterSection, /^Last activity: 2026-08-10/m, 'Last activity line must update');
|
||
});
|
||
});
|