fix(execute): the merge lock refuses a review of an older commit (review-stale)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
6c0718c8d8
commit
050a77f513
SSH key fingerprint:
SHA256:JakMjO6FTBBzN0Bhfj9saOoEjaFxlSdYuZQQpM/lF9Q
4 changed files with 157 additions and 16 deletions
|
|
@ -17,13 +17,14 @@
|
|||
|
||||
import { test } from 'node:test';
|
||||
import { strict as assert } from 'node:assert';
|
||||
import { copyFileSync, existsSync, mkdtempSync, readFileSync, readdirSync, rmSync } from 'node:fs';
|
||||
import { copyFileSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs';
|
||||
import { tmpdir } from 'node:os';
|
||||
import { dirname, join, resolve, sep } from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { spawnSync } from 'node:child_process';
|
||||
import { findSection } from '../../lib/parsers/plan-schema.mjs';
|
||||
import { readFrontmatterFields } from '../../lib/skills/skill-frontmatter.mjs';
|
||||
import { childEnv } from '../helpers/child-env.mjs';
|
||||
|
||||
const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..', '..');
|
||||
|
||||
|
|
@ -869,3 +870,131 @@ test('arch: lib/ never imports from scripts/, and the scan reports a planted imp
|
|||
const bad = files.flatMap((f) => importsIntoScripts(f, readFileSync(f, 'utf8')).map((s) => `${f.slice(ROOT.length + 1)}: ${s}`));
|
||||
assert.deepEqual(bad, [], 'lib/ imports from scripts/');
|
||||
});
|
||||
|
||||
// --- R6 ----------------------------------------------------------------------------
|
||||
// The merge lock (Phase 7.2 step 4 and the Phase 8 Main-merge gate) runs the
|
||||
// verdict gate with `--repo .`, so a review of an older commit than the one
|
||||
// being merged is refused (`review-stale`), and only the closing run's own
|
||||
// review opens the merge.
|
||||
|
||||
const MERGE_GATE = '### Main-merge gate (MAIN_MERGE_GATE — always pauses)';
|
||||
const PHASE_72 = '## Phase 7.2 — Simplify, review, verdict (P11)';
|
||||
const LOCK_LINE = 'node ${CLAUDE_PLUGIN_ROOT}/lib/review/verdict-gate.mjs --json "{review_path}" --repo .';
|
||||
const STEP4_LINE = 'node ${CLAUDE_PLUGIN_ROOT}/lib/review/verdict-gate.mjs --json "{project_dir}/review.md" --repo .';
|
||||
|
||||
/** A review_version 1.1 review.md of `sha`: ALLOW with no findings, or BLOCK over one BLOCKER. */
|
||||
function r6Review(verdict, sha) {
|
||||
const id = 'd'.repeat(40);
|
||||
const findings = verdict === 'BLOCK'
|
||||
? [{ id, severity: 'BLOCKER', rule_key: 'MISSING_TEST', file: 'a.mjs', line: 1, title: 't', detail: 'd', recommended_action: 'Add a test.' }]
|
||||
: [];
|
||||
const counts = { BLOCKER: findings.length, MAJOR: 0, MINOR: 0, SUGGESTION: 0 };
|
||||
const block = JSON.stringify({ verdict, counts, allow_blocked_by: [], findings }, null, 2);
|
||||
return [
|
||||
'---', 'type: trekreview', 'review_version: "1.1"', 'task: "t"', 'slug: s',
|
||||
'project_dir: .claude/projects/2026-10-23-s/', 'brief_path: .claude/projects/2026-10-23-s/brief.md',
|
||||
`scope_sha_end: ${sha}`, 'reviewed_files_count: 1', `verdict: ${verdict}`,
|
||||
findings.length ? `findings:\n - ${id}` : 'findings: []', '---', '', '# Review: t', '',
|
||||
'## Executive Summary', '', 'x', '', '## Coverage', '', '| File | Treatment | Reason |', '|---|---|---|',
|
||||
'| a.mjs | summary-only | default |', '', '## Remediation Summary', '', 'x', '', '```json', block, '```', '',
|
||||
].join('\n');
|
||||
}
|
||||
|
||||
/**
|
||||
* A throwaway repo (no git hooks): the reviewed commit, then a later commit
|
||||
* that changes source. `review(verdict, sha)` writes review.md outside the
|
||||
* repo and returns its folder.
|
||||
*/
|
||||
function staleRepo() {
|
||||
const base = mkdtempSync(join(tmpdir(), 'fix-round-r6-'));
|
||||
const repo = join(base, 'repo');
|
||||
const out = join(base, 'project');
|
||||
mkdirSync(repo);
|
||||
mkdirSync(out);
|
||||
mkdirSync(join(base, 'hooks-none'));
|
||||
const g = (...args) => {
|
||||
const r = spawnSync('git', args, { cwd: repo, encoding: 'utf8', env: childEnv() });
|
||||
assert.equal(r.status, 0, `git ${args.join(' ')}: ${r.stderr}`);
|
||||
return r.stdout.trim();
|
||||
};
|
||||
g('init', '-q', '-b', 'main');
|
||||
g('config', 'user.name', 'Test');
|
||||
g('config', 'user.email', 'test@example.invalid');
|
||||
g('config', 'commit.gpgsign', 'false');
|
||||
g('config', 'core.hooksPath', join(base, 'hooks-none'));
|
||||
writeFileSync(join(repo, 'a.mjs'), 'export const a = 1;\n');
|
||||
g('add', 'a.mjs');
|
||||
g('commit', '-q', '-m', 'feat: the reviewed work');
|
||||
const reviewed = g('rev-parse', 'HEAD');
|
||||
writeFileSync(join(repo, 'a.mjs'), 'export const a = 2;\n');
|
||||
g('add', 'a.mjs');
|
||||
g('commit', '-q', '-m', 'feat: a later source change');
|
||||
const head = g('rev-parse', 'HEAD');
|
||||
const review = (verdict, sha) => {
|
||||
writeFileSync(join(out, 'review.md'), r6Review(verdict, sha));
|
||||
return out;
|
||||
};
|
||||
return { repo, reviewed, head, review, cleanup: () => rmSync(base, { recursive: true, force: true }) };
|
||||
}
|
||||
|
||||
/** The lock line with its review path filled in, run in `repo` through bash(). */
|
||||
function runLock(cmd, dir, repo) {
|
||||
const filled = cmd.split('{review_path}').join(join(dir, 'review.md')).split('{project_dir}').join(dir);
|
||||
return bash(filled, repo);
|
||||
}
|
||||
|
||||
test('[R6] the Main-merge gate and Phase 7.2 step 4 each hold exactly one verdict-gate.mjs line, with --repo .', () => {
|
||||
const text = read(EXEC);
|
||||
assert.equal(line(section(text, MERGE_GATE), 'review/verdict-gate.mjs'), LOCK_LINE,
|
||||
'the Phase 8 lock does not run the verdict gate against the repo being merged');
|
||||
assert.equal(line(section(text, PHASE_72), 'review/verdict-gate.mjs'), STEP4_LINE,
|
||||
'Phase 7.2 step 4 does not run the verdict gate against the repo being merged');
|
||||
});
|
||||
|
||||
test('[R6] the extracted lock lines, run on an ALLOW review of an older commit with a later source commit, exit 2 with review-stale', () => {
|
||||
const text = read(EXEC);
|
||||
const lines = [line(section(text, MERGE_GATE), 'review/verdict-gate.mjs'), line(section(text, PHASE_72), 'review/verdict-gate.mjs')];
|
||||
const fx = staleRepo();
|
||||
try {
|
||||
for (const cmd of lines) {
|
||||
const ok = runLock(cmd, fx.review('ALLOW', fx.head), fx.repo);
|
||||
assert.equal(ok.status, 0, `control: an ALLOW review of HEAD opens the lock: ${ok.stdout}${ok.stderr}`);
|
||||
const r = runLock(cmd, fx.review('ALLOW', fx.reviewed), fx.repo);
|
||||
assert.equal(r.status, 2, `${cmd}: an ALLOW review of an older commit must exit 2: ${r.stdout}${r.stderr}`);
|
||||
const reason = JSON.parse(r.stdout).reason;
|
||||
assert.ok(reason.startsWith('review-stale'), `the reason must start review-stale: ${reason}`);
|
||||
}
|
||||
} finally { fx.cleanup(); }
|
||||
});
|
||||
|
||||
test('[R6] both decline lists name review-stale, the exit table says to re-run /trekreview on this commit, and --resume runs the same gate', () => {
|
||||
const gate = flat(section(read(EXEC), MERGE_GATE));
|
||||
const closed = gate.match(/\*\*Closed:\*\* emit `main-merge-declined` with the reason ([^.]*)\./);
|
||||
assert.ok(closed, 'the gate no longer says which reasons a closed lock emits');
|
||||
assert.ok(closed[1].includes('`review-stale`'), `the closed-lock reasons do not name review-stale: ${closed[1]}`);
|
||||
const literal = gate.match(/The reason is one of the literal words above \(([^)]*)\)/);
|
||||
assert.ok(literal, 'the gate no longer lists the literal decline reasons');
|
||||
assert.ok(literal[1].includes('`review-stale`'), `the literal decline reasons do not name review-stale: ${literal[1]}`);
|
||||
assert.match(gate, /a reason that starts `review-stale`[^.]*decline reason `review-stale`[^.]*re-run \/trekreview on this commit/,
|
||||
'the exit table does not map a review-stale reason to the decline reason and its "re-run /trekreview on this commit" line');
|
||||
assert.match(gate, /`--resume re-enters at the gate`[^.]*runs the same gate[^.]*review of an older commit stays refused/,
|
||||
'the --resume paragraph does not say the re-read runs the same gate');
|
||||
});
|
||||
|
||||
test('keep: Phase 7.2 step 4 run on a BLOCK review of an older commit still exits 1, so the fix loop opens', () => {
|
||||
const step4 = line(section(read(EXEC), PHASE_72), 'review/verdict-gate.mjs');
|
||||
const fx = staleRepo();
|
||||
try {
|
||||
const r = runLock(step4, fx.review('BLOCK', fx.reviewed), fx.repo);
|
||||
assert.equal(r.status, 1, `a BLOCK review must exit 1 before any staleness check: ${r.stdout}${r.stderr}`);
|
||||
assert.equal(JSON.parse(r.stdout).verdict, 'BLOCK');
|
||||
} finally { fx.cleanup(); }
|
||||
});
|
||||
|
||||
test('keep: the other verdict-gate callers carry no --repo', () => {
|
||||
for (const rel of ['commands/trekreview.md', 'agents/review-orchestrator.md', 'README.md', 'docs/release-runbook.md', 'tests/e2e-files-trial4.sh']) {
|
||||
const hits = read(rel).split('\n').filter((l) => /^\s*(?:out="\$\()?node \S*lib\/review\/verdict-gate\.mjs\b/.test(l));
|
||||
assert.ok(hits.length > 0, `${rel} no longer runs verdict-gate.mjs; the check would be empty`);
|
||||
for (const h of hits) assert.ok(!h.includes('--repo'), `${rel} gained --repo: ${h.trim()}`);
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue