Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 7 additions & 4 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,14 @@ Relayfile runtime changes that write provider records must keep

Full rule: `.claude/rules/relayfile-integration-digests.md`.

<!-- prpm:snippet:start @agent-relay/merge-train-snippet@1.0.0 -->
<!-- prpm:snippet:start @agent-relay/merge-train-snippet@1.0.1 -->
## Merging: `trunk` + the `mergeable` label

CI does **not** run on feature branches. It runs only on the `trunk` → `main`
pull request and on pushes to `main`. (Repos whose default branch is not
CI suites do **not** run automatically on feature branches. They run only on
this repository's `trunk` → `main` pull request and on pushes to `main`. The
one check that does run on a feature PR into `main` is `Trunk guard`, which
fails it on purpose; manually dispatched workflows (`workflow_dispatch`) still
run on any branch. (Repos whose default branch is not
`main`, e.g. `master`, use that branch wherever this says `main`.) A merge
agent batches ready PRs into `trunk`, gets that one PR green, and merges it.

Expand Down Expand Up @@ -241,4 +244,4 @@ to rebase on `trunk`; do so and keep the label.

> Interim: the sweep worker is not deployed yet. Until it is, a human or a
> designated agent performs the merge-agent steps manually. Labelling is unchanged.
<!-- prpm:snippet:end @agent-relay/merge-train-snippet@1.0.0 -->
<!-- prpm:snippet:end @agent-relay/merge-train-snippet@1.0.1 -->
8 changes: 4 additions & 4 deletions prpm.lock
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@
"installedPath": ".opencode/skills/running-headless-orchestrator/SKILL.md"
},
"@agent-relay/merge-train-snippet#agents.md:AGENTS.md": {
"version": "1.0.0",
"resolved": "https://registry.prpm.dev/api/v1/packages/%40agent-relay%2Fmerge-train-snippet/1.0.0.tar.gz",
"integrity": "sha256-a85e34747a332452ab6d8d7f814c828d404a3a77dd724f16878d26b91fb7d5bb",
"version": "1.0.1",
"resolved": "https://registry.prpm.dev/api/v1/packages/%40agent-relay%2Fmerge-train-snippet/1.0.1.tar.gz",
"integrity": "sha256-b993f4fd7a737b5788f10fca8b02d6eea02c803b1d4483f6536f3cfd3f85126e",
"format": "agents.md",
"subtype": "snippet",
"sourceFormat": "generic",
Expand All @@ -172,7 +172,7 @@
}
}
},
"generated": "2026-10-08T22:45:42.438Z",
"generated": "2026-10-08T23:07:22.828Z",
"collections": {
"agent-relay-starter": {
"name_slug": "agent-relay-starter",
Expand Down
Loading