pr-shepherd 0.57.1 → 0.59.0

package/.claude-plugin/marketplace.json

@@ -10,7 +10,7 @@
     {
       "name": "pr-shepherd",
       "description": "Autonomous PR CI monitor and review-comment resolver",
-      "source": "./",
+      "source": "./plugins/pr-shepherd",
       "category": "productivity",
       "homepage": "https://github.com/jonathanong/pr-shepherd"
     }

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.57.1",
+  "version": "0.59.0",
   "author": {
     "name": "Jonathan Ong",
     "email": "jonathanrichardong@gmail.com"

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

@@ -1,8 +1,8 @@
 import type { ClassifyRule } from "../types.mts";
 /**
  * CodeRabbit progress, rate-limit, review-skipped and draft notices, plus its "Action not
- * completed" command replies. The summarize comment is later edited in place into the PR
- * walkthrough, so the rule only hides it from agent output and never minimizes it.
+ * 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.
  */
 declare const rule: ClassifyRule;
 export default rule;

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

@@ -1,14 +1,54 @@
 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 -->$/;
 /** Strips CodeRabbit's footer and header blocks so only the notice envelope remains. */
 function stripChrome(body) {
-    return body
+    const withoutFooter = body
         .trim()
         .replace(/\n<!-- tips_start -->[\s\S]*?<!-- tips_end -->$/, "")
         .trim()
-        .replace(/\n<!-- autopilot:start -->[\s\S]*?<!-- autopilot: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
         .replace(/^<!-- This is an auto-generated comment: summarize by coderabbit.ai -->\s*/, "")
         .replace(/^<!-- review_stack_entry_start -->[\s\S]*?<!-- review_stack_entry_end -->\s*/, "");
 }
@@ -23,8 +63,8 @@ function isQuotedNotice(quoted) {
 }
 /**
  * CodeRabbit progress, rate-limit, review-skipped and draft notices, plus its "Action not
- * completed" command replies. The summarize comment is later edited in place into the PR
- * walkthrough, so the rule only hides it from agent output and never minimizes it.
+ * 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.
  */
 const rule = (item) => {
     if (!isBotItem(item, ["coderabbitai"], ["pr-comment"]))
@@ -33,6 +73,10 @@ const rule = (item) => {
     const quoted = body.match(NOTICE_ENVELOPE)?.[2]?.trim();
     if (!(quoted && isQuotedNotice(quoted)) && !COMMAND_REPLY.test(body))
         return null;
-    return { suppress: true, reason: "CodeRabbit progress, review-limit, or skipped-review notice" };
+    return {
+        autoResolve: true,
+        suppress: true,
+        reason: "CodeRabbit progress, review-limit, or skipped-review notice",
+    };
 };
 export default rule;

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

@@ -6,7 +6,7 @@ const QUOTA_NOTICES = [
     /^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-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 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\._$/;
 /**

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

@@ -1,4 +1,4 @@
 import type { ClassifyRule } from "../types.mts";
-/** Gemini Code Assist daily-quota and review-limit notices on conversation comments. A heading means a real review. */
+/** Complete Gemini Code Assist quota and review-limit notices. */
 declare const rule: ClassifyRule;
 export default rule;

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

@@ -1,13 +1,14 @@
 import { isBotItem } from "./author.mjs";
-/** Gemini Code Assist daily-quota and review-limit notices on conversation comments. A heading means a real review. */
+const 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 rule = (item) => {
     if (!isBotItem(item, ["gemini-code-assist"], ["pr-comment"]))
         return null;
-    if (/^#{1,6}\s/m.test(item.body))
+    if (!NOTICES.includes(item.body.trim()))
         return null;
-    if (!/You have reached your daily quota limit|Review limit reached/i.test(item.body)) {
-        return null;
-    }
     return { autoResolve: true, suppress: true, reason: "Gemini quota or review-limit notice" };
 };
 export default rule;

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

@@ -1,4 +1,4 @@
 import type { ClassifyRule } from "../types.mts";
-/** Kilo Code conversation comment whose status line reads "No Issues Found" and that carries no findings. */
+/** Complete Kilo Code no-issues status or report with a file list and no extra prose. */
 declare const rule: ClassifyRule;
 export default rule;

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

@@ -1,16 +1,20 @@
 import { isBotItem } from "./author.mjs";
-const STATUS_LINE = /^[^\S\n]*(?:\*\*)?Status:?(?:\*\*)?:?[^\S\n]*(?:\p{Extended_Pictographic}️?[^\S\n]*)?No Issues Found\b/imu;
-/** Headings a no-issues report carries; any other heading means real feedback. */
-const REPORT_HEADING = /^(?:Code Review Summary|Files Reviewed\b.*)$/i;
-/** Kilo Code conversation comment whose status line reads "No Issues Found" and that carries no findings. */
+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. */
 const rule = (item) => {
     if (!isBotItem(item, ["kilo-code-bot"], ["pr-comment"]))
         return null;
-    if (!STATUS_LINE.test(item.body))
-        return null;
-    for (const [, heading] of item.body.matchAll(/^#{1,6}\s+(.*)$/gm)) {
-        if (!REPORT_HEADING.test(heading.trim()))
+    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;
+        }
     }
     return { autoResolve: true, suppress: true, reason: "Kilo Code no-issues report" };
 };

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

@@ -1,8 +1,4 @@
 import type { ClassifyRule } from "../types.mts";
-/**
- * Sourcery's private-repo upsell and weekly rate-limit notices on conversation comments. A real review opens
- * with a Markdown heading ("Reviewer's Guide", "Summary by Sourcery"); the notices carry none,
- * so a heading means genuine feedback that merely quotes the phrase.
- */
+/** Complete Sourcery private-repo upsell and weekly rate-limit notices. */
 declare const rule: ClassifyRule;
 export default rule;

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

@@ -1,18 +1,15 @@
 import { isBotItem } from "./author.mjs";
-/**
- * Sourcery's private-repo upsell and weekly rate-limit notices on conversation comments. A real review opens
- * with a Markdown heading ("Reviewer's Guide", "Summary by Sourcery"); the notices carry none,
- * so a heading means genuine feedback that merely quotes the phrase.
- */
+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 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) => {
     if (!isBotItem(item, ["sourcery-ai"], ["pr-comment"]))
         return null;
-    if (/^#{1,6}\s/m.test(item.body))
-        return null;
-    if (/does not have access to Sourcery/i.test(item.body)) {
+    const body = item.body.trim();
+    if (NO_ACCESS.test(body)) {
         return { autoResolve: true, suppress: true, reason: "Sourcery no-access upsell" };
     }
-    if (/reached your weekly rate limit/i.test(item.body)) {
+    if (RATE_LIMIT.test(body)) {
         return { autoResolve: true, suppress: true, reason: "Sourcery rate-limit notice" };
     }
     return null;

package/bin/commands/iterate/index.mjs

@@ -95,14 +95,15 @@ async function runIterateCore(opts) {
         if (unminimized.length > 0)
             reviewSummaryIds = [...reviewSummaryIds, ...unminimized];
     }
-    // Hidden PR comments surface once so the agent can acknowledge them, but
-    // they are not readiness evidence: bots keep editing hidden notices after a
-    // PR settles. They never restart the ready-delay or void a READY receipt.
+    // A first look at an already-minimized comment is only an acknowledgment.
+    // An edited body that no longer matches a noise rule may carry new feedback;
+    // it must restart the ready delay and void an existing READY receipt.
     const hasReadinessWork = report.threads.actionable.length > 0 ||
         report.threads.resolutionOnly.length > 0 ||
         report.threads.firstLook.length > 0 ||
         (report.threads.ruleAutoResolveIds?.length ?? 0) > 0 ||
         report.comments.actionable.length > 0 ||
+        report.comments.firstLook.some((comment) => comment.edited === true) ||
         (report.comments.minimizeIds?.length ?? 0) > 0 ||
         report.changesRequestedReviews.length > 0 ||
         hasCheckDrivenActionableWork(reportForWork.checks, report.mergeStatus.status) ||
@@ -393,11 +394,13 @@ async function revalidateReadyReceipt(key, report, hasReadinessWork, context) {
         report.mergeStatus.state === "OPEN" &&
         !report.mergeStatus.isDraft &&
         Boolean(report.headSha && report.baseRefOid);
+    const editedMinimizedFeedback = report.comments.firstLook.some((comment) => comment.isMinimized && comment.edited === true);
     if (report.mergeStatus.state !== "OPEN" ||
         report.mergeStatus.isDraft ||
         !report.headSha ||
         !report.baseRefOid ||
         transportReadinessGaps(report, report.mergeStatus.mergeStateStatus).length > 0 ||
+        editedMinimizedFeedback ||
         (!retainQueuedReceipt && (report.status !== "READY" || hasReadinessWork))) {
         await clearReadyReceipt(key);
         return false;

package/bin/github/poll-summary-review.mjs

@@ -18,8 +18,7 @@ export async function summarizePollSummaryReview(raw, seen, viewerCanAdminister)
         raw.reviews.pageInfo.hasPreviousPage ||
         raw.reviewThreads.pageInfo.hasPreviousPage;
     for (const comment of raw.comments.nodes) {
-        if (!comment.isMinimized &&
-            !isSuppressed(rules, "pr-comment", comment) &&
+        if (!isSuppressed(rules, "pr-comment", comment, comment.id, undefined, comment.body, comment.isMinimized) &&
             classifyItem(comment.id, comment.body, seen) !== "unchanged")
             actionable += 1;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pr-shepherd",
-  "version": "0.57.1",
+  "version": "0.59.0",
   "description": "Autonomous PR CI monitor and review-comment resolver for agentic coding tools",
   "keywords": [
     "automation",

package/plugins/pr-shepherd/.claude-plugin/plugin.json

@@ -0,0 +1,15 @@
+{
+  "name": "pr-shepherd",
+  "description": "Autonomous PR CI monitor and review-comment resolver for agentic coding tools",
+  "version": "0.59.0",
+  "author": {
+    "name": "Jonathan Ong",
+    "email": "jonathanrichardong@gmail.com"
+  },
+  "homepage": "https://github.com/jonathanong/pr-shepherd",
+  "repository": "https://github.com/jonathanong/pr-shepherd",
+  "license": "MIT",
+  "keywords": ["github", "pull-request", "ci", "code-review", "automation"],
+  "skills": "./skills/",
+  "mcpServers": "./.mcp.json"
+}

package/plugins/pr-shepherd/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "pr-shepherd",
-  "version": "0.57.1",
+  "version": "0.59.0",
   "description": "Autonomous PR CI monitor and review-comment resolver for Codex.",
   "author": {
     "name": "Jonathan Ong",

package/plugins/pr-shepherd/.codex.mcp.json

@@ -2,7 +2,7 @@
   "mcpServers": {
     "pr-shepherd": {
       "command": "npx",
-      "args": ["--yes", "--package", "pr-shepherd@0.57.1", "pr-shepherd-mcp"]
+      "args": ["--yes", "--package", "pr-shepherd@0.59.0", "pr-shepherd-mcp"]
     }
   }
 }

package/plugins/pr-shepherd/.mcp.json

@@ -1,6 +1,6 @@
 {
   "pr-shepherd": {
     "command": "npx",
-    "args": ["--yes", "--package", "pr-shepherd@0.57.1", "pr-shepherd-mcp"]
+    "args": ["--yes", "--package", "pr-shepherd@0.59.0", "pr-shepherd-mcp"]
   }
 }

package/plugins/pr-shepherd/skills/mark-files-as-viewed/SKILL.md

@@ -3,7 +3,7 @@ name: mark-files-as-viewed
 description: "Mark selected changed pull-request files as viewed with pr-shepherd (MCP or CLI)."
 user-invocable: true
 argument-hint: "[PR number or URL] [files|tests|--tests|--match REGEX]"
-allowed-tools: ["MCP", "Bash", "Read", "Grep", "Glob"]
+allowed-tools: mcp__plugin_pr-shepherd_pr-shepherd, Bash(npx pr-shepherd:*), Bash(pnpm exec pr-shepherd:*), Bash(pnpm dlx pr-shepherd:*), Bash(bunx pr-shepherd:*), Bash(pr-shepherd:*)
 ---
 
 # mark-files-as-viewed

package/plugins/pr-shepherd/skills/pr-shepherd/SKILL.md

@@ -3,7 +3,7 @@ name: pr-shepherd
 description: 'Create or iterate a GitHub pull request with pr-shepherd (MCP or CLI). Use for requests like "make a PR and use pr-shepherd", "iterate PR #123", or "run pr-shepherd until this PR is ready".'
 user-invocable: true
 argument-hint: "[PR number or URL | --stack PR] [--merge]"
-allowed-tools: ["MCP", "Bash", "Read", "Grep", "Glob", "Edit", "Write"]
+allowed-tools: mcp__plugin_pr-shepherd_pr-shepherd, Bash(npx pr-shepherd:*), Bash(pnpm exec pr-shepherd:*), Bash(pnpm dlx pr-shepherd:*), Bash(bunx pr-shepherd:*), Bash(pr-shepherd:*)
 ---
 
 # pr-shepherd

package/plugins/pr-shepherd/skills/reduce-pr-noise/SKILL.md

@@ -3,7 +3,7 @@ name: reduce-pr-noise
 description: Reduce repetitive pr-shepherd output by configuring bot-comment classification rules or existing noise settings. Use for requests to silence a specific bot notice, quiet polling, trim CI logs, or tune comment visibility; use pr-shepherd for PR iteration itself.
 user-invocable: true
 argument-hint: "[noisy bot comment or output]"
-allowed-tools: ["Bash", "Read", "Grep", "Glob", "Edit", "Write"]
+allowed-tools: Bash(npx pr-shepherd:*), Bash(pnpm exec pr-shepherd:*), Bash(pnpm dlx pr-shepherd:*), Bash(bunx pr-shepherd:*), Bash(pr-shepherd:*), Edit(**/.pr-shepherdrc.yml), Edit(~/.pr-shepherdrc.yml)
 ---
 
 # Reduce pr-shepherd noise