@clipboard-health/ai-rules 2.15.2 → 2.15.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clipboard-health/ai-rules",
-  "version": "2.15.2",
+  "version": "2.15.3",
   "description": "Pre-built AI agent rules for consistent coding standards.",
   "keywords": [
     "ai",

package/skills/babysit-pr/SKILL.md

@@ -1,12 +1,12 @@
 ---
 name: babysit-pr
-description: "Watch a PR through CI and review feedback: commit/push, wait for CI, auto-fix high-confidence failures, reply to active review threads, and summarize parsed CodeRabbit nitpicks with sentinel-tagged comments. Runs once by default; pass a short interval like `30s` or `2m` for best-effort same-turn polling; longer cadences should use an external loop wrapper. Use when the user says 'babysit my PR', 'watch my PR', 'keep my PR moving', 'respond to comments', or 'loop on CI'."
+description: "Watch a PR through CI and review feedback: commit/push, wait for CI, auto-fix high-confidence failures, reply to active review threads, and summarize parsed CodeRabbit review-body comments with sentinel-tagged comments. Runs once by default; pass a short interval like `30s` or `2m` for best-effort same-turn polling; longer cadences should use an external loop wrapper. Use when the user says 'babysit my PR', 'watch my PR', 'keep my PR moving', 'respond to comments', or 'loop on CI'."
 argument-hint: "[interval]"
 ---
 
 # Babysit PR
 
-Watch one PR through CI, auto-fix high-confidence failures, and leave a paper-trail reply on every active review thread and CodeRabbit nitpick. Threads stay open for human resolution — this skill only posts replies, it never resolves.
+Watch one PR through CI, auto-fix high-confidence failures, and leave a paper-trail reply on every active review thread and CodeRabbit review-body comment. Threads stay open for human resolution — this skill only posts replies, it never resolves.
 
 This skill is self-contained: it does not invoke other skills. It works in Claude Code and Codex — no subagents, no `Skill` tool calls, no `!` command interpolation, no `$CLAUDE_PLUGIN_ROOT`.
 
@@ -33,7 +33,7 @@ Rules:
 
 The skill uses two HTML-comment sentinels.
 
-**Addressed sentinel**: `<!-- babysit-pr:addressed v1 -->`. Appended on its own line at the end of every reply the skill posts (both thread replies and the nitpick summary). This is how the skill knows, on re-runs, which threads and nitpicks it already handled.
+**Addressed sentinel**: `<!-- babysit-pr:addressed v1 -->`. Appended on its own line at the end of every reply the skill posts (both thread replies and the CodeRabbit summary). This is how the skill knows, on re-runs, which threads and CodeRabbit review-body comments it already handled.
 
 **Follow-up sentinel**: `<!-- babysit-pr:followup v1 -->`. Attached to replies that defer an out-of-scope comment as a tracked follow-up (see the Scope subsection and the Defer verdict in step 6). Grep `babysit-pr:followup` across PR conversation JSON to enumerate deferred items. This sentinel is additive — the post-reply scripts still append the `addressed` sentinel at the end, so a deferred thread is correctly machine-classified as addressed (the skill _has_ handled it — by deferring). Human reviewers and future sweeps distinguish deferred from resolved by looking for the follow-up sentinel.
 
@@ -50,7 +50,7 @@ The skill uses two HTML-comment sentinels.
 
 The bot detection exists ONLY to downgrade the default for post-sentinel bot activity from `"active"` to `"uncertain"`. It NEVER suppresses bot comments or marks a thread `"addressed"` on its own — CodeRabbit's review content would be lost if it did.
 
-For nitpicks, the script emits a stable `fingerprint` per nitpick (sha256 of file + line + title + body, no timestamp). Before posting a nitpick summary, search existing PR issue-comments for a prior babysit-pr sentinel comment that already contains those fingerprints; if every current fingerprint is already present in a prior sentinel comment, skip posting.
+For CodeRabbit review-body comments, the script emits a stable `fingerprint` per comment (sha256 of file + line + title + body, no timestamp). This includes CodeRabbit's Nitpick comments, Minor comments, and Outside diff range comments sections. Before posting a summary, search existing PR issue-comments for a prior babysit-pr sentinel comment that already contains those fingerprints; if every current fingerprint is already present in a prior sentinel comment, skip posting.
 
 ## One iteration
 
@@ -119,14 +119,14 @@ The output JSON has:
 - `threads`: every unresolved review thread, with `threadId`, `replyToCommentDatabaseId`, `comments[]`, `lastBabysitSentinelAt`, `lastHumanCommentAt`, `lastBotCommentAt`, `postSentinelBotComments[]`, `postSentinelHumanComments[]`, and `activityState` (`"active"` / `"uncertain"` / `"addressed"`).
 - `activeThreads`: threads where `activityState != "addressed"` — these need attention this iteration (active AND uncertain).
 - `uncertainThreads`: just the uncertain subset. For each, read EVERY entry in `postSentinelBotComments` before deciding.
-- `nitpickComments`: parsed CodeRabbit nitpicks, each with a stable `fingerprint`.
+- `nitpickComments`: parsed CodeRabbit review-body comments, each with a stable `fingerprint`. The field name is retained for compatibility, but it includes Nitpick comments, Minor comments, and Outside diff range comments.
 - `totalActiveThreads`, `totalUncertainThreads`, `totalNitpicks`, `totalUnresolvedComments` for quick checks.
 
 ### Scope
 
-This PR's review-feedback scope is strict by default. Steps 6 (threads) and 7 (nitpicks) classify each comment as in-scope or out-of-scope using this rule before choosing a verdict. Step 5 (CI) uses the broader CI-scope rule in that step, not this one — CI can legitimately fail on unchanged lines because the PR changed a contract or dependency path.
+This PR's review-feedback scope is strict by default. Steps 6 (threads) and 7 (CodeRabbit review-body comments) classify each comment as in-scope or out-of-scope using this rule before choosing a verdict. Step 5 (CI) uses the broader CI-scope rule in that step, not this one — CI can legitimately fail on unchanged lines because the PR changed a contract or dependency path.
 
-Build the changed-line set from `gh pr diff` once per iteration. Count changed diff lines on both sides: added lines in the new version, removed lines in the old version, and modified code represented by adjacent remove/add pairs. Do not count diff context lines. A reviewer comment or nitpick is **in scope** when its anchor falls on a changed diff line on either side of the hunk. Deleted-line comments like "why remove this?" or "please add this back" are in scope by definition. For a range like `12-14`, any overlap with a changed diff line is in scope.
+Build the changed-line set from `gh pr diff` once per iteration. Count changed diff lines on both sides: added lines in the new version, removed lines in the old version, and modified code represented by adjacent remove/add pairs. Do not count diff context lines. A reviewer comment or CodeRabbit review-body comment is **in scope** when its anchor falls on a changed diff line on either side of the hunk. Deleted-line comments like "why remove this?" or "please add this back" are in scope by definition. For a range like `12-14`, any overlap with a changed diff line is in scope.
 
 When matching review comments to hunks, use the anchor line provided by `unresolvedPrComments.sh`; it may be the current `line` or the script's fallback to `originalLine`. Compare that anchor against both new-side added ranges and old-side removed ranges.
 
@@ -199,19 +199,19 @@ For every thread in `activeThreads` (this includes both `"active"` and `"uncerta
     - Does not meet the bar → **Defer** (new verdict). Record a one-line rationale and, if relevant, a pointer to where the concern lives.
     - Disagree and Already-fixed can still apply to out-of-scope comments (e.g., reviewer asks for a refactor that's already landed on main, or misreads the code).
 
-### 7. Assess nitpicks
+### 7. Assess CodeRabbit review-body comments
 
-For every nitpick in `nitpickComments`:
+For every parsed CodeRabbit review-body comment in `nitpickComments`:
 
 - Check whether its `fingerprint` already appears in a prior babysit-pr sentinel comment on the PR. If yes, skip.
-- **Classify scope** (in / out) using the Scope subsection. For CodeRabbit nitpick ranges like `12-14`, any overlap with changed diff lines on either side of the hunk is in scope; no overlap is out of scope unless one of the explicit escape-hatch signals applies.
+- **Classify scope** (in / out) using the Scope subsection. For CodeRabbit ranges like `12-14`, any overlap with changed diff lines on either side of the hunk is in scope; no overlap is out of scope unless one of the explicit escape-hatch signals applies.
 - Pick a verdict:
   - In-scope → Agree / Disagree / Already fixed (as with threads). If Agree, apply the fix.
-  - Out-of-scope → apply the out-of-scope fix bar. Meets the bar → Agree and apply the fix, noting in the summary that it was fixed despite being out of scope. Does not meet the bar → **Defer**. A Deferred nitpick does not get its own top-level comment; it goes into the nitpick summary under the **Deferred (out of scope)** heading (see step 9).
+  - Out-of-scope → apply the out-of-scope fix bar. Meets the bar → Agree and apply the fix, noting in the summary that it was fixed despite being out of scope. Does not meet the bar → **Defer**. A Deferred CodeRabbit review-body comment does not get its own top-level comment; it goes into the summary under the **Deferred (out of scope)** heading (see step 9).
 
-Deferred nitpick fingerprints still go into the fenced fingerprint block at the end of the summary alongside addressed ones, so future runs dedupe correctly — the nitpick is handled, just handled by deferring.
+Deferred CodeRabbit fingerprints still go into the fenced fingerprint block at the end of the summary alongside addressed ones, so future runs dedupe correctly — the comment is handled, just handled by deferring.
 
-If no nitpicks remain after filtering, skip ONLY the top-level nitpick-summary comment in step 9. Still post thread replies for every non-Skip-reply thread from step 6.
+If no CodeRabbit review-body comments remain after filtering, skip ONLY the top-level CodeRabbit summary comment in step 9. Still post thread replies for every non-Skip-reply thread from step 6.
 
 ### 8. Commit and push (if any edits)
 
@@ -256,18 +256,18 @@ For Defer replies, include the follow-up sentinel on its own line as shown. The
 
 The script uses the `addPullRequestReviewThreadReply` GraphQL mutation. It does NOT resolve the thread.
 
-If any nitpicks were assessed in step 7, post ONE top-level PR comment summarizing all of them:
+If any CodeRabbit review-body comments were assessed in step 7, post ONE top-level PR comment summarizing all of them:
 
 ```bash
 bash scripts/postSentinelPrComment.sh "$PR_NUMBER" "$BODY"
 ```
 
-The nitpick summary body should:
+The CodeRabbit summary body should:
 
 - Group verdicts under **Agree / Disagree / Already fixed / Deferred (out of scope)** headings. Omit a heading if its list is empty.
-- Under **Deferred (out of scope)**, list each deferred nitpick as a bullet, followed on its own line by `<!-- babysit-pr:followup v1 -->` so grep catches them individually.
+- Under **Deferred (out of scope)**, list each deferred CodeRabbit review-body comment as a bullet, followed on its own line by `<!-- babysit-pr:followup v1 -->` so grep catches them individually.
 - Include the commit URL for fixes.
-- Include every current nitpick's `fingerprint` — addressed and deferred — in a fenced block at the end (one per line, before the sentinel) so future runs can dedupe. Deferred nitpicks count as handled for dedupe purposes.
+- Include every current CodeRabbit review-body comment's `fingerprint` — addressed and deferred — in a fenced block at the end (one per line, before the sentinel) so future runs can dedupe. Deferred comments count as handled for dedupe purposes.
 
 ### 10. Summarize
 

package/skills/babysit-pr/scripts/_sentinel.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# _sentinel.sh — shared SENTINEL constant + append helper.
+# Sourced by unresolvedPrComments.sh, postSentinelReply.sh, postSentinelPrComment.sh.
+# Keeping the sentinel in one place prevents a version bump from silently
+# diverging between the posting scripts and the reader's recency detector.
+
+SENTINEL='<!-- babysit-pr:addressed v1 -->'
+
+# Echo $1 with the sentinel appended on its own trailing paragraph, unless
+# the body already ends with the sentinel.
+ensure_sentinel() {
+  local body="$1"
+  case "$body" in
+    *"$SENTINEL") printf '%s' "$body" ;;
+    *) printf '%s\n\n%s' "$body" "$SENTINEL" ;;
+  esac
+}

package/skills/babysit-pr/scripts/parseNitpicks.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
-# parseNitpicks.sh — Parse CodeRabbit nitpick comments from PR review bodies.
-# Copied from plugins/core/skills/unresolved-pr-comments/scripts/parseNitpicks.sh
-# with one addition: each emitted nitpick includes a stable `fingerprint` field
-# (sha256 of file + normalized line range + title + body), so reposted reviews
-# dedupe to the same fingerprint. Source review timestamps are kept as
-# `createdAt` metadata but NOT included in the fingerprint.
+# parseNitpicks.sh — Parse CodeRabbit review-body comments from PR review bodies.
 #
-# Sourced by unresolvedPrComments.sh. Requires: jq, perl with Digest::SHA + Encode.
+# Each emitted comment includes a stable `fingerprint` field (sha256 of file +
+# normalized line range + title + body), so reposted reviews dedupe to the same
+# fingerprint. Source review timestamps are kept as `createdAt` metadata but
+# NOT included in the fingerprint.
+#
+# Sourced by unresolvedPrComments.sh. Requires: perl with Digest::SHA + Encode.
 
 extract_nitpick_comments() {
   local reviews_json="$1"
@@ -27,7 +27,7 @@ my $latest_time = "";
 for my $review (@$reviews) {
   my $author = $review->{author}{login} // "";
   my $body = $review->{body} // "";
-  next unless $author eq "coderabbitai" && $body =~ /Nitpick comments/;
+  next unless $author eq "coderabbitai" && has_supported_sections($body);
   my $created = $review->{createdAt} // "";
   if ($created gt $latest_time) {
     $latest_time = $created;
@@ -44,44 +44,62 @@ my $body = $latest_review->{body};
 my $author = $latest_review->{author}{login} // "deleted-user";
 my $created_at = $latest_review->{createdAt} // "";
 
-my $nitpick_content = extract_nitpick_section($body);
-unless (defined $nitpick_content) {
+my @sections = extract_review_body_comment_sections($body);
+unless (@sections) {
   print "[]";
   exit 0;
 }
 
 my @comments;
-while ($nitpick_content =~ /<details>\s*<summary>([^<]+?)\s+\(\d+\)<\/summary>\s*<blockquote>([\s\S]*?)<\/blockquote>\s*<\/details>/g) {
-  my $file_name = trim($1);
-  my $file_content = $2;
-
-  while ($file_content =~ /`(\d+(?:-\d+)?)`:\s*\*\*([^*]+)\*\*\s*([\s\S]*?)(?=---|\n`\d|<\/blockquote>|$)/g) {
-    my $line_range = $1;
-    my $title = trim($2);
-    my $clean_body = clean_comment_body(trim($3));
-
-    # Fingerprint: file + normalized line + title + body (NO timestamp,
-    # NO author — reposted reviews must dedupe to the same fingerprint).
-    my $fingerprint_input = join("\n", $file_name, $line_range, $title, $clean_body);
-    my $fingerprint = substr(sha256_hex(encode_utf8($fingerprint_input)), 0, 16);
-
-    push @comments, {
-      author      => $author,
-      body        => "$title\n\n$clean_body",
-      createdAt   => $created_at,
-      file        => $file_name,
-      fingerprint => $fingerprint,
-      line        => $line_range,
-      title       => $title,
-    };
+for my $section (@sections) {
+  my $section_content = $section->{content};
+  my $category = $section->{category};
+
+  while ($section_content =~ /<details>\s*<summary>([^<]+?)\s+\(\d+\)<\/summary>\s*<blockquote>([\s\S]*?)<\/blockquote>\s*<\/details>/g) {
+    my $raw_file_name = trim($1);
+    my $file_content = $2;
+
+    while ($file_content =~ /`(\d+(?:-\d+)?)`:\s*(?:_[^_]+_\s*\|\s*_[^_]+_\s*)?\*\*([^*]+)\*\*\s*([\s\S]*?)(?=---|\n`\d|<\/blockquote>|$)/g) {
+      my $line_range = $1;
+      my $title = trim($2);
+      my $clean_body = clean_comment_body(trim($3));
+      my $file_name = normalize_file_name($raw_file_name, $line_range);
+
+      # Fingerprint: file + normalized line + title + body (NO timestamp,
+      # NO author, NO category — reposted reviews must dedupe to the same
+      # fingerprint even if CodeRabbit relabels the section).
+      my $fingerprint_input = join("\n", $file_name, $line_range, $title, $clean_body);
+      my $fingerprint = substr(sha256_hex(encode_utf8($fingerprint_input)), 0, 16);
+
+      push @comments, {
+        author      => $author,
+        body        => "$title\n\n$clean_body",
+        category    => $category,
+        createdAt   => $created_at,
+        file        => $file_name,
+        fingerprint => $fingerprint,
+        line        => $line_range,
+        title       => $title,
+      };
+    }
   }
 }
 
 print encode_json(\@comments);
 
-sub extract_nitpick_section {
+sub has_supported_sections {
+  my ($text) = @_;
+  $text = strip_markdown_blockquote_prefixes($text);
+  return $text =~ /<summary>\s*[^<]*(?:Nitpick comments|Minor comments|Outside diff range comments)\s*\(\d+\)<\/summary>\s*<blockquote>/i;
+}
+
+sub extract_review_body_comment_sections {
   my ($text) = @_;
-  if ($text =~ /<summary>\x{1f9f9} Nitpick comments \(\d+\)<\/summary>\s*<blockquote>/i) {
+  $text = strip_markdown_blockquote_prefixes($text);
+
+  my @sections;
+  while ($text =~ /<summary>\s*[^<]*(Nitpick comments|Minor comments|Outside diff range comments)\s*\(\d+\)<\/summary>\s*<blockquote>/ig) {
+    my $category = section_category($1);
     my $content_start = $+[0];
     my $after = substr($text, $content_start);
 
@@ -96,11 +114,36 @@ sub extract_nitpick_section {
     for my $tag (@tags) {
       $depth += $tag->[1] ? 1 : -1;
       if ($depth == 0) {
-        return substr($after, 0, $tag->[0]);
+        push @sections, {
+          category => $category,
+          content  => substr($after, 0, $tag->[0]),
+        };
+        last;
       }
     }
   }
-  return undef;
+  return @sections;
+}
+
+sub section_category {
+  my ($label) = @_;
+  return "nitpick" if $label =~ /Nitpick comments/i;
+  return "minor" if $label =~ /Minor comments/i;
+  return "outside-diff" if $label =~ /Outside diff range comments/i;
+  return "unknown";
+}
+
+sub normalize_file_name {
+  my ($file_name, $line_range) = @_;
+  my $suffix = "-" . $line_range;
+  $file_name =~ s/\Q$suffix\E$//;
+  return $file_name;
+}
+
+sub strip_markdown_blockquote_prefixes {
+  my ($text) = @_;
+  $text =~ s/^[ \t]*>[ \t]?//mg;
+  return $text;
 }
 
 sub clean_comment_body {
@@ -124,9 +167,3 @@ sub trim {
 }
 '
 }
-
-# Extract code scanning alert number from comment body.
-extract_code_scanning_alert_number() {
-  local body="$1"
-  printf '%s' "$body" | perl -ne 'print $1 if m{/code-scanning/(\d+)}'
-}

package/skills/babysit-pr/scripts/postSentinelPrComment.sh

@@ -8,7 +8,9 @@
 
 set -euo pipefail
 
-SENTINEL='<!-- babysit-pr:addressed v1 -->'
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+# shellcheck source=_sentinel.sh
+source "${SCRIPT_DIR}/_sentinel.sh"
 
 if [ $# -lt 2 ]; then
   printf '{"error":"Usage: postSentinelPrComment.sh <pr-number> <body>"}\n' >&2
@@ -27,14 +29,7 @@ if [ -z "$BODY" ]; then
   exit 2
 fi
 
-case "$BODY" in
-  *"$SENTINEL") ;;
-  *)
-    BODY="${BODY}
-
-${SENTINEL}"
-    ;;
-esac
+BODY="$(ensure_sentinel "$BODY")"
 
 repo_json="$(gh repo view --json owner,name 2>/dev/null)" || {
   printf '{"error":"Could not determine repository."}\n' >&2

package/skills/babysit-pr/scripts/postSentinelReply.sh

@@ -11,7 +11,9 @@
 
 set -euo pipefail
 
-SENTINEL='<!-- babysit-pr:addressed v1 -->'
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+# shellcheck source=_sentinel.sh
+source "${SCRIPT_DIR}/_sentinel.sh"
 
 if [ $# -lt 2 ]; then
   printf '{"error":"Usage: postSentinelReply.sh <thread-id> <body>"}\n' >&2
@@ -30,15 +32,7 @@ if [ -z "$BODY" ]; then
   exit 2
 fi
 
-# Ensure sentinel is present at the end.
-case "$BODY" in
-  *"$SENTINEL") ;;
-  *)
-    BODY="${BODY}
-
-${SENTINEL}"
-    ;;
-esac
+BODY="$(ensure_sentinel "$BODY")"
 
 MUTATION='
 mutation($threadId: ID!, $body: String!) {

package/skills/babysit-pr/scripts/unresolvedPrComments.sh

@@ -11,8 +11,8 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 # shellcheck source=parseNitpicks.sh
 source "${SCRIPT_DIR}/parseNitpicks.sh"
-
-SENTINEL='<!-- babysit-pr:addressed v1 -->'
+# shellcheck source=_sentinel.sh
+source "${SCRIPT_DIR}/_sentinel.sh"
 
 exec 3>&1
 
@@ -283,7 +283,7 @@ main() {
     ]
   ')"
 
-  # Flattened unresolved_comments (retained for backward compat with the prose summary).
+  # Flattened unresolved_comments — retained for backward compat with the prose summary.
   # Includes comments from "active" AND "uncertain" threads so the agent never misses new feedback.
   local all_unresolved
   all_unresolved="$(printf '%s' "$threads_json" | jq '[
@@ -300,41 +300,46 @@ main() {
       }
   ]')"
 
-  # Filter out fixed code-scanning alerts from github-advanced-security
-  local unresolved_comments="[]"
-  local count
-  count="$(printf '%s' "$all_unresolved" | jq 'length')"
-
-  local i=0
-  while [ "$i" -lt "$count" ]; do
-    local comment
-    comment="$(printf '%s' "$all_unresolved" | jq ".[$i]")"
-    local comment_author
-    comment_author="$(printf '%s' "$comment" | jq -r '.author')"
-
-    local keep=true
-    # GitHub Advanced Security's bot posts under either login depending on account
-    # type (app installation vs. direct). Match both forms.
-    case "$comment_author" in
-      "github-advanced-security"|"github-advanced-security[bot]")
-        local comment_body alert_number
-        comment_body="$(printf '%s' "$comment" | jq -r '.body')"
-        alert_number="$(extract_code_scanning_alert_number "$comment_body")"
-        if [ -n "$alert_number" ]; then
-          if is_code_scanning_alert_fixed "$owner" "$repo" "$alert_number"; then
-            keep=false
-          fi
-        fi
-        ;;
-    esac
-
-    if [ "$keep" = true ]; then
-      unresolved_comments="$(printf '%s' "$unresolved_comments" | jq --argjson c "$comment" '. + [$c]')"
+  # Filter out fixed code-scanning alerts from github-advanced-security.
+  # Two-pass: collect unique alert numbers, query each once, then drop matching
+  # comments in a single jq pass. Avoids the O(N²) rebuild and duplicate gh api
+  # calls the naive per-comment loop would incur.
+  # github-advanced-security posts under either login depending on account type
+  # (app vs direct) — both forms match below.
+  local security_alerts
+  security_alerts="$(printf '%s' "$all_unresolved" | jq -r '
+    .[]
+    | select(.author == "github-advanced-security" or .author == "github-advanced-security[bot]")
+    | try (.body | capture("/code-scanning/(?<n>[0-9]+)") | .n)
+  ' | sort -u)"
+
+  local fixed_alerts="" alert_number
+  for alert_number in $security_alerts; do
+    if is_code_scanning_alert_fixed "$owner" "$repo" "$alert_number"; then
+      fixed_alerts="${fixed_alerts} ${alert_number}"
     fi
-
-    i=$((i + 1))
   done
 
+  local unresolved_comments
+  if [ -z "$fixed_alerts" ]; then
+    unresolved_comments="$all_unresolved"
+  else
+    # capture() on a non-matching string produces ZERO outputs (not null, not an
+    # error). Without the `// null` guard below, `as $n` would bind to nothing
+    # and the map entry would silently collapse to empty — dropping
+    # github-advanced-security comments that reference no code-scanning URL.
+    unresolved_comments="$(printf '%s' "$all_unresolved" | jq --arg fixed "$fixed_alerts" '
+      ($fixed | split(" ") | map(select(length > 0))) as $fixedSet
+      | map(
+          . as $c
+          | if ($c.author == "github-advanced-security" or $c.author == "github-advanced-security[bot]") then
+              (((try ($c.body | capture("/code-scanning/(?<n>[0-9]+)") | .n)) // null)) as $n
+              | if ($n != null and ($n | IN($fixedSet[]))) then empty else $c end
+            else $c end
+        )
+    ')"
+  fi
+
   # Nitpicks from coderabbit review bodies
   local reviews_json
   reviews_json="$(printf '%s' "$response" | jq '[.data.repository.pullRequest.reviews.nodes[]]')"

package/skills/unresolved-pr-comments/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: unresolved-pr-comments
-description: "Get unresolved review comments from a GitHub pull request. Use this skill when the user asks about PR feedback, review comments, unresolved threads, what reviewers said, CodeRabbit nitpicks, or wants to address PR review feedback. Also use when the user says 'check my PR', 'what's left on my PR', or 'resolve comments'."
+description: "Get unresolved review comments from a GitHub pull request. Use this skill when the user asks about PR feedback, review comments, unresolved threads, what reviewers said, CodeRabbit review-body comments, or wants to address PR review feedback. Also use when the user says 'check my PR', 'what's left on my PR', or 'resolve comments'."
 argument-hint: "[pr-number]"
 ---
 
@@ -26,7 +26,7 @@ Using the JSON output from the script:
 
 1. **If error**: Display the error message and suggest the fix
 2. **If no comments**: Report the PR has no pending feedback
-3. **If comments exist**: Present a brief summary (e.g., "Found 3 unresolved comments and 5 nitpicks")
+3. **If comments exist**: Present a brief summary (e.g., "Found 3 unresolved comments and 5 CodeRabbit review-body comments")
 
 Then, for EVERY comment (both `unresolvedComments` AND `nitpickComments`):
 

package/skills/unresolved-pr-comments/scripts/parseNitpicks.sh

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
-# parseNitpicks.sh — Parse CodeRabbit nitpick comments from PR review bodies.
+# parseNitpicks.sh — Parse CodeRabbit review-body comments from PR review bodies.
 # Sourced by unresolvedPrComments.sh. Requires: jq, perl.
 
-# Extract nitpick comments from reviews JSON (passed via stdin).
-# Outputs a JSON array of nitpick comment objects.
+# Extract CodeRabbit review-body comments from reviews JSON (passed via stdin).
+# Outputs a JSON array of comment objects. The function name is retained for
+# backward compatibility with existing skill scripts.
 extract_nitpick_comments() {
   local reviews_json="$1"
 
@@ -16,13 +17,13 @@ local $/;
 my $reviews_json = <STDIN>;
 my $reviews = decode_json($reviews_json);
 
-# Find latest coderabbitai review with nitpick section
+# Find latest coderabbitai review with supported review-body comment sections.
 my $latest_review;
 my $latest_time = "";
 for my $review (@$reviews) {
   my $author = $review->{author}{login} // "";
   my $body = $review->{body} // "";
-  next unless $author eq "coderabbitai" && $body =~ /Nitpick comments/;
+  next unless $author eq "coderabbitai" && has_supported_sections($body);
   my $created = $review->{createdAt} // "";
   if ($created gt $latest_time) {
     $latest_time = $created;
@@ -39,44 +40,58 @@ my $body = $latest_review->{body};
 my $author = $latest_review->{author}{login} // "deleted-user";
 my $created_at = $latest_review->{createdAt} // "";
 
-# Extract nitpick section content (handle nested blockquotes)
-my $nitpick_content = extract_nitpick_section($body);
-unless (defined $nitpick_content) {
+my @sections = extract_review_body_comment_sections($body);
+unless (@sections) {
   print "[]";
   exit 0;
 }
 
-# Extract file sections: <details><summary>filename (count)</summary><blockquote>...</blockquote></details>
 my @comments;
-while ($nitpick_content =~ /<details>\s*<summary>([^<]+?)\s+\(\d+\)<\/summary>\s*<blockquote>([\s\S]*?)<\/blockquote>\s*<\/details>/g) {
-  my $file_name = trim($1);
-  my $file_content = $2;
-
-  # Extract individual comments: `line-range`: **title** body
-  while ($file_content =~ /`(\d+(?:-\d+)?)`:\s*\*\*([^*]+)\*\*\s*([\s\S]*?)(?=---|\n`\d|<\/blockquote>|$)/g) {
-    my $line_range = $1;
-    my $title = trim($2);
-    my $clean_body = clean_comment_body(trim($3));
-    push @comments, {
-      author    => $author,
-      body      => "$title\n\n$clean_body",
-      createdAt => $created_at,
-      file      => $file_name,
-      line      => $line_range,
-    };
+for my $section (@sections) {
+  my $section_content = $section->{content};
+  my $category = $section->{category};
+
+  # Extract file sections: <details><summary>filename (count)</summary><blockquote>...</blockquote></details>
+  while ($section_content =~ /<details>\s*<summary>([^<]+?)\s+\(\d+\)<\/summary>\s*<blockquote>([\s\S]*?)<\/blockquote>\s*<\/details>/g) {
+    my $raw_file_name = trim($1);
+    my $file_content = $2;
+
+    # Extract individual comments: `line-range`: severity metadata, **title**, body
+    while ($file_content =~ /`(\d+(?:-\d+)?)`:\s*(?:_[^_]+_\s*\|\s*_[^_]+_\s*)?\*\*([^*]+)\*\*\s*([\s\S]*?)(?=---|\n`\d|<\/blockquote>|$)/g) {
+      my $line_range = $1;
+      my $title = trim($2);
+      my $clean_body = clean_comment_body(trim($3));
+      my $file_name = normalize_file_name($raw_file_name, $line_range);
+      push @comments, {
+        author    => $author,
+        body      => "$title\n\n$clean_body",
+        category  => $category,
+        createdAt => $created_at,
+        file      => $file_name,
+        line      => $line_range,
+      };
+    }
   }
 }
 
 print encode_json(\@comments);
 
-sub extract_nitpick_section {
+sub has_supported_sections {
   my ($text) = @_;
-  # Match the nitpick section header
-  if ($text =~ /<summary>\x{1f9f9} Nitpick comments \(\d+\)<\/summary>\s*<blockquote>/i) {
+  $text = strip_markdown_blockquote_prefixes($text);
+  return $text =~ /<summary>\s*[^<]*(?:Nitpick comments|Minor comments|Outside diff range comments)\s*\(\d+\)<\/summary>\s*<blockquote>/i;
+}
+
+sub extract_review_body_comment_sections {
+  my ($text) = @_;
+  $text = strip_markdown_blockquote_prefixes($text);
+
+  my @sections;
+  while ($text =~ /<summary>\s*[^<]*(Nitpick comments|Minor comments|Outside diff range comments)\s*\(\d+\)<\/summary>\s*<blockquote>/ig) {
+    my $category = section_category($1);
     my $content_start = $+[0];
     my $after = substr($text, $content_start);
 
-    # Find matching closing blockquote by tracking depth
     my $depth = 1;
     my @tags;
     while ($after =~ /(<blockquote>|<\/blockquote>)/gi) {
@@ -88,11 +103,36 @@ sub extract_nitpick_section {
     for my $tag (@tags) {
       $depth += $tag->[1] ? 1 : -1;
       if ($depth == 0) {
-        return substr($after, 0, $tag->[0]);
+        push @sections, {
+          category => $category,
+          content  => substr($after, 0, $tag->[0]),
+        };
+        last;
       }
     }
   }
-  return undef;
+  return @sections;
+}
+
+sub section_category {
+  my ($label) = @_;
+  return "nitpick" if $label =~ /Nitpick comments/i;
+  return "minor" if $label =~ /Minor comments/i;
+  return "outside-diff" if $label =~ /Outside diff range comments/i;
+  return "unknown";
+}
+
+sub normalize_file_name {
+  my ($file_name, $line_range) = @_;
+  my $suffix = "-" . $line_range;
+  $file_name =~ s/\Q$suffix\E$//;
+  return $file_name;
+}
+
+sub strip_markdown_blockquote_prefixes {
+  my ($text) = @_;
+  $text =~ s/^[ \t]*>[ \t]?//mg;
+  return $text;
 }
 
 sub clean_comment_body {