pr-shepherd 0.57.0 → 0.58.0

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

@@ -1,7 +1,7 @@
 import { isBotItem } from "./author.mjs";
-/** Gemini Code Assist daily-quota and review-limit notices. A heading means a real review. */
+/** Gemini Code Assist daily-quota and review-limit notices on conversation comments. A heading means a real review. */
 const rule = (item) => {
-    if (!isBotItem(item, ["gemini-code-assist"], ["pr-comment", "review-summary"]))
+    if (!isBotItem(item, ["gemini-code-assist"], ["pr-comment"]))
         return null;
     if (/^#{1,6}\s/m.test(item.body))
         return null;

package/bin/classify/standard/index.d.mts

@@ -1,4 +1,7 @@
 import type { ClassifyRule } from "../types.mts";
-/** Bundled classification rules that `classify.standard` can enable by name. */
+/**
+ * Bundled classification rules that `classify.standard` can enable by name.
+ * Each rule matches conversation comments (`pr-comment`) only.
+ */
 export declare const STANDARD_RULES: Readonly<Record<string, ClassifyRule>>;
 export declare const STANDARD_RULE_NAMES: readonly string[];

package/bin/classify/standard/index.mjs

@@ -1,19 +1,18 @@
 import coderabbitNotices from "./coderabbit-notices.mjs";
-import coderabbitReviewSummary from "./coderabbit-review-summary.mjs";
 import codecovReport from "./codecov-report.mjs";
 import codexNotices from "./codex-notices.mjs";
-import codexReviewSummary from "./codex-review-summary.mjs";
 import dependabotNotices from "./dependabot-notices.mjs";
 import geminiNotices from "./gemini-notices.mjs";
 import kiloNoIssues from "./kilo-no-issues.mjs";
 import sourceryNotices from "./sourcery-notices.mjs";
-/** Bundled classification rules that `classify.standard` can enable by name. */
+/**
+ * Bundled classification rules that `classify.standard` can enable by name.
+ * Each rule matches conversation comments (`pr-comment`) only.
+ */
 export const STANDARD_RULES = {
     "coderabbit-notices": coderabbitNotices,
-    "coderabbit-review-summary": coderabbitReviewSummary,
     "codecov-report": codecovReport,
     "codex-notices": codexNotices,
-    "codex-review-summary": codexReviewSummary,
     "dependabot-notices": dependabotNotices,
     "gemini-notices": geminiNotices,
     "kilo-no-issues": kiloNoIssues,

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

@@ -1,4 +1,4 @@
 import type { ClassifyRule } from "../types.mts";
-/** Kilo Code's report whose status line reads "No Issues Found" and that carries no findings. */
+/** Kilo Code conversation comment whose status line reads "No Issues Found" and that carries no findings. */
 declare const rule: ClassifyRule;
 export default rule;

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

@@ -2,9 +2,9 @@ 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's report whose status line reads "No Issues Found" and that carries no findings. */
+/** Kilo Code conversation comment whose status line reads "No Issues Found" and that carries no findings. */
 const rule = (item) => {
-    if (!isBotItem(item, ["kilo-code-bot"], ["pr-comment", "review-summary"]))
+    if (!isBotItem(item, ["kilo-code-bot"], ["pr-comment"]))
         return null;
     if (!STATUS_LINE.test(item.body))
         return null;

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

@@ -1,6 +1,6 @@
 import type { ClassifyRule } from "../types.mts";
 /**
- * Sourcery's private-repo upsell and weekly rate-limit notices. A real Sourcery review opens
+ * 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.
  */

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

@@ -1,11 +1,11 @@
 import { isBotItem } from "./author.mjs";
 /**
- * Sourcery's private-repo upsell and weekly rate-limit notices. A real Sourcery review opens
+ * 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 rule = (item) => {
-    if (!isBotItem(item, ["sourcery-ai"], ["pr-comment", "review-summary"]))
+    if (!isBotItem(item, ["sourcery-ai"], ["pr-comment"]))
         return null;
     if (/^#{1,6}\s/m.test(item.body))
         return null;

package/bin/commands/iterate/index.mjs

@@ -259,16 +259,24 @@ async function runIterateCore(opts) {
     if (markReadyResult)
         return markReadyResult;
     if (readyState.shouldCancel && !report.mergeStatus.isDraft) {
-        const receiptWritten = receiptCurrent || (await recordReadyReceipt(receiptKey, report, checkContext));
+        const receipt = receiptCurrent
+            ? "written"
+            : await recordReadyReceipt(receiptKey, report, checkContext);
         // Aggregate --stack routing trusts only a layer's receipt, so an unwritten
         // one keeps the elapsed marker and retries next tick. A one-PR receipt
         // only lets a rerun skip the wait, so its failure never changes the action.
-        if (!receiptWritten && report.mergeStatus.mergeRequirements?.stack !== undefined) {
+        // A layer GitHub reports BLOCKED gets no receipt, so aggregate routing
+        // still holds it, but without --merge its one-PR session ends like a
+        // single PR's instead of waiting for a stall-timeout.
+        const stackLayer = report.mergeStatus.mergeRequirements?.stack !== undefined;
+        if (stackLayer && (receipt === "failed" || (receipt === "blocked" && opts.merge))) {
             const receiptWait = {
                 ...base,
                 action: "wait",
                 shouldCancel: false,
-                log: `WAIT: PR #${base.pr} reached ready-delay but its stack readiness receipt could not be persisted`,
+                log: receipt === "blocked"
+                    ? `WAIT: PR #${base.pr} reached ready-delay but GitHub reports BLOCKED, so its stack readiness receipt was not certified`
+                    : `WAIT: PR #${base.pr} reached ready-delay but its stack readiness receipt could not be persisted`,
             };
             return annotateBlockedWait(await applyStallGuard(stallKey, stallTimeoutSeconds, headSha, base, prNumber, receiptWait, reportForWork, reviewSummaryIds, opts.stallDeadlineSink), blockerGate);
         }
@@ -305,6 +313,11 @@ async function runIterateCore(opts) {
     };
     return annotateBlockedWait(await applyStallGuard(stallKey, stallTimeoutSeconds, headSha, base, prNumber, wait, reportForWork, reviewSummaryIds, opts.stallDeadlineSink), blockerGate);
 }
+/**
+ * Persist a READY receipt from a fresh compact snapshot. `blocked` means the
+ * snapshot is ready except for GitHub's BLOCKED state; `failed` covers missing,
+ * stale, or not-ready evidence and write errors.
+ */
 async function recordReadyReceipt(key, report, context) {
     if (report.status !== "READY" ||
         report.mergeStatus.state !== "OPEN" ||
@@ -312,7 +325,7 @@ async function recordReadyReceipt(key, report, context) {
         !report.headSha ||
         !report.baseRefOid ||
         transportReadinessGaps(report, report.mergeStatus.mergeStateStatus).length > 0)
-        return false;
+        return "failed";
     try {
         const raw = await receiptSummaryForReport(key, report, context);
         if (fingerprintRawSummaryPr(raw) === null ||
@@ -320,16 +333,22 @@ async function recordReadyReceipt(key, report, context) {
             raw.isDraft ||
             raw.headRefOid !== report.headSha ||
             raw.baseRefOid !== report.baseRefOid)
-            return false;
+            return "failed";
         // Summarize hydrates annotation totals onto the snapshot before the stored hash.
         const summary = await summarizePollSummaryPr(raw, { owner: key.owner, name: key.repo }, { stackPrNumber: report.pr });
         if (annotationProbeUnavailable(raw))
-            return false;
+            return "failed";
         const fingerprint = fingerprintRawSummaryPr(raw);
         if (fingerprint === null)
-            return false;
-        if (!isCurrentSummaryReady(raw, summary.checks ?? {}, summary.review ?? {}))
-            return false;
+            return "failed";
+        const checks = summary.checks ?? {};
+        const review = summary.review ?? {};
+        if (!isCurrentSummaryReady(raw, checks, review)) {
+            const onlyBlocked = raw.mergeStateStatus === "BLOCKED" &&
+                !raw.isInMergeQueue &&
+                isCurrentSummaryReady(raw, checks, review, { allowBlocked: true });
+            return onlyBlocked ? "blocked" : "failed";
+        }
         const removalEvent = currentQueueRemovalEvent(raw);
         // Bind recovery to the exact evidence the one-PR check accepted. A new ejection
         // between that check and this fresh snapshot must get its own acknowledgment.
@@ -341,7 +360,7 @@ async function recordReadyReceipt(key, report, context) {
                 removalEvent.beforeCommit?.oid !== accepted.beforeCommitOid ||
                 Math.floor(Date.parse(removalEvent.createdAt) / 1000) !== accepted.createdAtUnix ||
                 removalEvent.reason !== accepted.reason)
-                return false;
+                return "failed";
         }
         await writeReadyReceipt({
             version: 1,
@@ -356,13 +375,13 @@ async function recordReadyReceipt(key, report, context) {
             }),
             recordedAtUnix: Math.floor(Date.now() / 1000),
         });
-        return true;
+        return "written";
     }
     catch {
         // The receipt is supplementary evidence. A transient summary fetch or
         // state-directory failure must not turn a completed one-PR poll into a
         // different Shepherd action.
-        return false;
+        return "failed";
     }
 }
 /** Clear a stale READY receipt; return whether a current receipt remains. */

package/bin/github/captured-proxy-agent.d.mts

@@ -0,0 +1,3 @@
+import type { Dispatcher } from "undici";
+/** Build the proxy agent from the request's captured environment, not a later one. */
+export declare function createCapturedProxyAgent(undici: typeof import("undici"), httpProxy: string, httpsProxy: string): Dispatcher;

package/bin/github/captured-proxy-agent.mjs

@@ -0,0 +1,8 @@
+/** Build the proxy agent from the request's captured environment, not a later one. */
+export function createCapturedProxyAgent(undici, httpProxy, httpsProxy) {
+    return new undici.EnvHttpProxyAgent({
+        httpProxy,
+        httpsProxy,
+        proxyTunnel: true,
+    });
+}

package/bin/github/github-fetch.mjs

@@ -1,19 +1,32 @@
-import { EnvHttpProxyAgent } from "undici";
+import { createRequire } from "node:module";
+import { createCapturedProxyAgent } from "./captured-proxy-agent.mjs";
+import { loadUndiciKeepingLegacyDispatcher } from "./legacy-dispatcher.mjs";
+const require = createRequire(import.meta.url);
 let proxyAgent;
 let proxyConfiguration;
+let undiciModule;
+function loadUndici() {
+    undiciModule ??= loadUndiciKeepingLegacyDispatcher(() => require("undici"));
+    return undiciModule;
+}
 /** Attach proxy routing to GitHub requests without changing the host's dispatcher. */
-export function githubFetch(input, init) {
+export async function githubFetch(input, init) {
     const httpProxy = process.env["http_proxy"] ?? process.env["HTTP_PROXY"] ?? "";
     const httpsProxy = process.env["https_proxy"] ?? process.env["HTTPS_PROXY"] ?? "";
     if (!httpProxy && !httpsProxy)
         return fetch(input, init);
+    const undici = loadUndici();
     const configuration = JSON.stringify([httpProxy, httpsProxy]);
-    if (!proxyAgent || configuration !== proxyConfiguration) {
-        const previous = proxyAgent;
-        proxyAgent = new EnvHttpProxyAgent();
+    let agent = proxyAgent;
+    if (!agent || configuration !== proxyConfiguration) {
+        const previous = agent;
+        // Undici 8 sends plain HTTP to the proxy as an absolute-form request.
+        // Tunnel every request so HTTP stays on CONNECT, matching Undici 7.
+        agent = createCapturedProxyAgent(undici, httpProxy, httpsProxy);
+        proxyAgent = agent;
         proxyConfiguration = configuration;
         // close waits for in-flight bodies before releasing the previous pool.
         void previous?.close().catch(() => { });
     }
-    return fetch(input, { ...init, dispatcher: proxyAgent });
+    return undici.fetch(input, { ...init, dispatcher: agent });
 }

package/bin/github/legacy-dispatcher.d.mts

@@ -0,0 +1,6 @@
+/**
+ * Load Undici and put the host's legacy dispatcher back when this load replaced
+ * it. `load` must be synchronous so a concurrent setGlobalDispatcher() cannot
+ * land in the slot and then be overwritten by the restore.
+ */
+export declare function loadUndiciKeepingLegacyDispatcher<T>(load: () => T, slot?: symbol): T;

package/bin/github/legacy-dispatcher.mjs

@@ -0,0 +1,44 @@
+const legacyDispatcherSlot = Symbol.for("undici.globalDispatcher.1");
+/**
+ * Undici 8's import installs a default agent and copies it onto the legacy
+ * dispatcher slot that Node 22 and 24's fetch still reads. Put the host's
+ * value back afterwards. The current slot stays writable, so a later
+ * setGlobalDispatcher() can replace it and mirror that change onto fetch.
+ */
+function restoreLegacyDispatcher(previous, slot) {
+    if (previous) {
+        Object.defineProperty(globalThis, slot, previous);
+        return;
+    }
+    const installed = Object.getOwnPropertyDescriptor(globalThis, slot);
+    // Undici defines this property as non-configurable, so absence can only be
+    // represented by clearing the value.
+    if (!installed?.writable)
+        return;
+    Object.defineProperty(globalThis, slot, {
+        value: undefined,
+        writable: true,
+        enumerable: false,
+        configurable: false,
+    });
+}
+/**
+ * Load Undici and put the host's legacy dispatcher back when this load replaced
+ * it. `load` must be synchronous so a concurrent setGlobalDispatcher() cannot
+ * land in the slot and then be overwritten by the restore.
+ */
+export function loadUndiciKeepingLegacyDispatcher(load, slot = legacyDispatcherSlot) {
+    const previous = Object.getOwnPropertyDescriptor(globalThis, slot);
+    const previousValue = previous?.value;
+    try {
+        const loaded = load();
+        if (Object.getOwnPropertyDescriptor(globalThis, slot)?.value !== previousValue) {
+            restoreLegacyDispatcher(previous, slot);
+        }
+        return loaded;
+    }
+    catch (error) {
+        restoreLegacyDispatcher(previous, slot);
+        throw error;
+    }
+}

package/bin/github/poll-summary-readiness.d.mts

@@ -1,6 +1,11 @@
 import type { PollSummaryChecks, PollSummaryReview } from "../types.mts";
 import type { RawSummaryPr } from "./poll-summary-raw.mts";
-/** Fresh compact evidence required before a READY receipt can be used. */
+/**
+ * Fresh compact evidence required before a READY receipt can be used.
+ * `allowBlocked` asks whether GitHub's BLOCKED state is the only gap, so a
+ * caller can tell a blocker it cannot clear from missing or stale evidence.
+ */
 export declare function isCurrentSummaryReady(raw: RawSummaryPr, checks: PollSummaryChecks, review: PollSummaryReview, options?: {
     allowQueuedProgress?: boolean;
+    allowBlocked?: boolean;
 }): boolean;

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

@@ -2,8 +2,15 @@ import { summarizePollSummaryChecks } from "./poll-summary-checks.mjs";
 import { parseBranchRules } from "./batch-parsers-rules.mjs";
 import { rulesComplete } from "./fingerprint-fields.mjs";
 import { isKnownMergeStateStatus, transportReadinessGaps } from "./transport-evidence.mjs";
-/** Fresh compact evidence required before a READY receipt can be used. */
+/**
+ * Fresh compact evidence required before a READY receipt can be used.
+ * `allowBlocked` asks whether GitHub's BLOCKED state is the only gap, so a
+ * caller can tell a blocker it cannot clear from missing or stale evidence.
+ */
 export function isCurrentSummaryReady(raw, checks, review, options = {}) {
+    const blockedStates = options.allowBlocked
+        ? ["DIRTY", "BEHIND", "UNKNOWN", "HAS_HOOKS"]
+        : ["DIRTY", "BEHIND", "UNKNOWN", "BLOCKED", "HAS_HOOKS"];
     const queued = options.allowQueuedProgress === true && raw.isInMergeQueue;
     // Merge-group checks may still be running after the PR earned its receipt;
     // source-commit checks must remain complete. A fresh pending source check is
@@ -29,8 +36,7 @@ export function isCurrentSummaryReady(raw, checks, review, options = {}) {
         raw.mergeable !== "CONFLICTING" &&
         raw.mergeStateStatus !== "DIRTY" &&
         (queued || raw.mergeable === "MERGEABLE") &&
-        (queued ||
-            !["DIRTY", "BEHIND", "UNKNOWN", "BLOCKED", "HAS_HOOKS"].includes(raw.mergeStateStatus)) &&
+        (queued || !blockedStates.includes(raw.mergeStateStatus)) &&
         (checks.failing ?? 0) === 0 &&
         (sourceChecks.failing ?? 0) === 0 &&
         (sourceChecks.inProgress ?? 0) === 0 &&

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

@@ -1,11 +1,13 @@
 import { normalizeBotUsernames } from "../comments/authors.mjs";
 import { applyRules } from "../classify/apply.mjs";
+import { normalizeAuthorType } from "../comments/authors.mjs";
 import { loadClassifyRules } from "../classify/loader.mjs";
 import { loadConfig } from "../config/load.mjs";
 import { getEffectiveCwd } from "../execution-context.mjs";
 import { classifyItem } from "../state/seen-comments.mjs";
 import { mutationWasDenied } from "../state/seen-comments.mjs";
 import { canGenerateGithubMutation } from "./mutation-policy.mjs";
+import { threadEndedByShepherd } from "../comments/marker.mjs";
 const THREAD_COMMENT_SEPARATOR = "\n\n--- thread comment ---\n\n";
 export async function summarizePollSummaryReview(raw, seen, viewerCanAdminister) {
     const config = loadConfig();
@@ -55,7 +57,11 @@ export async function summarizePollSummaryReview(raw, seen, viewerCanAdminister)
         const transcript = thread.comments.nodes
             .map((comment) => comment.body)
             .join(THREAD_COMMENT_SEPARATOR);
-        if (isSuppressed(rules, "review-thread", root, thread.id, thread.path, transcript))
+        const completeResolved = thread.isResolved === true && !truncated;
+        if (completeResolved &&
+            threadEndedByShepherd({ body: root?.body ?? "", comments: thread.comments.nodes }))
+            continue;
+        if (isSuppressed(rules, "review-thread", root, thread.id, thread.path ?? root?.path ?? null, root?.body ?? "", completeResolved))
             continue;
         const repeatable = !mutationWasDenied(thread.id, transcript, seen) &&
             (root?.viewerDidAuthor === true ||
@@ -75,23 +81,20 @@ export async function summarizePollSummaryReview(raw, seen, viewerCanAdminister)
         ...(incomplete && { incomplete: true }),
     };
 }
-function isSuppressed(rules, kind, raw, id = raw?.id ?? "unknown", path, body = raw?.body ?? "") {
+function isSuppressed(rules, kind, raw, id = raw?.id ?? "unknown", path, body = raw?.body ?? "", autoResolveSatisfied = false) {
     const item = {
         kind,
         id,
         author: raw?.author?.login ?? "unknown",
-        authorType: raw?.author?.__typename === "Bot"
-            ? "Bot"
-            : raw?.author?.__typename === "User"
-                ? "User"
-                : "Unknown",
-        ...(raw?.authorAssociation && { authorAssociation: raw.authorAssociation }),
+        authorType: normalizeAuthorType(raw?.author?.__typename, raw?.author?.login),
+        ...(raw?.authorAssociation !== undefined && { authorAssociation: raw.authorAssociation }),
         body,
-        ...(raw?.url && { url: raw.url }),
+        ...(kind === "review-thread" ? { url: raw?.url ?? "" } : raw?.url ? { url: raw.url } : {}),
         ...(kind === "review-thread" && { path }),
     };
     const action = applyRules(rules, item);
     // An auto-resolve match is hidden only once the full check minimizes or resolves it, or
     // surfaces a denied mutation once; until then it stays actionable so that check runs.
-    return action.suppress === true && (action.autoResolve !== true || kind === "changes-requested");
+    return (action.suppress === true &&
+        (action.autoResolve !== true || kind === "changes-requested" || autoResolveSatisfied));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pr-shepherd",
-  "version": "0.57.0",
+  "version": "0.58.0",
   "description": "Autonomous PR CI monitor and review-comment resolver for agentic coding tools",
   "keywords": [
     "automation",
@@ -79,7 +79,7 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.30.0",
     "picomatch": "^4.0.4",
-    "undici": "^7.30.0",
+    "undici": "^8.11.2",
     "yaml": "^2.7.0",
     "zod": "^4.4.3"
   },
@@ -96,6 +96,6 @@
     "vitest": "^5.0.0"
   },
   "engines": {
-    "node": ">=22.18.0"
+    "node": ">=22.19.0"
   }
 }

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.58.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.0",
+  "version": "0.58.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.0", "pr-shepherd-mcp"]
+      "args": ["--yes", "--package", "pr-shepherd@0.58.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.0", "pr-shepherd-mcp"]
+    "args": ["--yes", "--package", "pr-shepherd@0.58.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

package/plugins/pr-shepherd/skills/reduce-pr-noise/references/classifiers.md

@@ -2,7 +2,7 @@
 
 Use a classification rule when the unwanted item has a recognizable author and message pattern. Inspect a representative item first so the rule does not hide other feedback from the same bot. Prefer an existing settings control for polling- or output-wide behavior.
 
-Check the bundled rules first. Under `classify.standard` in `.pr-shepherdrc.yml`, `all: true` enables every rule, and a named boolean such as `codecov-report: false` overrides `all`. They cover vendor bot notices: `coderabbit-notices`, `coderabbit-review-summary`, `codecov-report`, `codex-notices`, `codex-review-summary`, `dependabot-notices`, `gemini-notices`, `kilo-no-issues`, and `sourcery-notices`. Write a custom rule only when no bundled rule fits.
+Check the bundled rules first. Under `classify.standard` in `.pr-shepherdrc.yml`, `all: true` enables every rule, and a named boolean such as `codecov-report: false` overrides `all`. They cover vendor bot notices on conversation comments only: `coderabbit-notices`, `codecov-report`, `codex-notices`, `dependabot-notices`, `gemini-notices`, `kilo-no-issues`, and `sourcery-notices`. They do not match review summaries or inline review comments. Write a custom rule only when no bundled rule fits.
 
 Place an `.mts` file in `.pr-shepherd/classification/` in the project. Shepherd uses the first classification directory on the working directory's ancestor chain; it stops at the home directory if reached, otherwise at the filesystem root. A home-level rule directory is not discovered when the project is outside the home tree. Rule directories do not merge. Files ending in `.ts`, `.mts`, `.mjs`, or `.js` load, except names beginning with `_` or `.`. An `.mts` rule can use erasable TypeScript syntax and `import type`, without transpilation-only features such as enums.
 
@@ -12,7 +12,7 @@ Each file default-exports a `ClassifyRule` from `pr-shepherd/classify`. A rule r
 import type { ClassifyRule } from "pr-shepherd/classify";
 
 const rule: ClassifyRule = (item) => {
-  if (item.kind !== "pr-comment" && item.kind !== "review-summary") return null;
+  if (item.kind !== "pr-comment") return null;
   if (item.author.toLowerCase() !== "gemini-code-assist") return null;
   if (!/^You have reached your daily quota limit\b/i.test(item.body)) return null;
   return { suppress: true };

package/bin/classify/standard/coderabbit-review-summary.d.mts

@@ -1,8 +0,0 @@
-import type { ClassifyRule } from "../types.mts";
-/**
- * CodeRabbit review summaries that only count and re-prompt their inline threads. The threads
- * carry the findings, so the summary adds nothing. Any outside-diff, nitpick, duplicate or
- * other body-only section keeps the summary visible.
- */
-declare const rule: ClassifyRule;
-export default rule;

package/bin/classify/standard/coderabbit-review-summary.mjs

@@ -1,37 +0,0 @@
-import { isBotItem } from "./author.mjs";
-const HEADING = /^\*\*Actionable comments posted: \d+\*\*\n/;
-const PROMPT_BLOCK = /\n<details>\n<summary>🤖 Prompt to fix review comments<\/summary>\n\n```\n([\s\S]*?)\n```\n\n<\/details>\n/;
-const REVIEW_INFO_BLOCK = /\n<details>\n<summary>ℹ️ Review info<\/summary>\n[\s\S]*<\/details>\n/;
-const AUTOFIX_BLOCK = /\n<!-- autofix_checkbox_start -->[\s\S]*?<!-- autofix_checkbox_end -->\n/;
-/** Sections that carry findings only in the summary body, never in an inline thread. */
-const BODY_ONLY_FINDINGS = /\[!CAUTION\]|Outside diff range comments|Nitpick comments|Duplicate comments|Additional comments|Outside diff comments:/;
-/**
- * CodeRabbit review summaries that only count and re-prompt their inline threads. The threads
- * carry the findings, so the summary adds nothing. Any outside-diff, nitpick, duplicate or
- * other body-only section keeps the summary visible.
- */
-const rule = (item) => {
-    if (!isBotItem(item, ["coderabbitai"], ["review-summary"]))
-        return null;
-    const body = `${item.body.trim()}\n`;
-    if (!HEADING.test(body) || BODY_ONLY_FINDINGS.test(body))
-        return null;
-    const prompt = body.match(PROMPT_BLOCK)?.[1];
-    if (prompt !== undefined && !prompt.includes("\nInline comments:\n"))
-        return null;
-    const rest = body
-        .replace(HEADING, "\n")
-        .replace(AUTOFIX_BLOCK, "\n")
-        .replace(PROMPT_BLOCK, "\n")
-        .replace(REVIEW_INFO_BLOCK, "\n")
-        .replace(/<!--[\s\S]*?-->/g, "")
-        .replace(/^---$/gm, "");
-    if (rest.trim() !== "")
-        return null;
-    return {
-        autoResolve: true,
-        suppress: true,
-        reason: "CodeRabbit review summary that only repeats its inline threads",
-    };
-};
-export default rule;

package/bin/classify/standard/codex-review-summary.d.mts

@@ -1,7 +0,0 @@
-import type { ClassifyRule } from "../types.mts";
-/**
- * The Codex review summary that only introduces its inline threads. A summary that carries a
- * finding in its own body (for example, a permalink to a line outside the diff) stays visible.
- */
-declare const rule: ClassifyRule;
-export default rule;

package/bin/classify/standard/codex-review-summary.mjs

@@ -1,20 +0,0 @@
-import { isBotItem } from "./author.mjs";
-const ABOUT_BLOCK = /\n\n<details> <summary>ℹ️ About Codex in GitHub<\/summary>[\s\S]*?<\/details>$/;
-const ENVELOPE = /^### 💡 Codex Review\n\nHere are some automated review suggestions for this pull request\.\n\n\*\*Reviewed commit:\*\* `[a-f0-9]+`$/;
-/**
- * The Codex review summary that only introduces its inline threads. A summary that carries a
- * finding in its own body (for example, a permalink to a line outside the diff) stays visible.
- */
-const rule = (item) => {
-    if (!isBotItem(item, ["chatgpt-codex-connector"], ["review-summary"]))
-        return null;
-    const content = item.body.trim().replace(ABOUT_BLOCK, "").trim();
-    if (!ENVELOPE.test(content))
-        return null;
-    return {
-        autoResolve: true,
-        suppress: true,
-        reason: "Codex review summary that only introduces its inline threads",
-    };
-};
-export default rule;