pr-shepherd 0.32.3 → 0.32.5

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

package/bin/commands/iterate/classify.mjs

@@ -14,16 +14,21 @@ function dedupeIds(ids) {
 }
 export function classifyReviewSummaries(summaries, approvals, minimizeApprovals, minimizeComments = "all", botUsernames = new Set(), unresolvedThreads = [], ruleAutoResolveIds = []) {
     const blockedReviewIds = new Set(unresolvedThreads.flatMap((t) => (t.reviewId !== undefined ? [t.reviewId] : [])));
-    // First-look and seen summaries go into the minimize mutation; edited summaries do NOT —
-    // they are already minimized server-side (body changed after minimize was applied).
-    // First-look bodies are rendered so the agent sees them before the minimize happens.
-    const minimizeIds = [...summaries.firstLook, ...summaries.seen]
-        .filter((r) => shouldMinimizeAuthor(r.authorType, minimizeComments, r.author, botUsernames))
-        .filter((r) => !blockedReviewIds.has(r.id))
-        .map((r) => r.id);
-    // Rule-matched summaries are already suppressed from agent output; bypass normal policy gates.
+    const eligible = (r) => shouldMinimizeAuthor(r.authorType, minimizeComments, r.author, botUsernames) &&
+        !blockedReviewIds.has(r.id);
+    // First-look summaries still need one tick to surface their body to the agent,
+    // so their minimize IDs ride in the agent-facing resolve command. Seen summaries
+    // (already surfaced in a prior tick) have no new content to show — the CLI
+    // self-minimizes them in-process (selfMinimizeIds) instead of routing a
+    // cosmetic-only mutation through fix_code (issue #313). Edited summaries are
+    // excluded entirely: they are already minimized server-side (body changed after
+    // minimize was applied).
+    const minimizeIds = summaries.firstLook.filter(eligible).map((r) => r.id);
+    const selfMinimizeIds = summaries.seen.filter(eligible).map((r) => r.id);
+    // Rule-matched summaries are already suppressed from agent output; bypass normal
+    // policy gates. Keep the two sets disjoint.
     for (const id of ruleAutoResolveIds) {
-        if (!minimizeIds.includes(id))
+        if (!minimizeIds.includes(id) && !selfMinimizeIds.includes(id))
             minimizeIds.push(id);
     }
     if (minimizeApprovals) {
@@ -36,6 +41,7 @@ export function classifyReviewSummaries(summaries, approvals, minimizeApprovals,
         }
         return {
             minimizeIds,
+            selfMinimizeIds,
             firstLookSummaries: summaries.firstLook,
             editedSummaries: summaries.edited,
             surfacedApprovals,
@@ -43,6 +49,7 @@ export function classifyReviewSummaries(summaries, approvals, minimizeApprovals,
     }
     return {
         minimizeIds,
+        selfMinimizeIds,
         firstLookSummaries: summaries.firstLook,
         editedSummaries: summaries.edited,
         surfacedApprovals: approvals,

package/bin/commands/iterate/index.mjs

@@ -10,6 +10,7 @@ import { applyStallGuard } from "./stall.mjs";
 import { clearStallState } from "../../state/iterate-stall.mjs";
 import { handleFixCode } from "./fix-code.mjs";
 import { normalizeBotUsernames } from "../../comments/authors.mjs";
+import { autoMinimizeComments } from "../../comments/resolve.mjs";
 export async function runIterate(opts) {
     const config = loadConfig();
     const botUsernames = normalizeBotUsernames(config.botUsernames);
@@ -35,11 +36,25 @@ export async function runIterate(opts) {
         await clearStallState(stallKey);
         return buildTerminalCancelResult(report);
     }
-    const { minimizeIds: reviewSummaryIds, firstLookSummaries, editedSummaries, surfacedApprovals, } = classifyReviewSummaries({
+    const { minimizeIds, selfMinimizeIds, firstLookSummaries, editedSummaries, surfacedApprovals } = classifyReviewSummaries({
         firstLook: report.firstLookSummaries,
         seen: report.reviewSummaries,
         edited: report.editedSummaries,
     }, report.approvedReviews, config.iterate.minimizeApprovals, config.iterate.minimizeComments, botUsernames, [...report.threads.actionable, ...report.threads.resolutionOnly], report.ruleAutoResolveReviewSummaryIds);
+    // Already-seen review summaries have no new content to surface — minimize them
+    // in-process so they never register as agent-facing actionable work (#313).
+    // GitHub can still return a null/error/rate-limit result per ID without
+    // throwing (autoMinimizeComments reports this via `errors`, not a rejection);
+    // any ID it did not confirm minimized falls back into the agent-facing set so
+    // the resolve command remains a working fallback instead of silently dropping it.
+    let reviewSummaryIds = minimizeIds;
+    if (selfMinimizeIds.length > 0) {
+        const { minimized } = await autoMinimizeComments(selfMinimizeIds);
+        const minimizedIds = new Set(minimized);
+        const unminimized = selfMinimizeIds.filter((id) => !minimizedIds.has(id));
+        if (unminimized.length > 0)
+            reviewSummaryIds = [...reviewSummaryIds, ...unminimized];
+    }
     const hasActionableWork = report.threads.actionable.length > 0 ||
         report.threads.resolutionOnly.length > 0 ||
         report.threads.firstLook.length > 0 ||

package/bin/commands/poll.mjs

@@ -66,9 +66,16 @@ export async function runPoll(opts) {
     const untilTerminal = untilTerminalOpt === true;
     let dotsPrinted = false;
     let lastWaitSignature = null;
+    // When prNumber is omitted, iterateOpts.prNumber starts undefined and each tick would otherwise
+    // re-infer the PR from the current branch. That inference query only matches OPEN PRs, so once
+    // the monitored PR merges it returns nothing and runIterate throws instead of reporting the
+    // terminal CANCEL/merged result. Pin the PR resolved by the first tick so later ticks target it
+    // directly and never re-run branch discovery.
+    let prNumber = opts.prNumber;
     while (true) {
         tick += 1;
-        lastResult = await runIterate(iterateOpts);
+        lastResult = await runIterate({ ...iterateOpts, prNumber });
+        prNumber ??= lastResult.pr;
         if (lastResult.action !== "wait" && !(untilTerminal && lastResult.action === "mark_ready")) {
             break;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pr-shepherd",
-  "version": "0.32.3",
+  "version": "0.32.5",
   "description": "Autonomous PR CI monitor and review-comment resolver for agentic coding tools",
   "license": "MIT",
   "author": "Jonathan Ong",

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

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