Skip to content

chore: merge-train snippet 1.0.2 - #550

Closed
kjgbot wants to merge 1 commit into
trunkfrom
chore/merge-train-snippet-1.0.2
Closed

kjgbot wants to merge 1 commit into
trunkfrom
chore/merge-train-snippet-1.0.2

Conversation

@kjgbot

@kjgbot kjgbot commented Oct 9, 2026 •

Copy link
Copy Markdown
Contributor

Bumps the installed @agent-relay/merge-train-snippet from 1.0.1 to 1.0.2 (AgentWorkforce/skills#158). This only changes the marked block in AGENTS.md and the lock entry in prpm.lock.

What 1.0.2 changes

  • New rule: never add mergeable to a PR you didn't author without a human maintainer's explicit approval. Never add it to an external contributor's PR at all; only a maintainer labels those, after reviewing the exact head.
  • New step 3, migrations: re-derive the migration floor right before pushing, and push a renumbered branch immediately.
  • Removed: the stale "Interim: the sweep worker is not deployed yet" note.

How it was installed

npx prpm@latest install @agent-relay/merge-train-snippet@1.0.2 -y

The version is explicit because the prpm registry's latest tag still points at 1.0.1, even though 1.0.2 is published. prpm upgrade and prpm info read that tag, so a plain install or upgrade would stay on 1.0.1.

Notes

  • CLAUDE.md is untouched. Where it's a symlink (git mode 120000), it still points at AGENTS.md and wasn't replaced with a copy.

🤖 Generated with Claude Code


Note

Low Risk
Documentation and lockfile-only change to agent merge guidelines; no application or CI workflow code is modified.

Overview
Bumps the embedded @agent-relay/merge-train-snippet from 1.0.1 → 1.0.2 in AGENTS.md (snippet markers) and prpm.lock (version, tarball URL, integrity, generated timestamp).

The updated merge-train guidance adds step 3 for numbered migrations (re-derive the floor on trunk before push; push immediately after renumbering) and renumbers the mergeable label steps to 4–5. Under What you must not do, it now forbids agents from adding mergeable to PRs they did not author without maintainer approval, and restricts mergeable on external/fork PRs to maintainers after head review. It also removes the interim note that the sweep worker was not yet deployed.

Reviewed by Cursor Bugbot for commit d1437c1. Bugbot is set up for automated code reviews on this repo. Configure here.


Agent Relay sessions

  • claude session a19d0f6e · opened via gh pr create · last active 2026-10-09

Installed with `npx prpm@latest install @agent-relay/merge-train-snippet@1.0.2 -y`
(explicit version: the registry's latest tag still points at 1.0.1).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Oct 9, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration
  • Configuration used: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 0693c8f5-c6f0-4f06-b2e5-7aa1e0f2c69a

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@devin-ai-integration devin-ai-integration Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Devin Review: No Issues Found

Devin Review analyzed this PR and found no bugs or issues to report.

Devin Review

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues found across 2 files

View guided diff | Re-trigger cubic

@kjgbot kjgbot added mergeable Merge train: merge this PR into trunk once its ready check is green and removed mergeable Merge train: merge this PR into trunk once its ready check is green labels Oct 9, 2026
@kjgbot

kjgbot commented Oct 9, 2026

Copy link
Copy Markdown
Contributor Author

Closing: the merge train is cloud-only now (Khaliq's decision). This repo goes back to normal per-PR CI on main, and a separate revert PR removes the trunk gating and the merge-train snippet.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant