From f44e61c7eef9ebae8d4130ad28b6cc1ada0db7dd Mon Sep 17 00:00:00 2001 From: garrytan Date: Tue, 3 Nov 2026 04:49:19 +0000 Subject: [PATCH] fix(ship-release): push guards skip only when origin has no base branch; a refused run or unreachable origin stops Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --- docs/pregate.md | 7 ++++++- lib/ship-release.ts | 5 ++++- test/ship-release.test.ts | 20 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/docs/pregate.md b/docs/pregate.md index e65ea6409..0c8a64802 100644 --- a/docs/pregate.md +++ b/docs/pregate.md @@ -1104,7 +1104,12 @@ prints `GUARDS: ()`. A failing or unfinished guard stops the push with the guard's fix, and nothing is pushed. A pass already recorded at HEAD's exact tree is reused instead of rerun: either push's own record or `finish`'s preflight record. Both live under `.git`, where no commit can -place one. Outside /ship, run the command above yourself before `git push`. +place one. The guards must have checked the tree being pushed, so uncommitted +or untracked files that change what they saw stop the push until you commit or +stash them. A refused run (an unreadable policy, a base that is on origin but +not fetched, a mistyped `--base`) stops the push too; only a remote with no base +branch at all skips the guards, as `GUARDS: not run`. Outside /ship, run the +command above yourself before `git push`. gstack declares its own list in `.gstack/pregate.json`: `typecheck`, `skill-size`, `parity-suite`, `context-budget`, `module-size`, `goldens` and diff --git a/lib/ship-release.ts b/lib/ship-release.ts index 57dbdf6ea..2b0ba7501 100644 --- a/lib/ship-release.ts +++ b/lib/ship-release.ts @@ -488,7 +488,10 @@ function prepushGuards(cwd: string, base: string | undefined): { line: string; s const pg = bin(cwd, 'gstack-pregate', ['--stage', 'guards', '--allow-repo-commands', '--json', '--out', out, ...(base ? ['--base', base] : [])], 3_600_000); let res: { status?: string; verdict?: string; tree?: string; code?: string; detail?: string; fix?: string; checks?: { id: string; status: string; detail?: string; fix?: string }[] } = {}; try { res = JSON.parse(pg.stdout.trim().split('\n').pop() ?? ''); } catch { /* unreadable: stops below */ } - if (res.status === 'refused' && res.code === 'POLICY_SOURCE_UNAVAILABLE' && /is not a resolvable commit/.test(res.detail ?? '')) return { line: `GUARDS: not run (no base branch to read guards from: ${res.detail})` }; + const missing = res.status === 'refused' && res.code === 'POLICY_SOURCE_UNAVAILABLE' && !base ? /origin\/(\S+) is not a resolvable commit/.exec(res.detail ?? '')?.[1] : undefined; + const onOrigin = missing ? git(cwd, ['ls-remote', '--heads', 'origin', `refs/heads/${missing}`], 120_000) : null; + if (onOrigin && onOrigin.status !== 0) return { line: 'GUARDS: not run (origin unreachable)', stop: `cannot verify the remote branch (${firstLine(onOrigin.stderr)}): restore access before pushing` }; + if (onOrigin?.status === 0 && !onOrigin.stdout.trim()) return { line: `GUARDS: not run (origin has no ${missing} branch to read guards from)` }; if (res.status === 'refused') return { line: `GUARDS: refused ${res.code}`, stop: `the pre-push guards could not run (${res.detail}; fix: ${res.fix}): repair it, then rerun push` }; if (res.tree && res.tree !== tree) return { line: `GUARDS: not certified (they checked the working tree ${res.tree.slice(0, 12)}, not HEAD's tree ${tree.slice(0, 12)})`, stop: 'the working tree differs from HEAD (uncommitted or untracked files): commit or stash them, then rerun push' }; const verdict = res.verdict ?? `unreadable (exit ${pg.status}: ${firstLine(pg.stderr)})`; diff --git a/test/ship-release.test.ts b/test/ship-release.test.ts index a9c1f05f3..ffaa7895b 100644 --- a/test/ship-release.test.ts +++ b/test/ship-release.test.ts @@ -390,6 +390,26 @@ describe('push: the pre-push housekeeping guards (GST-1138)', () => { expect(pushedHead(f)).toBe(''); }); + test('a base that exists on origin but is not fetched, a mistyped --base and an unreadable policy stop the push; only a remote with no base branch skips', () => { + const f = fx({ '.gstack/pregate.json': policy('exit 4') }); + ready(f); + f.git('update-ref', '-d', 'refs/remotes/origin/main'); + const unfetched = f.run(RELEASE, ['push', '--branch', 'feat']); + expect(unfetched.status).toBe(3); + expect(lineOf(unfetched.stdout, 'GUARDS')).toMatch(/^GUARDS: refused POLICY_SOURCE_UNAVAILABLE/); + expect(unfetched.stdout).toContain('STOP: the pre-push guards could not run'); + f.git('fetch', '-q', 'origin', 'main:refs/remotes/origin/main'); + const typo = f.run(RELEASE, ['push', '--branch', 'feat', '--base', 'mian']); + expect(typo.status).toBe(3); + expect(lineOf(typo.stdout, 'GUARDS')).toMatch(/^GUARDS: refused /); + expect(pushedHead(f)).toBe(''); + const broken = fx({ '.gstack/pregate.json': '{not json\n' }); + ready(broken); + const refused = broken.run(RELEASE, ['push', '--branch', 'feat']); + expect(refused.status).toBe(3); + expect(lineOf(refused.stdout, 'GUARDS')).toMatch(/^GUARDS: refused /); + }); + test("finish's preflight record is reused only at HEAD's tree with passing regen and guards rows", () => { const f = fx({ '.gstack/pregate.json': policy('echo ran >> ../guard-runs') }); ready(f);