agentleFS
marmot-protocolmarmot-protocol/mdk/.agents/skills/land-change/SKILL.md

land-change

Skill69 starsChanged 9 days agoMITView on GitHub

Take a finished mdk change from a local branch to master: targeted local verification, the local end-to-end smoke, two independent cross-model reviews of the local diff, a short PR, the merge queue, and owning the queue result until the change merges. Use when a change is ready to ship, or when asked to land, ship, open a PR for, enqueue, or merge a change.

2 other projects use a version of this.

Adopted by

Most recently taken up by

The file

We split this skill into the rules it gives an agent

9 rules. About 0 are common, 6 are distinctive, and 3 are very specific to this project.

  • ≈0

    Common · estimate

    Many files like this have a rule of this kind.

  • ≈6

    Distinctive · estimate

    This author's own choices. Worth a look.

  • 3

    Very specific

    Tied to their project's names, files or tools. Probably skip.

  • Common
  • Distinctive
  • Very specific
  1. Distinctive:

    Run what the root AGENTS.md Verification section and the nearest crate AGENTS.md ask for:

    line 22
  2. Very specific:

    Keep them as two commands: one invocation would unify features and turn test-policy-overrides on for the simulator.

    line 46
  3. Distinctive:

    Check a finding's premise before acting on it.

    line 69
  4. Distinctive:

    Stop patching at the first of:

    line 80
  5. Distinctive:

    Do not open the PR or start another round until they decide.

    line 116
  6. Distinctive:

    Wait for the PR's required pre-check, then enqueue the head you verified and had reviewed:

    line 145
  7. Very specific:

    If the pre-check fails, open this head's pull-request run (gh run list --workflow ci.yml --commit "$(git rev-parse HEAD)", then gh run view …

    line 181
  8. Distinctive:

    No queue event since your enqueue: it has not been recorded yet, so check again.

    line 219
  9. Very specific:

    Read the newest one with gh run view <id> --log-failed.

    line 231

≈ “Common” is an estimate: at least 1 in 5 of the 350,495 skill files we read have a rule of the same kind, not the same words. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.

Keep what fits and drop the rest. Your version, ready for your agents.
Files
SKILL.md

Land a change

The merge queue is the only full gate. Verification and review happen on your machine, the PR carries the change into the queue, and the queue runs the full CI matrix on the exact commit that becomes master. Nothing reaches master any other way: no direct pushes, no admin merges, no ruleset bypass.

You own the change until it is on master. Opening the PR is the midpoint.

1. Verify locally

Run what the root AGENTS.md Verification section and the nearest crate AGENTS.md ask for:

cargo fmt --all
cargo clippy -p <crate> --all-targets --all-features --locked -- -D warnings   # each crate you changed
cargo nextest run -p <crate> -E 'test(<area>)'                                 # tests covering the change

Then run the end-to-end smoke, unless the change touches only docs or CI metadata:

# App runtime, account, engine, SQLite, Nostr adapter and relay plane against
# a separate local relay process, at production settlement (no test features).
cargo nextest run -p cgka-conformance-simulator --locked \
  --test app_runtime_journeys --test process_orchestrator \
  -E 'test(=public_app_03_late_join_and_messaging) | test(=engine_app_runtime_and_process_adapters_reach_equivalent_public_state)'

# The wn/wnd CLI and daemon over the same stack, against a mock relay.
cargo nextest run -p wn-cli --locked --test cli --features test-policy-overrides \
  -E 'test(=local_group_message_workflow_runs_through_the_dm_contract) | test(=daemon_start_status_execute_and_stop_are_user_facing_commands)'

Keep them as two commands: one invocation would unify features and turn test-policy-overrides on for the simulator. Both run offline. The four tests take under a minute; the two builds take a few minutes on a warm cache, and the first simulator build is the heaviest compile in the workspace. The tests use real sockets and settlement windows, so a heavily loaded machine can stretch them. If one fails, rerun it alone before treating the failure as yours.

An initial cohort-release PR follows the release exception in the root AGENTS.md Verification section instead of this step: run only just release-pr-preflight <version>.

A test that fails locally is yours until shown otherwise. Before calling it unrelated, run git fetch origin master and then run the test on the merge-base (git merge-base HEAD origin/master). If it fails there too, note it in the PR. If it passes there, your change broke it.

2. Review locally

Get two independent reviews of the whole local diff from model families other than yours, using .agents/skills/review-local. You are the author: you do not review your own change, and you do not decide alone that it is good enough.

  • Reviewers are read-only. They report findings; you make every change.
  • Check a finding's premise before acting on it. When you reject one, say why in the next round's prompt so the reviewer can answer it.
  • Fix what is real, redo step 1 for what the fix touched, and review again.
  • You are done when both reviewers recommend merging the same head commit. A follow-up commit that only answers a reviewer's note does not need another round; a substantive change does.

When review does not converge

Three rounds without two merge recommendations usually means the design, or the request itself, is flawed, not that the next patch will finish the job. Stop patching at the first of:

  • three rounds without two merge recommendations;
  • a round whose findings share a root cause with the previous round's;
  • a fix that would weaken an invariant documented in an AGENTS.md.

Signs of a flawed design or request:

  • Flip-flopping: fixing condition A breaks B, and fixing B brings A back.
  • A growing tail: each round finds new edge cases in the same machinery, and the list keeps getting longer.
  • Fixes that need special cases, flags or toggles to keep the design standing.
  • Reviewers who disagree about what the change should do, not just how.
  • A fix that works only by assuming something the system does not guarantee (timing, ordering, sizes, a trusted peer).

Then step back before reporting. Reread the original request and its issue, and the whole branch, not only the last round. Then ask:

  • Does the change still solve the problem that was asked?
  • Was that problem stated correctly?
  • Which assumption is producing the findings?
  • Is there a structurally different approach?
  • Did an existing pattern get reused under assumptions that no longer hold?

Report to the person who asked for the change, so they decide with concrete context:

  • the request as you understood it, and anything in it that now looks wrong;
  • what you built and why;
  • the findings across all rounds, grouped by root cause rather than by round;
  • the flaw you think is behind them, with your evidence;
  • two or three ways forward (for example a different design, a narrower scope, accepting a stated limitation, or reworking the request), each with its cost, plus your recommendation.

Do not open the PR or start another round until they decide.

3. Open the PR

Sign every commit; master rejects unsigned ones. Push the branch and open the PR with a description a person can scan in thirty seconds:

## Problem

<At most four sentences: what was wrong, and who feels it. If nobody outside
the codebase does, say so.>

## Fix

<At most four sentences: the idea of the change. No file, function or flag
lists.>

## Verification

- Local: <each command run, one line each, including the end-to-end smoke>
- Review: <seat> and <seat> recommend merge at <short sha>

Fixes #<n> and implementation notes go below these sections. Keep review transcripts, finding lists and round-by-round history out of the PR.

4. Enqueue

Wait for the PR's required pre-check, then enqueue the head you verified and had reviewed:

head="$(gh pr view <pr> --json headRefOid -q .headRefOid)"
while run="$(gh run list --workflow ci.yml --event pull_request --commit "$head" --limit 1 --json databaseId -q '.[].databaseId')" &&
  [ -z "$run" ]; do
  sleep 10
done
gh run watch "$run" --interval 30 > /dev/null
result="$(gh pr checks <pr> --required --json bucket -q '.[].bucket' 2>&1)"
echo "Required CI: $result"
[ "$result" = pass ] &&
  gh api graphql \
    -f query='mutation($id: ID!, $oid: GitObjectID!) { enqueuePullRequest(input: {pullRequestId: $id, expectedHeadOid: $oid}) { mergeQueueEntry { position } } }' \
    -f id="$(gh pr view <pr> --json id -q .id)" \
    -f oid="$(git rev-parse HEAD)"

The only required check, Required CI, does not exist until the other CI jobs finish, so while CI runs gh pr checks --required exits 1 at once with "no required checks reported", even with --watch. The block instead waits for the PR head's ci.yml run to start and finish, then reads Required CI. It lasts as long as the pre-check; run it in the background if your shell limits command time. Only pass enqueues. fail or cancel is a pre-check that did not pass, and so is "no required checks reported" once the run has finished: the run ended without creating the check, for example because the workflow failed to start. A gh error also stops the block without enqueueing; read it and run the block again. expectedHeadOid makes the enqueue fail if the PR head is not the commit you verified. Do not use gh pr merge; repository auto-merge is off, so it fails.

An enqueue refused with Required status check "Required CI" is expected means CI has not finished on the PR head yet, not that it failed. Wait for it and enqueue again.

If the pre-check fails, open this head's pull-request run (gh run list --workflow ci.yml --commit "$(git rev-parse HEAD)", then gh run view <id> --log-failed) and classify the failure with the table in step 5.

5. Own the queue result

A queue run takes about 30–35 minutes; one that fails stops at its first failed job, and the queue ejects the PR within minutes. If your host watches PRs for you, use that. Otherwise check every few minutes until the PR merges:

gh api graphql -F owner='{owner}' -F repo='{repo}' -F n=<pr> -f query='
query($owner: String!, $repo: String!, $n: Int!) {
  repository(owner: $owner, name: $repo) {
    pullRequest(number: $n) {
      state isInMergeQueue
      timelineItems(last: 1, itemTypes: [ADDED_TO_MERGE_QUEUE_EVENT, REMOVED_FROM_MERGE_QUEUE_EVENT]) {
        nodes {
          __typename
          ... on AddedToMergeQueueEvent { createdAt }
          ... on RemovedFromMergeQueueEvent { createdAt reason }
        }
      }
    }
  }
}'

The node is the PR's latest queue event. Removal events stay in the timeline, so judge only the latest one:

  • state: MERGED: done, go to step 6.
  • Latest is AddedToMergeQueueEvent: queued, keep waiting. A rebuild because a PR ahead of yours failed is not your failure.
  • Latest is RemovedFromMergeQueueEvent after your enqueue, with the PR still OPEN: the queue ejected it, and reason says why (for example failed_checks). Fixing that is now your job.
  • No queue event since your enqueue: it has not been recorded yet, so check again.

On an ejection, find your PR's queue run. Its branch is named gh-readonly-queue/master/pr-<pr>-<sha>, and other PRs' runs share the list:

gh run list --workflow ci.yml --event merge_group --limit 50 \
  --json databaseId,headBranch,conclusion,createdAt \
  --jq '.[] | select(.headBranch | startswith("gh-readonly-queue/master/pr-<pr>-"))'

Read the newest one with gh run view <id> --log-failed. The failed job is the cause; jobs shown as cancelled were stopped by it. Reproduce the failing test by name (cargo nextest run -p <crate> -E 'test(=<name>)'). Run git fetch origin master first: changes may have landed while your PR was in the queue, and every comparison below must use current master. Then decide which case it is:

CaseHow you knowWhat to do
Your bugFails on your branch, passes on origin/masterFix it, redo step 1 (and step 2 if the fix is substantive), push, enqueue again
Conflict with a change that landed ahead of youPasses on your branch alone, fails once rebased onto origin/masterRebase, fix the interaction, redo steps 1–2, push, enqueue again
FlakeIntermittent, also fails on origin/master, or in code your change cannot reachLeave the test alone. Open or update an issue for it (search the test name first), then enqueue again once
Master is brokenThe same failure in master's own CIFind the open PR fixing it and rebase once it lands. Do not fix it again in your PR

Bring in the person who asked for the change, with the run link and what you found, after a second flake ejection or for any case you cannot classify. Never skip, weaken, ignore or retry-loop a test to get a change through the queue.

6. After merge

Confirm the squash commit on master (gh pr view <pr> --json mergeCommit), delete the branch and your worktree, and report the merged commit.

Download now (ZIP)

Does it work?

Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.

No reviews yet

People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.

  • It worked
  • Partly
  • It didn't
What did you use it for? e.g. Reviewing pull requests in a Rails app

Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.

Your trail

Files you open will collect here, so you can find them again.

Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.

Now do this for your own.

Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.