Skip to content

chore(skill): Scope iterate-pr archive check to the stack tip #29

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
thecodedrift merged 2 commits into from
Jun 12, 2026
Merged

chore(skill): Scope iterate-pr archive check to the stack tip #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
648c2a3
chore(skill): Scope iterate-pr archive check to the stack tip
thecodedrift Jun 12, 2026
52ef35a
chore(skill): Refine the stacked-PR archive-check guidance
thecodedrift Jun 12, 2026
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
40 changes: 40 additions & 0 deletions .claude/skills/iterate-pr/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,46 @@ Run `${CLAUDE_SKILL_ROOT}/scripts/fetch_pr_checks.py` to get structured failure

**Wait if pending:** If review bot checks (sentry, warden, cursor, bugbot, seer, codeql) are still running, wait before proceeding—they post actionable feedback that must be evaluated. Informational bots (codecov) are not worth waiting for.

#### Stacked PRs: ignore the OpenSpec Archive Check unless this is the last PR in the chain

The `PR OpenSpec Archive Check` (workflow `pr-check-openspec.yml`) fails whenever
any unarchived directory exists under `openspec/changes/`. A change is archived
exactly once, at the END of the work — so a PR that still carries an in-progress
change directory will fail this check. Archiving on an intermediate PR is wrong:
it would remove the change docs before the implementation PRs above it merge.

Note the workflow's trigger is currently `pull_request.branches: [main]`, so it
only RUNS on PRs whose base is `main`. A stacked PR based on another feature
branch won't run (or fail) this check at all — so there is nothing to ignore
there. The check matters for PRs that target `main`: typically the bottom of a
stack, plus any PR later retargeted to `main` as the stack merges down.

When the archive check does run and fail, decide ONE thing before treating it as
actionable: **is this PR the last in the chain (the tip)?** A PR is the tip when
no other OPEN PR targets its head branch as a base:

```bash
HEAD=$(gh pr view --json headRefName --jq '.headRefName')
gh pr list --state open --base "$HEAD" --json number
```

An empty list → nothing is stacked on top → this PR is the tip.

Then:

- **Not the tip** (some open PR is stacked on this one) → IGNORE the
`PR OpenSpec Archive Check` failure. Do NOT archive the change on this PR.
Treat the check as expected-red and do not let it block the iterate loop
(still address every other failing check and all feedback normally).
- **The tip** (nothing stacked on top — including an ordinary standalone PR) →
the change MUST be archived before merge. Archive it via the OpenSpec archive
flow, which moves `openspec/changes/<name>/` to the dated archive directory
`openspec/changes/archive/YYYY-MM-DD-<name>/` (do not invent a different
location), then commit and push so the check goes green.

This rule applies ONLY to the OpenSpec Archive Check. Every other check is
handled normally regardless of stack position.

### 5. Fix CI Failures

For each failure in the script output:
Expand Down