docs(agents): Fold pr.mdc into the create-java-pr skill - #5936
Merged
Conversation
📲 Install BuildsAndroid
|
markushi
approved these changes
Aug 12, 2026
The pr.mdc rule file and the create-java-pr skill described the same six-step PR workflow, and both inlined a copy of the PR template and the changelog subsection table. Nobody on the team uses Cursor, so the rule/skill split earned nothing and the two copies had already drifted: both inlined templates were missing the "Public API changes reviewed by another Mobile SDK team member" checklist item that .github/pull_request_template.md has gained since. Delete pr.mdc and give its content one home each. The conventions the skill was missing (allowed commit types, PR title format, changelog rebase caveat) move into the skill. The stacked-PR workflow moves to a references file the skill loads on demand, so the common standalone-PR path no longer carries 150 lines that only apply to stacks. The skill now reads .github/pull_request_template.md instead of reproducing it, leaving one copy that cannot drift. #skip-changelog
runningcode
force-pushed
the
no/dedupe-pr-workflow-docs
branch
from
August 13, 2026 13:26
86fbcba to
41113f9
Compare
The reference file mixed two kinds of content: the standard Graphite-style stacking workflow, which any agent can reconstruct from general knowledge and `gh` usage, and the parts specific to this repo. The generic half diluted the half that matters. Drop the chain-walking recipe, the branch naming convention, the generic create/merge/sync steps, and the restatement of the stack shape. Keep what is not derivable: why the collection branch exists (`main` is squash-only, which conflicts repeatedly when syncing a stack), the title and stack list formats, and the permission-pattern constraint on editing PR bodies. Collect the four destructive-operation warnings under one heading instead of leaving them scattered across three sections, and point SKILL.md at the surviving section names. #skip-changelog
runningcode
commented
Aug 13, 2026
runningcode
marked this pull request as ready for review
August 13, 2026 15:01
runningcode
requested review from
0xadam-brown,
adinauer and
romtsn
as code owners
August 13, 2026 15:01
Ran fresh agents through "create a PR" and "create a stacked PR" against the deduped docs, stopping each before the first mutating action. Both paths loaded the intended files, but four defects surfaced: - SKILL.md named stacked-prs.md the source of truth for branch naming, which that file never covered. Corrected to title naming; the branch rule stays in Step 1, where the branch is created. - Four passages referenced the collection branch PR, but no step ever opened it. Added next to the branch creation, with its title and merge-reminder exceptions. - The PR-description editing rule was stated three times and had already drifted. It now lives once in SKILL.md, which both the standalone and stacked paths read, and stacked-prs.md points back to it. - AGENTS.md rule 7 told agents to propose but not execute a commit while the create-java-pr skill commits, pushes, and opens the PR, leaving two terminal states for one request. Scoped rule 7 to implementation work. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📜 Description
Deletes
.cursor/rules/pr.mdc(264 lines) and gives its content a single home each:create-java-pr/SKILL.md: allowed commit types, PR title format, changelog rebase caveat.create-java-pr/references/stacked-prs.md, loaded on demand. Git tracks this as a rename.The skill now reads
.github/pull_request_template.mdfor the PR body instead of reproducing it, with an explicit instruction never to write it from memory.AGENTS.mddrops theprrow from the rule table and points its Changelog section at the skill.Fixes found by dry-running the result
Agents were run against the deduped docs for "create a PR" and "create a stacked PR", stopping before the first mutating action. Both paths loaded the intended files — the standalone run never opened
stacked-prs.md— and surfaced four defects, now fixed:SKILL.mdnamedstacked-prs.mdthe source of truth for branch naming, which it never covered. Claim corrected to title naming.&&vs&&/||). Now stated once inSKILL.md, which both paths read.AGENTS.mdstep 7 ("propose but not execute a commit") contradicted the skill, which commits, pushes, and opens the PR. Scoped to implementation work.💡 Motivation and Context
pr.mdcand the skill described the same six-step workflow. The skill opened by declaringpr.mdc"required reading … the source of truth," then re-implemented every step anyway. Both inlined the PR template and the changelog subsection table.Nobody on the team uses Cursor, so the split bought nothing — it just doubled the surface that had to stay in sync. And it hadn't: both inlined templates were missing a checklist item
.github/pull_request_template.mdhas since gained:Every PR created through the skill silently dropped it. Pointing at the template file makes that class of drift impossible.
💚 How did you test it?
Docs-only — no code paths affected.
pr.mdcremain.AGENTS.mdrule table matches.cursor/rules/exactly (12 rules, 12 rows).📝 Checklist
sendDefaultPIIis enabled.🔮 Next steps
Remaining duplication, in order of payoff:
AGENTS.mdrepeats./gradlew spotlessApply apiDumpacross nine lines; theMakefileis the source of truth. (CONTRIBUTING.mdalso documents amake formattarget that doesn't exist — one-line fix held back for its own PR, which this one should follow.)AGENTS.mdand the skill.AGENTS.md,test/SKILL.md, ande2e_tests.mdc; the skill's module→task table is the accurate one..cursor/rules/files are arguably misfiled if nobody uses Cursor, but rehoming them touches every rule reference.#skip-changelog