mirror of
https://github.com/garrytan/gstack.git
synced 2026-10-31 22:14:25 +01:00
* feat(releases): weekly tagged releases and a stable update channel for team mode (GSTA-98)
Every Monday morning .github/workflows/weekly-release.yml tags the newest green
commit on main as v<VERSION>, publishes a GitHub Release from the CHANGELOG
headlines and fast-forwards refs/heads/stable to it (scripts/release-cut.ts;
workflow_dispatch with dry_run, and ref for a hotfix). Team-mode installs
follow stable through the new update_channel key (auto: stable when
team_mode, else main) in bin/gstack-session-update, bin/gstack-update-check,
bin/gstack-upgrade and /gstack-upgrade. Per-merge stamping and the merge
train are unchanged. docs/releases.md explains it.
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* ci(weekly-release): check out the dispatched ref so a dry run exercises that branch's script
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* ci(weekly-release): a PR touching the release tooling runs the dry run against main (read-only); the cut job checks out the dispatched ref
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* fix(gstack-upgrade): no $1 in the rendered skill (Claude Code rewrites $N), trim Step 4 under the size budget, pin the new floor-check literal
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* chore: leave setup untouched (its channel note moves to README and docs/releases.md); the release workflow and script are free-only PR files
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* test: record the pr-profile free-only classification as non-behavioral (HARNESS_VERSION 6)
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* fix(releases): gate the cut on a main-backstop check run, finish half-done cuts, keep team installs on their channel
/ship review fixes (GSTA-98, PR #3429):
- The weekly release read the Main backstop gate run's conclusion, but
scripts/train-backstop.ts exits 0 when main moved past the push before it
was gated (superseded), so a never-gated tree read as green. The backstop
workflow now publishes its verdict on the commit as the `main-backstop`
check run from a code-free checks:write job (success for covered|gated,
neutral for inert|superseded|deferred, failure for frozen|failed), fed by
the new `--outputs` flag; release-cut.ts requires that check run and
free-tests to succeed and holds a commit whose check runs are still going.
- A cut that pushed the tag and stable but failed to create the release can
be finished: stable itself stays a candidate until its release exists, the
notes compare against the release tag behind it, and a dry run with nothing
green exits 0 with the skips named (the real cut still fails).
- weekly-release.yml: the cut job runs only from refs/heads/main, `ref` must
be a full 40-hex SHA, and actions:read is dropped (no workflow-runs call).
- /gstack-upgrade: the destructive fallback requires the carried UPSTREAM_REF
instead of defaulting to origin/main in a fresh shell; a team install past
the release stops with AHEAD_OF_STABLE instead of FF_REFUSED and a reset
backwards. gstack-update-channel.sh --fetch-ref keeps origin/stable on any
fetch failure other than a missing release; dead gstack_update_channel_ref
removed. gstack-update-check follows main before the first release instead
of caching CHECK_FAILED; gstack-upgrade treats a failed ls-remote as a
fetch failure, not an empty answer.
- Tests: release-cut (check-run fixture, partial cut, neutral/pending),
weekly-release-workflow (new), evals-train-workflow and train-backstop
(backstop-check job, --outputs), update-channel (no-release fallback,
offline --fetch-ref), template pins.
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* fix(releases): the upgrade skill's ahead-of-stable exit works in depth-1 clones; update-check keeps its cache identity on the pre-release fallback
/ship second-pass review of 73e278d4 (GSTA-98, PR #3429):
- gstack-upgrade/SKILL.md.tmpl: README installs are depth-1 clones, where
origin/stable never connects to HEAD, so the AHEAD_OF_STABLE shortcut now
also fires when HEAD is not behind stable and stable's VERSION is not
higher than the installed one (the order bin/gstack-upgrade uses). The
fence prints the channel helper's warnings instead of discarding them, and
a 'fetching origin/stable failed' line is a STOP. Prose trimmed to stay
under the skill size budget. New behavioral test runs the Step 4 fence on
a depth-1 install past the release (AHEAD_OF_STABLE, nothing moved) and on
one behind it (goes on to the fast-forward).
- bin/gstack-update-check: the no-stable fallback keeps #stable in the
cache identity (so the outcome replays within its TTL instead of two
ls-remote calls per skill start), triggers only when ls-remote answered
with no such branch (a failed ls-remote stays CHECK_FAILED on stable), and
the branch-pinned URL derives from REMOTE_RAW_BASE so tests stay offline.
- scripts/release-cut.ts: a cancelled check run is red; the previous-release
lookups check .ok before using git output. docs/releases.md says which
pushes get no main-backstop check run at all.
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>
226 lines
13 KiB
TypeScript
226 lines
13 KiB
TypeScript
/**
|
|
* The main backstop (scripts/train-backstop.ts, evals-main-backstop.yml; plan
|
|
* GSTA-49 T1b): inert without a train block; a train's merges are covered by
|
|
* the train's own green record (a five-PR train fires zero backstop gates); a
|
|
* merge outside the queue is gated, and a red gate writes the freeze record
|
|
* gstack-ship-queue reads. Fixture repos with a bare origin under os.tmpdir()
|
|
* and a scripted gh; no network, no API spend.
|
|
*/
|
|
import { afterAll, afterEach, beforeEach, describe, expect, test } from 'bun:test';
|
|
import { spawnSync } from 'node:child_process';
|
|
import * as fs from 'node:fs';
|
|
import * as path from 'node:path';
|
|
import { bunIsolationArgs } from '../lib/bun-isolation';
|
|
import { loadPolicyFromHead } from '../lib/ship-policy';
|
|
import { NOTES_REF, persist, repoIdentity } from '../lib/ship-queue-train-record';
|
|
import type { GhRunner } from '../scripts/recover-receipts';
|
|
import { runBackstop } from '../scripts/train-backstop';
|
|
import { gitIn, trainPrefixes, type TrainRecord } from '../scripts/train-gate';
|
|
import { E2E_TOUCHFILES } from './helpers/touchfiles-data';
|
|
import { BASE_POLICY, cleanup, makeFixtureRepo, type FixtureRepo } from './helpers/restamp-fixture';
|
|
import { TRAIN_BLOCK, TRAIN_POLICY } from './helpers/ship-queue-train-fixture';
|
|
|
|
const REPO = 'fixture/repo';
|
|
const TRAIN_NONCE = 'gate.train-' + 'a'.repeat(12) + '-' + 'b'.repeat(12) + '-abc123';
|
|
const RED_CASE = Object.keys(E2E_TOUCHFILES)[0]!;
|
|
const repos: FixtureRepo[] = [];
|
|
afterAll(() => { for (const repo of repos) cleanup(repo); });
|
|
const savedStateRoot = process.env.GSTACK_STATE_ROOT;
|
|
afterEach(() => { if (savedStateRoot === undefined) delete process.env.GSTACK_STATE_ROOT; else process.env.GSTACK_STATE_ROOT = savedStateRoot; });
|
|
|
|
interface Fixture { repo: FixtureRepo; main0: string; prs: string[]; train: string[]; record: TrainRecord }
|
|
|
|
/** Five PR branches from main and the train T1..T5 gstack-ship-queue would build from them (lib/ship-queue-train.ts buildChain). */
|
|
function trainFixture(policy: Record<string, unknown> = TRAIN_POLICY): Fixture {
|
|
const repo = makeFixtureRepo({ policy, prefix: 'train-backstop-fx-' });
|
|
repos.push(repo);
|
|
process.env.GSTACK_STATE_ROOT = path.join(repo.root, 'state');
|
|
const main0 = repo.git('rev-parse', 'HEAD');
|
|
const prs = [1, 2, 3, 4, 5].map(i => {
|
|
repo.git('checkout', '-q', '-B', `pr${i}`, main0);
|
|
fs.writeFileSync(path.join(repo.work, `pr${i}.txt`), `pr ${i}\n`);
|
|
repo.git('add', '-A');
|
|
repo.git('commit', '-q', '-m', `pr ${i}`);
|
|
return repo.git('rev-parse', 'HEAD');
|
|
});
|
|
const train: string[] = [];
|
|
let parent = main0;
|
|
prs.forEach((head, i) => {
|
|
const tree = repo.git('merge-tree', '--write-tree', parent, head);
|
|
parent = repo.git('commit-tree', tree, '-p', parent, '-p', head, '-m', `train T${i + 1}: merge #${101 + i} at ${head.slice(0, 12)}`);
|
|
train.push(parent);
|
|
});
|
|
repo.git('checkout', '-q', 'main');
|
|
const prefixes = trainPrefixes(gitIn(repo.work), parent, repo.work, loadPolicyFromHead(repo.work).policy);
|
|
if (!Array.isArray(prefixes)) throw new Error(prefixes.error);
|
|
const record: TrainRecord = { schema: 1, kind: 'train-gate', nonce: TRAIN_NONCE, head_sha: parent, tree: repo.git('rev-parse', `${parent}^{tree}`), verdict: 'GREEN',
|
|
census: { complete: true, planned: { rule: 108, judge: 24 }, executed: { rule: 108, judge: 24 }, unbound: 0, partial_shards: 0, cancelled_shards: 0, killed_before_upload: 0 },
|
|
panels: [], run: { id: 900, attempt: 1, url: 'https://example.invalid/runs/900' }, prefixes };
|
|
return { repo, main0, prs, train, record };
|
|
}
|
|
|
|
/** The coordinator's squash merge of PR i onto main, stamped at merge (VERSION, package.json, the release output). */
|
|
function squashMerge(repo: FixtureRepo, i: number, extra: Record<string, string> = {}): string {
|
|
repo.git('checkout', '-q', 'main');
|
|
const version = `1.2.${3 + i}.0`;
|
|
const files: Record<string, string> = { [`pr${i}.txt`]: `pr ${i}\n`, VERSION: version + '\n', 'generated/digest.md': `# digest v${version}\nbody\n`, ...extra };
|
|
for (const [rel, text] of Object.entries(files)) fs.writeFileSync(path.join(repo.work, rel), text);
|
|
const pkg = JSON.parse(fs.readFileSync(path.join(repo.work, 'package.json'), 'utf8'));
|
|
fs.writeFileSync(path.join(repo.work, 'package.json'), JSON.stringify({ ...pkg, version: version.split('.').slice(0, 3).join('.') }, null, 2) + '\n');
|
|
repo.git('add', '-A');
|
|
repo.git('commit', '-q', '-m', `#${100 + i} (squash, stamped ${version})`);
|
|
repo.git('push', '-q', 'origin', 'main');
|
|
return repo.git('rev-parse', 'HEAD');
|
|
}
|
|
|
|
/** gh: the train's green run, its record artifact and check run, a gate dispatch whose run concludes as scripted, and an issue. */
|
|
function fakeGh(fx: Fixture, o: { record?: TrainRecord | null; check?: string; gate?: string } = {}) {
|
|
const calls: string[][] = [];
|
|
let dispatched = '';
|
|
const ok = (body: unknown) => ({ status: 0, stdout: typeof body === 'string' ? body : JSON.stringify(body), stderr: '' });
|
|
const gh: GhRunner = (args) => {
|
|
calls.push(args);
|
|
const joined = args.join(' ');
|
|
if (args[0] === 'api' && joined.includes('/actions/workflows/evals.yml/runs') && joined.includes('status=success')) {
|
|
return ok({ workflow_runs: o.record === null ? [] : [{ id: 900, status: 'completed', conclusion: 'success', head_sha: fx.record.head_sha, display_title: `E2E Evals [eval-bg ${TRAIN_NONCE}]` }] });
|
|
}
|
|
if (args[0] === 'api' && joined.includes('/actions/workflows/evals.yml/runs')) {
|
|
return ok({ workflow_runs: dispatched ? [{ id: 901, status: 'queued', conclusion: null, head_sha: '', display_title: `E2E Evals [eval-bg ${dispatched}]`, html_url: 'https://example.invalid/runs/901' }] : [] });
|
|
}
|
|
if (args[0] === 'run' && args[1] === 'download') {
|
|
const dir = args[args.indexOf('-D') + 1]!;
|
|
const name = args[args.indexOf('-n') + 1];
|
|
fs.mkdirSync(dir, { recursive: true });
|
|
if (name === TRAIN_BLOCK.record_artifact) fs.writeFileSync(path.join(dir, 'record.json'), JSON.stringify(o.record ?? fx.record));
|
|
if (name === 'trial-outcomes-pr-a1') fs.writeFileSync(path.join(dir, 'trial-outcomes.jsonl'), JSON.stringify({ case: RED_CASE, attempt: 1, outcome: 'failed' }) + '\n');
|
|
return ok('');
|
|
}
|
|
if (args[0] === 'api' && /\/commits\/[0-9a-f]{40}\/check-runs/.test(joined)) return ok({ check_runs: [{ name: TRAIN_BLOCK.full_gate_check, conclusion: o.check ?? 'success' }] });
|
|
if (args[0] === 'workflow' && args[1] === 'run') {
|
|
dispatched = args.find(a => a.startsWith('nonce='))!.slice('nonce='.length);
|
|
return ok('');
|
|
}
|
|
if (args[0] === 'api' && /actions\/runs\/901$/.test(joined)) return ok({ id: 901, status: 'completed', conclusion: o.gate ?? 'failure', head_sha: '', html_url: 'https://example.invalid/runs/901' });
|
|
if (args[0] === 'issue' && args[1] === 'create') return ok('https://github.com/fixture/repo/issues/7\n');
|
|
return { status: 1, stdout: '', stderr: `unexpected gh ${joined}` };
|
|
};
|
|
return { gh, calls, dispatches: () => calls.filter(c => c[0] === 'workflow' && c[1] === 'run') };
|
|
}
|
|
|
|
const backstop = (fx: Fixture, sha: string, gh: GhRunner, over: Partial<Parameters<typeof runBackstop>[0]> = {}) =>
|
|
runBackstop({ repo: REPO, branch: 'main', sha, repoRoot: fx.repo.work, gh, sleep: () => {}, pollMs: 1, random: 'abc123', ...over });
|
|
|
|
function originNotes(fx: Fixture): Array<Record<string, unknown>> {
|
|
const list = fx.repo.git('--git-dir', fx.repo.origin, 'notes', `--ref=${NOTES_REF}`, 'list');
|
|
return list.split('\n').filter(Boolean).map(line => JSON.parse(fx.repo.git('--git-dir', fx.repo.origin, 'cat-file', 'blob', line.split(' ')[0]!)));
|
|
}
|
|
|
|
describe('backstop: inert without a train block', () => {
|
|
test('a push to main under a policy with no train block runs nothing and calls no gh', () => {
|
|
const fx = trainFixture(BASE_POLICY);
|
|
const { gh, calls } = fakeGh(fx);
|
|
const out = backstop(fx, squashMerge(fx.repo, 1), gh);
|
|
expect(out.action).toBe('inert');
|
|
expect(out.lines[0]).toContain('declares no train block');
|
|
expect(calls).toEqual([]);
|
|
});
|
|
|
|
// evals-main-backstop.yml reads this step output and publishes the
|
|
// main-backstop check run the weekly release gates on (scripts/release-cut.ts).
|
|
test.skipIf(process.platform === 'win32')('the CLI appends action=<action> to --outputs and exits 0 when inert', () => {
|
|
const fx = trainFixture(BASE_POLICY);
|
|
const sha = squashMerge(fx.repo, 1);
|
|
const outputs = path.join(fx.repo.root, 'outputs.txt');
|
|
const summary = path.join(fx.repo.root, 'summary.md');
|
|
const r = spawnSync(process.execPath, [...bunIsolationArgs(), 'run', path.join(import.meta.dir, '..', 'scripts', 'train-backstop.ts'), 'run', '--repo', REPO, '--branch', 'main', '--sha', sha, '--summary', summary, '--outputs', outputs],
|
|
{ cwd: fx.repo.work, encoding: 'utf8', timeout: 60_000, env: { ...process.env, GSTACK_STATE_ROOT: path.join(fx.repo.root, 'state') } });
|
|
expect(r.status, r.stdout + r.stderr).toBe(0);
|
|
expect(r.stdout).toContain('BACKSTOP: inert');
|
|
expect(fs.readFileSync(outputs, 'utf8')).toBe('action=inert\n');
|
|
expect(fs.readFileSync(summary, 'utf8')).toContain('- BACKSTOP: inert');
|
|
});
|
|
});
|
|
|
|
describe("backstop: a train's merges are covered by the train's own green record", () => {
|
|
test('a five-PR train fires zero backstop gates', () => {
|
|
const fx = trainFixture();
|
|
const { gh, dispatches } = fakeGh(fx);
|
|
for (let i = 1; i <= 5; i++) {
|
|
const out = backstop(fx, squashMerge(fx.repo, i), gh);
|
|
expect(out.action, out.lines.join('\n')).toBe('covered');
|
|
expect(out.lines.at(-1)).toContain(`is T${i} of green train ${TRAIN_NONCE} (run 900`);
|
|
}
|
|
expect(dispatches()).toEqual([]);
|
|
});
|
|
|
|
test('a superseded push hands main to the newer push without a gh call', () => {
|
|
const fx = trainFixture();
|
|
const first = squashMerge(fx.repo, 1);
|
|
squashMerge(fx.repo, 2);
|
|
const { gh, calls } = fakeGh(fx);
|
|
expect(backstop(fx, first, gh).action).toBe('superseded');
|
|
expect(calls).toEqual([]);
|
|
});
|
|
|
|
test('a record without a successful check run, or not GREEN, covers nothing: the backstop gates main', () => {
|
|
const fx = trainFixture();
|
|
const sha = squashMerge(fx.repo, 1);
|
|
for (const o of [{ check: 'failure' }, { record: { ...fx.record, verdict: 'RED' as const } }, { record: { ...fx.record, census: { ...fx.record.census, complete: false } } }]) {
|
|
const { gh, dispatches } = fakeGh(fx, { ...o, gate: 'success' });
|
|
const out = backstop(fx, sha, gh);
|
|
expect(out.action, JSON.stringify(o)).toBe('gated');
|
|
expect(dispatches()).toHaveLength(1);
|
|
expect(dispatches()[0]).toEqual(expect.arrayContaining(['evals.yml', '--ref', 'main', 'evals_all=true', `expected_sha=${sha}`]));
|
|
}
|
|
});
|
|
});
|
|
|
|
describe('backstop: a merge outside the queue', () => {
|
|
test('is gated; a red gate writes the freeze record with its red cases, inputs, run and issue; the next run on that commit defers to it', () => {
|
|
const fx = trainFixture();
|
|
squashMerge(fx.repo, 1);
|
|
const outside = squashMerge(fx.repo, 6, { 'outside.txt': 'merged outside the queue\n' });
|
|
const { gh, dispatches } = fakeGh(fx);
|
|
const out = backstop(fx, outside, gh);
|
|
expect(out.action, out.lines.join('\n')).toBe('frozen');
|
|
expect(dispatches()).toHaveLength(1);
|
|
const nonce = dispatches()[0]!.find(a => a.startsWith('nonce='))!.slice('nonce='.length);
|
|
expect(nonce).toStartWith(`gate.backstop-${outside.slice(0, 12)}-${outside.slice(0, 12)}-`);
|
|
const freeze = originNotes(fx).find(r => r.kind === 'freeze')!;
|
|
expect(freeze).toMatchObject({ schema: 1, kind: 'freeze', repo_key: repoIdentity(fx.repo.work).key, train: 'backstop', cleared_at: null,
|
|
main: { sha: outside }, backstop: { nonce, run: 901, state: 'completed/failure' }, issue: 'https://github.com/fixture/repo/issues/7',
|
|
red_cases: [{ id: RED_CASE, inputs: E2E_TOUCHFILES[RED_CASE] }] });
|
|
expect(String(freeze.reason)).toContain(`${RED_CASE} (inputs `);
|
|
expect(String(freeze.reason)).toContain('fix: land the revert or fix-forward');
|
|
const again = fakeGh(fx);
|
|
expect(backstop(fx, outside, again.gh).action).toBe('deferred');
|
|
expect(again.dispatches()).toEqual([]);
|
|
});
|
|
|
|
test('a green gate on main writes nothing', () => {
|
|
const fx = trainFixture();
|
|
const outside = squashMerge(fx.repo, 6, { 'outside.txt': 'merged outside the queue\n' });
|
|
const { gh, dispatches } = fakeGh(fx, { record: null, gate: 'success' });
|
|
expect(backstop(fx, outside, gh).action).toBe('gated');
|
|
expect(dispatches()).toHaveLength(1);
|
|
expect(originNotes(fx)).toEqual([]);
|
|
});
|
|
});
|
|
|
|
describe('backstop: debounce while a train merges', () => {
|
|
let fx: Fixture;
|
|
beforeEach(() => { fx = trainFixture(); });
|
|
test('waits while a train is merging, then decides once the settle window ends', () => {
|
|
const at = new Date().toISOString();
|
|
persist(fx.repo.work, [{ schema: 1, kind: 'train', nonce: TRAIN_NONCE, repo_key: repoIdentity(fx.repo.work).key, state: 'merging', updated_at: at } as never]);
|
|
const sha = squashMerge(fx.repo, 1);
|
|
let clock = 0;
|
|
const { gh, dispatches } = fakeGh(fx);
|
|
const out = backstop(fx, sha, gh, { now: () => (clock += 20 * 60_000), settleMs: 60 * 60_000 });
|
|
expect(out.lines.some(line => line.includes(`waiting for train(s) ${TRAIN_NONCE} to finish merging`))).toBe(true);
|
|
expect(out.lines.some(line => line.includes('still merging after the settle window'))).toBe(true);
|
|
expect(out.action).toBe('covered');
|
|
expect(dispatches()).toEqual([]);
|
|
});
|
|
});
|