From edefd7ccdcfbe10fa0bcfcac7fa56f33e16925eb Mon Sep 17 00:00:00 2001 From: KJGBot Date: Thu, 8 Oct 2026 16:07:23 -0700 Subject: [PATCH] docs(agents): install @agent-relay/merge-train-snippet Feature PRs target trunk, verify locally, and get the `mergeable` label when ready; the merge agent promotes trunk -> main. --- AGENTS.md | 11 +++++++---- prpm.lock | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 5b28767f..5250914e 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -203,11 +203,14 @@ Relayfile runtime changes that write provider records must keep Full rule: `.claude/rules/relayfile-integration-digests.md`. - + ## 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. @@ -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. - + diff --git a/prpm.lock b/prpm.lock index f26d93ee..1f88332c 100644 --- a/prpm.lock +++ b/prpm.lock @@ -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", @@ -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",