mirror of
https://github.com/garrytan/gstack.git
synced 2026-09-14 00:49:00 +02:00
feat: git-based version allocator when the PR queue is unreachable (#2545)
When the host query (gh/glab) failed, gstack-next-version returned offline:true with an EMPTY claim set, and /ship's documented fallback was local BUMP_LEVEL arithmetic. Local arithmetic cannot see a sibling's claim, so the fallback allocated a version another open PR already held — observed in a downstream repo where two merged PRs both read v0.1.57.0 (and an audit found four such duplicate pairs over three weeks). New fetchGitClaimed() degrades the QUEUE VIEW without degrading the ALLOCATION: git already knows what the API was asked for. It reads every remote-tracking branch's pinned version file (through extractVersion, so JSON version-paths resolve on remote refs too and each branch's own digit width is preserved) plus the versions already shipped in the base's last 400 commit subjects (3- or 4-digit; the cap announces itself in warnings when it truncates). The fallback runs only when the host told us nothing — the online path is untouched — and the output gains a load-bearing `fallback: "git" | null` field that /ship can branch on, plus explicit warnings for both the recovered-from-git and the nothing-found cases. Tests: end-to-end stub-gh offline contract (fallback:'git' + a valid version + the warning), sibling-claim discovery from remote-tracking refs, the pick advancing past the sibling's claim, shipped-subject scanning, JSON version-path claims on remote refs, and non-repo degradation to a warning (45 pass in test/gstack-next-version.test.ts). Re-derived from PR #2545 by @CarringtonCreative under the wave plan's version-tooling end-state spec; the PR's own VERSION/CHANGELOG stamping is stripped (release stamping happens at /ship time, not per commit). Co-authored-by: Carrington Dennis <carrdenn3@gmail.com> Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Carrington Dennis
Claude Fable 5
parent
7b5fdab8cb
commit
da0e28e686
+103
-1
@@ -72,6 +72,7 @@ type Output = {
|
||||
bump: Bump;
|
||||
host: "github" | "gitlab" | "unknown";
|
||||
offline: boolean;
|
||||
fallback: "git" | null;
|
||||
claimed: ClaimedPR[];
|
||||
siblings: Sibling[];
|
||||
active_siblings: Sibling[];
|
||||
@@ -445,6 +446,84 @@ function autoDetectExcludePR(): number | null {
|
||||
return Number.isFinite(n) && n > 0 ? n : null;
|
||||
}
|
||||
|
||||
// ── git-only fallback (#2545) ────────────────────────────────────────────
|
||||
//
|
||||
// When the host query fails this util used to return `offline:true` with an
|
||||
// EMPTY claim set, and /ship's instruction was "fall back to local BUMP_LEVEL
|
||||
// arithmetic". Local arithmetic cannot see a sibling's claim, so the fallback
|
||||
// allocated a version another open PR already held.
|
||||
//
|
||||
// That is not hypothetical. On 2026-08-12 in a downstream repo, `gh pr list`
|
||||
// failed during a ship, this util reported offline, the bump fell back to
|
||||
// local arithmetic, and 0.1.57.0 was allocated to a second PR while an open
|
||||
// one already claimed it — both merged, and main carries two commits reading
|
||||
// v0.1.57.0. Auditing that repo's history found FOUR such pairs going back
|
||||
// three weeks, so the silent fallback had been mis-allocating for a while.
|
||||
//
|
||||
// Git already knows what the API was asked for. Remote-tracking refs carry
|
||||
// each branch's VERSION file, and the base's own history records every version
|
||||
// already shipped. Neither needs a token, a network round-trip, or a working
|
||||
// `gh`. So "offline" degrades the QUEUE VIEW (no PR numbers, no draft status)
|
||||
// without degrading the ALLOCATION.
|
||||
function fetchGitClaimed(
|
||||
base: string,
|
||||
versionPath: string,
|
||||
warnings: string[],
|
||||
): ClaimedPR[] {
|
||||
const claims: ClaimedPR[] = [];
|
||||
|
||||
// 1. Every remote-tracking branch's VERSION file. These are the open PRs'
|
||||
// branches, whether or not the API can be reached to enumerate them.
|
||||
// Read through extractVersion so a JSON version-path (#2501) resolves on
|
||||
// remote refs too, and the branch's own width is preserved in the claim.
|
||||
const refs = runCommand("git", [
|
||||
"for-each-ref",
|
||||
"--format=%(refname:short)",
|
||||
"refs/remotes",
|
||||
]);
|
||||
if (refs.ok) {
|
||||
const baseShort = base.replace(/^origin\//, "");
|
||||
for (const ref of refs.stdout.split("\n").map((r) => r.trim()).filter(Boolean)) {
|
||||
if (ref.endsWith("/HEAD")) continue;
|
||||
if (ref === base || ref.replace(/^origin\//, "") === baseShort) continue;
|
||||
const show = runCommand("git", ["show", `${ref}:${versionPath}`]);
|
||||
if (!show.ok) continue;
|
||||
const raw = extractVersion(show.stdout, versionPath);
|
||||
if (!raw || !parseVersion(raw)) continue;
|
||||
claims.push({ pr: 0, branch: ref, version: raw });
|
||||
}
|
||||
} else {
|
||||
warnings.push("git for-each-ref failed; branch claims unavailable");
|
||||
}
|
||||
|
||||
// 2. Versions already shipped, read from the base's commit subjects. Catches
|
||||
// the case the VERSION file cannot: a number that merged and was then
|
||||
// re-picked. Bounded, and it says so rather than implying full history.
|
||||
const SUBJECT_SCAN = 400;
|
||||
const log = runCommand("git", ["log", `-n${SUBJECT_SCAN}`, "--format=%s", base]);
|
||||
if (log.ok) {
|
||||
for (const subject of log.stdout.split("\n")) {
|
||||
const m = subject.trim().match(/^v(\d+\.\d+\.\d+(?:\.\d+)?)\b/);
|
||||
if (!m) continue;
|
||||
if (!parseVersion(m[1])) continue;
|
||||
claims.push({ pr: 0, branch: `(shipped on ${base})`, version: m[1] });
|
||||
}
|
||||
// A cap that does not announce itself reads as "checked all history".
|
||||
// Only fires when the log came back exactly full, which is the only
|
||||
// observable signal that older commits went unread.
|
||||
if (log.stdout.trim().split("\n").length >= SUBJECT_SCAN) {
|
||||
warnings.push(
|
||||
`shipped-version scan stopped at ${SUBJECT_SCAN} commits on ${base}; ` +
|
||||
`a version shipped before that is not counted as claimed`,
|
||||
);
|
||||
}
|
||||
} else {
|
||||
warnings.push(`git log ${base} failed; shipped-version scan unavailable`);
|
||||
}
|
||||
|
||||
return claims;
|
||||
}
|
||||
|
||||
async function main() {
|
||||
const args = parseArgs(process.argv.slice(2));
|
||||
if (args.help) {
|
||||
@@ -485,6 +564,28 @@ async function main() {
|
||||
warnings.push("host unknown; queue-awareness unavailable");
|
||||
}
|
||||
|
||||
// Degraded host query → fall back to git, which needs no API. Additive: it
|
||||
// only runs when the host told us nothing, so the online path is untouched.
|
||||
let fallback: "git" | null = null;
|
||||
if (offline || host === "unknown") {
|
||||
const gitClaims = fetchGitClaimed(args.base, versionPath, warnings);
|
||||
if (gitClaims.length) {
|
||||
claimed = [...claimed, ...gitClaims];
|
||||
fallback = "git";
|
||||
warnings.push(
|
||||
`host queue unavailable — allocated from git instead ` +
|
||||
`(${gitClaims.length} claim(s) from remote refs + shipped subjects). ` +
|
||||
`PR numbers and draft status are unavailable, but the version is safe.`,
|
||||
);
|
||||
} else {
|
||||
warnings.push(
|
||||
"host queue unavailable AND git found no claims — the pick rests on " +
|
||||
"the base VERSION alone. Verify no sibling branch holds it before " +
|
||||
"shipping.",
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Only count PRs that actually bumped VERSION past base as real "claims".
|
||||
// A PR whose VERSION equals base's VERSION hasn't claimed anything.
|
||||
const realClaims = claimed.filter((c) => {
|
||||
@@ -522,6 +623,7 @@ async function main() {
|
||||
bump: args.bump,
|
||||
host,
|
||||
offline,
|
||||
fallback,
|
||||
claimed: realClaims,
|
||||
siblings,
|
||||
active_siblings: activeSiblings,
|
||||
@@ -535,7 +637,7 @@ async function main() {
|
||||
// from lib/version-source so existing importers of this module keep working
|
||||
// unchanged.
|
||||
export { parseVersion, fmtVersion, bumpVersion, cmpVersion, versionWidth, extractVersion };
|
||||
export { pickNextSlot, markActiveSiblings, resolveVersionPath };
|
||||
export { pickNextSlot, markActiveSiblings, resolveVersionPath, fetchGitClaimed };
|
||||
|
||||
// Only run main() when invoked as a script, not when imported by tests.
|
||||
if (import.meta.main) {
|
||||
|
||||
Reference in New Issue
Block a user