pr-shepherd 0.25.0 → 0.25.2

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

package/bin/cli/help-command-pages.mjs

@@ -10,14 +10,16 @@ Usage:
                             [--require-sha SHA] [--format text|json]
 
 Flags:
-  --resolve-thread-ids <ids>      Comma-separated review thread IDs to resolve.
+  --resolve-thread-ids <ids>      Comma-separated review thread IDs (PRRT_*) to resolve.
                                   Human-authored thread IDs are skipped; use --reply-thread-ids.
+                                  Note: comment IDs (PRRC_*) from gh api are not thread IDs and will fail.
   --reply-thread-ids <ids>        Comma-separated human review thread IDs to reply to.
   --minimize-comment-ids <ids>    Comma-separated issue/review comment IDs to minimize.
   --dismiss-review-ids <ids>      Comma-separated CHANGES_REQUESTED review IDs to dismiss.
   --message <text>                Reply/dismiss message. Required with --reply-thread-ids
                                   or --dismiss-review-ids.
   --require-sha <sha>             Wait until GitHub reports this PR head SHA before mutating.
+                                  Must be a full 40-character lowercase hex SHA. Use $(git rev-parse HEAD).
   --format text|json              Output format. Default: text.
   --help, -h                      Print this help and exit before GitHub I/O.
 

package/bin/cli/resolve-validators.mjs

@@ -0,0 +1,16 @@
+export function warnPrrcThreadIds(ids) {
+    const prrcIds = ids.filter((id) => id.startsWith("PRRC_"));
+    if (prrcIds.length > 0) {
+        process.stderr.write(`pr-shepherd: resolve: warning: --resolve-thread-ids contains comment IDs (PRRC_*) instead of thread IDs (PRRT_*): ${prrcIds.join(", ")}. The resolveReviewThread mutation requires PRRT_* thread IDs. Run a GraphQL query for pullRequest.reviewThreads to get the correct IDs.\n`);
+    }
+    return prrcIds;
+}
+export function validateRequireSha(sha) {
+    if (sha === undefined)
+        return true;
+    if (/^[0-9a-f]{40}$/.test(sha))
+        return true;
+    process.stderr.write(`pr-shepherd: resolve: --require-sha must be a full 40-character lowercase hex SHA, got "${sha}". Short SHAs will never match GitHub's headRefOid. Use $(git rev-parse HEAD) to get the full SHA.\n`);
+    process.exitCode = 1;
+    return false;
+}

package/bin/cli-parser.mjs

@@ -30,6 +30,7 @@ import { USAGE, maybePrintHelp } from "./cli/help.mjs";
 import { formatMutateResult } from "./cli/formatters.mjs";
 import { handleClean, handleCommitSuggestion, handleIterate, handleMarkFilesAsViewed, } from "./cli/handlers.mjs";
 import { handlePoll } from "./cli/poll-handler.mjs";
+import { warnPrrcThreadIds, validateRequireSha } from "./cli/resolve-validators.mjs";
 import { setupLog } from "./log/setup.mjs";
 // ---------------------------------------------------------------------------
 // Entry
@@ -130,6 +131,9 @@ async function handleResolve(args) {
     const dismissReviewIds = parseList(getFlag(extra, "--dismiss-review-ids"));
     const dismissMessage = getFlag(extra, "--message") ?? undefined;
     const requireSha = getFlag(extra, "--require-sha") ?? undefined;
+    warnPrrcThreadIds(resolveThreadIds);
+    if (!validateRequireSha(requireSha))
+        return;
     if (hasFlag(extra, "--fetch")) {
         process.stderr.write("pr-shepherd: resolve: --fetch has been removed; run pr-shepherd iterate or poll to fetch the next action.\n");
         process.exitCode = 1;

package/bin/commands/resolve-mutate.mjs

@@ -5,6 +5,7 @@ import { loadConfig } from "../config/load.mjs";
 import { isConfiguredBotAuthor, isHumanAuthor, normalizeBotUsernames, } from "../comments/authors.mjs";
 import { markReplySeen } from "../state/seen-comments.mjs";
 import { threadTranscriptBody } from "../threads/transcript.mjs";
+import { addPrShepherdMarker } from "../comments/marker.mjs";
 export async function runResolveMutate(opts) {
     const repo = await getRepoInfo();
     const prNumber = opts.prNumber ?? (await getCurrentPrNumber());
@@ -49,12 +50,13 @@ export async function runResolveMutate(opts) {
     if (skippedNonHumanReplies.length > 0)
         result.skippedNonHumanReplies = skippedNonHumanReplies;
     if (opts.dismissMessage) {
+        const markedMessage = addPrShepherdMarker(opts.dismissMessage);
         await Promise.all(result.repliedThreads.map((id) => {
             const thread = threadById.get(id);
             if (!thread)
                 return Promise.resolve();
             const previousBody = threadTranscriptBody(thread);
-            return markReplySeen({ owner: repo.owner, repo: repo.name, pr: prNumber }, id, previousBody, threadTranscriptBody(thread, [opts.dismissMessage]), opts.dismissMessage);
+            return markReplySeen({ owner: repo.owner, repo: repo.name, pr: prNumber }, id, previousBody, threadTranscriptBody(thread, [markedMessage]), markedMessage);
         }));
     }
     return result;

package/bin/comments/marker.mjs

@@ -0,0 +1,7 @@
+const PR_SHEPHERD_MARKER = "<!-- pr-shepherd -->";
+export function hasPrShepherdMarker(body) {
+    return body.startsWith(PR_SHEPHERD_MARKER);
+}
+export function addPrShepherdMarker(body) {
+    return `${PR_SHEPHERD_MARKER}\n${body}`;
+}

package/bin/comments/resolve.mjs

@@ -1,5 +1,6 @@
 /* eslint-disable max-lines */
 import { graphqlWithRateLimit } from "../github/client.mjs";
+import { addPrShepherdMarker } from "./marker.mjs";
 import { isRateLimitMessage, rateLimitFromError, rateLimitFromGraphQlResult, } from "./rate-limit.mjs";
 import { setPendingOps } from "./pending-ops.mjs";
 import { waitForSha } from "./sha-poll.mjs";
@@ -70,8 +71,9 @@ export async function autoResolveOutdated(threadIds) {
 const BULK_CHUNK_SIZE = 10;
 function buildBulkMutation(replyIds, resolveIds, minimizeIds, dismissIds, dismissMessage) {
     const ops = [];
+    const replyBody = addPrShepherdMarker(dismissMessage);
     for (let i = 0; i < replyIds.length; i++) {
-        ops.push(`  p${i}: addPullRequestReviewThreadReply(input: { pullRequestReviewThreadId: ${JSON.stringify(replyIds[i])}, body: ${JSON.stringify(dismissMessage)} }) { comment { id } }`);
+        ops.push(`  p${i}: addPullRequestReviewThreadReply(input: { pullRequestReviewThreadId: ${JSON.stringify(replyIds[i])}, body: ${JSON.stringify(replyBody)} }) { comment { id } }`);
     }
     for (let i = 0; i < resolveIds.length; i++) {
         ops.push(`  r${i}: resolveReviewThread(input: { threadId: ${JSON.stringify(resolveIds[i])} }) { thread { isResolved } }`);

package/bin/comments/thread-visibility.mjs

@@ -1,6 +1,14 @@
 import { classifyItem } from "../state/seen-comments.mjs";
 import { threadTranscriptBody } from "../threads/transcript.mjs";
 import { isConfiguredBotAuthor } from "./authors.mjs";
+import { hasPrShepherdMarker } from "./marker.mjs";
+function threadEndedByShepherd(thread) {
+    const comments = thread.comments;
+    if (comments && comments.length > 0) {
+        return hasPrShepherdMarker(comments[comments.length - 1].body);
+    }
+    return hasPrShepherdMarker(thread.body);
+}
 function withEdited(thread, edited) {
     return edited ? { ...thread, edited: true } : thread;
 }
@@ -11,6 +19,8 @@ function classifyVisibleThread(thread, seenMap) {
     return withEdited(thread, cls === "edited");
 }
 function classifyFirstLookThread(thread, seenMap, firstLookStatus) {
+    if (threadEndedByShepherd(thread))
+        return null;
     const visible = classifyVisibleThread(thread, seenMap);
     if (visible === null)
         return null;
@@ -21,6 +31,8 @@ export function classifyThreadVisibility(threads, seenMap, botUsernames = new Se
     const activeThreads = unresolvedThreads
         .filter((t) => !t.isOutdated && !t.isMinimized)
         .flatMap((t) => {
+        if (threadEndedByShepherd(t))
+            return [];
         if (isConfiguredBotAuthor(t, botUsernames))
             return [t];
         const visible = classifyVisibleThread(t, seenMap);

package/bin/comments/visible-comments.mjs

@@ -8,6 +8,7 @@ export function classifyVisibleComments(comments, seenMap, minimizeComments, bot
         if (shouldMinimizeAuthor(c.authorType, minimizeComments, c.author, botUsernames)) {
             actionable.push(c);
             minimizeIds.push(c.id);
+            toMarkSeen.push(c); // prevents re-surfacing as first-look after GitHub marks it minimized
             continue;
         }
         const cls = classifyItem(c.id, c.body, seenMap);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pr-shepherd",
-  "version": "0.25.0",
+  "version": "0.25.2",
   "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.25.0",
+  "version": "0.25.2",
   "description": "Autonomous PR CI monitor and review-comment resolver for Codex.",
   "author": {
     "name": "Jonathan Ong",