fix(#4730): decode entity-escaped ampersands before verify-command-paths segment splitting (#4755)

* fix(#4730): decode entity-escaped ampersands before verify-command-paths segment splitting

Planners emit <automated> bodies with the chain operator entity-escaped
(`&amp;&amp;`), and the executing agent reads the decoded (rendered) form.
The grounding probe split the raw text on &&/||/;/newline without decoding
first, so `&amp;&amp;` was cut at its semicolons and a cd-form target
absorbed the trailing `&amp` fragment — an existing directory was reported
missing_dir (blocker), feeding false blockers into the revision loop.

Decode `&amp;` → `&` inside resolveVerifyCommandTarget, after
result.command captures the text verbatim and before any segment splitting
or target resolution, so the escaped and literal forms of the same command
produce identical verdicts. Module-private helper beside splitSegments,
mirroring the sibling src/verify.cts decodeEntityAmps (#3611); the two
gates are separate modules and neither imports the other.

Regression coverage pins escaped/literal verdict parity for: existing dir
+ manifest (ok), missing dir (missing_dir blocker kept), dir without
manifest (no_manifest blocker kept), --prefix form, a literal & inside a
quoted dir name, and a full probePhaseVerifyCommands pass whose reported
command field stays verbatim.

* docs(#4730): use the documented pr:0 placeholder in the changeset fragment

The fragment carried pr: 4730 — the ISSUE number, the exact guess-shape
DEFECT.CHANGESET-PR-FIELD-DRIFT (#3316, #3325) exists to catch: it parses
as a positive integer so local lint passed, but on a real PR run the
drift check would fail it against the actual PR number. CONTRIBUTING.md
documents pr: 0 as the deliberate unresolved placeholder used during
initial commit before the PR number exists (scripts/changeset/new.cjs
accepts 0 for exactly this reason); the gate's fail_invalid_fragment on
an unbackfilled 0 is the designed backfill enforcement, not a defect.

No production or test changes. Backfill pr: with the real PR number
once the PR is created.

* docs(#4730): backfill changeset pr field with the real PR number

pr: 0 → pr: 4755 (the PR carrying this fix), completing the
documented placeholder workflow; the changeset gate's content
validation can now pass.

---------

Co-authored-by: TwistedRiCen <16397953+TwistedRiCen@users.noreply.github.com>
Co-authored-by: Tom Boucher <trekkie@nomorestars.com>
This commit is contained in:
Twisted Fate
2026-09-16 12:36:10 +08:00
committed by GitHub
parent 092d9256b8
commit ecc508139a
3 changed files with 116 additions and 1 deletions

View File

@@ -308,6 +308,93 @@ describe('resolveVerifyCommandTarget — grounded forms', () => {
});
});
describe('#4730 — entity-escaped chain operators decode to the same verdict as the literal form', () => {
test('escaped && agrees with literal && when the cd target exists', () => {
const root = fixtureRoot('4730-ok');
writePackageJson(path.join(root, 'src'), { test: 'node --version' });
const esc = resolveVerifyCommandTarget('cd src &amp;&amp; npm test', { projectRoot: root });
const lit = resolveVerifyCommandTarget('cd src && npm test', { projectRoot: root });
assert.equal(esc.status, 'ok');
assert.equal(esc.status, lit.status);
assert.equal(esc.reason, lit.reason);
assert.equal(esc.severity, lit.severity);
assert.equal(esc.form, lit.form);
assert.equal(esc.target, lit.target);
assert.equal(esc.rawTarget, lit.rawTarget);
assert.equal(esc.manifest, lit.manifest);
});
test('escaped && on a missing dir keeps the literal form\u2019s missing_dir blocker', () => {
const root = fixtureRoot('4730-missing');
const esc = resolveVerifyCommandTarget('cd nope &amp;&amp; npm test', { projectRoot: root });
const lit = resolveVerifyCommandTarget('cd nope && npm test', { projectRoot: root });
assert.equal(esc.status, 'broken');
assert.equal(esc.reason, 'missing_dir');
assert.equal(esc.severity, 'blocker');
assert.equal(esc.status, lit.status);
assert.equal(esc.reason, lit.reason);
assert.equal(esc.severity, lit.severity);
assert.equal(esc.rawTarget, lit.rawTarget);
});
test('escaped && on a dir without a manifest keeps the literal form\u2019s no_manifest blocker', () => {
const root = fixtureRoot('4730-nomanifest');
fs.mkdirSync(path.join(root, 'docs-only'), { recursive: true });
const esc = resolveVerifyCommandTarget('cd docs-only &amp;&amp; npm run lint', { projectRoot: root });
const lit = resolveVerifyCommandTarget('cd docs-only && npm run lint', { projectRoot: root });
assert.equal(esc.status, 'broken');
assert.equal(esc.reason, 'no_manifest');
assert.equal(esc.severity, 'blocker');
assert.equal(esc.status, lit.status);
assert.equal(esc.reason, lit.reason);
assert.equal(esc.severity, lit.severity);
});
test('escaped && agrees with literal && for the --prefix form', () => {
const root = fixtureRoot('4730-prefix');
writePackageJson(path.join(root, 'web'), { build: 'vite build' });
const esc = resolveVerifyCommandTarget('npm --prefix ./web run build &amp;&amp; echo done', {
projectRoot: root,
});
const lit = resolveVerifyCommandTarget('npm --prefix ./web run build && echo done', {
projectRoot: root,
});
assert.equal(esc.status, 'ok');
assert.equal(esc.status, lit.status);
assert.equal(esc.form, lit.form);
assert.equal(esc.target, lit.target);
});
test('a literal & inside a quoted dir name survives the decode intact', () => {
const root = fixtureRoot('4730-litamp');
writePackageJson(path.join(root, 'a&b'), { test: 'node --version' });
const esc = resolveVerifyCommandTarget('cd "a&amp;b" &amp;&amp; npm test', { projectRoot: root });
const lit = resolveVerifyCommandTarget('cd "a&b" && npm test', { projectRoot: root });
assert.equal(esc.status, 'ok');
assert.equal(esc.status, lit.status);
assert.equal(esc.target, lit.target);
});
test('probe of a plan with an escaped <automated> block is ok and reports the command verbatim', () => {
const root = fixtureRoot('4730-probe');
writePackageJson(path.join(root, 'src'), { test: 'node --version' });
const phaseDir = path.join(root, '01-demo');
fs.mkdirSync(phaseDir, { recursive: true });
fs.writeFileSync(
path.join(phaseDir, '01-01-PLAN.md'),
'<task>\n<name>demo</name>\n<verify>\n<automated>cd src &amp;&amp; npm test</automated>\n</verify>\n</task>\n',
'utf8',
);
const r = probePhaseVerifyCommands({ phaseDir, projectRoot: root });
assert.equal(r.status, 'ok');
assert.equal(r.counts.blocker, 0);
assert.equal(r.commands.length, 1);
assert.equal(r.commands[0].command, 'cd src &amp;&amp; npm test');
assert.equal(r.commands[0].status, 'ok');
assert.equal(r.commands[0].target, path.join(root, 'src'));
});
});
describe('#2401 review Finding 1 — script check runs for --prefix form regardless of flag order', () => {
test('npm --prefix ./web run <missing-script> is script_missing/warning', () => {
const root = fixtureRoot('finding1-prefix-first-missing');