Review and Fix

Review existing changes → identify issues → fix with subagent pattern.

Entry point when you have changes to review (vs implement which starts from a plan).

When to Use

dot

digraph when_to_use {
    "Have existing changes?" [shape=diamond];
    "Have a plan/spec?" [shape=diamond];
    "review-and-fix" [shape=box];
    "subagent-driven-development" [shape=box];
    "explore first" [shape=box];

    "Have existing changes?" -> "Have a plan/spec?" [label="yes"];
    "Have existing changes?" -> "explore first" [label="no"];
    "Have a plan/spec?" -> "subagent-driven-development" [label="yes - implement from scratch"];
    "Have a plan/spec?" -> "review-and-fix" [label="yes - review against spec"];
    "Have a plan/spec?" -> "review-and-fix" [label="no - quality review only"];
}

Input

Accepts one of:

•Commit range: main..HEAD, HEAD~3..HEAD
•File list: src/foo.ts src/bar.ts
•PR number: #123 (fetches via gh pr view)

Process

dot

digraph process {
    rankdir=TB;

    "Identify changes (commits/files/PR)" [shape=box];
    "Has spec/plan to compare?" [shape=diamond];
    "Dispatch spec reviewer" [shape=box];
    "Spec compliant?" [shape=diamond];
    "Dispatch quality reviewer" [shape=box];
    "Quality approved?" [shape=diamond];
    "Dispatch implementer to fix" [shape=box];
    "Done" [shape=box];

    "Identify changes (commits/files/PR)" -> "Has spec/plan to compare?";
    "Has spec/plan to compare?" -> "Dispatch spec reviewer" [label="yes"];
    "Has spec/plan to compare?" -> "Dispatch quality reviewer" [label="no - quality only"];
    "Dispatch spec reviewer" -> "Spec compliant?";
    "Spec compliant?" -> "Dispatch implementer to fix" [label="no"];
    "Dispatch implementer to fix" -> "Dispatch spec reviewer" [label="re-review"];
    "Spec compliant?" -> "Dispatch quality reviewer" [label="yes"];
    "Dispatch quality reviewer" -> "Quality approved?";
    "Quality approved?" -> "Dispatch implementer to fix" [label="no"];
    "Dispatch implementer to fix" -> "Dispatch quality reviewer" [label="re-review"];
    "Quality approved?" -> "Done" [label="yes"];
}

Steps

•Parse input - determine commit range, files, or PR
•
Gather context:
- •git diff {range} or file contents
- •Find related spec/plan if exists (.agents/plans/, PR description, issue)
•
Spec review (if spec exists):
- •Use subagent-driven-development/spec-reviewer-prompt.md
•
Quality review:
- •Use subagent-driven-development/code-quality-reviewer-prompt.md
•Present summary - table of issues by severity

•CRITICAL: Use AskUserQuestion to determine next steps:

code

AskUserQuestion:
  question: "How should I proceed with fixes?"
  header: "Fix scope"
  options:
    - label: "Critical only"
      description: "Fix {N} critical issues, leave rest"
    - label: "Critical + High"
      description: "Fix {N} critical and high priority issues"
    - label: "All issues"
      description: "Fix all {N} issues across all severities"
    - label: "Let me pick"
      description: "I'll specify which issues to fix"

•Dispatch fixes based on answer - use implementer prompt per component/area
•Re-review fixed code → loop until approved or user stops

Implementer Fix Prompt

When reviewer finds issues, dispatch fix subagent:

code

Task tool (general-purpose):
  description: "Fix review issues"
  prompt: |
    The reviewer found these issues in the code:

    ## Issues to Fix

    {list of issues with file:line references}

    ## Context

    {what the code is supposed to do}

    ## Your Job

    1. Fix each issue listed
    2. Verify fixes work
    3. Commit with message: "fix: address review feedback"
    4. Report what you fixed

    Do NOT:
    - Fix things not listed (scope creep)
    - Refactor beyond what's needed
    - Add features

Key Behaviors

•After summary → AskUserQuestion to determine fix scope
•After user answers → dispatch fixes immediately
•After fixes → re-review automatically

Keep momentum: summary → ask → fix → verify → done

Integration

Uses prompts from subagent-driven-development:

•spec-reviewer-prompt.md
•code-quality-reviewer-prompt.md

Related skills:

•pr-fix-comments - fix PR review comments (from humans)
•code-review - general review guidance