mirror of
https://github.com/garrytan/gstack.git
synced 2026-10-31 22:14:25 +01:00
* feat(test-free): --files-from runs exactly the listed planned files Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * feat(pregate): declare scripts/ubicloud/pregate-remote.sh as gstack's remote gate (keyed Ubicloud VM, keyless local shards) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * perf(next-version): fetch PR VERSIONs concurrently; a timed-out fetch is an unknown claim Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(pregate): gstack remote-gate example and the small-machine pregate row Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(pregate): remote gate leaves paid test files to the paid gate, adds reason codes and the keyless backend line Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(next-version): unknown claims make the pick provisional (complete: false) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(pregate): remote-gate reason codes, paid-file handling and measured keyed/keyless timing Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(pregate): remote gate finishes before pregate's deadline pregate kills the remote gate at --timeout with a 5 s grace, which could cut a VM teardown short. pregate-remote.sh now reads the enclosing deadline (PREGATE_TIMEOUT_S, else the gstack-pregate --timeout it runs under, else 600), reserves 120 s for teardown plus 15 s margin, and tells the VM to stop at the earlier of that point and the cap's wall; a deadline that leaves under 300 s refuses before any VM (PREGATE_REMOTE_TIMEOUT_TOO_SHORT). It names the VM up front and prints the exact ubi-runner.sh down line, and the body is one braced block so an edit to the script mid-run cannot change what the run executes (keyed run 5 died after teardown with '$2: unbound variable' for that reason). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(restamp): an incomplete claim queue is never reported as read gstack-next-version now returns complete: false with unknown_claims when a PR's VERSION fetch timed out or failed. restamp's claim-at-open path took any usable JSON as 'read'; it now says 'incomplete', names the unknown PRs and calls the version provisional, the same warn-not-refuse stance as the existing 'unverified' fallback. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(pregate): only a gstack-pregate process sets the remote gate's deadline The ancestor walk matched any command line that mentioned gstack-pregate, so a shell line running pregate beside the tests (bash -c '...; bin/gstack-pregate ...') gave the stub gate a 600 s deadline. It now matches only a process whose program, or the script its interpreter runs, is gstack-pregate. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(changelog): A3 remote gate, --files-from, concurrent next-version Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * v1.91.132.0 chore: stamp Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --------- Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
411 lines
27 KiB
TypeScript
411 lines
27 KiB
TypeScript
/**
|
|
* C2/C3 queue replay (plan Validation 3): three PRs on a fixture repo with a
|
|
* `release:restamp` script, a CHANGELOG, `since:` fields and `vX` mentions;
|
|
* the queue is reordered twice with zero manual edits. Pins the stamp text,
|
|
* CHANGELOG order, the journal, injected failures after every stage,
|
|
* idempotency, dry-run, gate-ahead on a squash-history PR, the PREDECESSOR
|
|
* MOVED refusal, QUEUE_STALE for a moved base and a moved order, and the
|
|
* version-source shapes (package-manifest pin, monorepo pin, absent source).
|
|
*/
|
|
import { afterEach, describe, expect, test } from 'bun:test';
|
|
import * as fs from 'node:fs';
|
|
import * as path from 'node:path';
|
|
import { EXIT } from '../lib/headless-artifacts';
|
|
import { checkChangelog, mergeChangelogs, normalizeChangelog, reheadChangelog } from '../lib/changelog-check';
|
|
import { rewriteStamps, tentativeMentions } from '../lib/restamp';
|
|
import {
|
|
BASE_POLICY, cleanup, ghShim, makeFixtureRepo, makePr, mergeToMain, readFile, recordAndBundle, restamp, runBin, type FixtureRepo, mergeMain } from './helpers/restamp-fixture';
|
|
|
|
const repos: FixtureRepo[] = [];
|
|
const fixture = (opts?: Parameters<typeof makeFixtureRepo>[0]) => { const r = makeFixtureRepo(opts); repos.push(r); return r; };
|
|
afterEach(() => { while (repos.length) cleanup(repos.pop()!); });
|
|
|
|
const topHeading = (repo: FixtureRepo) => readFile(repo, 'CHANGELOG.md').split('\n').find(l => l.startsWith('## '));
|
|
const headings = (repo: FixtureRepo) => readFile(repo, 'CHANGELOG.md').split('\n').filter(l => l.startsWith('## ')).map(l => /\[([^\]]+)\]/.exec(l)![1]);
|
|
const stages = (out: string) => Object.fromEntries([...out.matchAll(/^stage (\w+): (\w+)/gm)].map(m => [m[1], m[2]]));
|
|
|
|
describe('pure pieces', () => {
|
|
test('rewriteStamps: exact (was X) / since: X / vX only; a bare dependency pin equal to X stays', () => {
|
|
const r = rewriteStamps('since: 1.2.3.0, v1.2.3.0, (was 1.2.3.0), pinned 1.2.3.0, v1.2.3.01, av1.2.3.0, since:1.2.3.0', '1.2.3.0', '1.2.4.0');
|
|
expect(r.text).toBe('since: 1.2.4.0, v1.2.4.0, (was 1.2.4.0), pinned 1.2.3.0, v1.2.3.01, av1.2.3.0, since:1.2.4.0');
|
|
expect(r.count).toBe(4);
|
|
});
|
|
|
|
test('tentativeMentions: only lines the branch added, newer than the fork version, matching width, not the allocated one', () => {
|
|
const added = new Map([['docs/a.md', new Set(['since: 1.2.4.0 v1.2.3.0 (was 1.2.2.0) v1.2.9.0 since: 1.2.4 v2.0.0.0', 'pinned 1.2.5.0'])]]);
|
|
expect(tentativeMentions(added, '1.2.3.0', '1.2.9.0').sort()).toEqual(['1.2.4.0', '2.0.0.0']);
|
|
expect(tentativeMentions(added, '1.2.6.0', '1.2.7.0').sort()).toEqual(['1.2.9.0', '2.0.0.0']);
|
|
expect(tentativeMentions(new Map([['x', new Set(['since: 1.2.4'])]]), '1.2.3', '1.2.5')).toEqual(['1.2.4']);
|
|
expect(tentativeMentions(new Map(), '1.2.3.0', '1.2.4.0')).toEqual([]);
|
|
});
|
|
|
|
test('CHANGELOG: re-heading moves [Unreleased] to the top; duplicates and a top mismatch are errors; a heading move normalizes equal', () => {
|
|
const text = '# Changelog\n\n## [1.2.3.0] - 2026-10-01\n\n- base\n\n## [Unreleased]\n\n- mine\n';
|
|
const r = reheadChangelog(text, { from: '1.2.4.0', to: '1.2.5.0', date: '2026-10-10' });
|
|
expect(r.moved).toBe(true);
|
|
expect(r.text).toBe('# Changelog\n\n## [1.2.5.0] - 2026-10-10\n\n- mine\n\n## [1.2.3.0] - 2026-10-01\n\n- base\n');
|
|
expect(checkChangelog(r.text, '1.2.5.0')).toEqual([]);
|
|
expect(checkChangelog(r.text, '1.2.6.0').map(e => e.code)).toEqual(['CHANGELOG_TOP_MISMATCH']);
|
|
expect(checkChangelog(r.text + '\n## [1.2.3.0] - 2026-10-02\n\n- dup\n', '1.2.5.0').map(e => e.code)).toEqual(['CHANGELOG_DUPLICATE_HEADING']);
|
|
expect(reheadChangelog(r.text, { from: '1.2.5.0', to: '1.2.5.0', date: 'x' }).moved).toBe(false);
|
|
expect(reheadChangelog('# Changelog\n\n## [1.2.3.0] - d\n\n- base\n', { from: '9.9.9.9', to: '1.2.5.0', date: 'x' }).error?.code).toBe('CHANGELOG_SECTION_MISSING');
|
|
expect(normalizeChangelog(r.text)).toBe(normalizeChangelog(text.replace('[Unreleased]', '[1.2.9.0] - 2026-10-11')));
|
|
expect(normalizeChangelog(r.text)).not.toBe(normalizeChangelog(r.text.replace('- mine', '- mine edited')));
|
|
const merged = mergeChangelogs('# Changelog\n\n## [Unreleased]\n\n- b\n\n## [1.2.3.0] - d\n\n- base\n', '# Changelog\n\n## [1.2.4.0] - d\n\n- a\n\n## [1.2.3.0] - d\n\n- base\n');
|
|
expect(merged).toBe('# Changelog\n\n## [Unreleased]\n\n- b\n\n## [1.2.4.0] - d\n\n- a\n\n## [1.2.3.0] - d\n\n- base\n');
|
|
expect(mergeChangelogs('# C\n\n## [Unreleased]\n\n- b\n', '# C\n\n## [Unreleased]\n\n- a\n')).toBeNull();
|
|
});
|
|
});
|
|
|
|
describe('three PRs, reordered twice, zero manual edits', () => {
|
|
test('stamp-at-merge: each PR stamps from main at its turn; since:/vX text, CHANGELOG order and journals follow', () => {
|
|
const repo = fixture();
|
|
makePr(repo, 'pr-a', { expects: '1.2.4.0' });
|
|
makePr(repo, 'pr-b', { expects: '1.2.4.0' });
|
|
makePr(repo, 'pr-c', { expects: '1.2.4.0' });
|
|
|
|
// A is next.
|
|
repo.git('checkout', '-q', 'pr-a');
|
|
const a = restamp(repo, ['--next', '--pr', '1']);
|
|
expect(a.status).toBe(EXIT.ok);
|
|
expect(a.out).toContain('ship, next in queue at 1.2.4.0');
|
|
expect(a.out).toContain('claims: ignored (stamp-at-merge)');
|
|
expect(a.out).toMatch(/^next: NEW_VERSION=1\.2\.4\.0; .*CHANGELOG entry text only.*expected head [0-9a-f]{40}/m);
|
|
expect(stages(a.out)).toMatchObject({ version: 'done', release_tool: 'done', changelog: 'done', stamp_paths: 'skipped', apply: 'done' });
|
|
expect(readFile(repo, 'VERSION')).toBe('1.2.4.0\n');
|
|
expect(readFile(repo, 'generated/digest.md')).toBe('# digest v1.2.4.0\nbody\n');
|
|
expect(topHeading(repo)).toMatch(/^## \[1\.2\.4\.0\] - \d{4}-\d{2}-\d{2}$/);
|
|
expect(JSON.parse(readFile(repo, 'package.json')).version).toBe('1.2.4');
|
|
expect(JSON.parse(readFile(repo, 'package-lock.json')).packages[''].version).toBe('1.2.4');
|
|
const journal = JSON.parse(readFile(repo, '.gstack/tmp/restamp-journal.json'));
|
|
expect(journal.status).toBe('complete');
|
|
expect(journal.inputs).toMatchObject({ old_version: '1.2.3.0', new_version: '1.2.4.0', queue_mode: 'stamp-at-merge' });
|
|
expect(journal.stages.map((s: any) => s.name)).toEqual(['version', 'release_tool', 'changelog', 'stamp_paths', 'mirror', 'apply']);
|
|
expect(journal.stages.at(-1).writes.every((w: any) => w.applied && w.post_sha256)).toBe(true);
|
|
// Idempotent.
|
|
const again = restamp(repo, ['--next', '--pr', '1']);
|
|
expect(again.out).toMatch(/^RESTAMP: 1\.2\.4\.0 -> 1\.2\.4\.0 \(noop;/m);
|
|
expect(again.out).toContain('FILES: (none)');
|
|
repo.git('commit', '-qam', 'stamp a');
|
|
mergeToMain(repo, 'pr-a');
|
|
|
|
// Reorder 1: C jumps ahead of B. C wrote docs for 1.2.4.0; main is 1.2.4.0 now, so 1.2.4.0 is released and its docs mention must move to 1.2.5.0.
|
|
repo.git('checkout', '-q', 'pr-c');
|
|
mergeMain(repo);
|
|
const c = restamp(repo, ['--next', '--pr', '3']);
|
|
expect(c.status).toBe(EXIT.ok);
|
|
expect(c.out).toContain('STAMP_VERSION: 1.2.5.0');
|
|
expect(stages(c.out).stamp_paths).toBe('done');
|
|
expect(readFile(repo, 'docs/pr-c.md')).toBe('since: 1.2.5.0\nRequires v1.2.5.0 or later.\n');
|
|
expect(readFile(repo, 'docs/notes.md')).toBe('Previous release v1.2.3.0.\nleft-pad pinned at 1.2.3 (was 1.2.2)\n');
|
|
expect(headings(repo).slice(0, 3)).toEqual(['1.2.5.0', '1.2.4.0', '1.2.3.0']);
|
|
repo.git('commit', '-qam', 'stamp c');
|
|
mergeToMain(repo, 'pr-c');
|
|
|
|
// Reorder 2: B was once "next"; it is last now and goes 1.2.6.0.
|
|
repo.git('checkout', '-q', 'pr-b');
|
|
mergeMain(repo);
|
|
const b = restamp(repo, ['--next', '--pr', '2']);
|
|
expect(b.status).toBe(EXIT.ok);
|
|
expect(b.out).toContain('ship, next in queue at 1.2.6.0');
|
|
expect(readFile(repo, 'docs/pr-b.md')).toBe('since: 1.2.6.0\nRequires v1.2.6.0 or later.\n');
|
|
expect(headings(repo).slice(0, 4)).toEqual(['1.2.6.0', '1.2.5.0', '1.2.4.0', '1.2.3.0']);
|
|
// A later tentative stamp on the branch itself is rewritten exactly, and the re-stamp is a pure stamp for the receipt.
|
|
repo.git('commit', '-qam', 'stamp b');
|
|
const gated = repo.git('rev-parse', 'HEAD');
|
|
const b2 = restamp(repo, ['--version', '1.2.7.0', '--pr', '2']);
|
|
expect(b2.status).toBe(EXIT.ok);
|
|
expect(stages(b2.out).stamp_paths).toBe('done');
|
|
expect(b2.out).toContain('(1.2.6.0 -> 1.2.7.0)');
|
|
expect(readFile(repo, 'docs/pr-b.md')).toBe('since: 1.2.7.0\nRequires v1.2.7.0 or later.\n');
|
|
expect(headings(repo)[0]).toBe('1.2.7.0');
|
|
repo.git('commit', '-qam', 'restamp b');
|
|
const receipt = runBin(repo, 'gstack-tree-receipt', ['--gated', gated, '--base', 'main', '--json']);
|
|
const parsed = JSON.parse(receipt.out);
|
|
expect(parsed.tree).toBe('same-modulo-stamps');
|
|
expect(parsed.files.map((f: any) => `${f.path}:${f.verdict}:${f.rule}`).sort()).toEqual([
|
|
'CHANGELOG.md:stamp:changelog-heading', 'VERSION:stamp:version-file', 'docs/pr-b.md:stamp:stamp_paths', 'generated/digest.md:stamp:release_outputs',
|
|
'package-lock.json:stamp:lockfile-root-version', 'package.json:stamp:manifest-version',
|
|
]);
|
|
expect(parsed.gate_reuse).toBe('not-eligible');
|
|
expect(parsed.gate_reuse_reason).toContain('no evidence bundle');
|
|
expect(receipt.out).not.toContain('TREE:');
|
|
// A real edit after the gate is a change.
|
|
fs.appendFileSync(path.join(repo.work, 'pr-b.txt'), 'more\n');
|
|
repo.git('commit', '-qam', 'edit');
|
|
const changed = runBin(repo, 'gstack-tree-receipt', ['--gated', gated, '--base', 'main']);
|
|
expect(changed.status).toBe(EXIT.fail);
|
|
expect(changed.out).toMatch(/^TREE: changed \(pr-b\.txt\)$/m);
|
|
expect(changed.out).toMatch(/^gate-reuse: not-eligible \(tree changed: pr-b\.txt\) — fix: .* \(GATE_REUSE_NOT_ELIGIBLE\)$/m);
|
|
});
|
|
|
|
test('--dry-run prints the full diff and writes nothing; --was overrides the mention source', () => {
|
|
const repo = fixture();
|
|
makePr(repo, 'pr-a', { expects: '1.9.0.0' });
|
|
const r = restamp(repo, ['--next', '--dry-run', '--was', '1.9.0.0']);
|
|
expect(r.status).toBe(EXIT.ok);
|
|
expect(r.out).toMatch(/^-since: 1\.9\.0\.0$/m);
|
|
expect(r.out).toMatch(/^\+since: 1\.2\.4\.0$/m);
|
|
expect(r.out).toMatch(/^-## \[Unreleased\]$/m);
|
|
expect(repo.git('status', '--porcelain')).toBe('');
|
|
expect(fs.existsSync(path.join(repo.work, '.gstack', 'tmp', 'restamp-journal.json'))).toBe(false);
|
|
});
|
|
|
|
test('legacy claim-at-open: --next reads the claim queue (unverified falls back to arithmetic) and says so', () => {
|
|
const repo = fixture({ policy: { ...BASE_POLICY, queue_mode: 'claim-at-open' } });
|
|
makePr(repo, 'pr-a');
|
|
const r = restamp(repo, ['--next', '--dry-run']);
|
|
expect(r.status).toBe(EXIT.ok);
|
|
expect(r.out).toContain('queue_mode=claim-at-open');
|
|
expect(r.out).toMatch(/^claims: (read \(claim-at-open|unverified \(claim-at-open)/m);
|
|
expect(r.out).not.toContain('ship, next in queue at');
|
|
const forced = restamp(repo, ['--next', '--dry-run', '--queue-mode', 'stamp-at-merge']);
|
|
expect(forced.out).toContain('claims: ignored (stamp-at-merge)');
|
|
});
|
|
|
|
test('claim-at-open with an unknown claim says incomplete, names the PR and never says read', () => {
|
|
const repo = fixture({ policy: { ...BASE_POLICY, queue_mode: 'claim-at-open' }, prefix: 'gstack-restamp-github.com-' });
|
|
makePr(repo, 'pr-a');
|
|
const shim = path.join(repo.root, 'gh-unknown-claim');
|
|
fs.mkdirSync(shim);
|
|
const list = JSON.stringify([41, 42].map(n => ({ number: n, headRefName: `pr-${n}`, headRepositoryOwner: { login: 'o' }, url: `https://github.com/o/r/pull/${n}`, isDraft: false })));
|
|
fs.writeFileSync(path.join(shim, 'gh'), [
|
|
'#!/bin/sh',
|
|
'case "$*" in',
|
|
` "pr list --state open --base main --limit 200 --json number,headRefName,headRepositoryOwner,url,isDraft") printf '%s\\n' '${list}'; exit 0 ;;`,
|
|
" \"repo view --json owner -q .owner.login\") echo o; exit 0 ;;",
|
|
` "api repos/{owner}/{repo}/contents/VERSION?ref=pr-41 -q .content") echo '${Buffer.from('1.2.5.0\n').toString('base64')}'; exit 0 ;;`,
|
|
" \"api repos/{owner}/{repo}/contents/VERSION?ref=pr-42 -q .content\") echo 'gh: Server Error (HTTP 502)' >&2; exit 1 ;;",
|
|
'esac',
|
|
'exit 2',
|
|
'',
|
|
].join('\n'), { mode: 0o755 });
|
|
const r = restamp(repo, ['--next', '--dry-run'], { PATH: `${shim}:${process.env.PATH ?? ''}` });
|
|
expect(r.status, r.err).toBe(EXIT.ok);
|
|
expect(r.out).toContain('STAMP_VERSION: 1.2.6.0');
|
|
expect(r.out).toContain('claims: incomplete (claim-at-open; the VERSION claims of PR #42 are unknown, so 1.2.6.0 is provisional and may collide; rerun, then ask the coordinator before stamping; queue [');
|
|
expect(r.out).not.toMatch(/^claims: read/m);
|
|
});
|
|
});
|
|
|
|
describe('journal and injected failures', () => {
|
|
for (const stage of ['version', 'release_tool', 'changelog', 'stamp_paths']) {
|
|
test(`a failure after the ${stage} stage leaves the branch untouched and the staging worktree removed`, () => {
|
|
const repo = fixture();
|
|
makePr(repo, 'pr-a', { expects: '1.2.4.0' });
|
|
const before = repo.git('status', '--porcelain');
|
|
const r = restamp(repo, ['--version', '1.2.5.0'], { GSTACK_RESTAMP_FAIL_AFTER: stage });
|
|
expect(r.status).toBe(EXIT.fail);
|
|
expect(r.err).toMatch(new RegExp(`injected failure after ${stage}.*\\(RESTAMP_CONFLICT\\)`));
|
|
expect(r.out).toMatch(/GSTACK_RESULT: skill=restamp status=incomplete/);
|
|
expect(repo.git('status', '--porcelain')).toBe(before);
|
|
expect(readFile(repo, 'VERSION')).toBe('1.2.3.0\n');
|
|
expect(repo.git('worktree', 'list').split('\n')).toHaveLength(1);
|
|
});
|
|
}
|
|
|
|
test('a failure mid-apply rolls back the applied writes, records it, and a rerun completes the stamp', () => {
|
|
const repo = fixture();
|
|
makePr(repo, 'pr-a', { expects: '1.2.4.0' });
|
|
const r = restamp(repo, ['--version', '1.2.5.0'], { GSTACK_RESTAMP_FAIL_AFTER: 'apply:2' });
|
|
expect(r.status).toBe(EXIT.fail);
|
|
expect(r.err).toMatch(/injected failure after apply:2; rolled back 2 write\(s\).*\(RESTAMP_CONFLICT\)/);
|
|
expect(repo.git('status', '--porcelain')).toBe('');
|
|
const journal = JSON.parse(readFile(repo, '.gstack/tmp/restamp-journal.json'));
|
|
expect(journal.status).toBe('rolled_back');
|
|
expect(journal.stages.at(-1).writes.filter((w: any) => w.applied)).toHaveLength(0);
|
|
const again = restamp(repo, ['--version', '1.2.5.0']);
|
|
expect(again.status).toBe(EXIT.ok);
|
|
expect(readFile(repo, 'VERSION')).toBe('1.2.5.0\n');
|
|
expect(readFile(repo, 'docs/pr-a.md')).toContain('since: 1.2.5.0');
|
|
expect(JSON.parse(readFile(repo, '.gstack/tmp/restamp-journal.json')).status).toBe('complete');
|
|
});
|
|
|
|
test('an edit to a stamp file while the restamp stages is RESTAMP_CONFLICT: the preimage check refuses and nothing is applied', async () => {
|
|
const repo = fixture({ policy: { ...BASE_POLICY, release_tool: 'node gen.js && while [ ! -f "$GSTACK_TEST_GO" ]; do sleep 0.05; done' } });
|
|
makePr(repo, 'pr-a', { expects: '1.2.4.0' });
|
|
const go = path.join(repo.root, 'go');
|
|
const { spawn } = await import('node:child_process');
|
|
const child = spawn(path.join(path.resolve(import.meta.dir, '..'), 'bin', 'gstack-restamp'), ['--base', 'main', '--allow-repo-commands', '--version', '1.2.5.0'], { cwd: repo.work, env: { ...process.env, ...repo.env, GSTACK_TEST_GO: go }, stdio: ['ignore', 'pipe', 'pipe'] });
|
|
let out = ''; let err = '';
|
|
child.stdout.on('data', (d) => { out += d; });
|
|
child.stderr.on('data', (d) => { err += d; });
|
|
const deadline = Date.now() + 20_000;
|
|
while (!fs.existsSync(path.join(repo.work, 'generated', 'digest.md')) || repo.git('worktree', 'list').split('\n').length < 2) {
|
|
if (Date.now() > deadline) throw new Error('staging worktree never appeared');
|
|
await new Promise(r => setTimeout(r, 50));
|
|
}
|
|
fs.appendFileSync(path.join(repo.work, 'docs', 'pr-a.md'), 'edited meanwhile\n');
|
|
fs.writeFileSync(go, '1');
|
|
const code = await new Promise<number | null>((resolve) => child.on('close', resolve));
|
|
expect(code).toBe(EXIT.fail);
|
|
expect(err).toMatch(/docs\/pr-a\.md changed in the working tree while the restamp staged.*\(RESTAMP_CONFLICT\)/);
|
|
expect(out).toMatch(/status=incomplete/);
|
|
expect(readFile(repo, 'VERSION')).toBe('1.2.3.0\n');
|
|
expect(readFile(repo, 'docs/pr-a.md')).toContain('edited meanwhile');
|
|
expect(repo.git('worktree', 'list').split('\n')).toHaveLength(1);
|
|
}, 30_000);
|
|
});
|
|
|
|
describe('gate-ahead (--after), predecessor movement and queue staleness', () => {
|
|
test('a squash-history PR gates ahead of its predecessor: the branch is untouched, the synthetic tree carries N+1 above the predecessor entry, and the record binds the evidence branch key', () => {
|
|
const repo = fixture();
|
|
const aHead = makePr(repo, 'pr-a', { expects: '1.2.4.0' });
|
|
repo.git('checkout', '-q', 'pr-a');
|
|
expect(restamp(repo, ['--next', '--pr', '1']).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'stamp a');
|
|
const aStamped = repo.git('rev-parse', 'HEAD');
|
|
const bHead = makePr(repo, 'pr-b', { expects: '1.2.4.0' });
|
|
expect(repo.git('rev-list', '--count', 'origin/main..HEAD')).toBe('1');
|
|
const r = restamp(repo, ['--after', '1', '--predecessor-ref', 'pr-a', '--pr', '2']);
|
|
expect(r.status).toBe(EXIT.ok);
|
|
expect(r.out).toContain('STAMP_VERSION: 1.2.5.0');
|
|
expect(r.out).toContain('claims: ignored (gate-ahead relative to predecessor)');
|
|
expect(r.out).toMatch(/^next: run the verification gate in .*gate-ahead-worktree, then `gstack-evidence bundle --out <file>` there/m);
|
|
expect(r.out).toMatch(/^GATE_AHEAD: head=[0-9a-f]{40} tree=[0-9a-f]{40} predecessor=#1@[0-9a-f]{12} worktree=.* evidence_branch=pr-b$/m);
|
|
expect(repo.git('rev-parse', 'HEAD')).toBe(bHead);
|
|
expect(repo.git('status', '--porcelain')).toBe('');
|
|
expect(repo.git('rev-list', '--count', 'origin/main..HEAD')).toBe('1');
|
|
const rec = JSON.parse(readFile(repo, '.gstack/tmp/gate-ahead.json'));
|
|
expect(rec).toMatchObject({ schema_version: 1, pr: '2', predecessor_pr: '1', predecessor_head: aStamped, branch_head: bHead, version: '1.2.5.0', evidence_branch_key: 'pr-b' });
|
|
expect(rec.gated_head).not.toBe(bHead);
|
|
const show = (rel: string) => runBin(repo, 'gstack-restamp', ['--help'], {}, repo.work) && repo.git('show', `${rec.gated_head}:${rel}`);
|
|
expect(show('VERSION')).toBe('1.2.5.0');
|
|
expect(show('docs/pr-b.md')).toBe('since: 1.2.5.0\nRequires v1.2.5.0 or later.');
|
|
expect(show('CHANGELOG.md').split('\n').filter(l => l.startsWith('## ')).slice(0, 2).join('|')).toMatch(/^## \[1\.2\.5\.0\] - .*\|## \[1\.2\.4\.0\] - /);
|
|
expect(aHead).not.toBe(aStamped);
|
|
|
|
// The gate runs in the worktree and exports a bundle; after the real merge + restamp the receipt is eligible except for stamp-sensitive lanes.
|
|
const bundle = path.join(repo.root, 'bundle.json');
|
|
recordAndBundle(repo, rec.worktree, [{ label: 'tests', command: 'true' }, { label: 'digest', command: 'cat generated/digest.md' }], bundle);
|
|
mergeToMain(repo, 'pr-a');
|
|
repo.git('checkout', '-q', 'pr-b');
|
|
mergeMain(repo);
|
|
expect(restamp(repo, ['--next', '--pr', '2']).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'stamp b');
|
|
const receipt = runBin(repo, 'gstack-tree-receipt', ['--from', path.join(repo.work, '.gstack/tmp/gate-ahead.json'), '--predecessor-ref', 'pr-a', '--bundle', bundle, '--base', 'main']);
|
|
expect(receipt.status).toBe(EXIT.ok);
|
|
expect(receipt.out).toMatch(/^TREE: same-modulo-stamps$/m);
|
|
expect(receipt.out).toMatch(/^gate-reuse: eligible \(reusable: tests; rerun: digest\)$/m);
|
|
expect(receipt.out).toMatch(/^ gate digest: rerun \(stamp-sensitive/m);
|
|
const json = JSON.parse(runBin(repo, 'gstack-tree-receipt', ['--from', path.join(repo.work, '.gstack/tmp/gate-ahead.json'), '--predecessor-ref', 'pr-a', '--bundle', bundle, '--base', 'main', '--json']).out);
|
|
expect(json.gated_tree).toBe(json.current_tree);
|
|
expect(json.predecessor).toMatchObject({ pr: '1', recorded_head: aStamped, current_head: aStamped, moved: false });
|
|
|
|
// PREDECESSOR MOVED: the predecessor PR gains a commit after the gate.
|
|
repo.git('checkout', '-q', 'pr-a');
|
|
fs.appendFileSync(path.join(repo.work, 'pr-a.txt'), 'late\n');
|
|
repo.git('commit', '-qam', 'late fix');
|
|
repo.git('checkout', '-q', 'pr-b');
|
|
const moved = runBin(repo, 'gstack-tree-receipt', ['--from', path.join(repo.work, '.gstack/tmp/gate-ahead.json'), '--predecessor-ref', 'pr-a', '--bundle', bundle, '--base', 'main']);
|
|
expect(moved.status).toBe(EXIT.fail);
|
|
expect(moved.out).toMatch(/^PREDECESSOR MOVED [0-9a-f]{40} -> [0-9a-f]{40} — fix: gstack-restamp --after 1 again \(RESTAMP_PREDECESSOR_MOVED\)$/m);
|
|
expect(moved.out).toMatch(/^gate-reuse: not-eligible \(PREDECESSOR MOVED/m);
|
|
const viaGh = runBin(repo, 'gstack-tree-receipt', ['--from', path.join(repo.work, '.gstack/tmp/gate-ahead.json'), '--predecessor-pr', '1', '--bundle', bundle, '--base', 'main', '--json'], ghShim(repo, { '1': { headRefOid: repo.git('rev-parse', 'pr-a') } }));
|
|
expect(JSON.parse(viaGh.out).predecessor.moved).toBe(true);
|
|
expect(JSON.parse(viaGh.out).code).toBe('RESTAMP_PREDECESSOR_MOVED');
|
|
});
|
|
|
|
test('a gate-ahead merge that conflicts outside the stamp files is RESTAMP_MERGE_CONFLICT with nothing written', () => {
|
|
const repo = fixture();
|
|
makePr(repo, 'pr-a', { file: 'shared.txt' });
|
|
makePr(repo, 'pr-b', { file: 'shared.txt' });
|
|
const r = restamp(repo, ['--after', '1', '--predecessor-ref', 'pr-a', '--pr', '2']);
|
|
expect(r.status).toBe(EXIT.refused);
|
|
expect(r.err).toMatch(/conflicts in .*shared\.txt; nothing written.*\(RESTAMP_MERGE_CONFLICT\)/);
|
|
expect(fs.existsSync(path.join(repo.work, '.gstack', 'tmp', 'gate-ahead.json'))).toBe(false);
|
|
expect(repo.git('worktree', 'list').split('\n')).toHaveLength(1);
|
|
});
|
|
|
|
test('two coordinators: --expect-base catches a base that moved between validation and merge (QUEUE_STALE, recompute command, nothing written)', () => {
|
|
const repo = fixture();
|
|
makePr(repo, 'pr-a');
|
|
makePr(repo, 'pr-b');
|
|
const assumed = repo.git('rev-parse', 'origin/main');
|
|
repo.git('checkout', '-q', 'pr-a');
|
|
expect(restamp(repo, ['--next', '--pr', '1', '--expect-base', assumed.slice(0, 12)]).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'stamp a');
|
|
mergeToMain(repo, 'pr-a');
|
|
repo.git('checkout', '-q', 'pr-b');
|
|
const r = restamp(repo, ['--next', '--pr', '2', '--expect-base', assumed.slice(0, 12), '--json']);
|
|
expect(r.status).toBe(EXIT.refused);
|
|
const j = JSON.parse(r.out);
|
|
expect(j).toMatchObject({ status: 'refused', code: 'QUEUE_STALE', expected: { base: assumed.slice(0, 12) } });
|
|
expect(j.actual.base).toBe(repo.git('rev-parse', 'origin/main'));
|
|
expect(j.recompute).toMatch(/^gstack-restamp --next --base main --expect-base [0-9a-f]{12}$/);
|
|
expect(repo.git('status', '--porcelain')).toBe('');
|
|
const text = restamp(repo, ['--next', '--pr', '2', '--expect-base', assumed.slice(0, 12)]);
|
|
expect(text.err).toMatch(/base moved.*\(QUEUE_STALE\)\nrecompute: gstack-restamp --next/);
|
|
expect(text.out).toMatch(/status=refused/);
|
|
const ok = restamp(repo, ['--next', '--pr', '2', '--expect-base', repo.git('rev-parse', 'origin/main')]);
|
|
expect(ok.status).toBe(EXIT.ok);
|
|
expect(ok.out).toMatch(/^MERGE_CONDITION: sha=[0-9a-f]{40}$/m);
|
|
});
|
|
|
|
test('--expect-order: an unmerged predecessor or a merged successor is QUEUE_STALE; the assumed order is re-validated through gh', () => {
|
|
const repo = fixture();
|
|
makePr(repo, 'pr-a');
|
|
makePr(repo, 'pr-b');
|
|
repo.git('checkout', '-q', 'pr-a');
|
|
expect(restamp(repo, ['--next', '--pr', '1']).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'stamp a');
|
|
const aMerge = mergeToMain(repo, 'pr-a');
|
|
repo.git('checkout', '-q', 'pr-b');
|
|
const merged = { state: 'MERGED', mergeCommit: { oid: aMerge }, headRefOid: repo.git('rev-parse', 'pr-a') };
|
|
const open = { state: 'OPEN', mergeCommit: null, headRefOid: 'x' };
|
|
const good = restamp(repo, ['--next', '--pr', '2', '--expect-order', '1,2,3', '--dry-run'], ghShim(repo, { '1': merged, '3': open }));
|
|
expect(good.status).toBe(EXIT.ok);
|
|
const stale = restamp(repo, ['--next', '--pr', '2', '--expect-order', '1,2,3', '--json'], ghShim(repo, { '1': merged, '3': merged }));
|
|
expect(stale.status).toBe(EXIT.refused);
|
|
expect(JSON.parse(stale.out)).toMatchObject({ code: 'QUEUE_STALE', actual: { prs: { '1': 'merged', '3': 'merged' } } });
|
|
expect(JSON.parse(stale.out).recompute).toContain('--expect-order 1,2,3');
|
|
const unmerged = restamp(repo, ['--next', '--pr', '2', '--expect-order', '1,4,2', '--json'], ghShim(repo, { '1': merged, '4': open }));
|
|
expect(JSON.parse(unmerged.out)).toMatchObject({ code: 'QUEUE_STALE', actual: { prs: { '4': 'open' } } });
|
|
});
|
|
});
|
|
|
|
describe('version-source shapes', () => {
|
|
test('a package.json pin (3-digit) stamps the manifest and lockfile only and bumps patch', () => {
|
|
const repo = fixture({ policy: { ...BASE_POLICY, release_tool: null, release_outputs: [] } });
|
|
fs.rmSync(path.join(repo.work, 'VERSION'));
|
|
fs.writeFileSync(path.join(repo.work, '.gstack', 'version-path'), 'package.json\n');
|
|
fs.writeFileSync(path.join(repo.work, 'docs', 'notes.md'), 'since: 1.2.4\n');
|
|
repo.git('add', '-A'); repo.git('commit', '-q', '-m', 'pin manifest'); repo.git('push', '-q', 'origin', 'main');
|
|
makePr(repo, 'pr-a');
|
|
const r = restamp(repo, ['--next']);
|
|
expect(r.status).toBe(EXIT.ok);
|
|
expect(r.out).toContain('STAMP_VERSION: 1.2.4');
|
|
expect(JSON.parse(readFile(repo, 'package.json')).version).toBe('1.2.4');
|
|
expect(JSON.parse(readFile(repo, 'package-lock.json')).version).toBe('1.2.4');
|
|
expect(fs.existsSync(path.join(repo.work, 'VERSION'))).toBe(false);
|
|
expect(readFile(repo, 'docs/notes.md')).toBe('since: 1.2.4\n');
|
|
const again = restamp(repo, ['--version', '1.2.5']);
|
|
expect(again.out).toContain('(1.2.4 -> 1.2.5)');
|
|
expect(readFile(repo, 'docs/notes.md')).toBe('since: 1.2.5\n');
|
|
});
|
|
|
|
test('a monorepo with a pinned frontend/package.json stamps that manifest, not the root', () => {
|
|
const repo = fixture({ policy: { ...BASE_POLICY, release_tool: null, release_outputs: [] } });
|
|
fs.mkdirSync(path.join(repo.work, 'frontend'));
|
|
fs.writeFileSync(path.join(repo.work, 'frontend', 'package.json'), JSON.stringify({ name: 'web', version: '1.2.3' }, null, 2) + '\n');
|
|
fs.writeFileSync(path.join(repo.work, '.gstack', 'version-path'), 'frontend/package.json\n');
|
|
repo.git('add', '-A'); repo.git('commit', '-q', '-m', 'monorepo'); repo.git('push', '-q', 'origin', 'main');
|
|
makePr(repo, 'pr-a');
|
|
const r = restamp(repo, ['--next']);
|
|
expect(r.status).toBe(EXIT.ok);
|
|
expect(JSON.parse(readFile(repo, 'frontend/package.json')).version).toBe('1.2.4');
|
|
expect(JSON.parse(readFile(repo, 'package.json')).version).toBe('1.2.3');
|
|
expect(r.out).toMatch(/^FILES: CHANGELOG\.md frontend\/package\.json$/m);
|
|
});
|
|
|
|
test('an absent version source is RESTAMP_VERSION_SOURCE (exit 3), never an invented 0.0.0.0', () => {
|
|
const repo = fixture({ policy: { ...BASE_POLICY, release_tool: null, release_outputs: [] } });
|
|
repo.git('rm', '-q', 'VERSION'); repo.git('commit', '-q', '-m', 'no version'); repo.git('push', '-q', 'origin', 'main');
|
|
makePr(repo, 'pr-a');
|
|
const r = restamp(repo, ['--next']);
|
|
expect(r.status).toBe(EXIT.refused);
|
|
expect(r.err).toMatch(/VERSION does not exist at [0-9a-f]{40}; nothing written.*\(RESTAMP_VERSION_SOURCE\)/);
|
|
expect(fs.existsSync(path.join(repo.work, 'VERSION'))).toBe(false);
|
|
});
|
|
});
|