From 575256a3b6a79d8cda0031413101ad5beff23092 Mon Sep 17 00:00:00 2001 From: KJGBot Date: Thu, 8 Oct 2026 16:06:39 -0700 Subject: [PATCH] =?UTF-8?q?fix(prpm):=20merge-train=20snippet=201.0.1=20?= =?UTF-8?q?=E2=80=94=20accurate=20CI=20wording?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 (1M context) --- prpm.json | 4 ++-- snippets/merge-train-snippet.md | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/prpm.json b/prpm.json index 07500db4..49d0d56c 100644 --- a/prpm.json +++ b/prpm.json @@ -332,7 +332,7 @@ { "name": "writeback-as-files", "version": "1.0.0", - "description": "Use when an agent needs to write back to a provider through a relayfile mount (Linear comments, GitHub issues, Slack messages, Notion pages, etc.). Covers the file-creation writeback contract (drop JSON at the canonical path → provider mutation), discovering paths and schemas via .schema.json siblings, idempotency keys, writeback status with relayfile writeback list and relayfile status, and recovering from dead-lettered writes under .relay/dead-letter/.", + "description": "Use when an agent needs to write back to a provider through a relayfile mount (Linear comments, GitHub issues, Slack messages, Notion pages, etc.). Covers the file-creation writeback contract (drop JSON at the canonical path \u2192 provider mutation), discovering paths and schemas via .schema.json siblings, idempotency keys, writeback status with relayfile writeback list and relayfile status, and recovering from dead-lettered writes under .relay/dead-letter/.", "format": "claude", "subtype": "skill", "tags": [ @@ -616,7 +616,7 @@ }, { "name": "merge-train-snippet", - "version": "1.0.0", + "version": "1.0.1", "description": "AGENTS.md snippet: feature PRs target trunk, verify locally (no feature-branch CI), and add the `mergeable` label when ready; the merge agent sweeps them into trunk and promotes trunk to the default branch.", "format": "generic", "subtype": "snippet", diff --git a/snippets/merge-train-snippet.md b/snippets/merge-train-snippet.md index efc7eb1e..acac77ad 100644 --- a/snippets/merge-train-snippet.md +++ b/snippets/merge-train-snippet.md @@ -1,7 +1,10 @@ ## 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.