toolroll 0.9.78 → 0.9.81

package/CHANGELOG.md

@@ -1,5 +1,46 @@
 # Changelog
 
+## 0.9.81 — 2026-10-30
+
+- **The release proof works after the merge.** GitHub empties a CI run's
+  pull-request link once the pull request merges and its branch is deleted,
+  so 0.9.80's tag could never prove its checks and wasn't published. A run
+  with no link now stands only when its branch has had exactly one pull
+  request, ever, and that pull request merged into main. 0.9.80's changes
+  ship in this release.
+
+## 0.9.80 — 2026-10-30
+
+- **Each test runs once, where it adds something** (docs/plans/test-matrix.md).
+  Pull requests run the unit suite on Node 24 (Linux and macOS) and every
+  area lane (Windows, Linux fence and cgroup, git 2.41 and 2.47); a pull
+  request that only changes Markdown under `docs/`, the changelog or the
+  README skips the area lanes. Node 22 runs on Linux and macOS once per
+  release, on the `release-*` branch's pull request, in the new
+  Release candidate workflow. Release tags no longer rerun the macOS suites:
+  a release proof reads GitHub's record that the tagged tree passed every
+  required check on its pull request before npm publication. A push to main
+  typechecks and builds, and runs the full CI only when it can't prove the
+  merge commit was tested. The nightly runs everything. A release now needs
+  every required check executed, never skipped, and refuses to merge while
+  main's branch protection doesn't require all of them. Hosted unit shards
+  require their platform's native fence attacks to run.
+
+## 0.9.79 — 2026-10-29
+
+- **`toolroll release` rides out a short network failure instead of
+  stopping.** A read from GitHub or git (`gh api`, `gh pr list`,
+  `git ls-remote`, `git fetch`) that fails for a passing reason (no
+  connection, a name that didn't resolve, a timeout, a 5xx, an answer cut
+  short, GitHub's secondary rate limit) is asked again with backoff for up
+  to about three minutes, saying why once; then it stops with the original
+  error. A definitive answer (404, 401/403) is never asked again. A merge or
+  a tag is never sent twice blindly: after a lost answer the release reads
+  GitHub to learn whether it happened, and asks again only when it didn't.
+  When main's branch protection can't be read, the release now says
+  "Couldn't read GitHub's branch protection" instead of "main's protection
+  doesn't hold", and still stops.
+
 ## 0.9.78 — 2026-10-29
 
 - **Toolroll says when it is restarting.** The worker and console now record

package/dist/desktop-update.d.ts

@@ -97,7 +97,6 @@ export declare function sqliteLock(file: string, busyTimeoutMs?: number): Databa
 export declare function lockHeld(file: string): boolean;
 export declare const installationLock: (j: UpdateJournal) => DatabaseSync | null;
 export declare function desktopUpdateStatus(stateDir: string): {
-    version?: never;
     active: boolean;
     phase: string;
     detail: string;
@@ -111,6 +110,7 @@ export declare function desktopUpdateStatus(stateDir: string): {
     wasRunning?: never;
     backupPath?: never;
     updateId?: never;
+    version?: never;
     buildId?: never;
     workDir?: never;
 } | {

package/dist/git-views.d.ts

@@ -17,4 +17,4 @@ export declare function lockCheckout(home: string, checkout: string, timeoutMs?:
  * another on the same checkout (teardown's git run through the builder's hardened runner, a view within a view) runs
  * under the lock its caller already holds instead of waiting on itself.
  */
-export declare function withCheckoutLock<T>(home: string, checkout: string, work: () => Promise<T>): Promise<T>;
+export declare function withCheckoutLock<T>(home: string, checkout: string, work: () => Promise<T>, timeoutMs?: number): Promise<T>;

package/dist/git-views.js

@@ -106,11 +106,11 @@ const heldHere = new AsyncLocalStorage();
  * another on the same checkout (teardown's git run through the builder's hardened runner, a view within a view) runs
  * under the lock its caller already holds instead of waiting on itself.
  */
-export async function withCheckoutLock(home, checkout, work) {
+export async function withCheckoutLock(home, checkout, work, timeoutMs) {
     const held = heldHere.getStore() ?? new Set();
     if (held.has(checkout))
         return work();
-    const release = await lockCheckout(home, checkout);
+    const release = await lockCheckout(home, checkout, timeoutMs);
     try {
         return await heldHere.run(new Set([...held, checkout]), work);
     }

package/dist/guides.js

@@ -473,20 +473,23 @@ with a time limit.
    saved first; if either name doesn't answer as the new build, both go
    back. It goes on only when the console, worker and both names run the
    gated commit. A rerun relinks without deploying again.
-8. **ci**: waits for every pull-request check on the gated commit:
-   Ubuntu on Node 22 and 24, Linux and Windows containment. Pending,
-   missing, skipped, cancelled or failed never merges.
+8. **ci**: waits for every pull-request check on the gated commit: Node 24
+   on Ubuntu and macOS, the area lanes (Linux cgroup and fence, Windows,
+   git 2.41 and 2.47), and Node 22 on Ubuntu and macOS, which runs on a
+   release-* branch's pull request.
+   Pending, missing, skipped, cancelled or failed never merges, and main's
+   protection must require every one of them.
 9. **merge**: squash-merges with the head pinned to the gated commit,
    once main has nothing the branch lacks, then deletes the remote branch
    only if its head still matches. A resumed merge also finishes this cleanup.
 10. **tree**: main's merge commit must have exactly the gated tree, or
    nothing is tagged.
-11. **tag**: pushes \`v<version>\` on that merge commit. In publish.yml,
-    macOS Node 22 and 24 must both pass before npm and GitHub publication
-    (the candidate's macOS checks already passed in ci.yml before the merge).
-    macos.yml keeps the nightly matrix.
-12. **publish**: waits for npm, the GitHub release and the tag's publish
-    job (which needs the macOS legs); not main's own CI on the merge commit.
+11. **tag**: pushes \`v<version>\` on that merge commit. The tag runs no
+    tests again: publish.yml's release proof reads GitHub's record that the
+    tagged tree is the merged pull request's head tree and passed every
+    required check there, and npm and GitHub publication need it.
+12. **publish**: waits for npm, the GitHub release and the tag's release
+    proof and publish jobs; not main's own push run on the merge commit.
 13. **homebrew**: the release is published once npm and the GitHub release
     are verified. It proposes the tap's formula change (checksum from npm's
     tarball) and looks at its checks once: \`Published; Homebrew pending\`

package/dist/project-knowledge.d.ts

@@ -22,17 +22,20 @@ export type KnowledgeView = ReturnType<typeof knowledgeView>;
 export declare function knowledgeVersion(store: Store, repo: string, actor: string, revision: number): Knowledge;
 /** Chat reads only an admitted project. Keep the full source in the project UI. */
 export declare function conversationKnowledge(store: Store, repo: string, actor: string, reference?: string, decision?: number): {
+    title?: never;
+    history?: never;
     revision: number;
     stale: boolean;
     notice: string;
     decision?: never;
-    title?: never;
     content?: never;
-    history?: never;
     instructions?: never;
     references?: never;
     decisions?: never;
 } | {
+    title?: never;
+    revision?: never;
+    history?: never;
     stale?: never;
     decision: {
         repo: string;
@@ -49,28 +52,25 @@ export declare function conversationKnowledge(store: Store, repo: string, actor:
         id: number;
     };
     notice: string;
-    title?: never;
     content?: never;
-    revision?: never;
-    history?: never;
     instructions?: never;
     references?: never;
     decisions?: never;
 } | {
+    history?: never;
     stale?: never;
     decision?: never;
     revision: number;
     title: string;
     content: string;
     notice: string;
-    history?: never;
     instructions?: never;
     references?: never;
     decisions?: never;
 } | {
+    title?: never;
     stale?: never;
     decision?: never;
-    title?: never;
     content?: never;
     revision: number;
     history: {

package/dist/release-adapters.d.ts

@@ -176,9 +176,16 @@ export declare function readContains(run: Exec, gh: string, repo: string, sha: s
  * can't be bypassed by that account:
  * classic protection with "Do not allow bypassing the above settings" (`enforce_admins`); an active ruleset whose
  * bypass list reads whole, names no role, team or organization admin, and says this account never bypasses it. Read
- * only — Toolroll never changes a repository's settings. A layer that can't be read never holds; null only when nothing
- * could be read at all.
+ * only — Toolroll never changes a repository's settings. A layer that can't be read never holds. When no layer holds
+ * and one couldn't be read (gh failed for a reason other than "not protected", or its answer didn't parse), the read
+ * throws ProtectionUnreadable: "couldn't read GitHub" is never reported as "protection doesn't hold", and never as
+ * holding. Null only for a repository or branch name GitHub can't be asked about.
  */
 export declare function readMainProtection(run: Exec, gh: string, repo: string, branch?: string): Promise<MainProtection | null>;
+/** Main's protection couldn't be read from GitHub (after the network retries): not "doesn't hold", and never "holds". */
+export declare class ProtectionUnreadable extends Error {
+    readonly unread: readonly string[];
+    constructor(unread: readonly string[]);
+}
 /** Whether main's protection holds, as a yes/no (release-auto.ts sealAutoGreen): null when it can't be read. */
 export declare function readUpToDateRequired(run: Exec, gh: string, repo: string, branch?: string): Promise<boolean | null>;

package/dist/release-adapters.js

@@ -12,6 +12,7 @@ import { basename, delimiter, dirname, join } from "node:path";
 import { createRequire } from "node:module";
 import { parse as parseYaml } from "yaml";
 import { sleep } from "./sleep.js";
+import { callLabel, readOnlyCall, retryCall, retryingExec, writeWithRecheck } from "./release-net.js";
 // Loaded on first use, like the store: a static import prints Node's SQLite warning before the CLI can quiet it.
 const sqlite = () => createRequire(import.meta.url)("node:sqlite");
 import { PROTECTION_MINIMUM_CHECKS, PROTECTION_REPORT_ONLY_CHECKS } from "./release.js";
@@ -28,7 +29,7 @@ import { proveCarry } from "./release-carry.js";
 import { randomBytes, randomUUID } from "node:crypto";
 import { deploymentGate } from "./deploy-gate.js";
 import { extractCommit } from "./commit-extract.js";
-import { checkoutIncludes } from "./teardown-git.js";
+import { teardownGit, refusal as gitRefusal } from "./teardown-git.js";
 import { RELEASE_REMOTE, releaseConfigProblem, releaseGitArgs, releaseGitEnv, releaseRemote, releaseTools } from "./release-git.js";
 export { RELEASE_PATH, RELEASE_REMOTE, releaseConfigProblem, releaseGitArgs, releaseGitEnv, releaseRemote, releaseTools } from "./release-git.js";
 /** A child process, its output kept whole; a missing program or a time limit is exit 127 or 124, never a throw. */
@@ -51,10 +52,12 @@ const cleanEnv = (extra = {}) => {
     delete env["NODE_OPTIONS"];
     return env;
 };
+/** A failed call, in the words every release stop uses: what, its exit code and the last lines it printed. */
+const failed = (result, what) => new Error(`${what} failed (exit ${result.code}): ${(result.stderr || result.stdout).trim().split("\n").slice(-3).join(" ")}`);
 const must = async (run, what) => {
     const result = await run;
     if (result.code !== 0)
-        throw new Error(`${what} failed (exit ${result.code}): ${(result.stderr || result.stdout).trim().split("\n").slice(-3).join(" ")}`);
+        throw failed(result, what);
     return result.stdout;
 };
 /** owner/name from an https or ssh GitHub remote. */
@@ -227,8 +230,16 @@ export function releaseAdapters(options) {
     const pause = options.sleep ?? ((ms) => new Promise(done => setTimeout(done, ms)));
     const tools = options.tools ?? releaseTools();
     const gitEnv = releaseGitEnv();
+    const say = options.say ?? ((line) => { process.stdout.write(`${line}\n`); });
+    /** A short network failure on the way to GitHub (release-net.ts): reads are asked again for up to ~3 minutes; a
+     * write never is, unless GitHub says it didn't happen (writeWithRecheck). */
+    const net = { say, sleep: options.sleep ?? sleep, ...(options.now === undefined ? {} : { now: options.now }) };
+    const reads = retryingExec(run, net);
     // Never a PATH lookup or the checkout's Git config: gh by its absolute path, from a neutral folder, naming the repo.
-    const gh = (...args) => run(tools.gh, args, { cwd: "/", env: gitEnv });
+    // Reads ride out a short network failure; anything that isn't provably a read passes straight through (readOnlyCall).
+    const gh = (...args) => reads(tools.gh, args, { cwd: "/", env: gitEnv });
+    /** A write by gh, never retried by itself. */
+    const ghWrite = (remainingMs, ...args) => run(tools.gh, args, { cwd: "/", env: gitEnv, timeoutMs: Math.min(120_000, remainingMs) });
     const ghJson = async (what, ...args) => JSON.parse(await must(gh(...args), what));
     const toolroll = async (...args) => {
         const result = await run("toolroll", [...args, "--json"], { env: cleanEnv(), timeoutMs: 120_000 });
@@ -245,9 +256,9 @@ export function releaseAdapters(options) {
     const ciGh = options.tools?.gh ?? releaseTools("").gh;
     const observeCi = async (sha) => {
         const observedAt = (options.now ?? (() => new Date()))().toISOString();
-        const runs = (await readCheckRuns(run, ciGh, releaseRepo().slug, sha)).map(one => ({ id: one.id ?? null, name: one.name, status: one.status, conclusion: one.conclusion, app: one.app ?? null, suite: one.suite ?? null, head: one.head ?? null, workflow: one.workflow ?? null, workflowPath: one.workflowPath ?? null,
+        const runs = (await readCheckRuns(reads, ciGh, releaseRepo().slug, sha)).map(one => ({ id: one.id ?? null, name: one.name, status: one.status, conclusion: one.conclusion, app: one.app ?? null, suite: one.suite ?? null, head: one.head ?? null, workflow: one.workflow ?? null, workflowPath: one.workflowPath ?? null,
             ...(one.beforeTests === undefined ? {} : { beforeTests: one.beforeTests }) }));
-        return { head: sha, observedAt, runs, complete: await readSuitesComplete(run, ciGh, releaseRepo().slug, sha) };
+        return { head: sha, observedAt, runs, complete: await readSuitesComplete(reads, ciGh, releaseRepo().slug, sha) };
     };
     const database = options.database ?? databasePath(process.env, homedir());
     let recorded = options.releaseRepo ?? null;
@@ -255,21 +266,55 @@ export function releaseAdapters(options) {
     const releaseRepo = () => recorded ??= recordedReleaseRepo(database, checkout);
     /**
      * The coordinator's one way to run Git (§0a.2): on the recorded Git directory, hardened, with an allowlisted
-     * environment and the absolute Git. Before every command the checkout's own config is read with includes off and
-     * as plain files; one that includes a file, names a command or redirects a remote stops the release, naming it.
+     * environment and the absolute Git. Every attempt uses the shared runner's private view: the audited config is
+     * the exact copy Git reads, so a build cannot redirect a command after its config was checked.
      */
     const git = async (...args) => {
         const repo = releaseRepo();
+        const full = [...releaseGitArgs(repo, tools), ...args];
         const stop = (why) => new Error(`Toolroll won't run Git in ${repo.checkout} for a release: ${why}. Remove it from the project's Git config, then rerun.`);
-        if (options.releaseRepo === undefined && checkoutIncludes(repo.checkout))
-            throw stop("its Git config includes another file, or couldn't be read as a plain file");
-        const listing = await run(tools.git, [`--git-dir=${repo.gitDir}`, "--no-optional-locks", "config", "--list", "--no-includes", "--show-scope", "-z"], { cwd: "/", env: gitEnv });
-        if (listing.code !== 0)
-            throw stop("its Git config couldn't be read");
-        const setting = releaseConfigProblem(listing.stdout);
-        if (setting !== null)
-            throw stop(`its Git config sets ${setting}, which a release doesn't run with (it could run a command, or change where Git connects or what it sends)`);
-        return run(tools.git, [...releaseGitArgs(repo, tools), ...args], { cwd: repo.checkout, env: gitEnv });
+        // The checkout's config is read again right before EVERY attempt, a retried one included (checked at the moment of use).
+        const once = async (remainingMs = 120_000) => {
+            const now = () => (options.now ?? (() => new Date()))().getTime();
+            const started = now();
+            const left = () => Math.min(120_000, remainingMs - Math.max(0, now() - started));
+            const checkConfig = (listing) => {
+                if (listing.code !== 0)
+                    throw stop("its Git config couldn't be read");
+                const setting = releaseConfigProblem(listing.stdout);
+                if (setting !== null)
+                    throw stop(`its Git config sets ${setting}, which a release doesn't run with (it could run a command, or change where Git connects or what it sends)`);
+            };
+            if (options.releaseRepo === undefined) {
+                // The shared runner pins both Git directories and freezes config/info in the plane's fenced view folder.
+                // Its private paths replace releaseGitArgs' first two directory flags; the recorded remote stays fixed.
+                const viewed = teardownGit(async (_command, argv, runOptions) => {
+                    const timeoutMs = left();
+                    if (timeoutMs <= 0)
+                        return { code: 124, stdout: "", stderr: "the network retry budget ran out", timedOut: true, notFound: false };
+                    const env = { ...gitEnv, ...Object.fromEntries(["GIT_DIR", "GIT_COMMON_DIR", "GIT_WORK_TREE"].map(key => [key, runOptions?.env?.[key]])) };
+                    const result = await run(tools.git, argv, { cwd: repo.checkout, env, timeoutMs });
+                    if (argv.includes("config"))
+                        checkConfig(result);
+                    return { ...result, timedOut: result.code === 124, notFound: result.code === 127 };
+                }, { repo: repo.checkout }, Math.max(0, left()), tools.git);
+                const result = await viewed(repo.checkout, full.slice(2));
+                const why = gitRefusal(result);
+                if (why !== null)
+                    throw stop(why);
+                return result;
+            }
+            // Injected repository/exec fixtures have no on-disk checkout, but exercise the same config policy per attempt.
+            if (left() <= 0)
+                return { code: 124, stdout: "", stderr: "the network retry budget ran out" };
+            const listing = await run(tools.git, [`--git-dir=${repo.gitDir}`, "--no-optional-locks", "config", "--list", "--no-includes", "--show-scope", "-z"], { cwd: "/", env: gitEnv, timeoutMs: left() });
+            checkConfig(listing);
+            if (left() <= 0)
+                return { code: 124, stdout: "", stderr: "the network retry budget ran out" };
+            return run(tools.git, full, { cwd: repo.checkout, env: gitEnv, timeoutMs: left() });
+        };
+        // ls-remote and fetch ride out a short network failure; a push or a local command is never retried (readOnlyCall).
+        return readOnlyCall(tools.git, full) === null ? once() : retryCall(once, callLabel(tools.git, full), net);
     };
     /** The remote every fetch, look and push names: the recorded URL, defined only on the command line. */
     const remoteUrl = () => RELEASE_REMOTE;
@@ -373,8 +418,8 @@ export function releaseAdapters(options) {
             rmSync(extracted.dir, { recursive: true, force: true });
         }
     };
-    const release = storeReleaseAdapter(() => openStore(database), store => store.close(), options.now ?? (() => new Date()), undefined, { observe: sha => observeCi(sha), mergeBase: (base, sha) => readMergeBase(run, ciGh, releaseRepo().slug, base, sha),
-        upToDateRequired: () => readUpToDateRequired(run, ciGh, releaseRepo().slug), evidenceRoot: join(dirname(database), "evidence"),
+    const release = storeReleaseAdapter(() => openStore(database), store => store.close(), options.now ?? (() => new Date()), undefined, { observe: sha => observeCi(sha), mergeBase: (base, sha) => readMergeBase(reads, ciGh, releaseRepo().slug, base, sha),
+        upToDateRequired: () => readUpToDateRequired(reads, ciGh, releaseRepo().slug), evidenceRoot: join(dirname(database), "evidence"),
         // A successful Actions job authenticates the job, not the candidate-writable JSON it uploads. Until the
         // executor protects that reporting channel, production releases must take the person's approval road.
         reportsProtected: false });
@@ -382,7 +427,7 @@ export function releaseAdapters(options) {
         ...(existsSync(database) ? { release } : {}),
         now: options.now ?? (() => new Date()),
         sleep: options.sleep ?? sleep,
-        say: options.say ?? (line => process.stdout.write(`${line}\n`)),
+        say,
         repo: {
             // The recorded owner/name, never the checkout's origin.
             async github() { return releaseRepo().slug; },
@@ -575,33 +620,38 @@ export function releaseAdapters(options) {
                 return prs.find(one => one.state === "open") ?? prs.filter(one => one.state === "merged").sort((a, b) => b.number - a.number)[0] ?? null;
             },
             // Every attempt (filter=all), with its app, check suite and commit: the release judges each job by its latest attempt.
-            async checks(repo, sha, options) { return readCheckRuns(run, ciGh, repo, sha, options); },
-            async complete(repo, sha) { return readSuitesComplete(run, ciGh, repo, sha); },
-            async mainHead(repo) { return readMainHead(run, ciGh, repo); },
-            async contains(repo, sha, ancestor) { return readContains(run, ciGh, repo, sha, ancestor); },
-            async upToDateRequired(repo) { return readMainProtection(run, ciGh, repo); },
+            async checks(repo, sha, options) { return readCheckRuns(reads, ciGh, repo, sha, options); },
+            async complete(repo, sha) { return readSuitesComplete(reads, ciGh, repo, sha); },
+            async mainHead(repo) { return readMainHead(reads, ciGh, repo); },
+            async contains(repo, sha, ancestor) { return readContains(reads, ciGh, repo, sha, ancestor); },
+            async upToDateRequired(repo) { return readMainProtection(reads, ciGh, repo); },
             async merge(repo, pr, head, message) {
-                // The squash commit's message lists every commit that landed after the approval (release-once.md).
-                const merged = object(await ghJson("gh api pulls merge", "api", "-X", "PUT", `repos/${repo}/pulls/${pr}/merge`, "-f", "merge_method=squash", "-f", `sha=${head}`, ...(message === undefined ? [] : ["-f", `commit_message=${message}`])));
-                if (typeof merged["sha"] !== "string")
-                    throw new Error(`GitHub did not merge #${pr}: ${String(merged["message"] ?? "no merge commit")}`);
-                return merged["sha"];
-            },
-            async tag(repo, tag) {
-                const result = await gh("api", `repos/${repo}/git/ref/tags/${tag}`);
-                if (result.code !== 0) {
-                    if (/Not Found|HTTP 404/.test(result.stderr + result.stdout))
-                        return null;
-                    throw new Error(`gh api git/ref/tags/${tag} failed: ${result.stderr.trim()}`);
-                }
-                const target = object(object(JSON.parse(result.stdout))["object"]);
-                if (target["type"] !== "tag")
-                    return String(target["sha"]);
-                // An annotated tag: the commit it names.
-                return String(object(object(await ghJson("gh api git/tags", "api", `repos/${repo}/git/tags/${String(target["sha"])}`))["object"])["sha"]);
+                // The squash commit's message lists every commit that landed after the approval (release-once.md). Never asked
+                // again under stale approval/lease/CI checks: reconcile a lost answer, but another write needs a fresh
+                // coordinator pass through those guards. A PR still being open proves none of them.
+                return writeWithRecheck(`merging #${pr}`, { ...net, maxAttempts: 1 }, {
+                    write: remaining => ghWrite(remaining, "api", "-X", "PUT", `repos/${repo}/pulls/${pr}/merge`, "-f", "merge_method=squash", "-f", `sha=${head}`, ...(message === undefined ? [] : ["-f", `commit_message=${message}`])),
+                    accept: result => {
+                        const merged = object(JSON.parse(result.stdout));
+                        if (merged["merged"] !== true || typeof merged["sha"] !== "string" || !/^[0-9a-f]{40}$/.test(merged["sha"]))
+                            throw new Error(`GitHub did not merge #${pr}: ${String(merged["message"] ?? "no merge commit")}`);
+                        return merged["sha"];
+                    },
+                    refuse: result => { throw failed(result, "gh api pulls merge"); },
+                    recheck: bounded => pullMergedAt(repo, pr, head, "main", bounded, message),
+                });
             },
+            async tag(repo, tag) { return readTag(repo, tag); },
             async createTag(repo, tag, sha) {
-                await must(gh("api", "-X", "POST", `repos/${repo}/git/refs`, "-f", `ref=refs/tags/${tag}`, "-f", `sha=${sha}`), `creating ${tag}`);
+                await writeWithRecheck(`creating ${tag}`, net, {
+                    write: remaining => ghWrite(remaining, "api", "-X", "POST", `repos/${repo}/git/refs`, "-f", `ref=refs/tags/${tag}`, "-f", `sha=${sha}`),
+                    accept: () => undefined,
+                    refuse: result => { throw failed(result, `creating ${tag}`); },
+                    recheck: async (bounded) => {
+                        const at = await readTag(repo, tag, bounded);
+                        return at === sha ? { state: "done", value: undefined } : at === null ? { state: "not-done" } : { state: "other", why: `${tag} now points at ${at.slice(0, 7)}` };
+                    },
+                });
             },
             async release(repo, tag) { return (await gh("release", "view", tag, "--repo", repo, "--json", "tagName")).code === 0; },
         },
@@ -713,12 +763,57 @@ export function releaseAdapters(options) {
                 return problem === null ? { ok: true } : { ok: false, why: problem };
             },
             async merge(pr, head) {
-                const merged = object(await ghJson(`merging ${tap} #${pr}`, "api", "-X", "PUT", `repos/${tap}/pulls/${pr}/merge`, "-f", "merge_method=squash", "-f", `sha=${head}`));
-                if (merged["merged"] !== true || typeof merged["sha"] !== "string")
-                    throw new Error(`GitHub did not merge ${tap} #${pr}: ${String(merged["message"] ?? "no merge commit")}`);
+                const base = await defaultBranch();
+                await writeWithRecheck(`merging ${tap} #${pr}`, { ...net, maxAttempts: 1 }, {
+                    write: remaining => ghWrite(remaining, "api", "-X", "PUT", `repos/${tap}/pulls/${pr}/merge`, "-f", "merge_method=squash", "-f", `sha=${head}`),
+                    accept: result => {
+                        const merged = object(JSON.parse(result.stdout));
+                        if (merged["merged"] !== true || typeof merged["sha"] !== "string" || !/^[0-9a-f]{40}$/.test(merged["sha"]))
+                            throw new Error(`GitHub did not merge ${tap} #${pr}: ${String(merged["message"] ?? "no merge commit")}`);
+                    },
+                    refuse: result => { throw failed(result, `merging ${tap} #${pr}`); },
+                    recheck: async (bounded) => { const state = await pullMergedAt(tap, pr, head, base, bounded); return state.state === "done" ? { state: "done", value: undefined } : state; },
+                });
             },
         },
     };
+    /** A tag's commit as GitHub answers now (an annotated tag: the commit it names), or null when there is no such tag. */
+    async function readTag(repo, tag, bounded = net) {
+        const read = (path) => retryingExec(run, bounded)(tools.gh, ["api", path], { cwd: "/", env: gitEnv });
+        const result = await read(`repos/${repo}/git/ref/tags/${tag}`);
+        if (result.code !== 0) {
+            if (/Not Found|HTTP 404/.test(result.stderr + result.stdout))
+                return null;
+            throw new Error(`gh api git/ref/tags/${tag} failed: ${result.stderr.trim()}`);
+        }
+        const target = object(object(JSON.parse(result.stdout))["object"]);
+        if (target["type"] !== "tag")
+            return String(target["sha"]);
+        return String(object(object(JSON.parse(await must(read(`repos/${repo}/git/tags/${String(target["sha"])}`), "gh api git/tags")))["object"])["sha"]);
+    }
+    /** Whether a pull request is merged from exactly `head` (its merge commit), still open at `head` (not merged), or
+     * anything else — read after a merge's answer was lost. */
+    async function pullMergedAt(repo, pr, head, base, bounded, message) {
+        const read = async (path) => object(JSON.parse(await must(retryingExec(run, bounded)(tools.gh, ["api", path], { cwd: "/", env: gitEnv }), "gh api merge recovery")));
+        const pull = await read(`repos/${repo}/pulls/${pr}`);
+        const at = object(pull["head"])["sha"], commit = pull["merge_commit_sha"];
+        if (at !== head || object(pull["base"])["ref"] !== base)
+            return { state: "other", why: `#${pr} is no longer open at ${head.slice(0, 7)} into ${base}` };
+        if (pull["merged"] === true && pull["state"] === "closed" && typeof commit === "string" && /^[0-9a-f]{40}$/.test(commit)) {
+            // Another caller may have merged it. Only the same squash result counts, never merely "merged=true".
+            const source = await read(`repos/${repo}/git/commits/${head}`);
+            const merged = await read(`repos/${repo}/git/commits/${commit}`);
+            const tree = object(source["tree"])["sha"], parents = merged["parents"];
+            if (typeof tree === "string" && /^[0-9a-f]{40}$/.test(tree) && object(merged["tree"])["sha"] === tree
+                && Array.isArray(parents) && parents.length === 1
+                && (message === undefined || (typeof merged["message"] === "string" && merged["message"].endsWith(`\n\n${message}`))))
+                return { state: "done", value: commit };
+            return { state: "other", why: `#${pr}'s merge is not the approved squash result` };
+        }
+        if (pull["merged"] === false && pull["state"] === "open")
+            return { state: "not-done" };
+        return { state: "other", why: `#${pr} is no longer open at ${head.slice(0, 7)}` };
+    }
     async function defaultBranch() {
         return (await must(gh("api", `repos/${tap}`, "--jq", ".default_branch"), `gh api repos/${tap}`)).trim();
     }
@@ -1173,15 +1268,19 @@ export async function readContains(run, gh, repo, sha, ancestor) {
  * can't be bypassed by that account:
  * classic protection with "Do not allow bypassing the above settings" (`enforce_admins`); an active ruleset whose
  * bypass list reads whole, names no role, team or organization admin, and says this account never bypasses it. Read
- * only — Toolroll never changes a repository's settings. A layer that can't be read never holds; null only when nothing
- * could be read at all.
+ * only — Toolroll never changes a repository's settings. A layer that can't be read never holds. When no layer holds
+ * and one couldn't be read (gh failed for a reason other than "not protected", or its answer didn't parse), the read
+ * throws ProtectionUnreadable: "couldn't read GitHub" is never reported as "protection doesn't hold", and never as
+ * holding. Null only for a repository or branch name GitHub can't be asked about.
  */
 export async function readMainProtection(run, gh, repo, branch = "main") {
     if (!/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(repo) || !/^[A-Za-z0-9._/-]+$/.test(branch) || branch.includes(".."))
         return null;
     const missing = [];
     const held = [];
-    let read = 0;
+    /** What couldn't be read at all, and the words gh gave. */
+    const unread = [];
+    const words = (out) => (out.stderr || out.stdout).trim().split("\n").slice(-1)[0]?.slice(0, 160) || `exit ${out.code}`;
     const judge = (where, strict, checks, bound, bypass) => {
         const own = [];
         if (!strict)
@@ -1191,7 +1290,7 @@ export async function readMainProtection(run, gh, repo, branch = "main") {
         else {
             const lacking = PROTECTION_MINIMUM_CHECKS.filter(name => !checks.includes(name));
             if (lacking.length > 0)
-                own.push(`${where}: required checks lack ${lacking.join(", ")}`);
+                own.push(`${where}: required checks lack ${lacking.join(", ")} (add ${lacking.length === 1 ? "it" : "them"} to main's required status checks: a release's proof trusts what main required)`);
             const unbound = PROTECTION_MINIMUM_CHECKS.filter(name => checks.includes(name) && !bound.includes(name));
             if (unbound.length > 0)
                 own.push(`${where}: required checks must require GitHub Actions (app 15368) as their source: ${unbound.join(", ")}`);
@@ -1227,46 +1326,41 @@ export async function readMainProtection(run, gh, repo, branch = "main") {
         catch { /* unreadable below */ }
         const p = object(answer), checks = p["required_status_checks"];
         if (answer === null || typeof answer !== "object" || Array.isArray(answer))
-            missing.push("classic protection couldn't be read");
-        else if (checks === undefined || checks === null) {
-            read++;
+            unread.push("classic protection (its answer didn't parse)");
+        else if (checks === undefined || checks === null)
             missing.push("classic protection: \"Require status checks to pass before merging\" is off");
-        }
         else {
             const rsc = object(checks), contexts = names(rsc["contexts"] ?? [], ""), apps = names(rsc["checks"] ?? [], "context");
             const admins = p["enforce_admins"];
+            // GitHub answered, but without the settings this judges: read, and not holding.
             if (contexts === null || apps === null || typeof rsc["strict"] !== "boolean" || admins === undefined || admins === null || typeof object(admins)["enabled"] !== "boolean")
-                missing.push("classic protection couldn't be read");
+                missing.push("classic protection: GitHub's answer doesn't say which checks it requires or whether administrators can bypass it");
             else {
-                read++;
                 judge("classic protection", rsc["strict"] === true, [...new Set([...contexts, ...apps])], actionsChecks(rsc["checks"], "app_id"), object(admins)["enabled"] === true ? [] : ["\"Do not allow bypassing the above settings\" is off, so administrators can merge past it"]);
             }
         }
     }
-    else if (notProtected(classic))
-        read++;
-    else
-        missing.push("classic protection couldn't be read");
+    else if (!notProtected(classic))
+        unread.push(`classic protection (${words(classic)})`);
     // Rulesets: every active rule requiring status checks on the branch, then its ruleset's enforcement and bypass list.
     const rules = await run(gh, ["api", "--hostname", "github.com", "--paginate", `repos/${repo}/rules/branches/${branch}`,
         "--jq", ".[] | select(.type == \"required_status_checks\") | @json"], { cwd: "/", env: ciEnv() });
     if (rules.code !== 0)
-        missing.push("main's rulesets couldn't be read");
+        unread.push(`main's rulesets (${words(rules)})`);
     else {
-        read++;
         for (const line of rules.stdout.split("\n").filter(one => one.trim() !== "")) {
             let rule;
             try {
                 rule = object(JSON.parse(line));
             }
             catch {
-                missing.push("a ruleset rule couldn't be read");
+                unread.push("a ruleset rule (its answer didn't parse)");
                 continue;
             }
             const id = rule["ruleset_id"], params = object(rule["parameters"]);
             const checks = names(params["required_status_checks"], "context");
             if (!Number.isSafeInteger(id) || Number(id) <= 0 || checks === null) {
-                missing.push("a ruleset rule couldn't be read");
+                missing.push("a ruleset rule doesn't name its ruleset or required checks");
                 continue;
             }
             const where = `ruleset ${id}`;
@@ -1280,7 +1374,7 @@ export async function readMainProtection(run, gh, repo, branch = "main") {
                 set = null;
             }
             if (set === null) {
-                missing.push(`${where}: its settings couldn't be read`);
+                unread.push(`${where}: its settings (${got.code === 0 ? "its answer didn't parse" : words(got)})`);
                 continue;
             }
             const bypass = [];
@@ -1304,15 +1398,31 @@ export async function readMainProtection(run, gh, repo, branch = "main") {
         const required = new Set(held.flat());
         return { effective: true, missing: [], notYetRequired: PROTECTION_REPORT_ONLY_CHECKS.filter(name => !required.has(name)) };
     }
-    if (read === 0)
-        return null;
+    if (unread.length > 0)
+        throw new ProtectionUnreadable(unread);
     if (missing.length === 0)
         missing.push("main has no branch protection or ruleset requiring status checks");
     return { effective: false, missing, notYetRequired: [] };
 }
+/** Main's protection couldn't be read from GitHub (after the network retries): not "doesn't hold", and never "holds". */
+export class ProtectionUnreadable extends Error {
+    unread;
+    constructor(unread) {
+        super(`couldn't read GitHub's branch protection for main: ${unread.join("; ")}`);
+        this.unread = unread;
+    }
+}
 /** Whether main's protection holds, as a yes/no (release-auto.ts sealAutoGreen): null when it can't be read. */
 export async function readUpToDateRequired(run, gh, repo, branch = "main") {
-    const protection = await readMainProtection(run, gh, repo, branch);
+    let protection;
+    try {
+        protection = await readMainProtection(run, gh, repo, branch);
+    }
+    catch (error) {
+        if (error instanceof ProtectionUnreadable)
+            return null;
+        throw error;
+    }
     return protection === null ? null : protection.effective;
 }
 /** Whether a workflow run is the push of exactly this release tag (its workflow file is the tagged commit's own, on main). */

package/dist/release-auto.d.ts

@@ -19,7 +19,7 @@ export type ObservedCheckRun = {
     suite?: number | null;
     head?: string | null;
     workflow?: number | null;
-    /** The workflow's file (GitHub's workflow-run `path`): a required check counts only from ci.yml. */
+    /** The workflow's file (GitHub's workflow-run `path`): a required check counts only from its own (REQUIRED_PR_CHECKS_WORKFLOW). */
     workflowPath?: string | null;
     /** GitHub's job record shows this unsuccessful attempt ended before any workflow step ran (release-adapters.ts). */
     beforeTests?: boolean | null;