diff --git a/.claude/skills/address-pr-comments/SKILL.md b/.claude/skills/address-pr-comments/SKILL.md
index 7f620c3229..7b63412acd 100644
--- a/.claude/skills/address-pr-comments/SKILL.md
+++ b/.claude/skills/address-pr-comments/SKILL.md
@@ -49,7 +49,11 @@ This ensures running the command again won't double-reply to already-addressed c
 
 Before presenting comments to the user, **read the relevant code and think critically about each comment**. Determine whether the suggestion is correct, already addressed, or a bad idea. Form a proposed action for each.
 
-Use the AskUserQuestion tool to show a **multi-select list** of all remaining unresolved, unaddressed comments. Each option should show:
+Use the AskUserQuestion tool to show a **multi-select list** of all remaining unresolved, unaddressed comments.
+
+**Always make "All comments" the first option of the first question**, with the total count (e.g. `All comments (8)`). Selecting it addresses every comment with its proposed action, whatever else is selected. `AskUserQuestion` allows at most 4 options per question and 4 questions, so when the comments don't fit in the remaining slots, group related ones into a single option (by file or shared concern) rather than leaving any out.
+
+Each comment option should show:
 
 - The reviewer's username
 - The file path and line number
@@ -58,11 +62,12 @@ Use the AskUserQuestion tool to show a **multi-select list** of all remaining un
 
 Example options:
 
+- `All comments (8)` → address every comment above with its proposed action
 - `[reviewer] file.ts:42 — "Fix this typo..." → Will fix: rename varName to variableName`
 - `[reviewer] other.ts:10 — "This should use..." → Will push back: current pattern is more performant here`
 - `[reviewer] types.ts:5 — "Why not use...?" → Will answer: explain the tradeoff`
 
-The user picks which comments they want to address. Only proceed with the selected ones.
+The user picks which comments they want to address. If "All comments" is selected, address every comment; otherwise proceed only with the selected ones.
 
 If there are no actionable comments, tell the user everything has been addressed and stop.
 
diff --git a/.claude/skills/review/SKILL.md b/.claude/skills/review/SKILL.md
index 3080a64941..2fea0985f8 100644
--- a/.claude/skills/review/SKILL.md
+++ b/.claude/skills/review/SKILL.md
@@ -143,7 +143,9 @@ Present findings in this format:
 
 After presenting the review, use `AskUserQuestion` with **multi-select** to let the user pick which findings to post as inline PR comments.
 
-Each option should show:
+**Always make "All findings" the first option of the first question**, with the total count (e.g. `All findings (12)`). Selecting it posts every finding, whatever else is selected. `AskUserQuestion` allows at most 4 options per question and 4 questions, so when the findings don't fit in the remaining slots, group related ones into a single option (by severity or shared root cause) rather than leaving any out.
+
+Each finding option should show:
 
 - Severity
 - File path and line number
@@ -152,10 +154,11 @@ Each option should show:
 
 Example options:
 
+- `All findings (12)` → post every finding above
 - `[High] src/utils/api.ts:42 — "Unsafe type cast" → suggest type guard instead of as`
 - `[Medium] src/components/List.tsx:15 — "Missing UI primitive" → use BlockStack instead of div`
 
-The user picks which comments to post. Only proceed with the selected ones.
+The user picks which comments to post. If "All findings" is selected, post every finding; otherwise post only the selected ones.
 
 If the user selects none or there are no findings, skip to the end.