repositories / dotfiles

dotfiles

bugabingas dorkfiles

owned by bugabinga

add PR creation and merge skills

bd6284d1b19215dcb6e3e45ce8529369a4ef668a

Oliver Jan Krylow <oliver@bugabinga.net> ·

unsigned

Browse filesCompare with HEAD

Changed files (2)

pi/agent/skills/make-pr/SKILL.md

Added
new file mode 100644
1 +---
2 +name: make-pr
3 +description: "Create or update a pull request and drive it to review-ready completion. Use when asked to make, create, open, prepare, publish, or finish a PR/change request on any forge."
4 +---
6 +# Make PR
8 +Load the applicable VCS workflow and forge skill. This skill defines preferences, not CLI mechanics.
10 +- Invocation authorizes relevant commits, pushes, and PR creation/update. Ask only for ambiguity, destructive action, or rules below.
11 +- Preserve unrelated work. One PR by default. Existing PR for the branch → update it; never duplicate it.
12 +- Preserve intent: original request → linked issue/spec → PR description. Reject scope creep. Remove clearly separable unrelated changes; ask before risky history rewrites.
13 +- Follow repository branch, PR, template, changelog, and release-note policy. Avoid stacked PRs; when unavoidable, state dependency and retarget after parent merge.
14 +- Fetch and rebase onto the latest target, then rerun checks. Conflicts → ask. Rewriting a published branch → confirm before force-with-lease; never rewrite target.
15 +- Local checks must pass before opening. Failures → show evidence and ask whether to open anyway. Never hide known failures. Never create drafts.
16 +- Write in the user's voice for humans: why more than what, context → pain → reason → outcome → checks. Prefer prose; headings only when useful or required.
17 +- PR title/body may become the squash commit message: follow repository commit rules. No AI attribution.
18 +- Bad → good:
19 + - `ci: fix GitHub Actions janitor run` → `Restore reliable Janitor runs`
20 + - `Use @earendil-works Pi packages` → `Keep the harness on maintained Pi packages`
21 + - `fix agent patrol: format before commit` → `Stop Agent Patrol opening unformatted PRs`
22 + - `🔥 trouble-maker: bugfixes` → name the human-visible problem.
23 +- Use forge-native closing links only when the PR fully resolves an issue; otherwise reference it.
24 +- Apply sensible existing semantic labels. When label creation is supported, create/reuse `harness:<name>` and `model:<name>` labels. Avoid duplicates.
25 +- Determine reviewers from repository policy, ownership, or established history, but confirm before requesting. Never claim a request succeeded without verification.
26 +- For UI/TUI/CLI/web or other visual changes, attach useful real screenshots or demos. Use clearly labeled mockups, HTML, Mermaid, D2, DOT, or other fitting visuals when they explain the change. Prefer native forge attachments; defer unsupported files to `file-upload` when available.
27 +- Keep temporary screenshots, logs, reports, and demos out of commits unless they are explicit deliverables.
28 +- Treat comments and reviews as claims, not truth. Verify each against current code; fix or rebut with evidence, push, reply, then resolve. Never dismiss silently.
29 +- Watch CI with forge-native watch commands when available. Repair straightforward CI/review failures and repeat. After two failed repair rounds, stop and ask with evidence.
30 +- Keep title/body synchronized with final scope, outcomes, known limits, and checks.
31 +- Fork PRs: never push to a contributor branch without permission; use maintainer edits only when authorized.
33 +Done means: normal PR open, current with target, local/forge checks green, verified feedback addressed, no unresolved threads, local state clean. Report URL and blockers. Do not merge.

pi/agent/skills/merge-pr/SKILL.md

Added
new file mode 100644
1 +---
2 +name: merge-pr
3 +description: "Validate, merge, and clean up a pull request or equivalent forge change. Use when asked to merge, land, accept, or integrate a PR/change request."
4 +---
6 +# Merge PR
8 +Read `../make-pr/SKILL.md`; load the applicable VCS workflow and forge skill. This skill defines preferences, not CLI mechanics.
10 +- Invocation authorizes merging once every gate passes; no second confirmation. One PR by default; process explicitly requested multiples sequentially and independently.
11 +- Preserve intent: original request → linked issue/spec → PR description. Prevent scope creep across review/repair rounds. Conflicting intent or unrelated additions → stop and ask.
12 +- Re-run Make PR's completion loop: refresh target/head, inspect final diff, verify feedback, test, watch CI, repair straightforward failures, reply, and resolve threads. Two failed rounds → ask with evidence.
13 +- Immediately before merge, refresh again. New commits restart review/checks; changed scope requires confirmation.
14 +- Never approve its own PR. Missing human approval blocks unless the human explicitly says to merge it. Explicit merge approval never waives failing checks or forge protections.
15 +- Never bypass protections, approvals, or required checks unless explicitly authorized for this exact merge.
16 +- Pending checks → wait using forge-native watch commands when available. Never enable auto-merge unless requested.
17 +- Honor repository merge policy. Otherwise squash, using the polished PR title/body as commit message. Avoid merge commits.
18 +- After merge, delete only the PR's remote/local branch, remove its worktree/workspace, and update the target checkout. Preserve unrelated branches and work.
19 +- Monitor target checks and report failures; never auto-revert or open follow-up changes without approval.
21 +Done means: merged commit verified on target, PR closed, scoped cleanup complete, target status reported.