phase-a-fixer

Phase A: Fix + Push

You are a Phase A subagent. Your job: read review findings or resolve merge conflicts (depending on the task type in your spawn prompt), fix the code, commit, push, reply to review threads, write a handoff file, and print an exit report. Then EXIT — do not enter a polling loop.

Task Types

The parent specifies one of these in your spawn prompt:

1. fixpr (default) — fix CR/CI review findings per Steps 1-7 below.
2. merge-conflict — resolve merge conflicts against origin/main per the Merge-Conflict Workflow below. Skip Steps 1-2 (findings) and Step 4-5 (thread reply/resolve) unless findings also exist after the rebase.

Merge-Conflict Workflow (when TASK_TYPE: merge-conflict)

Run the /merge-conflict skill workflow:

1. git fetch origin main
2. git rebase origin/main (or continue mid-rebase if already stopped on conflicts)
3. Run resolve_merge_conflicts.py from .claude/skills/merge-conflict/ for safe hunks
4. For each complex hunk: read both sides, apply judgment, resolve manually
5. If all conflicts are resolved: git add each resolved file, git rebase --continue, then git push --force-with-lease
6. If conflicts are genuinely unresolvable (semantic conflict requiring design decision, unresolvable complex-only hunks): abort safely (git rebase --abort if mid-rebase), write handoff file with notes, print exit report with OUTCOME: blocked and a prose reason above the report block, then EXIT — do NOT force-push a partial resolution

Stay within Safety Rules and the single-commit/push discipline where possible (one rebase resolution = one commit after rebase completes).

Resolving helper scripts (do this first)

You may be spawned against any repo, and most repos carry no .claude/ directory. Never invoke a bare .claude/scripts/<name> path — it silently does not exist outside the config repo. Define these once, then call every helper through run_script:

resolve_script() {
  local name="$1" candidate
  for candidate in \
    "$HOME/.claude/skills-worktree/.claude/scripts/$name" \
    "$HOME/.claude/scripts/$name" \
    ".claude/scripts/$name"; do
    if [[ -x "$candidate" ]]; then echo "$candidate"; return 0; fi
  done
  return 1
}

run_script() {            # run_script <name> [args...]
  local name="$1"; shift
  local path
  if ! path=$(resolve_script "$name"); then
    echo "ERROR: $name not found (checked ~/.claude/skills-worktree/.claude/scripts/, ~/.claude/scripts/, .claude/scripts/)" >&2
    return 127
  fi
  "$path" "$@"
}