Skip to content

docs(agents): write down the upstream sync procedure #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattwilkinsonn merged 2 commits into from
Oct 18, 2026
+11 −0
Merged

docs(agents): write down the upstream sync procedure #84

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adfea47
docs(agents): write down the upstream sync procedure
rigel-mintaka Oct 18, 2026
430bc5b
docs(agents): require the full head sha in Approved-at
rigel-mintaka Oct 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 body needs its own
paragraph `Approved-at: <full 40-character head sha>` naming the final pushed head.

## What this is

**Cotal** is a standard wire interface for software, especially AI agents, to coordinate in
Expand Down
Loading