AGENT SKILL

merge-fix-until-satisfied

Fix every PR review issue, commit, push, re-check until satisfied. Triggers: fix all, fix everything, /fix-until-satisfied. After merge-review-pr.

License 许可
MIT
最近更新
2026-11-13
Stars
★ 0
Forks
0

01 前言 Front Matter

name
merge-fix-until-satisfied
description
Fix every PR review issue, commit, push, re-check until satisfied. Triggers: fix all, fix everything, /fix-until-satisfied. After merge-review-pr.

03 SKILL.md 正文

merge-fix-until-satisfied

Host execution

Claude Code: retain the agent-dispatch and concurrency behavior defined below. Codex: use only the inline behavior stated here.

On Codex this sub-skill runs inline under agile-11-merge-train with concurrency=0; never spawn or assume a named agent. Perform its full gate and return its normal receipt to the caller.

Purpose

Fix every issue from a PR review, commit, re-examine, repeat until satisfied. The "Satisfied. No remaining issues." verdict is the contract callers (agile-11-merge-train 3c) gate on.

Input: the issues from the current session (merge-review-pr output or an inline review). No review yet → run merge-review-pr first.

Verification mode (0 issues) is valid usage, not a smell. When the caller passes "0 issues", still run and still emit the verdict — never refuse with "nothing to do". Phase 1 becomes opportunistic cleanup: while re-reading the changed files, fix anything genuinely ugly you find.

Cleanup threshold — obvious and low-risk only. In scope: an unused import, a dead branch, a misleading name, copy-paste worth extracting (≥3 lines), a comment the code contradicts, a magic number that wants a named constant, an f-string SQL that wants bound params. Out of scope (file a follow-up ticket instead): a restructured class hierarchy, a new abstraction layer, splitting a module, renaming a public API, or touching any file the PR did not already modify. Unsure whether it is an improvement → leave it. The cleanup belongs in the PR being merged, not sprawled into adjacent code.

Phase 1 — Fix

No review issues and nothing ugly spotted → skip to Phase 3. Otherwise, per issue (critical first, then minor):

  1. Read the full file before editing — never edit from diff context alone.
  2. Apply the fix.
  3. Grep for analogous sites. Fixing a field name means grepping every test file for the old name; a wrong port in one docstring means checking its siblings. One fix, then the sweep.
  4. Run the project's linter on the file (ruff check, eslint, golangci-lint, …). Markdown / YAML / TOML / JSON have no linter — just verify the file still parses.

Under a round budget (round= from the caller, e.g. agile-11-merge-train): this is the only fix push before a final delta review. Fix only the findings named, with the smallest change that resolves each. No opportunistic cleanup, in verification mode too, and no analogous-site sweep beyond files the fix touches; every extra edit is new surface for that review.

"Fix all" means fix all, including every Minor. Minor is a severity, not permission to punt. The only acceptable skip is genuinely separate work in files the PR did not already touch, never one that is merely more effort — file a follow-up inline and note it in the postmortem. Never declare Satisfied with unaddressed Minor findings on the report.

If a fix reveals a deeper problem, escalate and explain before proceeding.

Phase 2 — Commit & push

No-op Phase 1 → skip to Phase 3. Otherwise group related fixes into one commit and separate unrelated ones. Keep opportunistic cleanup separate from review-issue fixes: refactor(scope): / style(scope): for cleanup, fix(scope): for review corrections.

fix(<scope>): <ticket> <imperative summary>

<body only if the why is non-obvious>

Lint before the push. Run every command the CI lint job runs on the tree you are about to push, not only Phase 1's per-file linter, and read each real exit code. Fix and re-run until each exits 0; a lint failure CI finds costs the caller a whole 3e round.

Then git push origin <branch> where <branch> is whatever HEAD is on (git rev-parse --abbrev-ref HEAD) — a PR feature branch, or main itself when a person runs this on a post-merge follow-up outside the autonomous loop. Inside the loop work lands only through a PR, and the agile-mods push guard refuses a push to main.

Confirm you are on the right branch BEFORE committing. Your caller resolves one working location per PR and names it in your prompt — often a worktree that already holds the branch, because agile-10-implement leaves one per unmerged ticket. Work there by absolute path (cd <path>, git -C <path>) and check git -C <path> rev-parse --abbrev-ref HEAD matches the PR's branch. If it does not — most dangerously if it says main while you were asked to fix a PR — stop and emit the receipt with blocked; do not commit. "Whatever HEAD is on" is the push rule, not a licence to commit a PR's fixes wherever the shell happens to be pointing.

Phase 3 — Re-examine

Re-read every file changed, in the original PR and in the fixes. Did a fix introduce something new (did every reference update)? Are there analogous issues in untouched files? Does the test-suite CLAUDE.md/AGENTS.md need updating?

Phase 4 — Verdict

Satisfaction is a multi-gate check, not a vibe. Emit "Satisfied. No remaining issues." only when every gate below is provably green; any failure loops back to Phase 1.

Do not poll or wait for CI. Capture the latest run id before pushing (gh run list --branch <branch> -L1 --json databaseId), push, then emit the receipt immediately naming that pre-push run id and the pushed sha. Waiting for the post-push run is the caller's gate (agile-11-merge-train 3e); a poll loop here burns the whole step's budget and returns nothing.

  1. CI accounted for — read the checks on branch HEAD once (gh pr view <N> --json statusCheckRollup,mergeStateStatus). A non-SUCCESS conclusion on a pre-existing run must be diagnosed and fixed here. An in-progress or not-yet-started run on the tip you just pushed is not a gate failure — record the pre-push id + pushed sha and hand off. One read, no loop.
  2. Lint clean — the project linter exits 0 across all touched paths.
  3. All ACs satisfied — walk the Jira ticket's AC list one by one; if you cannot point at a specific line, it is not satisfied.
  4. PR up to date with main — gh pr view <N> --json mergeable,mergeStateStatus returns mergeable: MERGEABLE + mergeStateStatus: CLEAN. BEHIND / DIRTY / CONFLICTING → invoke merge-update-pr before declaring satisfaction.
  5. Implementation quality — re-read the changed files (diff context is not enough): clean, DRY, no dead branches, no duplication worth extracting, no misleading names, no contradicted comments, no unused imports, no unnamed magic numbers. Anything surfacing here goes back through Phase 1.

A DoD-vs-convention conflict is a labelled conscious accept, never a silent choice in either direction. When a standing repo convention contradicts the ticket's DoD wording, follow the convention and record a Conscious accept: entry stating all five: what the DoD asks · what was done instead · why the convention wins · where the equivalent-strength coverage actually lives · that this was deliberate. It carries into the postmortem so the merge/QA reader signs off knowingly; unlabelled it reads later as a missed DoD item. none is a real value of that field, not an omission.

Satisfied. No remaining issues.
- CI: pre-push run <run-id>, pushed sha <sha> — caller gates the fresh run
- Lint: clean
- ACs: <N>/<N> verified against specific lines
- Conscious accept: <DoD asks X> → <did Y per convention Z>; equivalent coverage at <file:line>; deliberate   |   none
- Rebase: branch up to date with main, no conflicts
- Implementation: <one-line quality assessment>

Not satisfied → name which gate(s) failed and what blocks them, then loop back to Phase 1.

Never end the turn without the verdict receipt, and never ask the caller a question — blocked means emitting the receipt with a blocked field naming the blocker. The receipt is structured fields, written in normal English full sentences: the merge train reads it as the green light for merge, and it must stay unambiguous when read later.

04 同仓库更多 Skills

cedricfarinazzo
cedricfarinazzo/agile-skills

session-audit

Audit the cost and efficiency of Claude Code sessions that ran agile-skills: per-skill and per-subagent spend, a before/after delta normalised by work shipped, and ranked skill improvements. Triggers: audit this session's cost, analyze the session transcripts, compare before and after sessions, is the new version more efficient, where do the tokens go, subagent cost breakdown, find efficiency improvements.

★ 0
cedricfarinazzo
cedricfarinazzo/agile-skills

deep-it-project-review

Autonomously perform a deep, evidence-backed technical review of a software or IT project across applicable architecture, code, security, delivery, operations, and lifecycle domains without modifying project files. Triggers: deep IT project review, technical project review, architecture audit, repository assessment, assess this codebase, review this project.

★ 0
cedricfarinazzo
cedricfarinazzo/agile-skills

test-refactor

Audit one test suite at a time for dead weight, duplication, parallel-unsafety and runtime cost, or characterize behavior before a risky refactor — with production code frozen and good coverage kept, proven per module rather than assumed. Triggers: test refactor, characterize before refactor, characterization tests, clean the tests, refactor the tests, test suite audit, DRY the tests, parallelize the test suite, speed up the tests.

★ 0
cedricfarinazzo
cedricfarinazzo/agile-skills

doc-refactor

Audit every markdown file in a repo — READMEs, docs/, and agent-instruction files — for lies, drift, duplication and bloat, then ticket and ship the cleanup as a sequenced PR train, with source code frozen and every surviving claim verified against the repo rather than read. Triggers: doc refactor, refactor the docs, clean the docs, documentation audit, README audit, docs are stale, DRY the docs, audit every markdown file.

★ 0
cedricfarinazzo
cedricfarinazzo/agile-skills

deep-refactor

Audit an entire codebase for defects, waste and debt, then ticket and ship the findings as a sequenced PR train — without breaking the test contract. Triggers: deep refactor, refactor audit, clean the codebase, DRY pass, audit and fix everything.

★ 0
cedricfarinazzo
cedricfarinazzo/agile-skills

agile-sprint-drain

Drain the active sprint to a fixed point: auto-alternate agile-10-implement (build) and agile-11-merge-train (merge) until both empty (DRAINED) or blocked (STUCK). Optional concurrency=N, dispatch=session, max-merges=N. Triggers: drain the sprint, run the sprint to completion, implement and merge until done, clear the whole board, ship the sprint.

★ 0