Skip to content

docs(integration): ask the user whether a run includes draft PRs [skip-ci] #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RonenMars merged 1 commit into from
Aug 12, 2026
Merged

docs(integration): ask the user whether a run includes draft PRs [skip-ci] #550

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion .claude/skills/integration-branch/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,22 @@ gh pr view <n> --json mergeable,mergeStateStatus,isDraft,statusCheckRollup
```

- `isDraft` is invisible in the readiness fields — a draft reads as `MERGEABLE`/`CLEAN` and still will not merge.

**Drafts are the user's call, never yours.** As soon as the set is resolved, list every draft in it and
ask whether this run includes them — before cutting the branch, not at the merge that hits one:

```bash
gh pr list --state open --json number,title,isDraft --jq '.[]|select(.isDraft)|"#\(.number) \(.title)"'
```

Do not infer the answer in either direction. A PR is draft because it is unfinished, or because its
author is blocked on something with nothing to do with the code, and those want opposite treatment.
Record the answer in the log's §3 — included drafts flagged as such, declined ones in the exclusions
table as "draft — user declined".

Including a draft does **not** require flipping it ready: this skill merges the PR's head locally, and
GitHub's draft flag only gates merging on GitHub. Leave the flag alone — flipping a batch of PRs ready
so an integration branch can be built is a change to their state that nobody asked for.
- `DIRTY` means the merge ref is missing, so CI never ran on it: a lone green Snyk check is not "CI passed".

Detect two things that override chronological order:
Expand Down Expand Up @@ -347,7 +363,7 @@ merge PRs to `main` as part of this skill.
| Stale `origin/main` | Branch is not from today's `main`, no error anywhere | `git fetch` immediately before the cut; state the SHA |
| `git fetch --prune` | Deletes `origin/pr/*` mid-run | Fetch heads to `refs/integration/pr/*` |
| Bulk `mergeable` query | Every row `UNKNOWN` | Per-PR `gh pr view` |
| Draft PRs | Read as mergeable, will not merge | Request `isDraft` explicitly |
| Draft PRs | Read as mergeable, will not merge | Request `isDraft` explicitly, then ask the user whether the run includes them |
| Stacked child | Does not auto-restack when its base merges; goes `DIRTY` | Merge base first, verify the child's unique commits survive |
| `main` not green | Every count misattributed | Baseline in Step 3 |
| Commit hooks rejecting merge commits | The whole shell call aborts, not just the commit | Expect it; ask the user how to proceed rather than reaching for `--no-verify` |
Expand Down
Loading