* fix(#4619): execute-phase computes decimal/N-segment phase numbers without breaking shell arithmetic $((10#${PHASE_NUMBER})) is a hard bash/zsh syntax error when PHASE_NUMBER is decimal (01.1, from an inserted phase) or N-segment (23.1.2) — neither is valid shell-arithmetic syntax at all, and the failed expansion aborts the rest of the snippet in a non-interactive shell. safe_resume_gate runs unconditionally before trusting STATE.md or dispatching any executor, so execute-phase failed at its own gate before the first executor on any decimal phase, regardless of workflow.tdd_mode. Regression from #4194. Fixes all 4 sites: safe_resume_gate and the TDD gate in workflows/execute-phase.md, the completion-signal spot-check fallback in workflows/execute-phase/steps/completion-reconciliation.md, and the executor gate validation example in references/tdd.md. Each now zero-strips only the leading integer segment into a *_INT variable (via %%.* / # parameter expansion — always valid shell syntax regardless of what follows) and keeps the remainder as an escaped-dot string for the anchored commit- scope regex, exactly as issue #4619 verified in both bash and zsh. A plain integer phase (12, 01) computes byte-identically to before. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * test(#4619): pin the decimal/N-segment fix and characterize the pre-fix bug Behavioral coverage via real bash execution: the old $((10#01.1)) form throws (characterizes the bug, matching the issue's own reproduction); the new form resolves 01.1 -> 1\.1 and 23.1.2 -> 23\.1\.2, unchanged for plain integers (12 -> 12, 01 -> 1); the resulting anchored ERE matches feat(01.1-03):/test(1.1-3): and correctly rejects feat(01-03):, feat(01.2-03):, feat(011-03):, feat(12-03): for a decimal phase — mirroring issue #4619's own verified table exactly. Updates safe-resume-gate-anchoring.test.cjs's 4 existing source-text assertions (one per site) to the new fixed text. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * chore(#4634): refine the shell-arith drift detector to distinguish safe from unsafe arithmetic With #4619's fix in place, the guard's original "ban $((10#... outright, match any occurrence" was too blunt: it flagged a comment merely mentioning the pattern in prose, the now-safe $((10#$PHASE_INT)) arithmetic on an already-%%.*-stripped integer, and the always-safe plan-id arithmetic (plan ids are plain integers, never decimal). Refines the detector to skip full-line comments and to only flag a captured variable/placeholder name that contains "phase" and does NOT end in _INT/_int — the naming convention the #4619 fix establishes at all four sites for "already reduced to a safe integer." A plan-id variable was never phase-number arithmetic in the first place and is excluded on the same basis. This closes epic #4634's D6 ("lint-phase-id-drift... passes with no new exemptions") and D7 ("a decimal and N-segment phase id survive an end-to-end execute-phase selection without error") for real — the guard now reports zero violations across all five .cts/.md rules. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * chore: regenerate conformance-tier manifests for the new test file Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * test(#4619): cover the plain-padded-integer near-miss matrix too Review found the anchored-ERE near-miss coverage only exercised the decimal case (PHASE_NUMBER=01.1); issue #4619's own worked table also verifies the plain padded-integer case (01 -> PHASE_N=1) against its own near-miss set (matches 01-03, rejects 01.1-03/011-03/12-03). Adds the missing assertion. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * docs(#4619): add Fixed changeset Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix(#4619): correct JS backslash-escaping in safe-resume-gate anchoring test The test's string-literal assertions for the PHASE_FRAC//./\\.} pattern wrote only 2 backslash characters in JS source, which single-quoted-string parsing collapses to 1 real backslash at runtime -- but the workflow/reference files actually contain 2 raw backslash bytes at that position (needed so bash's ${var//pattern/replacement} produces the correct single-backslash output). Write 4 backslash characters in the JS source at all 4 occurrences so the runtime string matches the files' real bytes. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * chore(#4619): refresh the committed compact-content benchmark baseline The new PHASE_INT/PHASE_FRAC arithmetic lines added to gsd-core/workflows/execute-phase.md shifted its committed compaction-ratio baseline. Regenerate via `node scripts/benchmark-compact-content.cjs --write`. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * docs(#4619): note the safe_resume_gate arithmetic growth in the test header The emitted-attribution gate flags execute-phase.md growing 91253 -> 91846 bytes (593 bytes). The growth is the fix: the safe_resume_gate and TDD RED block now derive PHASE_INT/PHASE_FRAC before computing PHASE_N, so a decimal/N-segment phase number (e.g. 01.1, 2.3.1) zero-strips its leading integer segment via base-10 arithmetic instead of forcing the whole value through $((10#...)) and hitting a hard shell syntax error on the first dot. A blank line previously separated the Emitted-Drift-Ack-Growth trailer from the Co-Authored-By trailer below it, which splits git's trailer-block detection: only the last contiguous non-blank run of Key: Value lines at the end of a commit message is recognized as trailers, so the growth ack was silently read as ordinary body text and the differential-attribution gate failed with the growth unacknowledged. Joining the two trailers into one contiguous block fixes it. Emitted-Drift-Ack-Growth: execute-phase.md — adds PHASE_INT/PHASE_FRAC derivation to the safe_resume_gate and TDD RED commit-scope grep so a decimal/N-segment phase number zero-strips its leading integer segment via base-10 arithmetic instead of failing on a non-numeric value (#4619) Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * test(#4208): replace chmod-based restore-failure injection with a root-proof git shim `tests/commit-files-deletion.test.cjs`'s two restore-failure tests simulated an unwritable index via a `post-index-change` hook running `chmod a-w` on the git dir. That relies on the OS enforcing the *owner's own* permission bits against itself, which uid 0 (a routine identity inside this repo's Docker-based gsd-test benches) does not: every DAC check short-circuits true for root, so the write the chmod meant to block silently succeeds, the restore comes back clean, and the disclosure/rollback behavior under test never actually gets exercised. This is CLAUDE.md's own named anti-pattern for I/O-failure injection ("Cross-platform test IO-failure injection" — chmod tricks fail under root Docker/CI). It is confirmed as the actual root cause here, not a production defect: `src/commands.cts`'s `restoreRemovedEntries`/rollback-disclosure logic (added by #4253, merged just before this run) was hand-traced and manually reproduced end to end on an unprivileged workstation against a freshly built `gsd-core/bin/lib/commands.cjs`, and it already produces exactly the `staging_failed` + "could not be restored" / "could NOT be restored during rollback" results both tests assert. The other `post-index-change`-based tests in this file (a `sleep` to force a timeout; a real `update-index` to flip a restored entry's mode) are unaffected because neither depends on a permission check — consistent with only the two chmod-based tests failing on the real remote run. Replaces the chmod fixture with a fake `git` placed ahead of the real one on PATH that fails only `update-index --add --cacheinfo` — the one call the restore makes — unconditionally, regardless of privilege level. Every other git invocation execs straight through to the real binary, so the rest of each scenario (`rm --cached`, the restore's own `ls-files` verification, etc.) is exercised exactly as before. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * chore(#4619): backfill changeset pr number to 4644 Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix(#4619): feed the bash fixture script via stdin, not argv, to fix Windows CI Passing the script as a `-c "<script>"` argv element made it subject to Windows' CreateProcess command-line argument encoding, which silently dropped the escaped-dot backslashes before bash ever saw them (observed on PR #4644's windows-latest CI shard: `1\.1` came back as `1.1`). Feeding the same script via stdin instead removes argv entirely from the transport, so there is nothing for Windows to re-encode. POSIX behavior is unchanged. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> --------- Co-authored-by: sim <sim@local> Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
163 lines
7.6 KiB
JavaScript
163 lines
7.6 KiB
JavaScript
'use strict';
|
|
|
|
/**
|
|
* #4619 — execute-phase's `$((10#{phase_number}))` shell arithmetic is a hard
|
|
* syntax error when `{phase_number}` is decimal (inserted phase, e.g. `01.1`) or
|
|
* N-segment (e.g. `23.1.2`): `$((10#01.1))` aborts the whole script in a
|
|
* non-interactive shell, both in bash and zsh. The fix zero-strips only the
|
|
* LEADING integer segment via parameter expansion and keeps the remainder as an
|
|
* escaped-dot string for the downstream anchored ERE — never touching real
|
|
* shell arithmetic on a non-integer value.
|
|
*
|
|
* These tests are BEHAVIORAL: they execute the actual fixed snippet (and, for
|
|
* the regression control, the actual OLD broken snippet) via a real bash
|
|
* subprocess, asserting on literal stdout/exit-code — not just string-matching
|
|
* the source. A companion sourcetext check (mirroring the established pattern
|
|
* in tests/safe-resume-gate-anchoring.test.cjs) proves each of the 4 real
|
|
* production sites still carries a byte-identical copy of the fixed logic
|
|
* (under each site's own variable-name spelling), so a future accidental
|
|
* revert of any ONE site is caught.
|
|
*/
|
|
|
|
const { test, describe } = require('node:test');
|
|
const assert = require('node:assert/strict');
|
|
const fs = require('node:fs');
|
|
const path = require('node:path');
|
|
const { execFileSync } = require('node:child_process');
|
|
|
|
const EXECUTE_PHASE = path.join(__dirname, '..', 'gsd-core', 'workflows', 'execute-phase.md');
|
|
const COMPLETION_RECONCILIATION = path.join(__dirname, '..', 'gsd-core', 'workflows',
|
|
'execute-phase', 'steps', 'completion-reconciliation.md');
|
|
const TDD_REF = path.join(__dirname, '..', 'gsd-core', 'references', 'tdd.md');
|
|
|
|
const TIMEOUT = 5000;
|
|
|
|
// The fixed transformation, parameterized by (source variable, target prefix) — this
|
|
// is a byte-for-byte copy of what ships at all 4 sites:
|
|
// site 1/2 (execute-phase.md): source PHASE_NUMBER, prefix PHASE
|
|
// site 3 (completion-reconciliation.md): source SPOT_PHASE_NUMBER, prefix SPOT_PHASE
|
|
// site 4 (tdd.md): source PHASE, prefix PHASE
|
|
function fixedSnippet(sourceVar, prefix, indent = '') {
|
|
return `${indent}${prefix}_INT=\${${sourceVar}%%.*}; ${prefix}_FRAC=\${${sourceVar}#"$${prefix}_INT"}\n` +
|
|
`${indent}${prefix}_N="$((10#$${prefix}_INT))\${${prefix}_FRAC//./\\\\.}"`;
|
|
}
|
|
|
|
function runFixed(phaseNumberValue) {
|
|
const script = `PHASE_NUMBER="${phaseNumberValue}"\n${fixedSnippet('PHASE_NUMBER', 'PHASE')}\necho "$PHASE_N"`;
|
|
return execFileSync('bash', [], { input: script, encoding: 'utf8', timeout: TIMEOUT }).trim();
|
|
}
|
|
|
|
describe('#4619 — execute-phase decimal/N-segment phase-number arithmetic', () => {
|
|
test('fixed snippet zero-strips the leading integer segment for a decimal phase (01.1 -> 1\\.1)', () => {
|
|
assert.equal(runFixed('01.1'), '1\\.1');
|
|
});
|
|
|
|
test('fixed snippet zero-strips the leading integer segment for an N-segment phase (23.1.2 -> 23\\.1\\.2)', () => {
|
|
assert.equal(runFixed('23.1.2'), '23\\.1\\.2');
|
|
});
|
|
|
|
test('regression control: a plain unpadded phase number is unchanged (12 -> 12)', () => {
|
|
assert.equal(runFixed('12'), '12');
|
|
});
|
|
|
|
test('regression control: a padded plain phase number is still zero-stripped (01 -> 1)', () => {
|
|
assert.equal(runFixed('01'), '1');
|
|
});
|
|
|
|
test('failing-first: the OLD $((10#...)) form is a hard shell syntax error on a decimal phase number', () => {
|
|
assert.throws(() => {
|
|
execFileSync('bash', ['-c', 'echo $((10#01.1))'], { encoding: 'utf8', timeout: TIMEOUT });
|
|
}, /syntax error|status/);
|
|
});
|
|
|
|
test('the NEW form succeeds on the exact same input that hard-errors the OLD form', () => {
|
|
assert.doesNotThrow(() => runFixed('01.1'));
|
|
});
|
|
|
|
test('the resulting anchored ERE matches decimal commit scopes and rejects near-miss scopes', () => {
|
|
const phaseN = runFixed('01.1'); // '1\.1'
|
|
const planN = '3';
|
|
const re = `^[a-z]+\\((0*${phaseN})-(0*${planN})\\):`;
|
|
const cases = [
|
|
['feat(01.1-03):', true],
|
|
['test(1.1-3):', true],
|
|
['feat(01-03):', false],
|
|
['feat(01.2-03):', false],
|
|
['feat(011-03):', false],
|
|
['feat(12-03):', false],
|
|
];
|
|
for (const [subject, expected] of cases) {
|
|
const script = `echo ${JSON.stringify(subject)} | grep -qE ${JSON.stringify(re)}`;
|
|
let matched;
|
|
try {
|
|
execFileSync('bash', [], { input: script, encoding: 'utf8', timeout: TIMEOUT });
|
|
matched = true;
|
|
} catch {
|
|
matched = false;
|
|
}
|
|
assert.equal(matched, expected, `expected ${subject} match=${expected} against ${re}`);
|
|
}
|
|
});
|
|
|
|
test('the resulting anchored ERE matches a plain padded-integer phase and rejects near-miss scopes', () => {
|
|
const phaseN = runFixed('01'); // '1'
|
|
const planN = '3';
|
|
const re = `^[a-z]+\\((0*${phaseN})-(0*${planN})\\):`;
|
|
const cases = [
|
|
['feat(01-03):', true],
|
|
['feat(01.1-03):', false],
|
|
['feat(011-03):', false],
|
|
['feat(12-03):', false],
|
|
];
|
|
for (const [subject, expected] of cases) {
|
|
const script = `echo ${JSON.stringify(subject)} | grep -qE ${JSON.stringify(re)}`;
|
|
let matched;
|
|
try {
|
|
execFileSync('bash', [], { input: script, encoding: 'utf8', timeout: TIMEOUT });
|
|
matched = true;
|
|
} catch {
|
|
matched = false;
|
|
}
|
|
assert.equal(matched, expected, `expected ${subject} match=${expected} against ${re}`);
|
|
}
|
|
});
|
|
|
|
describe('source parity — each of the 4 production sites carries the fixed logic', () => {
|
|
test('execute-phase.md safe_resume_gate carries the fixed PHASE_NUMBER/PHASE_INT/PHASE_FRAC/PHASE_N logic', () => {
|
|
const w = fs.readFileSync(EXECUTE_PHASE, 'utf8');
|
|
assert.ok(w.includes(fixedSnippet('PHASE_NUMBER', 'PHASE')),
|
|
'safe_resume_gate must carry the byte-identical fixed decimal-tolerant snippet');
|
|
});
|
|
|
|
test('execute-phase.md TDD gate carries the fixed PHASE_NUMBER/PHASE_INT/PHASE_FRAC/PHASE_N logic', () => {
|
|
const w = fs.readFileSync(EXECUTE_PHASE, 'utf8');
|
|
// The TDD gate block is nested one level deeper (4-space indent) than
|
|
// safe_resume_gate's top-level snippet.
|
|
assert.ok(w.includes(fixedSnippet('PHASE_NUMBER', 'PHASE', ' ')),
|
|
'the TDD gate must carry the byte-identical fixed decimal-tolerant snippet (indented)');
|
|
});
|
|
|
|
test('completion-reconciliation.md carries the fixed SPOT_-prefixed logic', () => {
|
|
const frag = fs.readFileSync(COMPLETION_RECONCILIATION, 'utf8');
|
|
assert.ok(frag.includes(fixedSnippet('SPOT_PHASE_NUMBER', 'SPOT_PHASE')),
|
|
'completion-reconciliation spot-check must carry the byte-identical fixed SPOT_-prefixed snippet');
|
|
});
|
|
|
|
test('tdd.md carries the fixed bare PHASE/PLAN logic', () => {
|
|
const ref = fs.readFileSync(TDD_REF, 'utf8');
|
|
assert.ok(ref.includes(fixedSnippet('PHASE', 'PHASE')),
|
|
'tdd.md gate-enforcement example must carry the byte-identical fixed bare-PHASE snippet');
|
|
});
|
|
|
|
test('none of the 4 sites still contains the old unconditional $((10#...)) form on a template/variable phase number', () => {
|
|
const w = fs.readFileSync(EXECUTE_PHASE, 'utf8');
|
|
const frag = fs.readFileSync(COMPLETION_RECONCILIATION, 'utf8');
|
|
const ref = fs.readFileSync(TDD_REF, 'utf8');
|
|
assert.ok(!w.includes('PHASE_N=$((10#{phase_number}))'), 'old broken form must not remain in execute-phase.md (site 1)');
|
|
assert.ok(!w.includes('PHASE_N=$((10#${PHASE_NUMBER}))'), 'old broken form must not remain in execute-phase.md (site 2)');
|
|
assert.ok(!frag.includes('SPOT_PHASE_N=$((10#{phase_number}))'), 'old broken form must not remain in completion-reconciliation.md (site 3)');
|
|
assert.ok(!ref.includes('PHASE_N=$((10#${PHASE}))'), 'old broken form must not remain in tdd.md (site 4)');
|
|
});
|
|
});
|
|
});
|