Round 6 (v6.2.0..c3641ff, WARN: 11 MAJOR, 3 MINOR; 0 BLOCKER). The round-5
fixes hold (code-correctness-reviewer); three of the new MAJOR were side
effects of running checks with no shell. Each fixed behind a test that
failed first on c3641ff.
- git checks stay in the repo too: no path that climbs out with .., starts
at / or reads <rev>:../x, and no --no-index (both reviewers).
- A trailing `# comment` on a shell-fence line is dropped: with no shell,
its words made an honest check NOT RUN, among them the first check of the
shipped example plan.
- A glob reaches `node --test` only on Node 21 and later, which expands it
itself; on an older Node it is refused with that reason (engines >=18).
- With no shell, exit 126/127 is the test program's own: red proof reads it
as a red (the control run still tells an environment fault apart), the
done line and the test lock as a failure.
- A runner that could not start (not installed) is NOT RUN in the criteria
runner and not-run (exit 2) in regression-check, as red-proof and
done-line already said; never a red suite.
- Tests-only: a backticked `Makefile` alone in its entry is a path, and red
proof confirms the plan's tests-only reading against the step's own diff
(the altitude finding: the diff is a fact, the Files: prose is not).
- release-check stops a suite that never ends (15 minutes) and reads it as
not measured (exit 2).
- The two lines this release added to pre-bash-executor.mjs are ASCII.
- MINOR: git and the other runners share one plain-word pattern.
Not in this round: MINOR f00a2eb8 (shared norm/ticked-path and isMain
helpers) and MINOR on plan-review-dedup's repeated tokenizing.
Suite 2194 (2192/0/2).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
108 lines
5.8 KiB
JavaScript
108 lines
5.8 KiB
JavaScript
// lib/verification/done-line.mjs
|
|
// The done line (P9 (4)). A step is "done" only when this script has written
|
|
// its line, and it writes the line only when the test command exits 0:
|
|
//
|
|
// DONE step <N>: `<command>` exit 0 at <HEAD sha> <ISO time>
|
|
//
|
|
// appended to the step's report file. Exit 0 = written, 1 = the command failed
|
|
// (nothing written), 2 = could not run (nothing written; never green): no
|
|
// --step, a command outside the test-runner allowlist, a command that cannot
|
|
// start (not installed) or was killed, a working tree that is not a git repo.
|
|
// With no shell, an exit 126/127 is the test program's own and a failure.
|
|
//
|
|
// `--check --step <N> --report <file> [--commit <sha>]`: exit 0 when the report
|
|
// carries a well-formed line for step N (at exactly that commit, with
|
|
// --commit), 1 when it does not. /trekexecute writes the line right after the
|
|
// step's checkpoint and checks it with --commit, so the line is bound to the
|
|
// commit the test passed on.
|
|
//
|
|
// Adapted from obra/superpowers@8ca22db (MIT, (c) 2025 Jesse Vincent),
|
|
// skills/executing-plans/scripts/task-done: the completion line is appended
|
|
// only when the test command exits 0.
|
|
|
|
import { appendFileSync, existsSync, readFileSync, realpathSync } from 'node:fs';
|
|
import { spawnSync } from 'node:child_process';
|
|
import { resolve } from 'node:path';
|
|
import { fileURLToPath } from 'node:url';
|
|
import { allowedCommand, runCommand, screenCommand } from './criteria-runner.mjs';
|
|
import { DEFAULT_TIMEOUT_MS, repoRoot } from './red-proof.mjs';
|
|
|
|
export function doneLineRe(step, commit) {
|
|
const sha = commit ? String(commit).replace(/[^0-9a-f]/g, '') : '[0-9a-f]{40}';
|
|
return new RegExp(`^DONE step ${step}: \`.+\` exit 0 at ${sha} \\d{4}-\\d{2}-\\d{2}T\\S+$`, 'm');
|
|
}
|
|
|
|
/**
|
|
* With `commit` (the step's checkpoint sha, full 40 hex), the line must name
|
|
* exactly that commit. A regex cannot tell a typed line from a written one; the
|
|
* commit binds the line to the state the test ran on (/trekexecute writes the
|
|
* line right after the checkpoint, so HEAD is the step's own commit).
|
|
*/
|
|
export function hasDoneLine(reportPath, step, commit) {
|
|
if (!existsSync(reportPath)) return false;
|
|
return doneLineRe(step, commit).test(readFileSync(reportPath, 'utf8'));
|
|
}
|
|
|
|
/** @returns {{status: 'written'|'failed'|'not-run', reason: string, line?: string, exit?: number|null}} */
|
|
export function writeDoneLine({ cwd, step, cmd, report, timeoutMs = DEFAULT_TIMEOUT_MS }) {
|
|
if (!/^\d+$/.test(String(step ?? ''))) return { status: 'not-run', reason: '--step must be a step number' };
|
|
if (!report) return { status: 'not-run', reason: '--report is required' };
|
|
// The plan's Verify command is relative to the repo root, as in red-proof.mjs.
|
|
const dir = repoRoot(resolve(cwd ?? process.cwd()));
|
|
if (!dir) return { status: 'not-run', reason: `${cwd ?? process.cwd()} is not inside a git repository` };
|
|
const allowed = allowedCommand(cmd, { cwd: dir });
|
|
if (!allowed.allowed) return { status: 'not-run', reason: `command not run: ${allowed.reason}` };
|
|
const screen = screenCommand(cmd);
|
|
if (!screen.allowed) return { status: 'not-run', reason: `command blocked: ${screen.rule}` };
|
|
const head = spawnSync('git', ['rev-parse', '--verify', '--quiet', 'HEAD'], { cwd: dir, encoding: 'utf8' });
|
|
if (head.status !== 0) return { status: 'not-run', reason: `no git HEAD in ${dir}` };
|
|
// No shell: the words the screen checked are the words that run.
|
|
const r = runCommand(cmd, { cwd: dir, timeoutMs });
|
|
if (r.error || r.status === null) {
|
|
return { status: 'not-run', reason: `the command did not run to an exit code (${r.error?.message ?? r.signal ?? `exit ${r.status}`})`, exit: r.status };
|
|
}
|
|
if (r.status !== 0) return { status: 'failed', reason: `the test command exited ${r.status}`, exit: r.status };
|
|
const line = `DONE step ${step}: \`${cmd}\` exit 0 at ${head.stdout.trim()} ${new Date().toISOString()}`;
|
|
appendFileSync(report, `${line}\n`);
|
|
return { status: 'written', reason: 'the test command exited 0', line, exit: 0 };
|
|
}
|
|
|
|
const USAGE =
|
|
'usage: done-line.mjs --step <N> --cmd "<test command>" --report <file> [--cwd <dir>] [--json]\n' +
|
|
' done-line.mjs --check --step <N> --report <file> [--commit <sha>]';
|
|
|
|
export function main(argv) {
|
|
const o = {};
|
|
let check = false;
|
|
let json = false;
|
|
for (let i = 0; i < argv.length; i++) {
|
|
const a = argv[i];
|
|
if (a === '--step' && argv[i + 1]) o.step = argv[++i];
|
|
else if (a === '--cmd' && argv[i + 1]) o.cmd = argv[++i];
|
|
else if (a === '--report' && argv[i + 1]) o.report = resolve(argv[++i]);
|
|
else if (a === '--cwd' && argv[i + 1]) o.cwd = resolve(argv[++i]);
|
|
else if (a === '--timeout' && argv[i + 1]) o.timeoutMs = Number(argv[++i]);
|
|
else if (a === '--check') check = true;
|
|
else if (a === '--commit' && argv[i + 1]) o.commit = argv[++i];
|
|
else if (a === '--json') json = true;
|
|
else { process.stderr.write(`done-line: unknown argument ${a}\n${USAGE}\n`); return 2; }
|
|
}
|
|
if (check) {
|
|
if (!/^\d+$/.test(String(o.step ?? '')) || !o.report) { process.stderr.write(`done-line: --check needs --step and --report\n${USAGE}\n`); return 2; }
|
|
const ok = hasDoneLine(o.report, o.step, o.commit);
|
|
process.stdout.write(json ? `${JSON.stringify({ step: Number(o.step), done: ok })}\n` : `step ${o.step}: ${ok ? 'DONE line present' : 'no DONE line - not done'}\n`);
|
|
return ok ? 0 : 1;
|
|
}
|
|
let r;
|
|
try { r = writeDoneLine(o); }
|
|
catch (e) { r = { status: 'not-run', reason: `done-line crashed: ${e.message}` }; }
|
|
process.stdout.write(json ? `${JSON.stringify(r)}\n` : `done line: ${r.status.toUpperCase()} - ${r.line ?? r.reason}\n`);
|
|
return r.status === 'written' ? 0 : r.status === 'failed' ? 1 : 2;
|
|
}
|
|
|
|
function isMain() {
|
|
try { return realpathSync(process.argv[1]) === realpathSync(fileURLToPath(import.meta.url)); }
|
|
catch { return false; }
|
|
}
|
|
|
|
if (process.argv[1] && isMain()) process.exitCode = main(process.argv.slice(2));
|