From adfea47e63007c2198c050d1066de60b68cd1a46 Mon Sep 17 00:00:00 2001 From: mintaka Date: Sun, 18 Oct 2026 16:13:02 -0400 Subject: [PATCH 1/2] docs(agents): write down the upstream sync procedure Refs RIG-5440 Spec-impact: none Co-authored-by: Matt Wilkinson --- AGENTS.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/AGENTS.md b/AGENTS.md index c27b0d58ed..3b12d26ca2 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -20,6 +20,17 @@ and do not file a question about it. This is a standing owner ruling. - **A test for code we wrote is fixed.** Fix a race by waiting for the event, not with a retry or a quarantine. +## Syncing upstream into `rigel-release` + +1. Branch `harness/rig-5440-upstream-sync` from `rigel-release` and merge `main` into it. Keep the +merge commit; this PR must not be squashed or rebased. Mutation reproof skips this exact branch name. +2. Resolve conflicts in favor of our custody guarantees (custodian-run Linux pty seats, no +numeric or process-group signals, retain or refuse an unproven reap). If an upstream test asserts +the opposite, quarantine it unchanged. +3. Quarantine every other upstream-red suite as above, then run `pnpm smoke:gate-inventory`. +4. Add review fixes as new commits on the branch, never as a rebase. The PR needs an +`Approved-at: ` paragraph naming its final head. + ## What this is **Cotal** is a standard wire interface for software, especially AI agents, to coordinate in From 430bc5b11f44d3ce630349630cd2359314c9b551 Mon Sep 17 00:00:00 2001 From: mintaka Date: Sun, 18 Oct 2026 16:17:54 -0400 Subject: [PATCH 2/2] docs(agents): require the full head sha in Approved-at Refs RIG-5440 Spec-impact: none Co-authored-by: Matt Wilkinson --- AGENTS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 3b12d26ca2..d9d053739a 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -28,8 +28,8 @@ merge commit; this PR must not be squashed or rebased. Mutation reproof skips th numeric or process-group signals, retain or refuse an unproven reap). If an upstream test asserts the opposite, quarantine it unchanged. 3. Quarantine every other upstream-red suite as above, then run `pnpm smoke:gate-inventory`. -4. Add review fixes as new commits on the branch, never as a rebase. The PR needs an -`Approved-at: ` paragraph naming its final head. +4. Add review fixes as new commits on the branch, never as a rebase. The PR body needs its own +paragraph `Approved-at: ` naming the final pushed head. ## What this is