Repository navigation
Conversation
AGENTS.md gains the rule: a PR is caught up and re-tested before it merges when v2/main moved in a way that can interact with it, with a definition of "can interact" that is cheap to check. pr-flow step 10 gains the recipe: list what the PR's head lacks, decide, merge origin/v2/main into the branch, gate, push, wait for CI, plus the fan-out ordering note. Also corrects step 6's pointer to the close-out step (9 -> 10) and adds a trigger eval case for the new step; the description is unchanged. Closes #5589 Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com> Signed-off-by: cliffhall <cliff@futurescale.com>
|
There was a problem hiding this comment.
🟡 Changes recommended
The documented command block runs git push even when the validation gate fails, allowing a failing combined tree to be pushed contrary to the pre-push rule.
1 open issue
What changed in this PR
Adds a pre-merge catch-up procedure for PRs affected by changes on v2/main, addressing the integration failure described in #5589 without changing repository rulesets or server behavior.
Changes:
- Defines when upstream changes require merging the latest base and re-testing.
- Documents catch-up commands, CI waiting, review expectations, and ordering for related PRs.
- Adds a skill trigger evaluation and corrects the close-out step reference.
| File | Description |
|---|---|
AGENTS.md |
Adds the rule for catching up and re-testing interacting changes before merge. |
.claude/skills/pr-flow/SKILL.md |
Adds the pre-merge procedure and corrects the close-out reference. |
.claude/skills/pr-flow/evals/evals.json |
Adds a trigger case for a green PR whose base has changed. |
Review effort: Balanced
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com> Signed-off-by: cliffhall <cliff@futurescale.com>
|
Copilot round 1: one finding, fixed.
No suppressed comments. Gate exit 0 on bba0b99. Requesting round 2. |
|
Copilot round 2: clean (approval recommended, no open issues; the round 1 finding shows as resolved). The loop ends here on the clean-round exit. |

Closes #5589
Description
Adds the rule and the recipe for catching a PR up before it merges when
v2/mainmoved under it.AGENTS.md(Issue-driven work style): one new rule. Before a PR merges, it is caught up and re-tested ifv2/mainmoved in a way that can interact with it. "No conflicts" is not that test. What landed can interact when it touches asrc/<server>/directory the PR also touches, or when either side touches repository-wide configuration (a root manifest, lockfile or configuration file,scripts/,.github/workflows/). In doubt, re-test. Catching up is a merge oforigin/v2/main, never a rebase, then the gate, a push and green CI on the new head.pr-flowstep 10: now split into "Before the merge" and "After the merge". The new part holds the commands that list what the PR's head lacks and run the two checks, the decision table, the catch-up (merge,npm install, gate, push, one backgroundedgh pr checks --watch), the statement that a conflict-free catch-up needs no new Copilot round, and the fan-out note (a PR changing a server's configuration merges last, or the others are re-tested after it) with the query that lists the open PRs touching a server.pr-flowstep 6 pointed at "step 9" for the manual close; the close-out is step 10. Corrected, since the new text cites step numbers next to it.Server Details
None (repository-wide):
AGENTS.mdand thepr-flowskill.Motivation and Context
#5569: #5564 and #5567 were each gated and CI-green against a base that lacked the other, GitHub reported the second as cleanly mergeable, and the combination failed
ruff checkonv2/main. CI here runs on push, on the branch's head commit, so nothing had tested the combined tree.Relation to #5588 (a merge queue or required status checks for
v2/main, a maintainer decision): this procedure is what holds until that is decided.AGENTS.mdrule would be removed with that change.How Has This Been Tested?
No client-observable surface; targeted probes instead.
The recipe replayed against the incident.
HEAD_SHAis #5567's head (31a72754), and the base tip isv2/mainright after #5564 merged (88af1edb), which is the state #5567 was merged into:Check A names
src/fetch/, so the table says catch up; the catch-up's gate would have failedruff checkbefore the merge. Controls: a head already atorigin/v2/main, and #5596's head against the tip it merged into, both print no commits and nothing for A or B.Fan-out query: run against the live repo with
src/fetch/; returns the open PRs touching that server.Skill checks:
npm run verify:skills: OK, 11 skills, listing share 3903/4000 (unchanged, the description did not change).npm run skills:eval -- pr-flow(RUNS=3): 9/9 cases at 100%, including the new one ("My PR is green and GitHub says it has no conflicts, but another PR for the same server merged into v2/main ten minutes ago. What do I have to do before it can merge?") and both negatives. Onlypr-flow's cases were run, not the whole suite, because no description changed.$0–$9or$ARGUMENTSin the body.npm run local:gate: exit 0.Breaking Changes
None.
Types of changes
Checklist
🤖 Generated with Claude Code