Fixing PR: $ARGUMENTS

Fixing PR: $ARGUMENTS

Apply fixes to PR issues identified by /review-pr or GitHub review comments.

Options

• --local - Apply fixes locally only, skip GitHub posting and pushing

Step 1: Determine Posting Mode

If --local flag is provided: Skip prompt, proceed in local-only mode.

If no flag provided: Use AskUserQuestion to prompt BEFORE starting fixes:

Question: "Would you like to push changes and post summary to GitHub when complete?"
Options:
  - "Yes, push and post to GitHub" (default)
  - "No, keep changes local only"

Store the user's choice and proceed with the fixes.

Step 2: Determine Which PR to Fix

# Parse arguments for --local flag
LOCAL_ONLY=false
PR_ARG=""
for arg in $ARGUMENTS; do
    if [ "$arg" = "--local" ]; then
        LOCAL_ONLY=true
    else
        PR_ARG="$arg"
    fi
done

If no PR argument provided: Use AskUserQuestion to ask for the PR:

Question: "Which PR would you like to fix?"
Header: "PR"
Options:
  - "Enter PR number" (e.g., 6390)
  - "Enter PR name/title" (e.g., "Arkansas TANF")

Then use the provided value to find the PR.

# If argument is a number, use it directly
if [[ "$PR_ARG" =~ ^[0-9]+$ ]]; then
    PR_NUMBER=$PR_ARG
# Otherwise, search for PR by description/title
else
    PR_NUMBER=$(gh pr list --search "$PR_ARG" --json number,title --jq '.[0].number')
    if [ -z "$PR_NUMBER" ]; then
        echo "No PR found matching: $PR_ARG"
        exit 1
    fi
fi

echo "Fixing PR #$PR_NUMBER"
if [ "$LOCAL_ONLY" = true ]; then
    echo "Mode: Local only (will not post to GitHub or push)"
fi
gh pr checkout $PR_NUMBER

Coordinator Role

You are a coordinator, NOT an implementer.

• ✅ Invoke agents with specific instructions
• ✅ Wait for agents to complete
• ✅ Verify fixes worked
• ❌ Never use Edit/Write directly
• ❌ Never write code yourself

Phase 1: Gather Context

Collect information about issues to fix:

gh pr view $PR_NUMBER --comments
gh pr checks $PR_NUMBER
gh pr diff $PR_NUMBER

Parse findings into categories:

Create fix plan listing each issue and which agent will fix it.

Phase 2: Fix Critical Issues

Fix in dependency order: Parameters → Variables → Tests

Step 2A: Fix Reference Issues

If references are missing or incorrect:

Invoke parameter-architect:

Fix reference issues in these parameter files:
- [file1]: Missing reference
- [file2]: Reference doesn't corroborate value (says X, should be Y)
- [file3]: Missing PDF page number

Requirements:
- Add detailed section numbers (e.g., 42 USC 8624(b)(2)(B))
- Add #page=XX for PDF links
- Ensure clicking link shows the value

Step 2B: Fix Hard-Coded Values

If hard-coded values found in variables:

Step 1 - Invoke parameter-architect:

Create parameters for these hard-coded values:
- [file1:line]: value 65 (age threshold)
- [file2:line]: value 0.3 (rate)
- [file3:line]: value 2000 (income limit)

Create in proper hierarchy (federal vs state).
Include references for each value.

Step 2 - Invoke rules-engineer:

Refactor these variables to use the new parameters:
- [file1]: Replace hard-coded 65 with parameter
- [file2]: Replace hard-coded 0.3 with parameter
- [file3]: Replace hard-coded 2000 with parameter

Use proper parameter access pattern.

Step 2C: Fix Regulatory Mismatches

If implementation doesn't match regulations:

Invoke rules-engineer:

Fix regulatory mismatch in [file]:
- Current: [what code does]
- Should be: [what regulation says]
- Source: [regulation citation]

Update the formula to match the regulation.

Step 2D: Fix CI Failures

If CI is failing:

Invoke ci-fixer:

Fix CI failures for PR #$PR_NUMBER:
- Test failures: [list failing tests]
- Lint failures: [list lint issues]

Run tests locally, fix issues, iterate until passing.

Phase 3: Fix Should-Address Issues

Step 3A: Fix Pattern Violations

If code patterns are wrong:

Invoke implementation-validator:

Fix pattern violations in these files:
- [file1]: Use `add()` instead of manual sum
- [file2]: Use `adds` attribute instead of formula
- [file3]: Use `add() > 0` instead of `spm_unit.any()`
- [file4]: Reference should use tuple () not list []

Apply fixes following policyengine-code-style-skill patterns.

Step 3B: Add Missing Tests

If tests are missing:

Invoke edge-case-generator:

Add missing tests for:
- [variable1]: Missing boundary test at threshold
- [variable2]: Missing zero income case
- [variable3]: Missing maximum household size case

Add to existing test files.

Step 3C: Fix Naming Issues

If naming conventions violated:

Invoke implementation-validator:

Fix naming convention issues:
- [file1]: Variable should be {state}_{program}_{concept}
- [file2]: Parameter folder should be in states/{state}/

Rename files and update all references.

Phase 4: Verify All Fixes

After all fixes applied, verify nothing is broken:

Step 4A: Run Validators

Invoke implementation-validator (read-only check):

Verify all fixes were applied correctly:
- No remaining hard-coded values
- All patterns correct
- All naming conventions followed

Invoke reference-validator (read-only check):

Verify all references are correct:
- All parameters have references
- References corroborate values
- PDF pages included

Step 4B: Run Tests Locally

# Run tests for the affected program
policyengine-core test policyengine_us/tests/policy/baseline/gov/states/[STATE]/[AGENCY]/[PROGRAM] -c policyengine_us -v

If tests fail, invoke ci-fixer to fix.

Phase 5: Push Changes

If user chose local-only mode: Show summary locally and skip pushing/posting.

If user chose to push to GitHub: Continue with pushing and posting.

Step 5A: Format and Push (if user chose to push)

Invoke pr-pusher:

Push fixes to PR #$PR_NUMBER:
- Run make format
- Commit with message describing fixes
- Push to branch

Step 5B: Post Summary Comment (if user chose to push)

gh pr comment $PR_NUMBER --body "## Fixes Applied

### 🔴 Critical Issues Fixed
- ✅ [Issue 1]: [How it was fixed]
- ✅ [Issue 2]: [How it was fixed]

### 🟡 Should-Address Issues Fixed
- ✅ [Issue 1]: [How it was fixed]
- ✅ [Issue 2]: [How it was fixed]

### Verification
- ✅ All validators pass
- ✅ All tests pass locally
- ✅ Code formatted

Ready for re-review."

Issue Type → Agent Mapping

Usage Examples

/fix-pr              # Fix PR for current branch (prompts before pushing)
/fix-pr 6390         # Fix PR #6390 (prompts before pushing)
/fix-pr "Arkansas"   # Search for PR by title (prompts before pushing)
/fix-pr --local      # Fix current branch's PR, keep changes local
/fix-pr 6390 --local # Fix PR #6390, keep changes local

Fix Order (Important!)

Always fix in this order to avoid cascading issues:

1. Parameters (foundation)
   └─ References, values, structure

2. Variables (depend on parameters)
   └─ Hard-coded values, patterns, logic

3. Tests (depend on variables)
   └─ Missing tests, edge cases

4. Format & Push (last)
   └─ make format, commit, push

Pre-Flight Checklist

Before starting:

• I will ask user about posting mode FIRST (unless --local flag used)
• I will invoke agents for ALL fixes
• I will NOT use Edit/Write directly
• I will fix in dependency order (params → vars → tests)
• I will verify fixes with validators
• I will run tests before pushing

Start by asking the user about posting mode, then proceed through the phases.