vs-fix-pr

Files (22)

• SKILL.md
• openai.yaml · agents/
• fetch_comments.py · scripts/
• fix-pr-real-world.eval.ts · test/
• fix-pr.eval.ts · test/
• fix-pr.static.eval.ts · test/
• behavior.md · test/fixtures/ci-and-review/docs/
• handoff.md · test/fixtures/ci-and-review/
• package.json · test/fixtures/ci-and-review/
• slug.js · test/fixtures/ci-and-review/src/
• slug.test.js · test/fixtures/ci-and-review/src/
• handoff.md · test/fixtures/ci-ownership-dirty/
• local-scratch.txt · test/fixtures/ci-ownership-dirty/notes/
• package.json · test/fixtures/ci-ownership-dirty/
• slug.js · test/fixtures/ci-ownership-dirty/src/
• slug.test.js · test/fixtures/ci-ownership-dirty/src/
• handoff.md · test/fixtures/review-body-approval-dirty/
• local-scratch.txt · test/fixtures/review-body-approval-dirty/notes/
• ambiguous-thread.md · test/fixtures/review-thread-gates/docs/
• post-fix-handoff.md · test/fixtures/review-thread-gates/docs/
• reply-resolve-authority.md · test/fixtures/review-thread-gates/docs/
• test_fetch_comments.py · test/

SKILL.md (first lines)

# Fix PR

## Choose the PR mode

Preserve the difference between inspecting a PR and acting on it:

- **Inspect only:** the user says see, check, list, review, or summarize PR
  comments/feedback without asking to address them. Resolve the PR, wait for
  relevant reviewer checks, fetch all feedback surfaces in Step 2, and report
  CI plus the actionable, outdated, resolved, and informational feedback. Do
  not edit, commit, push, rerun CI, reply, or resolve threads. Stop after the
  report.
- **Address PR:** the user says address, fix, handle, apply, or resolve a PR or
  its comments/feedback. Treat both actionable CI failures and reviewer
  feedback as owned work. The initial address request authorizes posting
  evidence-backed replies and resolving accepted or addressed-by-rewrite inline
  threads. The address request carries standing repair authority for additional
  bounded batches of confirmed PR-owned fixes during the composed babysitting
  phase.
  Do not ask for a second approval for those actions. Ambiguous or declined
  feedback still needs a user decision and must remain open.

If the request combines both, inspect first and then continue in address mode.

## Building Block Composition

Fix-pr is a workflow for making an existing PR healthy after review or CI
feedback. It composes:

- `vs-verify` after applying fixes so replies are backed by evidence.
- `vs-baby-sit` after address-mode work so the updated PR stays owned while
  CI and new review feedback arrive.

Inspect-only mode stops after its report and does not start `vs-baby-sit`.

When the current checkout is not already on the PR branch, fix-pr owns the
branch/worktree setup directly: inspect the PR, preserve unrelated dirty state,
then switch to or create the appropriate isolated checkout before editing.

## Codex Goal Integration

When running in Codex, use
[`../vs-internal-shared/references/codex-goal.md`](../vs-internal-shared/references/codex-goal.md)
for goal ownership and completion rules.

Fix-pr owns the PR-health goal after Step 0 resolves the target PR and either
Step 1 finds actionable CI or Step 2 identifies unresolved feedback. The
objective should name the PR plus its failing-check and unresolved-feedback
scope. Complete the goal only after every owned CI failure and accepted review
fix is committed and pushed, evidence-backed replies are posted, accepted
threads are resolved, and the build/reviewer state has been rechecked. Declined feedback,
external CI blockers, or human-decision threads keep the goal active or blocked
according to Codex goal policy.

## Entry Points

If the user drops you into a later state such as "already inside Step 4b/4c", "continue from that exact state", or provides the current thread + drafted reply directly:

- Skip the earlier steps that would rediscover that state.
- Continue from the named step using this skill's rules for that step.
- Do **not** bypass the skill by answering ad hoc just because the state is already provided.

This matters most for decision gates:

- **Step 4b unsure path** → if the host exposes an ask-user question tool, invoke it.
- **Step 4c-decline gate** → if the host exposes an ask-user question tool, invoke it.

`continue from that exact state` means "skip discovery", not "skip a required
decision". An accepted thread in address mode proceeds without another gate.

Non-negotiable rule: when `AskUserQuestion` is available, do **not** render the final decision options as plain chat bullets or numbered lists first. Calling `AskUserQuestion` is the action. The follow-up chat message, if any, should only say that the question is up and you are waiting.

## Step 0: Resolve PR & Ensure Correct Branch

### 0a. Determine Target PR

Check if the user mentioned a PR number or URL in the conversation.

If yes — use that:
```bash
PR_JSON=$(gh pr view <number-or-url> --json number,headRefName,url)
```

If no — use the current branch's PR:
```bash
PR_JSON=$(gh pr view --json number,headRefName,url)
```

If `gh pr view` fails (no PR found): tell user "No PR found" and stop.

```bash
PR_NUM=$(echo "$PR_JSON" | jq -r .number)
PR_BRANCH=$(echo "$PR_JSON" | jq -r .headRefName)
PR_URL=$(echo "$PR_JSON" | jq -r .url)
REPO=$(echo "$PR_JSON" | jq -r '.url | capture("^https://github.com/(?<repo>[^/]+/[^/]+)/pull/[0-9]+$").repo')
```

Derive `REPO` from the PR URL, not the checkout remote. A fork PR's number
belongs to the base repository even when the current branch lives in the head
repository.

### 0b. Check Current Branch

```bash
CURRENT_BRANCH=$(git branch --show-current)
```

If `CURRENT_BRANCH` equals `PR_BRANCH` — proceed to Step 1.

### 0c. Handle Branch Mismatch

Check for uncommitted changes:
```bash
git status --porcelain
```

**If uncommitted changes exist:** Ask the user with the file list. Options:
- **Stash & switch** — `git stash --include-untracked --message "fix-pr: auto-stash from $CURRENT_BRANCH"`, then checkout
- **Switch without stashing** — Checkout directly (changes carry over if no conflicts)

From vltansky/vs, MIT.

More from vltansky/vs