pr-shepherd 0.59.3 → 0.60.1

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "pr-shepherd",
   "description": "Autonomous PR CI monitor and review-comment resolver for agentic coding tools",
-  "version": "0.59.3",
+  "version": "0.60.1",
   "author": {
     "name": "Jonathan Ong",
     "email": "jonathanrichardong@gmail.com"

package/bin/api.d.mts

@@ -18,7 +18,7 @@ export interface CreatePrShepherdOptions {
 }
 /** A positive PR number, GitHub pull-request URL, or owner/repo#number reference. */
 export type PrReference = number | string;
-type IterateOptions = Omit<IterateCommandOptions, "format" | "prNumber" | "targetRepository" | "persistSeen" | "fingerprintCache" | "stallDeadlineSink" | "deferQuotaWarning" | "quotaWarningMinimumPollIntervalMinutes">;
+type IterateOptions = Omit<IterateCommandOptions, "format" | "prNumber" | "targetRepository" | "persistSeen" | "deferEditedCommentMarkers" | "fingerprintCache" | "stallDeadlineSink" | "deferQuotaWarning" | "quotaWarningMinimumPollIntervalMinutes">;
 export type SingleIterateInput = IterateOptions & {
     pr?: PrReference;
     prs?: never;

package/bin/classify/standard/codecov-report.d.mts

@@ -1,4 +1,4 @@
 import type { ClassifyRule } from "../types.mts";
-/** Codecov's coverage report comment. Coverage gates still report through their status checks. */
+/** Codecov's coverage report and first-run welcome. Coverage gates still report through checks. */
 declare const rule: ClassifyRule;
 export default rule;

package/bin/classify/standard/codecov-report.mjs

@@ -1,9 +1,14 @@
 import { isBotItem } from "./author.mjs";
-/** Codecov's coverage report comment. Coverage gates still report through their status checks. */
+const WELCOME = /^## Welcome to \[Codecov\]\(https:\/\/codecov\.io[^\s)]*\) :tada:\n\nOnce you merge this PR into your default branch, you're all set! Codecov will compare coverage reports and display results in all future pull requests\.\n\nThanks for integrating Codecov - We've got you covered :open_umbrella:$/;
+/** Codecov's coverage report and first-run welcome. Coverage gates still report through checks. */
 const rule = (item) => {
     if (!isBotItem(item, ["codecov"], ["pr-comment"]))
         return null;
-    if (!/^#{1,6}\s*\[?Codecov\b/i.test(item.body.trimStart()))
+    const body = item.body.trim();
+    if (WELCOME.test(body)) {
+        return { autoResolve: true, suppress: true, reason: "Codecov welcome notice" };
+    }
+    if (!/^#{1,6}\s*\[?Codecov\b/i.test(body))
         return null;
     return { autoResolve: true, suppress: true, reason: "Codecov coverage report" };
 };

package/bin/classify/standard/coderabbit-notices.d.mts

@@ -1,8 +1,9 @@
 import type { ClassifyRule } from "../types.mts";
 /**
- * CodeRabbit progress, rate-limit, review-skipped and draft notices, plus its "Action not
- * completed" command replies. If the comment is later edited into a PR walkthrough, its new
- * body no longer matches and Shepherd surfaces the edited minimized comment to the agent.
+ * CodeRabbit progress, rate-limit, review-skipped and draft notices, its status-only command
+ * replies, and its zero-findings, skipped-autofix, and failed-edit status comments. If the
+ * comment is later edited into a PR walkthrough, its new body no longer matches and Shepherd
+ * surfaces the edited minimized comment to the agent.
  */
 declare const rule: ClassifyRule;
 export default rule;

package/bin/classify/standard/coderabbit-notices.mjs

@@ -1,54 +1,33 @@
 import { isBotItem } from "./author.mjs";
 const NOTICE_ENVELOPE = /^<!-- This is an auto-generated comment: (rate limited|skip review|review in progress) by coderabbit.ai -->\n([\s\S]*?)\n<!-- end of auto-generated comment: \1 by coderabbit.ai -->$/;
-const COMMAND_REPLY = /^<!-- This is an auto-generated reply by CodeRabbit -->\n<!-- CodeRabbit review command invocation: v2:[a-f0-9]+ -->\n<details>\n<summary>⚠️ Action not completed<\/summary>\n\n(?:Review rate limited\.|Review skipped: \d+ files exceed the limit of \d+\.)\n\n(?:> Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits\. This command is applicable only when automatic reviews are paused\.|---\n\nYour included review limit is currently reached under our \[Fair Usage Limits Policy\]\(https:\/\/docs.coderabbit.ai\/management\/plans#fair-usage-limits-policy\)\. This review may still proceed through usage-based billing if eligible\. Your next included review will be available in \d+ minutes?\.)\n\n<\/details>$/;
-const FINISHING_TOUCH_BLOCK = `<!-- finishing_touch_checkbox_start -->
-
-<details>
-<summary><strong>✨ Finishing Touches</strong></summary>
-<dl>
-<dd>
-
-<details open>
-<summary><strong>📝 Generate docstrings</strong></summary>
-<dl>
-<dd>
-
-- [ ] <!-- {"checkboxId":"3e1879ae-f29b-4d0d-8e06-d12b7ba33d98"} --> Commit to this branch
-- [ ] <!-- {"checkboxId":"7962f53c-55bc-4827-bfbf-6a18da830691"} --> Create a new PR
-
-</dd>
-</dl>
-</details>
-<details open>
-<summary><strong>🧪 Generate unit tests (beta)</strong></summary>
-<dl>
-<dd>
-
-- [ ] <!-- {"checkboxId": "6ba7b810-9dad-11d1-80b4-00c04fd430c8", "radioGroupId": "utg-output-choice-group-unknown_comment_id"} --> Commit to this branch
-- [ ] <!-- {"checkboxId": "f47ac10b-58cc-4372-a567-0e02b2c3d479", "radioGroupId": "utg-output-choice-group-unknown_comment_id"} --> Create a new PR
-
-</dd>
-</dl>
-</details>
-
-</dd>
-</dl>
-</details>
-
-<!-- finishing_touch_checkbox_end -->`;
-const AUTOPILOT_BLOCK = /\n<!-- autopilot:start -->\n- \[ \] <!-- \{"checkboxId":"2708ad07-9f24-4260-9c11-7dc76a49f2e3"\} --> <strong title="Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts">Autofix<\/strong> · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts\n<!-- autopilot:end -->$/;
+/**
+ * Command replies that only report a known status, optionally followed by one of CodeRabbit's
+ * fixed explanations. The invocation id varies between releases; any other text stays visible.
+ */
+const COMMAND_REPLY = /^<!-- This is an auto-generated reply by CodeRabbit -->\n<!-- CodeRabbit review command invocation: [^\n]* -->\n<details>\n<summary>(?:⚠️ Action not completed|✅ Action performed)<\/summary>\n\n(?:Review rate limited\.|Review skipped: \d+ files exceed the limit of \d+\.|(?:Full review|Review) finished\.|Pull request base or head changed\.|Pull request is closed\.)\n\n(?:(?:> Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits\. This command is applicable only when automatic reviews are paused\.|---\n\nYour included review limit is currently reached under our \[Fair Usage Limits Policy\]\(https:\/\/docs\.coderabbit\.ai\/[^\s)]*\)\. This review may still proceed through usage-based billing if eligible\. Your next included review will be available in \d+ minutes?\.)\n\n)?<\/details>$/;
+/** Standalone status comments: zero-findings completion, skipped autofix, and a failed edit. */
+const STATUS_COMMENTS = [
+    /^<!-- coderabbit-review-completion-marker -->\n\*\*Actionable comments posted: 0\*\*$/,
+    /^<!-- This is an auto-generated comment: autofix status by CodeRabbit -->\n> \[!NOTE\]\n> Autofix is a beta feature\.[^\n]*\n\nAutofix skipped\. No unresolved CodeRabbit review comments with fix instructions found\.\n<!-- autofix-run-id: [^\n]* -->$/,
+    /^> \[!CAUTION\]\n> Failed to replace \(edit\) comment\. This is likely due to insufficient permissions or the comment being deleted\.\n> \n> <details>\n> <summary>Error details<\/summary>\n> \n> ```\n> [^`\n]*\n> ```\n> \n> <\/details>$/,
+];
+/** One "Finishing Touches" option group: a bold title and only checkbox lines with plain labels. */
+const FINISHING_TOUCH_GROUP = "<details open>\\n<summary><strong>[^<\\n]+<\\/strong><\\/summary>\\n<dl>\\n<dd>\\n\\n(?:- \\[ \\] <!-- \\{[^\\n]*\\} --> [^<\\n]+\\n)+\\n<\\/dd>\\n<\\/dl>\\n<\\/details>\\n";
+/** The finishing-touch checkbox UI, with any checkbox ids and any number of option groups. */
+const FINISHING_TOUCH_BLOCK = new RegExp(`\\n\\n<!-- finishing_touch_checkbox_start -->\\n\\n<details>\\n<summary><strong>✨ Finishing Touches<\\/strong><\\/summary>\\n<dl>\\n<dd>\\n\\n(?:${FINISHING_TOUCH_GROUP})+\\n<\\/dd>\\n<\\/dl>\\n<\\/details>\\n\\n<!-- finishing_touch_checkbox_end -->$`);
+/** The Autofix/Autopilot checkbox, with any checkbox id, one-word label, and description. */
+const AUTOPILOT_BLOCK = /\n<!-- autopilot:start -->\n- \[ \] <!-- \{[^\n]*\} --> <strong title="[^"\n]*">\w+<\/strong> · [^<\n]+\n<!-- autopilot:end -->$/;
 /** Strips CodeRabbit's footer and header blocks so only the notice envelope remains. */
 function stripChrome(body) {
-    const withoutFooter = body
+    return body
         .trim()
         .replace(/\n<!-- tips_start -->[\s\S]*?<!-- tips_end -->$/, "")
         .trim()
         .replace(AUTOPILOT_BLOCK, "")
-        .trim();
-    const withoutFinishingTouch = withoutFooter.endsWith(`\n\n${FINISHING_TOUCH_BLOCK}`)
-        ? withoutFooter.slice(0, -FINISHING_TOUCH_BLOCK.length).trim()
-        : withoutFooter;
-    return withoutFinishingTouch
+        .trim()
+        .replace(FINISHING_TOUCH_BLOCK, "")
+        .trim()
+        .replace(/^<!-- coderabbit-ai-generated:\S* -->\s*/, "")
         .replace(/^<!-- This is an auto-generated comment: summarize by coderabbit.ai -->\s*/, "")
         .replace(/^<!-- review_stack_entry_start -->[\s\S]*?<!-- review_stack_entry_end -->\s*/, "");
 }
@@ -57,21 +36,24 @@ function isQuotedNotice(quoted) {
     if (!onlyQuotedLines)
         return false;
     return (quoted.includes("> ## Review limit reached\n") ||
+        quoted.includes("> ## Rate limit exceeded\n") ||
         quoted.includes("> ## Draft PR not reviewed\n") ||
         quoted.includes("> ## Review skipped\n") ||
         quoted.includes("> Currently processing new changes in this PR. This may take a few minutes, please wait..."));
 }
 /**
- * CodeRabbit progress, rate-limit, review-skipped and draft notices, plus its "Action not
- * completed" command replies. If the comment is later edited into a PR walkthrough, its new
- * body no longer matches and Shepherd surfaces the edited minimized comment to the agent.
+ * CodeRabbit progress, rate-limit, review-skipped and draft notices, its status-only command
+ * replies, and its zero-findings, skipped-autofix, and failed-edit status comments. If the
+ * comment is later edited into a PR walkthrough, its new body no longer matches and Shepherd
+ * surfaces the edited minimized comment to the agent.
  */
 const rule = (item) => {
     if (!isBotItem(item, ["coderabbitai"], ["pr-comment"]))
         return null;
     const body = stripChrome(item.body);
     const quoted = body.match(NOTICE_ENVELOPE)?.[2]?.trim();
-    if (!(quoted && isQuotedNotice(quoted)) && !COMMAND_REPLY.test(body))
+    const isStatus = COMMAND_REPLY.test(body) || STATUS_COMMENTS.some((notice) => notice.test(body));
+    if (!(quoted && isQuotedNotice(quoted)) && !isStatus)
         return null;
     return {
         autoResolve: true,

package/bin/classify/standard/codex-notices.mjs

@@ -1,14 +1,37 @@
 import { isBotItem } from "./author.mjs";
 const QUOTA_NOTICES = [
     /^You have reached your Codex usage limits for security reviews\. Please try again later\.$/,
-    /^You have reached your Codex usage limits for code reviews\. You can see your limits in the \[Codex usage dashboard\]\(https:\/\/chatgpt.com\/codex\/cloud\/settings\/usage\)\.(?:\nTo continue using code reviews, add credits to your account and enable them for code reviews in your \[settings\]\(https:\/\/chatgpt.com\/codex\/cloud\/settings\/code-review\)\.)?$/,
-    /^Codex usage limits have been reached for code reviews\. Please check with the admins of this repo to increase the limits by adding credits\.\nRepo admins can enable using credits for code reviews in their \[settings\]\(https:\/\/chatgpt.com\/codex\/cloud\/settings\/code-review\)\.$/,
+    /^You have reached your Codex usage limits for code reviews\. You can see your limits in the \[Codex usage dashboard\]\(https:\/\/chatgpt\.com\/[^\s)]*\)\.(?:\nTo continue using code reviews, add credits to your account and enable them for code reviews in your \[settings\]\(https:\/\/chatgpt\.com\/[^\s)]*\)\.)?$/,
+    /^Codex usage limits have been reached for code reviews\. Please check with the admins of this repo to increase the limits by adding credits\.\nRepo admins can enable using credits for code reviews in their \[settings\]\(https:\/\/chatgpt\.com\/[^\s)]*\)\.$/,
     /^Codex usage limits have been reached\. Please try again later\.$/,
 ];
 const ABOUT_BLOCK = /\n\n<details> <summary>ℹ️ About Codex (?:in GitHub|security reviews in GitHub)<\/summary>[\s\S]*?<\/details>$/;
-const ACTIVITY_SUMMARY = /^<!-- codex-pull-request-review-summary -->\n(?:<!-- codex-review-state:v1 \{[^\n]*\} -->\n)?(?:<!-- codex-security-review:v1 \{[^\n]*\} -->\n)?\n?## Codex Review Summary\n\nThis comment shows the latest Codex review activity on this pull request\.\n\n\| Review \| Status \| Commit \| Review trigger \|\n\| --- \| --- \| --- \| --- \|\n(?:\|[^\n]+\|\n?)+$/;
-const CLEAN_REVIEW = /^Codex Review: Didn't find any major issues\. (?:Bravo\.|Breezy!|Hooray!|:\+1:)\n\n\*\*Reviewed commit:\*\* `[a-f0-9]+`$/;
-const CLEAN_SECURITY = /^### 🛡️ Codex Security Review(?: · _Automatically triggered_)?\n\nSecurity review completed\. No security issues were found in this pull request\.\n\n\*\*Reviewed commit:\*\* `[a-f0-9]+`\n\n\[View security finding report\]\(https:\/\/chatgpt.com\/codex\/cloud\/tasks\/[a-zA-Z0-9_]+\)\n\n_Only the user who started this review can view the report in Codex\._$/;
+const ACTIVITY_SUMMARY = /^<!-- codex-pull-request-review-summary -->\n(?:<!-- codex-[a-z0-9-]+:[^\n]* -->\n)*\n?## Codex Review Summary\n\nThis comment shows the latest Codex review activity on this pull request\.\n\n\| Review \| Status \| Commit \| Review trigger \|\n\| --- \| --- \| --- \| --- \|\n(?:\|[^\n]+\|\n?)+$/;
+/**
+ * Codex's rotating clean-review sign-offs, as observed. Prose is matched only from this list so a
+ * short piece of advice in that position stays visible; a new sign-off is shown until added here.
+ */
+const SIGN_OFFS = [
+    "Already looking forward to the next diff.",
+    "Another round soon, please!",
+    "Bravo.",
+    "Breezy!",
+    "Can't wait for the next one!",
+    "Chef's kiss.",
+    "Delightful!",
+    "Hooray!",
+    "Keep it up!",
+    "Keep them coming!",
+    "More of your lovely PRs please.",
+    "Nice work!",
+    "Swish!",
+    "What shall we delve into next?",
+    "You're on a roll.",
+];
+const escapeRegExp = (text) => text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+/** A clean review closes with a known sign-off, a `:shortcode:`, or a single emoji. */
+const CLEAN_REVIEW = new RegExp(`^Codex Review: Didn't find any major issues\\. (?:${SIGN_OFFS.map(escapeRegExp).join("|")}|:[a-z0-9_+-]+:|\\p{Extended_Pictographic}\\uFE0F?)\\n\\n\\*\\*Reviewed commit:\\*\\* \`[a-f0-9]+\`$`, "u");
+const CLEAN_SECURITY = /^### 🛡️ Codex Security Review(?: · _Automatically triggered_)?\n\nSecurity review completed\. No security issues were found in this pull request\.\n\n\*\*Reviewed commit:\*\* `[a-f0-9]+`\n\n\[View security finding report\]\(https:\/\/chatgpt\.com\/[^\s)]*\)\n\n_Only the user who started this review can view the report in Codex\._$/;
 /**
  * Codex quota notices, the review-activity status table, and no-findings notices on conversation
  * comments. Each pattern matches the whole comment, so a notice with any appended finding stays
@@ -21,8 +44,12 @@ const rule = (item) => {
     if (QUOTA_NOTICES.some((notice) => notice.test(body))) {
         return { autoResolve: true, suppress: true, reason: "Codex usage-limit notice" };
     }
-    // Strip only the trailing About block; extra findings after it stay visible.
-    const content = body.replace(ABOUT_BLOCK, "").trim();
+    // Strip only leading codex-* metadata markers and the trailing About block; extra findings stay
+    // visible. The activity table's own marker has no colon, so it is kept for ACTIVITY_SUMMARY.
+    const content = body
+        .replace(ABOUT_BLOCK, "")
+        .trim()
+        .replace(/^(?:<!-- codex-[a-z0-9-]+:[^\n]* -->\s*)+/, "");
     if (ACTIVITY_SUMMARY.test(content)) {
         return { autoResolve: true, suppress: true, reason: "Codex review-activity table" };
     }

package/bin/classify/standard/dependabot-notices.mjs

@@ -1,7 +1,11 @@
 import { isBotItem } from "./author.mjs";
 const NOTICES = [
     /^Looks like this PR is already up-to-date with [^\s!]+! If you'd still like to recreate it from scratch, overwriting any edits, you can request `@dependabot recreate`\.$/,
-    /^Looks like these dependencies are updatable in another way, so this is no longer needed\.$/,
+    /^Looks like (?:these dependencies are|\S+ is) updatable in another way, so this is no longer needed\.$/,
+    /^Superseded by #\d+\.$/,
+    /^OK, I won't notify you again about this release, but will get in touch when a new version is available\. If you'd rather skip all updates until the next major or minor version, let me know by commenting `@dependabot ignore this major version` or `@dependabot ignore this minor version`\. You can also ignore all major, minor, or patch releases for a dependency by adding an \[`ignore` condition\]\(https:\/\/docs\.github\.com\/[^\s)]*\) with the desired `update_types` to your config file\.\n\nIf you change your mind, just re-open this PR and I'll resolve any conflicts on it\.$/,
+    /^This pull request was built based on a group rule\. Closing it will not ignore any of these versions in future pull requests\.\n\nTo ignore these dependencies, configure \[ignore rules\]\(https:\/\/docs\.github\.com\/[^\s)]*\) in dependabot\.yml$/,
+    /^Looks like this PR has been edited by someone other than Dependabot\. That means Dependabot can't rebase it - sorry!\n\nIf you're happy for Dependabot to recreate it from scratch, overwriting any edits, you can request `@dependabot recreate`\.$/,
 ];
 /** Dependabot's replies that report no change to make. */
 const rule = (item) => {

package/bin/classify/standard/gemini-notices.d.mts

@@ -1,4 +1,4 @@
 import type { ClassifyRule } from "../types.mts";
-/** Complete Gemini Code Assist quota and review-limit notices. */
+/** Complete Gemini Code Assist quota, review-limit, and unsupported-file notices. */
 declare const rule: ClassifyRule;
 export default rule;

package/bin/classify/standard/gemini-notices.mjs

@@ -1,14 +1,25 @@
 import { isBotItem } from "./author.mjs";
-const NOTICES = [
+const QUOTA_NOTICES = [
     "You have reached your daily quota limit. Please wait up to 24 hours and I will start processing your requests again!",
     "Review limit reached. I'll be able to review this pull request again tomorrow.",
 ];
-/** Complete Gemini Code Assist quota and review-limit notices. */
+const UNSUPPORTED_NOTICES = [
+    "Gemini is unable to generate a review for this pull request due to the file types involved not being currently supported.",
+    "Gemini is unable to generate a summary for this pull request due to the file types involved not being currently supported.",
+];
+/** A GitHub alert prefix such as `> [!WARNING]`, with the notice on the following quoted line. */
+const ALERT_PREFIX = /^> \[!(?:NOTE|TIP|IMPORTANT|WARNING|CAUTION)\]\n> /;
+/** Complete Gemini Code Assist quota, review-limit, and unsupported-file notices. */
 const rule = (item) => {
     if (!isBotItem(item, ["gemini-code-assist"], ["pr-comment"]))
         return null;
-    if (!NOTICES.includes(item.body.trim()))
-        return null;
-    return { autoResolve: true, suppress: true, reason: "Gemini quota or review-limit notice" };
+    const notice = item.body.trim().replace(ALERT_PREFIX, "");
+    if (QUOTA_NOTICES.includes(notice)) {
+        return { autoResolve: true, suppress: true, reason: "Gemini quota or review-limit notice" };
+    }
+    if (UNSUPPORTED_NOTICES.includes(notice)) {
+        return { autoResolve: true, suppress: true, reason: "Gemini unsupported-file-type notice" };
+    }
+    return null;
 };
 export default rule;

package/bin/classify/standard/kilo-no-issues.d.mts

@@ -1,4 +1,4 @@
 import type { ClassifyRule } from "../types.mts";
-/** Complete Kilo Code no-issues status or report with a file list and no extra prose. */
+/** Complete Kilo Code no-issues reports and its out-of-credits notice, with no extra findings. */
 declare const rule: ClassifyRule;
 export default rule;

package/bin/classify/standard/kilo-no-issues.mjs

@@ -1,20 +1,47 @@
 import { isBotItem } from "./author.mjs";
 const PLAIN_STATUS = /^Status: ✅ No Issues Found \| Recommendation: Merge$/;
 const REVIEW_REPORT = /^## Code Review Summary\n\n\*\*Status:\*\* No Issues Found \| \*\*Recommendation:\*\* Merge(?:\n\n### Files Reviewed \((\d+) files\)\n((?:- `[^`\n]+`(?:\n|$))+))?$/;
-/** Complete Kilo Code no-issues status or report with a file list and no extra prose. */
+/**
+ * The marked report: a no-issues status, an optional plain overview (see `isPlainOverview`), the
+ * collapsed file list, and `kilo-*` usage footers. Any other status, such as "N Issues Found",
+ * does not match, and Kilo rewrites this same comment when a later push finds issues. A stray
+ * `EOF` line, left by some models before the footer, is tolerated.
+ */
+const MARKED_REPORT = /^<!-- kilo-review -->\n\n?## Code Review Summary\n\n\*\*Status:\*\* No (?:New )?Issues Found \| \*\*Recommendation:\*\* Merge(?: \([^)\n]*\))?\n\n([\s\S]*?\n)?<details>\n<summary><b>Files Reviewed \([^)\n]*\)<\/b><\/summary>\n(?:(?!<details>)[\s\S])*?<\/details>\n+(?:EOF\n+)?---\n(?:<!-- kilo-[a-z-]+ -->\n<sub>[^\n]*<\/sub>(?:\n|$))+$/;
+const BILLING = /^<!-- kilo-billing-notice -->\n\*\*Kilo Code Review could not run — your account is out of credits\.\*\*\n\n\[Add credits\]\(https:\/\/app\.kilo\.ai\/[^\s)]*\) or \[switch to a free model\]\(https:\/\/app\.kilo\.ai\/[^\s)]*\) to enable reviews on this change\.$/;
+/**
+ * True when the overview is only prose and lists, optionally under `### Overview`. Any other
+ * heading, HTML block, or table could carry a finding, so it keeps the report visible.
+ */
+function isPlainOverview(overview) {
+    return (overview ?? "")
+        .split("\n")
+        .every((line) => line === "### Overview" || !/^\s*(?:#|<|\|)/.test(line));
+}
+/** True for the marked report when its overview is plain. */
+function isMarkedReport(body) {
+    const report = body.match(MARKED_REPORT);
+    return report != null && isPlainOverview(report[1]);
+}
+/** True for the unmarked report when its file count agrees with the listed files. */
+function isConsistentReport(body) {
+    const report = body.match(REVIEW_REPORT);
+    if (!report)
+        return false;
+    if (report[1] === undefined)
+        return true;
+    return report[2].trimEnd().split("\n").length === Number(report[1]);
+}
+/** Complete Kilo Code no-issues reports and its out-of-credits notice, with no extra findings. */
 const rule = (item) => {
     if (!isBotItem(item, ["kilo-code-bot"], ["pr-comment"]))
         return null;
     const body = item.body.trim();
-    if (!PLAIN_STATUS.test(body)) {
-        const report = body.match(REVIEW_REPORT);
-        if (!report)
-            return null;
-        if (report[1] !== undefined) {
-            const listed = report[2].trimEnd().split("\n").length;
-            if (listed !== Number(report[1]))
-                return null;
-        }
+    if (BILLING.test(body)) {
+        return { autoResolve: true, suppress: true, reason: "Kilo Code out-of-credits notice" };
+    }
+    if (!PLAIN_STATUS.test(body) && !isMarkedReport(body) && !isConsistentReport(body)) {
+        return null;
     }
     return { autoResolve: true, suppress: true, reason: "Kilo Code no-issues report" };
 };

package/bin/classify/standard/sourcery-notices.mjs

@@ -1,5 +1,5 @@
 import { isBotItem } from "./author.mjs";
-const NO_ACCESS = /^Hi @[A-Za-z0-9-]+! 👋\n\nYour private repo does not have access to Sourcery\.\n\nPlease \[upgrade\]\(https:\/\/app\.sourcery\.ai\/login\?connection=github(?:&git_namespace_id=\d+)?&from_surface=github_bot&intent=private_repo_upsell\) to continue using Sourcery ✨$/;
+const NO_ACCESS = /^Hi @[A-Za-z0-9-]+! 👋\n\nYour private repo does not have access to Sourcery\.\n\nPlease \[upgrade\]\(https:\/\/app\.sourcery\.ai\/[^\s)]*\) to continue using Sourcery ✨$/;
 const RATE_LIMIT = /^Sorry @[A-Za-z0-9-]+, you have reached your weekly rate limit for Sourcery\. Please try again later\.$/;
 /** Complete Sourcery private-repo upsell and weekly rate-limit notices. */
 const rule = (item) => {

package/bin/cli/edited-comments-format.d.mts

@@ -0,0 +1,14 @@
+import type { EditedComment } from "../types.mts";
+/** Insert the edited-comments section before `## Instructions` (or append it). */
+export declare function insertEditedCommentsSection(text: string, comments: readonly EditedComment[] | undefined, verbose: boolean): string;
+/** JSON projection matching the text section: the agent comment plus its minimized status. */
+export declare function projectEditedComments(comments: readonly EditedComment[]): {
+    id: string;
+    viewerCanMinimize?: boolean;
+    author: string;
+    authorType?: import("../types.mts").AuthorType;
+    authorAssociation?: import("../types.mts").CommentAuthorAssociation;
+    body: string;
+    url: string;
+    isMinimized?: boolean | undefined;
+}[];

package/bin/cli/edited-comments-format.mjs

@@ -0,0 +1,39 @@
+import { blockquote, renderAuthor } from "./list-formatters.mjs";
+import { BODY_TRUNCATE_MAX_CHARS } from "./body-truncate.mjs";
+import { toAgentComment } from "../reporters/agent.mjs";
+const HEADING = "Edited comments";
+function editedTag(c) {
+    return c.isMinimized ? "[status: minimized, edited]" : "[edited since first look]";
+}
+/** Markdown for `editedComments`; null when there are none. Edits are informational only. */
+function formatEditedCommentsSection(comments, verbose) {
+    if (!comments?.length)
+        return null;
+    const cap = verbose ? undefined : BODY_TRUNCATE_MAX_CHARS;
+    const parts = [
+        `## ${HEADING} (${comments.length}) — informational; edits do not block readiness`,
+    ];
+    for (const c of comments) {
+        const heading = c.url ? `[commentId=${c.id}](${c.url})` : `\`commentId=${c.id}\``;
+        parts.push(`### ${heading} (${renderAuthor(c.author, c.authorType, c.authorAssociation)}) ${editedTag(c)}`);
+        parts.push(blockquote(c.body, cap, c.url));
+    }
+    return parts.join("\n\n");
+}
+/** Insert the edited-comments section before `## Instructions` (or append it). */
+export function insertEditedCommentsSection(text, comments, verbose) {
+    const section = formatEditedCommentsSection(comments, verbose);
+    if (!section)
+        return text;
+    const index = text.lastIndexOf("## Instructions");
+    if (index === -1)
+        return `${text}\n\n${section}`;
+    return `${text.slice(0, index)}${section}\n\n${text.slice(index)}`;
+}
+/** JSON projection matching the text section: the agent comment plus its minimized status. */
+export function projectEditedComments(comments) {
+    return comments.map((c) => ({
+        ...toAgentComment(c),
+        ...(c.isMinimized && { isMinimized: true }),
+    }));
+}

package/bin/cli/fix-formatter.mjs

@@ -13,6 +13,10 @@ export function formatFixCodeResult(header, result, opts = {}) {
     const verbose = opts.verbose ?? false;
     const topCap = verbose ? undefined : BODY_TRUNCATE_MAX_CHARS;
     const sections = [header];
+    if (result.fix.reviewItems) {
+        const { shown, total } = result.fix.reviewItems;
+        sections.push(`**showing** ${shown} of ${total} review items`);
+    }
     if (result.mergedBasePullRequests?.length) {
         sections.push("## Merged PRs matching the current base");
         sections.push(result.mergedBasePullRequests
@@ -50,9 +54,8 @@ export function formatFixCodeResult(header, result, opts = {}) {
         sections.push("## Actionable comments");
         for (const c of result.fix.actionableComments) {
             const heading = c.url ? `[commentId=${c.id}](${c.url})` : `\`commentId=${c.id}\``;
-            const editedMarker = c.edited ? " [edited since first look]" : "";
             const authorizationMarker = c.viewerCanMinimize === false ? " [viewer cannot minimize]" : "";
-            sections.push(`### ${heading} (${renderAuthor(c.author, c.authorType, c.authorAssociation)})${authorizationMarker}${editedMarker}`);
+            sections.push(`### ${heading} (${renderAuthor(c.author, c.authorType, c.authorAssociation)})${authorizationMarker}`);
             sections.push(blockquote(c.body, topCap, c.url));
         }
     }

package/bin/cli/iterate-activity-formatter.d.mts

@@ -1,2 +1,2 @@
 import type { IterateResult } from "../types.mts";
-export declare function formatActivityLine(result: IterateResult): string | null;
+export declare function formatActivityLine(result: IterateResult, verbose?: boolean): string | null;

package/bin/cli/iterate-activity-formatter.mjs

@@ -1,4 +1,5 @@
-export function formatActivityLine(result) {
+import { formatNameList } from "./iterate-check-names.mjs";
+export function formatActivityLine(result, verbose = false) {
     const activity = result.activity ?? {
         commitCount: 0,
         reviewRoundCount: 0,
@@ -17,10 +18,8 @@ export function formatActivityLine(result) {
         parts.push(`${activity.reviewItemsSinceLatestCommit.length} review items since latest commit`);
     }
     if (hasActiveChecks) {
-        parts.push(`active: ${result
-            .inProgressChecks.slice(0, 5)
-            .map((check) => `\`${check.name}\``)
-            .join(", ")}`);
+        const names = result.inProgressChecks.map((check) => check.name);
+        parts.push(`active: ${formatNameList(names, verbose)}`);
     }
     return `**activity** ${parts.join(" · ")}`;
 }

package/bin/cli/iterate-check-names.d.mts

@@ -0,0 +1,5 @@
+import type { IterateResult } from "../types.mts";
+/** Backticked inline name list; lean output caps it and appends `+N more`. */
+export declare function formatNameList(names: readonly string[], verbose: boolean): string;
+/** `**ignored**` and `**superseded**` header lines, omitted when their lists are empty. */
+export declare function formatSuppressedNameLines(result: IterateResult, verbose: boolean): string[];

package/bin/cli/iterate-check-names.mjs

@@ -0,0 +1,17 @@
+import { capList, moreSuffix } from "../util/cap-list.mjs";
+/** Backticked inline name list; lean output caps it and appends `+N more`. */
+export function formatNameList(names, verbose) {
+    const { shown, hidden } = verbose ? { shown: names, hidden: 0 } : capList(names);
+    return shown.map((n) => "`" + n + "`").join(", ") + moreSuffix(hidden);
+}
+/** `**ignored**` and `**superseded**` header lines, omitted when their lists are empty. */
+export function formatSuppressedNameLines(result, verbose) {
+    const lines = [];
+    if (result.ignoredNames && result.ignoredNames.length > 0) {
+        lines.push(`**ignored** ${formatNameList(result.ignoredNames, verbose)}`);
+    }
+    if (result.supersededNames && result.supersededNames.length > 0) {
+        lines.push(`**superseded** ${formatNameList(result.supersededNames, verbose)}`);
+    }
+    return lines;
+}

package/bin/cli/iterate-formatter.mjs

@@ -1,3 +1,5 @@
+/* eslint-disable max-lines */
+import { insertEditedCommentsSection } from "./edited-comments-format.mjs";
 import { formatFixCodeResult } from "./fix-formatter.mjs";
 import { formatRelevantChecks } from "./iterate-checks-formatter.mjs";
 import { joinSections } from "../util/markdown.mjs";
@@ -6,6 +8,7 @@ import { formatMergeRequirementLines } from "../merge-status/requirements-format
 import { appendMergeQueueHeader, formatDeferredWorkLine, formatMergeAction, } from "./iterate-merge-formatter.mjs";
 import { formatApiUsage, formatQuotaWarning } from "./api-usage-formatter.mjs";
 import { formatActivityLine } from "./iterate-activity-formatter.mjs";
+import { formatSuppressedNameLines } from "./iterate-check-names.mjs";
 import { branchStateSegment } from "./iterate-branch-segment.mjs";
 import { insertRuleAutoResolveSection } from "../commands/rule-auto-resolve-format.mjs";
 import { formatTransportEvidence } from "./transport-formatter.mjs";
@@ -41,7 +44,7 @@ export function formatIterateResult(result, opts) {
                 instructions.includes(`--repo ${result.repo} `));
         return generated ? full.replace(repoSeg, "") : full;
     };
-    const finish = (text) => dropRepeatedRepo(insertRuleAutoResolveSection(text, result.ruleAutoResolve));
+    const finish = (text) => dropRepeatedRepo(insertEditedCommentsSection(insertRuleAutoResolveSection(text, result.ruleAutoResolve), result.editedComments, verbose));
     const heading = `# PR #${result.pr} [${result.action.toUpperCase()}]`;
     const reviewDecisionSeg = result.mergeStatus === "BLOCKED" && result.reviewDecision
         ? ` · **reviewDecision** \`${result.reviewDecision}\``
@@ -57,7 +60,7 @@ export function formatIterateResult(result, opts) {
     let summaryLine;
     if (verbose) {
         const verboseBranch = branchSeg ? ` · ${branchSeg}` : "";
-        summaryLine = `**summary** ${result.summary.passing} passing, ${result.summary.skipped} skipped, ${result.summary.filtered} filtered, ${result.summary.inProgress} inProgress, ${result.summary.superseded} superseded · **remainingSeconds** ${result.remainingSeconds} · **blockingBotReviewInProgress** ${result.blockingBotReviewInProgress} · **isDraft** ${result.isDraft} · **shouldCancel** ${result.shouldCancel}${verboseBranch}${readyDelaySuffix ? ` · **ready-delay** \`${readyDelaySuffix}\` (override)` : ""}`;
+        summaryLine = `**summary** ${result.summary.passing} passing, ${result.summary.skipped} skipped, ${result.summary.filtered} filtered, ${result.summary.inProgress} inProgress, ${result.summary.queued} queued, ${result.summary.superseded} superseded · **remainingSeconds** ${result.remainingSeconds} · **blockingBotReviewInProgress** ${result.blockingBotReviewInProgress} · **isDraft** ${result.isDraft} · **shouldCancel** ${result.shouldCancel}${verboseBranch}${readyDelaySuffix ? ` · **ready-delay** \`${readyDelaySuffix}\` (override)` : ""}`;
     }
     else {
         const counts = [];
@@ -69,6 +72,8 @@ export function formatIterateResult(result, opts) {
             counts.push(`${result.summary.filtered} filtered`);
         if (result.summary.inProgress > 0)
             counts.push(`${result.summary.inProgress} inProgress`);
+        if (result.summary.queued > 0)
+            counts.push(`${result.summary.queued} queued`);
         if (result.summary.superseded > 0)
             counts.push(`${result.summary.superseded} superseded`);
         const segs = counts.length > 0 ? [`**summary** ${counts.join(", ")}`] : [];
@@ -114,17 +119,10 @@ export function formatIterateResult(result, opts) {
     else if (requiredLine) {
         headerLines.push(requiredLine);
     }
-    if (result.ignoredNames && result.ignoredNames.length > 0) {
-        const names = result.ignoredNames.map((n) => "`" + n + "`").join(", ");
-        headerLines.push(`**ignored** ${names}`);
-    }
-    if (result.supersededNames && result.supersededNames.length > 0) {
-        const names = result.supersededNames.map((n) => "`" + n + "`").join(", ");
-        headerLines.push(`**superseded** ${names}`);
-    }
+    headerLines.push(...formatSuppressedNameLines(result, verbose));
     appendUnreportedLines(headerLines, result);
     appendMergeQueueHeader(headerLines, result);
-    const activityLine = formatActivityLine(result);
+    const activityLine = formatActivityLine(result, verbose);
     if (activityLine)
         headerLines.push(activityLine);
     headerLines.push(...formatNextCheckLines(result.nextCheck));
@@ -176,14 +174,7 @@ export function formatIterateResult(result, opts) {
             else if (requiredLine) {
                 cancelHeaderLines.push(requiredLine);
             }
-            if (result.ignoredNames && result.ignoredNames.length > 0) {
-                const ignoredStr = result.ignoredNames.map((n) => "`" + n + "`").join(", ");
-                cancelHeaderLines.push(`**ignored** ${ignoredStr}`);
-            }
-            if (result.supersededNames && result.supersededNames.length > 0) {
-                const supersededStr = result.supersededNames.map((n) => "`" + n + "`").join(", ");
-                cancelHeaderLines.push(`**superseded** ${supersededStr}`);
-            }
+            cancelHeaderLines.push(...formatSuppressedNameLines(result, verbose));
             appendUnreportedLines(cancelHeaderLines, result);
             appendMergeQueueHeader(cancelHeaderLines, result);
             if (activityLine)
@@ -198,6 +189,11 @@ export function formatIterateResult(result, opts) {
         case "escalate":
             return finish(joinSections([
                 header,
+                ...(result.escalate.reviewItems
+                    ? [
+                        `**showing** ${result.escalate.reviewItems.shown} of ${result.escalate.reviewItems.total} review items`,
+                    ]
+                    : []),
                 ...(apiUsage ? [apiUsage] : []),
                 ...(verboseChecks ? [verboseChecks] : []),
                 result.escalate.humanMessage,