* fix(#4830): re-land #4768's letter-suffix phase-id fix and its lint-phase-id-drift ratchets on current next Commit740ba0d8a(#4781) removed every change #4768 had merged for #4748: the first-non-digit split at execute-phase.md's two arithmetic sites, the init-emitted `padded_phase` the REVIEW.md lookup binds instead of `printf "%02d"`, the canonical-grammar extractions in autonomous.md and plan-review-convergence.md, the `.changeset/zesty-wolves-tumble.md` fragment, and the three lint-phase-id-drift ratchets with their tests. The guard and the code it guarded left together, so nothing went red. This is a cherry-pick of092d9256bonto current `next`, resolved against the #4683 threat-id fields on execute-phase.md's Parse-JSON line, with the changeset `pr:` reset to the placeholder and the compact-content benchmark baseline regenerated against the current base. (cherry picked from commit092d9256b8) Emitted-Drift-Ack-Growth: autonomous.md — restores #4768's canonical-grammar extraction and its explanatory comment for --from/--to/--only Emitted-Drift-Ack-Growth: execute-phase.md — restores #4768's first-non-digit split at two arithmetic sites and the padded_phase binding for the REVIEW.md lookup Emitted-Drift-Ack-Growth: plan-review-convergence.md — restores #4768's canonical-grammar phase extraction and its comment Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AX7LXxc3uAkGki6iaYiAMP * chore(#4830): set changeset fragment pr to 4873 --------- Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> Co-authored-by: Tom Boucher <trekkie@nomorestars.com>
237 lines
14 KiB
JavaScript
237 lines
14 KiB
JavaScript
'use strict';
|
|
|
|
/**
|
|
* #4003 — the safe_resume_gate / TDD RED / completion spot-check commit greps.
|
|
*
|
|
* The gate keyed on the padded `{phase_number}-{plan_padded}` as a bare substring:
|
|
* unanchored (any prior milestone's same-numbered plan matches) and padding-blind
|
|
* (the commit protocol — agents/gsd-executor.md <task_commit_protocol>,
|
|
* gsd-core/references/tdd.md:99 — specifies no padding rule, and both spellings are
|
|
* live in this repository's history). Workflow text IS the deployed product here, so
|
|
* the shape assertions are the faithful check; the behavioral fixture row runs the
|
|
* actual pipeline against a crafted history.
|
|
*
|
|
* #4619 — the gate's PHASE_N derivation grew to zero-strip only the leading
|
|
* integer segment of a decimal/N-segment phase number (`01.1`, `23.1.2`) via
|
|
* base-10 arithmetic, instead of forcing the whole value through
|
|
* `$((10#...))` and hitting a hard shell syntax error on the first dot.
|
|
*/
|
|
|
|
const { test, describe } = require('node:test');
|
|
const assert = require('node:assert/strict');
|
|
const fs = require('node:fs');
|
|
const path = require('node:path');
|
|
const { createTempGitProject, cleanup } = require('./helpers.cjs');
|
|
const { gitOrThrow } = require('./helpers/git-fixture.cjs');
|
|
|
|
const WORKFLOW = path.join(__dirname, '..', 'gsd-core', 'workflows', 'execute-phase.md');
|
|
|
|
describe('#4003 — safe_resume_gate commit-scope greps', () => {
|
|
test('safe_resume_gate greps an anchored, padding-tolerant plan scope', () => {
|
|
const w = fs.readFileSync(WORKFLOW, 'utf8');
|
|
// Anchored, ERE, zero-pad-tolerant on BOTH components — matches feat(2-02): and
|
|
// feat(02-02): alike, never a substring elsewhere in the message.
|
|
assert.ok(w.includes('PHASE_INT=${PHASE_NUMBER%%[!0-9]*}; PHASE_REST=${PHASE_NUMBER#"$PHASE_INT"}') &&
|
|
w.includes('PHASE_N="$((10#$PHASE_INT))${PHASE_REST//./\\\\.}"'),
|
|
'phase component must be zero-stripped via arithmetic base-10 (#4619: leading integer segment only, decimal/N-segment tolerant; #4748: split at the first non-digit so a letter suffix rides through)');
|
|
assert.ok(w.includes('PLAN_N=$((10#{plan_padded}))'),
|
|
'plan component must be zero-stripped via arithmetic base-10');
|
|
assert.ok(w.includes('PLAN_SCOPE_RE="^[a-z]+\\((0*${PHASE_N})-(0*${PLAN_N})\\):"'),
|
|
'the scope regex must be anchored to the commit-scope position and zero-pad-tolerant');
|
|
assert.ok(w.includes('--grep="${PLAN_SCOPE_RE}"'),
|
|
'the gate must grep the derived scope regex, not a padded literal');
|
|
// The old unanchored padded-literal grep must be gone.
|
|
assert.ok(!w.includes('--grep="${CURRENT_PLAN_ID}"'),
|
|
'the bare substring grep over the padded id must not remain');
|
|
assert.ok(!w.includes('CURRENT_PLAN_ID="{phase_number}-{plan_padded}"'),
|
|
'the padded id derivation must not remain');
|
|
});
|
|
|
|
test('the gate bounds history to the current milestone with a no-tag fallback', () => {
|
|
const w = fs.readFileSync(WORKFLOW, 'utf8');
|
|
assert.ok(w.includes('git describe --tags --abbrev=0'),
|
|
'the milestone bound derives from the most recent reachable tag (complete-milestone git_tag)');
|
|
assert.ok(w.includes('${MILESTONE_BASE:+"$MILESTONE_BASE..HEAD"}'),
|
|
'the bounded invocation must range BASE..HEAD only when a base resolved');
|
|
// Degrade must keep the anchor: a repo with no tags still gets the positional grep.
|
|
assert.ok(w.includes('MILESTONE_BASE=$(git describe --tags --abbrev=0 2>/dev/null || echo "")'),
|
|
'a missing tag base must degrade to empty, not fail the gate');
|
|
});
|
|
|
|
test('tdd red gate tolerates both commit-scope spellings (#4011 keying untouched)', () => {
|
|
const w = fs.readFileSync(WORKFLOW, 'utf8');
|
|
assert.ok(w.includes('PHASE_INT=${PHASE_NUMBER%%[!0-9]*}; PHASE_REST=${PHASE_NUMBER#"$PHASE_INT"}') &&
|
|
w.includes('PHASE_N="$((10#$PHASE_INT))${PHASE_REST//./\\\\.}"') && w.includes('PLAN_N=$((10#${PLAN_ID}))'),
|
|
'the TDD block derives zero-stripped components (#4619: leading integer segment only, decimal/N-segment tolerant; #4748: letter-suffix tolerant)');
|
|
assert.ok(w.includes('RED_COMMIT=$(git log --oneline -E ${TDD_MILESTONE_BASE:+"$TDD_MILESTONE_BASE..HEAD"} --grep="${PLAN_SCOPE_RE}" -- "*.test.*"'),
|
|
'the RED grep must use the same anchored padding-tolerant scope, milestone-bounded');
|
|
assert.ok(!w.includes('--grep="^test(${PHASE_NUMBER}-${PLAN_ID})"'),
|
|
'the padded-literal RED grep must not remain');
|
|
assert.ok(w.includes('TDD_MILESTONE_BASE=$(git describe --tags --abbrev=0 2>/dev/null || echo "")'),
|
|
'the RED grep carries the same milestone bound as the resume gate (#4003 review)');
|
|
assert.ok(w.includes('${TDD_MILESTONE_BASE:+"$TDD_MILESTONE_BASE..HEAD"}'),
|
|
'the RED grep range bound is applied');
|
|
assert.ok(w.includes('if [ "$TDD_MODE" = "true" ]'), '#4011 TDD_MODE keying preserved');
|
|
});
|
|
|
|
test('tdd.md gate-enforcement examples use the anchored padding-tolerant scope', () => {
|
|
const ref = fs.readFileSync(path.join(__dirname, '..', 'gsd-core', 'references', 'tdd.md'), 'utf8');
|
|
assert.ok(!ref.includes('--grep="^test(${PHASE}-${PLAN})"'),
|
|
'the padded-literal example grep must not remain');
|
|
assert.ok(ref.includes('--grep="^test\\((0*${PHASE_N})-(0*${PLAN_N})\\):"'),
|
|
'the RED example is anchored and zero-pad-tolerant');
|
|
assert.ok(ref.includes('PHASE_INT=${PHASE%%[!0-9]*}; PHASE_REST=${PHASE#"$PHASE_INT"}') &&
|
|
ref.includes('PHASE_N="$((10#$PHASE_INT))${PHASE_REST//./\\\\.}"') && ref.includes('PLAN_N=$((10#${PLAN}))'),
|
|
'the examples derive zero-stripped components (#4619: leading integer segment only, decimal/N-segment tolerant; #4748: letter-suffix tolerant)');
|
|
});
|
|
|
|
test('completion spot-check uses the anchored scope and keeps its time bound', () => {
|
|
// #4217 moved the completion spot-check probes (with the whole reconciliation
|
|
// policy, both arms) into execute-phase/steps/completion-reconciliation.md —
|
|
// "extract, not bump" against the frozen host ceiling. The anchoring contract
|
|
// travels with them: negative shape against the host, positives against the
|
|
// fragment that now owns the probes.
|
|
const w = fs.readFileSync(WORKFLOW, 'utf8');
|
|
const frag = fs.readFileSync(path.join(__dirname, '..', 'gsd-core', 'workflows',
|
|
'execute-phase', 'steps', 'completion-reconciliation.md'), 'utf8');
|
|
assert.ok(!w.includes('--grep="{phase_number}-{plan_padded}"') && !frag.includes('--grep="{phase_number}-{plan_padded}"'),
|
|
'the raw padded placeholder substring grep must not remain');
|
|
assert.ok(frag.includes('SPOT_PHASE_INT=${SPOT_PHASE_NUMBER%%[!0-9]*}; SPOT_PHASE_REST=${SPOT_PHASE_NUMBER#"$SPOT_PHASE_INT"}') &&
|
|
frag.includes('SPOT_PHASE_N="$((10#$SPOT_PHASE_INT))${SPOT_PHASE_REST//./\\\\.}"') &&
|
|
frag.includes('SPOT_PLAN_N=$((10#{plan_padded}))'),
|
|
'the spot-check derives zero-stripped components (#4619: leading integer segment only, decimal/N-segment tolerant; #4748: letter-suffix tolerant)');
|
|
assert.ok(frag.includes('--since="1 hour ago"'), 'the spot-check keeps its temporal bound');
|
|
});
|
|
|
|
test('the gate pipeline separates same-scope commits across a milestone tag (behavioral)', (t) => {
|
|
// Reproduces the report on a crafted history: an OLD milestone commit with the
|
|
// same scope, a tag, then THIS plan's unpadded commits. The pipeline shape is
|
|
// the workflow's: tag base (when present) + anchored, padding-tolerant ERE.
|
|
const repo = createTempGitProject('gsd-4003-gate-');
|
|
t.after(() => cleanup(repo));
|
|
const g = (args) => gitOrThrow(args, { cwd: repo });
|
|
|
|
g(['commit', '--allow-empty', '-m', 'feat(02-02): old milestone same-scope commit']);
|
|
// Annotated: a plain `git tag` can demand a message under some git configs.
|
|
g(['tag', '-a', 'v9.0.0', '-m', 'milestone close']);
|
|
g(['commit', '--allow-empty', '-m', 'test(2-02): RED for this plan']);
|
|
g(['commit', '--allow-empty', '-m', 'feat(2-02): GREEN for this plan']);
|
|
g(['commit', '--allow-empty', '-m', 'feat(2-20): adjacent plan must not match']);
|
|
g(['commit', '--allow-empty', '-m', 'feat: mentions 02-02 in prose but not in scope']);
|
|
|
|
const scope = '^[a-z]+\\((0*2)-(0*2)\\):';
|
|
const base = g(['describe', '--tags', '--abbrev=0']).trim();
|
|
const bounded = g(['log', '--oneline', '-E', `${base}..HEAD`, `--grep=${scope}`]).trim().split('\n');
|
|
assert.ok(bounded.some((l) => /test\(2-02\): RED for this plan/.test(l)), 'this plan RED commit is found');
|
|
assert.ok(bounded.some((l) => /feat\(2-02\): GREEN for this plan/.test(l)), 'this plan GREEN commit is found');
|
|
assert.ok(!bounded.some((l) => /old milestone same-scope/.test(l)), 'the pre-tag same-scope commit is excluded');
|
|
assert.ok(!bounded.some((l) => /adjacent plan/.test(l)), 'an adjacent plan scope does not match');
|
|
assert.ok(!bounded.some((l) => /in prose/.test(l)), 'a prose mention outside the scope position does not match');
|
|
|
|
// No-tag fallback: strip the tag, keep the anchor — the old milestone commit
|
|
// becomes reachable again, but prose/adjacent scopes still never match.
|
|
g(['tag', '-d', 'v9.0.0']);
|
|
const unbounded = g(['log', '--oneline', '-E', `--grep=${scope}`]).trim().split('\n');
|
|
assert.ok(unbounded.some((l) => /old milestone same-scope/.test(l)),
|
|
'without a tag base the anchor alone cannot exclude prior milestones (degrade is honest)');
|
|
assert.ok(!unbounded.some((l) => /in prose/.test(l)), 'the anchor still holds without a tag');
|
|
});
|
|
});
|
|
|
|
// ─── #4379: the RED pathspec is language-agnostic, and matches at root ──────
|
|
//
|
|
// The pathspec IS this gate's definition of "a test file". It was JS/TS-only, so
|
|
// a commit adding `foo_test.go` was invisible and every behaviour-adding task in
|
|
// a Go project halted with `TDD GATE TRIPPED: missing RED commit` — while
|
|
// references/tdd.md:175-177 advertises `go test ./...` as supported.
|
|
//
|
|
// These rows drive the REAL pathspec, extracted from the shipped workflow, against
|
|
// a real git repo. Re-typing the pattern into the test would only assert that two
|
|
// copies of a string agree; running it answers the question the gate actually asks.
|
|
describe('#4379 — the TDD RED pathspec is language-agnostic', () => {
|
|
// Pull the pathspec out of the workflow rather than restating it: the thing
|
|
// under test is what SHIPS, not a copy maintained alongside it.
|
|
function shippedRedPathspec() {
|
|
const w = fs.readFileSync(WORKFLOW, 'utf8');
|
|
const line = w.split(/\r?\n/).find((l) => l.includes('RED_COMMIT=$(git log'));
|
|
assert.ok(line, 'the RED_COMMIT line must exist in execute-phase.md');
|
|
const tail = line.slice(line.indexOf('-- ') + 3, line.lastIndexOf('| head -1)'));
|
|
const specs = (tail.match(/"[^"]{1,200}"/g) || []).map((s) => s.slice(1, -1));
|
|
assert.ok(specs.length > 0, `expected quoted pathspecs, parsed none from: ${tail}`);
|
|
return specs;
|
|
}
|
|
|
|
// One seeded repo, one commit, reused by every row below.
|
|
function seedRepo(t) {
|
|
const dir = createTempGitProject('gsd-4379-');
|
|
t.after(() => cleanup(dir));
|
|
const files = [
|
|
'foo_test.go', 'pkg/bar_test.go', // Go — incl. ROOT level
|
|
'root.test.js', 'src/a.test.ts', // JS/TS — incl. ROOT level
|
|
'tests/c.py', '__tests__/d.js', // directory conventions
|
|
'test_mod.py', 'mod_test.py', // Python, outside tests/
|
|
'lib_spec.rb', 'x_test.exs', // Ruby, Elixir
|
|
'src/impl.go', 'src/lib.rs', // NOT tests — must never match
|
|
];
|
|
for (const rel of files) {
|
|
const abs = path.join(dir, rel);
|
|
fs.mkdirSync(path.dirname(abs), { recursive: true });
|
|
fs.writeFileSync(abs, 'x\n');
|
|
}
|
|
gitOrThrow(['add', '-A'], { cwd: dir });
|
|
gitOrThrow(['commit', '-m', 'test(1-01): seed every convention'], { cwd: dir });
|
|
return dir;
|
|
}
|
|
|
|
function matched(dir, specs) {
|
|
const out = gitOrThrow(['log', '--format=', '--name-only', '--', ...specs], { cwd: dir });
|
|
return new Set(out.split(/\r?\n/).map((l) => l.trim()).filter(Boolean));
|
|
}
|
|
|
|
test('every convention tdd.md advertises is visible to the RED detector', (t) => {
|
|
const dir = seedRepo(t);
|
|
const hits = matched(dir, shippedRedPathspec());
|
|
for (const rel of [
|
|
'foo_test.go', 'pkg/bar_test.go',
|
|
'test_mod.py', 'mod_test.py',
|
|
'lib_spec.rb', 'x_test.exs',
|
|
]) {
|
|
assert.ok(hits.has(rel), `${rel} must satisfy the RED detector (#4379); matched: ${[...hits].sort().join(', ')}`);
|
|
}
|
|
});
|
|
|
|
test('a ROOT-level test file is not invisible', (t) => {
|
|
// The pre-#4379 pathspec was `**/`-prefixed, and `**/` does not match a path
|
|
// with no directory component — so a root `foo.test.js` was missed even in
|
|
// the language the gate did support. This is the half the issue did not report.
|
|
const dir = seedRepo(t);
|
|
const hits = matched(dir, shippedRedPathspec());
|
|
assert.ok(hits.has('root.test.js'), 'a root-level .test.js must match');
|
|
assert.ok(hits.has('foo_test.go'), 'a root-level _test.go must match');
|
|
});
|
|
|
|
test('the existing JS/TS conventions still match (no regression)', (t) => {
|
|
const dir = seedRepo(t);
|
|
const hits = matched(dir, shippedRedPathspec());
|
|
for (const rel of ['src/a.test.ts', 'tests/c.py', '__tests__/d.js']) {
|
|
assert.ok(hits.has(rel), `${rel} must still match after widening`);
|
|
}
|
|
});
|
|
|
|
test('implementation files never match — the gate must still be able to trip', (t) => {
|
|
// A pathspec broad enough to catch ordinary source would make the gate pass on
|
|
// ANY in-scope commit, which is worse than the bug being fixed.
|
|
//
|
|
// `src/lib.rs` carries the Rust consequence: `#[test]` conventionally lives
|
|
// INSIDE the implementation file, so a Rust RED commit touches only source and
|
|
// no path-based gate can see it. That gap is a direct consequence of this row
|
|
// holding — the two cannot both be satisfied — which is why it is documented in
|
|
// references/tdd.md rather than "fixed" by widening the pathspec.
|
|
const dir = seedRepo(t);
|
|
const hits = matched(dir, shippedRedPathspec());
|
|
for (const rel of ['src/impl.go', 'src/lib.rs']) {
|
|
assert.ok(!hits.has(rel), `${rel} must NOT be treated as a test file`);
|
|
}
|
|
});
|
|
});
|