Skip to content

Commit a969a9d

Browse files
cliffhallclaude
andcommitted
Keep the unverified advisory comment from naming the unsafe version; add the pre-merge triage fallback; reword the verified target row
Co-Authored-By: Claude Opus 5.5 <[email protected]> Signed-off-by: cliffhall <[email protected]>
1 parent 83b2fb9 commit a969a9d

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

‎.claude/skills/issue-triage/SKILL.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,11 @@ issues the automation wrote, so the next run would file a duplicate beside it.
309309
Dispatch the sweep instead (`gh workflow run dependabot-alerts.yml`, or
310310
`dependency-refresh.yml` for a version bump) and point at the issue it files.
311311

312+
⚠️ **Until the milestone merge carries the sweeps to `main`**, none of this
313+
applies yet: a workflow can only be dispatched or scheduled from the default
314+
branch, and `main` still has `dependabot.yml`. Leave Dependabot PRs open until
315+
then. The merge PR closes them, each with the pointer #5065 records.
316+
312317
Not touched by triage:
313318

314319
- **Maintainer-authored PRs.** List any that target `main` for their authors to

‎scripts/dependabot-alerts.mjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ export function buildIssueBody(
753753
`| Vulnerable on \`${TARGET_BRANCH}\` | ${[...new Set(affected.map((e) => e.version))].map((v) => `\`${cell(v)}\``).join(", ") || "—"} |`,
754754
group.targetVerified === false
755755
? `| Bump to | ⚠️ none found: ${cell(unverifiedReason(group))}. Pick a release outside every range listed |`
756-
: `| Bump to | \`${cell(group.fixedIn)}\`, the lowest patched version below that is outside every range listed |`,
756+
: `| Bump to | \`${cell(group.fixedIn)}\`: the lowest listed patched version that no range below covers |`,
757757
`| Scope | ${cell(group.scope)} |`,
758758
`| Highest severity | ${cell(group.severity)} |`,
759759
"",
@@ -827,7 +827,7 @@ export function buildNewAdvisoryComment(group, added) {
827827
.join("\n");
828828
return [
829829
buildCommentMarker(added),
830-
`${added.length} new Dependabot ${added.length === 1 ? "advisory" : "advisories"} for \`${group.package}\`. The bump this issue asks for is now to \`${group.fixedIn}\`${group.targetVerified === false ? "; see the issue body, since no single listed patched version clears every advisory" : `, which clears ${added.length === 1 ? "it" : "them"} along with the rest`}.`,
830+
`${added.length} new Dependabot ${added.length === 1 ? "advisory" : "advisories"} for \`${group.package}\`. ${group.targetVerified === false ? "No listed patched version clears every advisory now, so this issue asks for a safe release to be found first; see the body." : `The bump this issue asks for is now to \`${group.fixedIn}\`, which clears ${added.length === 1 ? "it" : "them"} along with the rest.`}`,
831831
"",
832832
"| GHSA | Severity | Summary |",
833833
"| --- | --- | --- |",

‎scripts/dependabot-alerts.test.mjs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -489,10 +489,9 @@ test("an unverified target is flagged in the body and the comment", () => {
489489
assert.match(body, /\*\*Choose a target first\.\*\*/);
490490
assert.ok(!body.includes("Raise the declared range**"));
491491
assert.ok(!body.includes("`>=2.0.0`"));
492-
assert.match(
493-
buildNewAdvisoryComment(narrowed, ["GHSA-b"]),
494-
/no single listed patched version/,
495-
);
492+
const comment = buildNewAdvisoryComment(narrowed, ["GHSA-b"]);
493+
assert.match(comment, /asks for a safe release to be found first/);
494+
assert.ok(!comment.includes(`\`${narrowed.fixedIn}\``));
496495
});
497496

498497
test("titles and labels name the bump and the server", () => {

0 commit comments

Comments
 (0)