pr-shepherd 0.30.0 → 0.30.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.30.0",
+  "version": "0.30.1",
   "author": {
     "name": "Jonathan Ong",
     "email": "jonathanrichardong@gmail.com"

package/bin/commands/iterate/fix-code.mjs

@@ -7,7 +7,7 @@ import { checkEscalateTriggers, validateBaseBranch, buildEscalateSuggestion, bui
 import { buildResolveCommand } from "./classify.mjs";
 import { buildFixInstructions } from "./render.mjs";
 import { applyStallGuard } from "./stall.mjs";
-import { tryCancelRun, buildInProgressRunIds } from "./helpers.mjs";
+import { tryCancelRun, buildAutoCancelRunIds, buildInProgressRunIds } from "./helpers.mjs";
 import { annotationMarkerBody } from "../check-annotations.mjs";
 import { threadTranscriptBody } from "../../threads/transcript.mjs";
 import { isHumanAuthor, isConfiguredBotAuthor } from "../../comments/authors.mjs";
@@ -78,10 +78,8 @@ export async function handleFixCode(ctx) {
     await writeFixAttempts({ owner: repoOwner, repo: repoName, pr: prNumber }, { headSha, threadAttempts, threadBodyHashes });
     let cancelled = [];
     if (!opts.noAutoCancelActionable) {
-        const uniqueRunIds = [
-            ...new Set(failingChecks.map((c) => c.runId).filter((id) => id !== null)),
-        ];
-        const results = await Promise.all(uniqueRunIds.map((id) => tryCancelRun(id, repoOwner, repoName)));
+        const runIds = buildAutoCancelRunIds(report);
+        const results = await Promise.all(runIds.map((id) => tryCancelRun(id, repoOwner, repoName)));
         cancelled = results.filter((id) => id !== null);
     }
     const cancelledSet = new Set(cancelled);
@@ -100,7 +98,11 @@ export async function handleFixCode(ctx) {
         hasConflicts ||
         changesRequestedReviews.length > 0 ||
         actionableComments.length > 0;
-    const inProgressRunIds = pushLikely ? buildInProgressRunIds(report, cancelledSet) : [];
+    const inProgressRunIds = pushLikely
+        ? buildInProgressRunIds(report, cancelledSet, {
+            suppressProtectedFreshReruns: false,
+        })
+        : [];
     const commentMinimizeIds = report.comments.minimizeIds ?? actionableComments.map((c) => c.id);
     const allCommentIds = [...commentMinimizeIds, ...reviewSummaryIds];
     const { resolveCommand, resolveOnlyCommand } = buildResolveCommand(threads, resolutionOnlyThreads, allCommentIds, changesRequestedReviews, checks, prNumber, botUsernames, ruleAutoResolveThreadIds);

package/bin/commands/iterate/helpers.mjs

@@ -2,13 +2,7 @@ import { execFile as execFileCb } from "node:child_process";
 import { promisify } from "node:util";
 import { rest } from "../../github/http.mjs";
 const execFile = promisify(execFileCb);
-export function buildInProgressRunIds(report, cancelledSet) {
-    return [
-        ...new Set(report.checks.inProgress
-            .map((c) => c.runId)
-            .filter((id) => id !== null && !cancelledSet.has(id))),
-    ];
-}
+export { buildAutoCancelRunIds, buildInProgressRunIds } from "./reruns.mjs";
 export function buildSummary(report) {
     return {
         passing: report.checks.passing.length,
@@ -17,12 +11,7 @@ export function buildSummary(report) {
         inProgress: report.checks.inProgress.length,
     };
 }
-/**
- * Build the full list of CI checks relevant to PR readiness: triggered by a PR
- * event (or StatusContext with null event), completed, and not skipped/neutral.
- * Includes both passing and failing. Failing entries carry workflowName, jobName,
- * failedStep, and summary.
- */
+/** Build completed, non-skipped checks relevant to PR readiness. */
 export function buildRelevantChecks(report) {
     const excluded = new Set([null, "SKIPPED", "NEUTRAL"]);
     const passing = report.checks.passing.flatMap((c) => {

package/bin/commands/iterate/reruns.mjs

@@ -0,0 +1,44 @@
+function matchesRerunCheck(failure, check) {
+    if (failure.runId !== null && check.runId !== null) {
+        return failure.runId === check.runId && failure.name === check.name;
+    }
+    return failure.runId === null && check.runId === null && failure.name === check.name;
+}
+function isProtectedByFreshRerun(failure, check) {
+    const attemptStartedAt = check.startedAtUnix ?? check.updatedAtUnix ?? check.createdAtUnix;
+    return (attemptStartedAt !== undefined &&
+        matchesRerunCheck(failure, check) &&
+        failure.completedAtUnix !== undefined &&
+        attemptStartedAt >= failure.completedAtUnix &&
+        (failure.startedAtUnix === undefined || failure.startedAtUnix < attemptStartedAt));
+}
+function hasProtectedFreshRerun(failure, checks) {
+    return checks.some((check) => isProtectedByFreshRerun(failure, check));
+}
+function isProtectedFreshRerun(check, failures) {
+    const matchingFailures = failures.filter((failure) => matchesRerunCheck(failure, check));
+    return (matchingFailures.length > 0 &&
+        matchingFailures.every((failure) => isProtectedByFreshRerun(failure, check)));
+}
+function protectedFreshRerunIds(report) {
+    return new Set(report.checks.inProgress
+        .filter((check) => isProtectedFreshRerun(check, report.checks.failing))
+        .map((check) => check.runId)
+        .filter((id) => id !== null));
+}
+export function buildAutoCancelRunIds(report) {
+    return [
+        ...new Set(report.checks.failing
+            .filter((check) => !hasProtectedFreshRerun(check, report.checks.inProgress))
+            .map((check) => check.runId)
+            .filter((id) => id !== null)),
+    ];
+}
+export function buildInProgressRunIds(report, cancelledSet, opts = {}) {
+    const protectedRunIds = opts.suppressProtectedFreshReruns === false ? new Set() : protectedFreshRerunIds(report);
+    return [
+        ...new Set(report.checks.inProgress
+            .map((check) => check.runId)
+            .filter((id) => id !== null && !cancelledSet.has(id) && !protectedRunIds.has(id))),
+    ];
+}

package/bin/github/batch-parsers.mjs

@@ -84,14 +84,11 @@ export function parseRawPr(raw, rawThreadPages, rawCommentNodes, rawReviewNodes,
             const event = node.checkSuite?.workflowRun?.event ?? null;
             const runId = extractRunId(node.detailsUrl);
             const summary = extractCheckRunSummary(node.title, node.summary);
-            const rawCreatedAt = node.checkSuite
-                ? (node.checkSuite.workflowRun?.createdAt ?? node.checkSuite.createdAt)
-                : undefined;
-            const rawUpdatedAt = node.checkSuite
-                ? (node.checkSuite.workflowRun?.updatedAt ?? node.checkSuite.updatedAt)
-                : undefined;
+            const rawCreatedAt = node.checkSuite?.workflowRun?.createdAt ?? node.checkSuite?.createdAt;
+            const rawUpdatedAt = node.checkSuite?.workflowRun?.updatedAt ?? node.checkSuite?.updatedAt;
             const createdAtUnix = rawCreatedAt ? parseCreatedAt(rawCreatedAt) : undefined;
             const startedAtUnix = node.startedAt ? parseCreatedAt(node.startedAt) : undefined;
+            const completedAtUnix = node.completedAt ? parseCreatedAt(node.completedAt) : undefined;
             const updatedAtUnix = rawUpdatedAt ? parseCreatedAt(rawUpdatedAt) : undefined;
             return [
                 {
@@ -105,6 +102,7 @@ export function parseRawPr(raw, rawThreadPages, rawCommentNodes, rawReviewNodes,
                     runId,
                     ...(createdAtUnix !== undefined && { createdAtUnix }),
                     ...(startedAtUnix !== undefined && { startedAtUnix }),
+                    ...(completedAtUnix !== undefined && { completedAtUnix }),
                     ...(updatedAtUnix !== undefined && { updatedAtUnix }),
                     ...(summary !== undefined && { summary }),
                 },

package/bin/github/gql/batch-pr.gql

@@ -192,6 +192,7 @@ query BatchPr(
                     status
                     conclusion
                     detailsUrl
+                    completedAt
                     startedAt
                     title
                     summary

package/package.json

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