Skip to content

docs(security-advisory): land GHSA fixes through ordinary public PRs - #2886

Merged
cliffhall merged 1 commit into
v2/mainfrom
v2/docs/2880-ghsa-public-pr-flow
Nov 5, 2026
Merged

cliffhall merged 1 commit into
v2/mainfrom
v2/docs/2880-ghsa-public-pr-flow

Conversation

@cliffhall

Copy link
Copy Markdown
Member

Closes #2880

Rewrites the security-advisory skill's landing step to the flow v2.14.0 / 1.0.4 actually used: fixes are developed and reviewed in the advisory's private fork, then land through an ordinary public PR, with normal CI, the required DCO / build checks, the Copilot loop and no ruleset changes.

Changes

  • .claude/skills/security-advisory/SKILL.md
    • Step 5 is now "Land the fix on every affected line, release, publish". "Merging from the private fork" (ruleset surgery, unchecked commits, all fork PRs merging together) is replaced by "Landing through an ordinary public PR":
      1. convert the draft card to the v2 issue (or file the v1 issue on get tools working #11, cross-linked; delete the draft for a v1-only advisory), trimming the body first, with the trade-off that title and body go public before the advisory does
      2. push the fork branch publicly as v2/fix/<N>-<slug> / v1/fix/<N>-<slug>
      3. open an ordinary PR with Closes #N and follow /pr-flow
      4. merge, close the issue, move the card to Done, and close the fork PRs unmerged
    • Step 6 shrinks to updating the already-public issues after publication.
    • Intro, the flow table, the /pr-flow note, and step 1/3/4 pointers are updated to match.
  • AGENTS.md: the GHSA-draft exception now says the card becomes public tracking when the reviewed fix is ready to land, not once the advisory is published. The Incoming invariant's milestone note is updated the same way.
  • .claude/skills/release/SKILL.md: the v1 merge-order pointer and the --advisory note no longer describe fork merges.
  • scripts/release-notes.mjs: the header comment is updated to match (comment only).

The skill's frontmatter description is unchanged, so the listing and the eval cases are unaffected.

🤖 Generated with Claude Code

Rewrite step 5 of the security-advisory skill to the flow v2.14.0 / 1.0.4
used: review in the private fork, convert the draft card (or file the v1
issue), push the fork branch publicly, open an ordinary PR with normal CI
and no ruleset changes, then close the fork PRs unmerged. Step 6 shrinks
to updating the already-public issues after publication. Update AGENTS.md's
GHSA-draft exception, the release skill's v1 pointer and --advisory note,
and the release-notes.mjs header to match.

Closes #2880

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: cliffhall <cliff@futurescale.com>

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

No active review issues remain for the security-advisory procedure updates, which change only documentation and a script header comment.

No open issues 🎉

What changed in this PR

Updates the security-advisory procedure for #2880 so privately developed fixes land through ordinary public PRs, preserving normal CI, required checks, and review without changing branch rulesets.

Changes:

  • Moves public issue creation to when the reviewed fix is ready to land, with guidance to remove sensitive details before disclosure.
  • Documents public PR landing, closing private-fork PRs unmerged, and releasing every affected line before advisory publication.
  • Aligns repository rules and release guidance; updates only the header comment in the release-notes script.
File Description
scripts/​release-notes.mjs Updates the explanatory comment for advisory fixes landing through public PRs; no runtime changes.
AGENTS.md Aligns public tracking and milestone timing with fix readiness.
.claude/​skills/​security-advisory/​SKILL.md Replaces private-fork merging with the ordinary public PR procedure and simplifies post-publication tracking.
.claude/​skills/​release/​SKILL.md Updates advisory release-note guidance and the v1 landing procedure.

Review effort: Balanced

@cliffhall

Copy link
Copy Markdown
Member Author

Copilot review loop closed: round 1 was clean (no inline comments, no headline findings, no suppressed comments), so per pr-flow 7c no further round was requested.

@cliffhall
cliffhall merged commit 75f1149 into v2/main Nov 5, 2026
11 checks passed
@cliffhall
cliffhall deleted the v2/docs/2880-ghsa-public-pr-flow branch November 5, 2026 05:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

v2 Issues and PRs for v2

Projects

None yet

Development

Successfully merging this pull request may close these issues.

security-advisory skill: land GHSA fixes through ordinary public PRs, not private-fork merges

2 participants