pr-shepherd 0.9.0 → 0.10.0

package/bin/commands/commit-suggestion.mjs

@@ -3,7 +3,7 @@ import { readFile, writeFile, unlink } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { promisify } from "node:util";
-import { getRepoInfo, getCurrentPrNumber, getPrHead, getCurrentBranch } from "../github/client.mjs";
+import { getRepoInfo, getCurrentPrNumber, getCurrentBranch } from "../github/client.mjs";
 import { fetchPrBatch } from "../github/batch.mjs";
 import { applyResolveOptions } from "../comments/resolve.mjs";
 import { parseSuggestion, isCommittableSuggestion } from "../suggestions/parse.mjs";
@@ -25,19 +25,21 @@ export async function runCommitSuggestion(opts) {
     if (prNumber === null) {
         throw new Error("No open PR found for current branch. Pass a PR number explicitly.");
     }
-    const head = await getPrHead(prNumber, repo.owner, repo.name);
     const currentBranch = await getCurrentBranch();
-    if (currentBranch !== head.ref) {
-        throw new Error(`Current branch "${currentBranch}" does not match PR head branch "${head.ref}". ` +
-            `Check out "${head.ref}" before applying suggestions.`);
-    }
     const { stdout: localHeadOut } = await execFile("git", ["rev-parse", "HEAD"]);
     const localHeadSha = localHeadOut.trim();
-    if (localHeadSha !== head.sha) {
-        throw new Error(`Local HEAD ${localHeadSha} does not match PR head ${head.sha}. ` +
-            `Pull/rebase "${head.ref}" to the latest PR head and try again.`);
-    }
     const { data } = await fetchPrBatch(prNumber, repo);
+    if (!data.headRepoWithOwner) {
+        throw new Error(`PR #${prNumber} head repository is unavailable (fork may have been deleted).`);
+    }
+    if (currentBranch !== data.headRefName) {
+        throw new Error(`Current branch "${currentBranch}" does not match PR head branch "${data.headRefName}". ` +
+            `Check out "${data.headRefName}" before applying suggestions.`);
+    }
+    if (localHeadSha !== data.headRefOid) {
+        throw new Error(`Local HEAD ${localHeadSha} does not match PR head ${data.headRefOid}. ` +
+            `Pull/rebase "${data.headRefName}" to the latest PR head and try again.`);
+    }
     const thread = data.reviewThreads.find((t) => t.id === opts.threadId);
     if (!thread) {
         throw new Error(`Thread ${opts.threadId} not found on PR #${prNumber}.`);

package/bin/commands/iterate/classify.mjs

@@ -7,32 +7,7 @@ export function classifyReviewSummaries(summaries, approvals, minimizeApprovals)
     }
     return { minimizeIds, surfacedApprovals: approvals };
 }
-// Patterns that indicate a comment is bot-generated noise rather than actionable feedback.
-// Conservative: only match explicit known patterns to avoid accidentally suppressing real reviews.
-const NOISE_PATTERNS = [
-    /you have reached your daily quota/i,
-    /please wait up to \d+ hours?/i,
-    /rate[\s-]?limit(?:ed)?\s*[-—:]\s*try again/i,
-    /resuming (monitoring|watch|checking)/i,
-    /restarting (monitoring|watch)/i,
-];
-function isNoiseComment(comment) {
-    return NOISE_PATTERNS.some((p) => p.test(comment.body));
-}
-export function classifyComments(comments) {
-    const actionable = [];
-    const noiseIds = [];
-    for (const c of comments) {
-        if (isNoiseComment(c)) {
-            noiseIds.push(c.id);
-        }
-        else {
-            actionable.push(c);
-        }
-    }
-    return { actionable, noiseIds };
-}
-export function buildResolveCommand(threads, actionableComments, allCommentIds, reviews, checks, prNumber) {
+export function buildResolveCommand(threads, allCommentIds, reviews, checks, prNumber) {
     const argv = ["npx", "pr-shepherd", "resolve", String(prNumber)];
     if (threads.length > 0) {
         argv.push("--resolve-thread-ids", threads.map((t) => t.id).join(","));
@@ -45,9 +20,10 @@ export function buildResolveCommand(threads, actionableComments, allCommentIds,
         argv.push("--dismiss-review-ids", reviews.map((r) => r.id).join(","));
         argv.push("--message", "$DISMISS_MESSAGE");
     }
-    // A push happens when there is code to change — threads, actionable comments, CI checks, or reviews.
-    // Noise-only comment minimization skips commit/push, so requiresHeadSha must be false.
-    const requiresHeadSha = threads.length > 0 || actionableComments.length > 0 || checks.length > 0 || reviews.length > 0;
+    // A push is required when threads, CI failures, or changes-requested reviews are present — the
+    // CLI knows those imply code edits. Comments are surfaced for the agent to evaluate; the CLI
+    // cannot know whether a given comment will require a push, so comments are excluded here.
+    const requiresHeadSha = threads.length > 0 || checks.length > 0 || reviews.length > 0;
     // hasMutations = we appended at least one of --resolve-thread-ids,
     // --minimize-comment-ids, or --dismiss-review-ids. Returned explicitly
     // (rather than derived from argv.length) so callers don't couple to the

package/bin/commands/iterate/escalate.mjs

@@ -31,8 +31,8 @@ export function checkEscalateTriggers(actionableThreads, actionableComments, cha
 /**
  * Validate the base branch name from the GraphQL batch (`report.baseBranch`)
  * and fall back safely if it's missing/unsafe. The branch is interpolated into
- * shell commands by `buildRebaseShellScript` and `buildFixInstructions`, so we
- * reject anything outside `[A-Za-z0-9._/-]` to prevent shell injection.
+ * shell commands by `buildFixInstructions`, so we reject anything outside
+ * `[A-Za-z0-9._/-]` to prevent shell injection.
  */
 export function validateBaseBranch(raw) {
     const trimmed = raw.trim();
@@ -52,18 +52,9 @@ export function validateBaseBranch(raw) {
     }
     return { branch: trimmed, isFallback: false };
 }
-export function buildRebaseShellScript(baseBranch) {
-    return [
-        `if ! git diff --quiet || ! git diff --cached --quiet; then`,
-        `  echo "SKIP rebase: dirty worktree (uncommitted changes present)"`,
-        `  exit 1`,
-        `fi`,
-        `git fetch origin && git rebase origin/${baseBranch} && git push --force-with-lease`,
-    ].join("\n");
-}
 export function buildEscalateHumanMessage(escalate, pr) {
     const lines = [];
-    lines.push("⚠️  /pr-shepherd:monitor paused — needs human direction");
+    lines.push("⚠️ /pr-shepherd:monitor paused — needs human direction");
     lines.push("");
     lines.push(`**Triggers:** ${escalate.triggers.map((t) => `\`${t}\``).join(", ")}`);
     lines.push("");

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

@@ -1,7 +1,7 @@
 import { readFixAttempts, writeFixAttempts } from "../../state/fix-attempts.mjs";
 import { toAgentThread, toAgentComment, toAgentChecks } from "../../reporters/agent.mjs";
 import { checkEscalateTriggers, validateBaseBranch, buildEscalateSuggestion, buildEscalateHumanMessage, } from "./escalate.mjs";
-import { classifyComments, buildResolveCommand } from "./classify.mjs";
+import { buildResolveCommand } from "./classify.mjs";
 import { buildFixInstructions } from "./render.mjs";
 import { applyStallGuard } from "./stall.mjs";
 import { tryCancelRun } from "./helpers.mjs";
@@ -48,16 +48,12 @@ export async function handleFixCode(ctx) {
     }
     const baseLookup = validateBaseBranch(report.baseBranch);
     const threads = report.threads.actionable.map(toAgentThread);
-    const { actionable: actionableComments, noiseIds: noiseCommentIds } = classifyComments(report.comments.actionable.map(toAgentComment));
+    const actionableComments = report.comments.actionable.map(toAgentComment);
     const checks = toAgentChecks(failingChecks);
     const { changesRequestedReviews } = report;
     const hasConflicts = report.mergeStatus.status === "CONFLICTS";
-    const allCommentIds = [
-        ...actionableComments.map((c) => c.id),
-        ...noiseCommentIds,
-        ...reviewSummaryIds,
-    ];
-    const resolveCommand = buildResolveCommand(threads, actionableComments, allCommentIds, changesRequestedReviews, checks, prNumber);
+    const allCommentIds = [...actionableComments.map((c) => c.id), ...reviewSummaryIds];
+    const resolveCommand = buildResolveCommand(threads, allCommentIds, changesRequestedReviews, checks, prNumber);
     if (baseLookup.isFallback && (resolveCommand.requiresHeadSha || hasConflicts)) {
         const fallbackEscalateBase = {
             triggers: ["base-branch-unknown"],
@@ -86,7 +82,6 @@ export async function handleFixCode(ctx) {
             mode: "rebase-and-push",
             threads,
             actionableComments,
-            noiseCommentIds,
             reviewSummaryIds,
             surfacedApprovals,
             checks,

package/bin/commands/iterate/render.mjs

@@ -30,14 +30,21 @@ export function renderResolveCommand(rc) {
 }
 export function buildFixInstructions(threads, actionableComments, checks, reviews, baseBranch, resolveCommand, hasConflicts, prNumber, cancelledCount, firstLookThreads = [], firstLookComments = []) {
     const instructions = [];
+    const hasSuggestions = threads.some((t) => t.suggestion);
+    if (hasSuggestions) {
+        instructions.push(`For each thread marked \`[suggestion]\` under \`## Review threads\`: run \`npx pr-shepherd commit-suggestion ${prNumber} --thread-id <id> --message "<one-sentence headline>" --format=json\`, one thread at a time. On \`applied: true\` the CLI already resolved the thread — remove its ID from \`--resolve-thread-ids\` in the \`resolve:\` command below. On \`applied: false\` read \`reason\` and \`patch\`, fall through to the manual-edit step, and do not retry the same command. Optionally pass \`--dry-run\` (omitting \`--message\`) to preview the patch without mutating the working tree.`);
+    }
     if (threads.length > 0 || actionableComments.length > 0) {
-        instructions.push(`Apply code fixes: read and edit each file referenced under \`## Review threads\` and \`## Actionable comments\` above.`);
+        const suggestionFallback = hasSuggestions
+            ? ` When applying a \`[suggestion]\` thread manually (e.g. after a failed \`commit-suggestion\` run), replace the exact line range shown in the heading (\`path:startLine-endLine\`) with the replacement shown in its \`Replaces lines …\` block verbatim — an empty replacement deletes those lines, a single blank line replaces the range with one blank line.`
+            : "";
+        instructions.push(`Apply code fixes: read and edit each file referenced under \`## Review threads\` and \`## Actionable comments\` above.${suggestionFallback}`);
     }
     const checksWithRunId = checks.filter((c) => c.runId);
     const externalChecks = checks.filter((c) => !c.runId && c.detailsUrl);
     const bareChecks = checks.filter((c) => !c.runId && !c.detailsUrl);
     if (checksWithRunId.length > 0) {
-        instructions.push(`For each failing check under \`## Failing checks\` with a run ID: examine the log tail shown in the fenced block when available (or run \`gh run view <runId> --log-failed\` if the block is absent) to decide what to do. If the logs show a transient runner or infrastructure failure (e.g. network timeout, runner setup crash, OOM kill), run \`gh run rerun <runId> --failed\` and stop this iteration — CI will re-run automatically. If the logs show a real test or build failure, apply a code fix.`);
+        instructions.push(`For each failing check under \`## Failing checks\` with a run ID, examine the log tail in the fenced block to decide what to do:\n   - If the log tail shows a transient runner or infrastructure failure (network timeout, runner setup crash, OOM kill), run \`gh run rerun <runId> --failed\` and stop this iteration — CI will re-run automatically.\n   - If the log tail shows a real test or build failure, apply a code fix.\n   - If the fenced log block is absent, run \`gh run view <runId> --log-failed\` first to fetch it, then choose between rerun and fix above.`);
     }
     if (externalChecks.length > 0) {
         instructions.push(`For each bullet in \`## Failing checks\` starting with \`external\` (external status check): open the linked URL in a browser to inspect the failure — log tails are not available for external checks.`);

package/bin/commands/log-file.mjs

@@ -0,0 +1,7 @@
+import { getRepoInfo } from "../github/client.mjs";
+import { resolveLogPath } from "../log/log-file.mjs";
+export async function runLogFile() {
+    const { owner, name } = await getRepoInfo();
+    const path = await resolveLogPath({ owner, repo: name });
+    return { path };
+}

package/bin/commands/monitor.mjs

@@ -16,7 +16,12 @@ export async function runMonitor(opts) {
     if (!Number.isFinite(maxTurns) || maxTurns <= 0 || !Number.isInteger(maxTurns)) {
         throw new Error(`Invalid config: watch.maxTurns must be a positive integer, got ${JSON.stringify(maxTurns)}`);
     }
-    const loopTag = `# pr-shepherd-loop:pr=${prNumber}`;
+    // No space after `#` — `# text` is a CommonMark ATX heading; `#text` is not.
+    // Trailing `:` prevents substring false positives: without it, the dedup grep
+    // for pr=1 would match a cron prompt for pr=135. Both the CronList check in
+    // step 1 of formatMonitorResult's ## Instructions and the in-prompt Self-dedup
+    // block depend on this exact string — don't change the format.
+    const loopTag = `#pr-shepherd-loop:pr=${prNumber}:`;
     const loopPrompt = buildLoopPrompt(prNumber, loopTag, opts.readyDelaySuffix);
     const loopArgs = `${interval} --max-turns ${maxTurns} --expires ${expiresHours}h`;
     return { prNumber, loopTag, loopArgs, loopPrompt };
@@ -56,9 +61,7 @@ function validateReadyDelaySuffix(readyDelaySuffix) {
 }
 function buildLoopPrompt(prNumber, loopTag, readyDelaySuffix) {
     const validatedDelay = validateReadyDelaySuffix(readyDelaySuffix);
-    const iterateCmd = validatedDelay
-        ? `npx pr-shepherd iterate ${prNumber} --no-cache --ready-delay ${validatedDelay}`
-        : `npx pr-shepherd iterate ${prNumber} --no-cache`;
+    const iterateCmd = `npx pr-shepherd iterate ${prNumber}${validatedDelay ? ` --ready-delay ${validatedDelay}` : ""}`;
     return [
         loopTag,
         "",

package/bin/commands/ready-delay.mjs

@@ -7,8 +7,8 @@
  */
 import { readFile, writeFile, mkdir, unlink } from "node:fs/promises";
 import { join, dirname } from "node:path";
-import { tmpdir } from "node:os";
 import { SAFE_SEGMENT } from "../util/path-segment.mjs";
+import { resolveStateBase } from "../state/base.mjs";
 /**
  * Update the ready-delay state machine and return the current decision.
  *
@@ -64,7 +64,7 @@ function readySincePath(pr, owner, repo) {
             throw new Error(`Invalid path segment "${field}": ${value}`);
         }
     }
-    const base = process.env["PR_SHEPHERD_STATE_DIR"] ?? join(tmpdir(), "pr-shepherd-state");
+    const base = resolveStateBase();
     return join(base, `${owner}-${repo}`, String(pr), "ready-since.txt");
 }
 async function safeUnlink(path) {

package/bin/commands/resolve-instructions.mjs

@@ -28,10 +28,13 @@ export function buildFetchInstructions(prNumber, result) {
     }
     if (hasCodeItems) {
         instructions.push(`Read and edit each file referenced under \`## Actionable Review Threads\`, \`## Actionable PR Comments\`, and \`## Pending CHANGES_REQUESTED reviews\` above. Reclassify each fixed item as Fixed. If an item is too complex to address, leave it as Actionable for the final report.`);
-        instructions.push(`Commit changed files: \`git add <files>\` (not \`git add -A\`) \`&& git commit -m "<descriptive message>"\`. If the fixes alter the PR's scope or intent, run \`gh pr edit ${prNumber} --title "<new title>" --body "<new body>"\` to reflect them. Then rebase and push: \`BASE_BRANCH=$(gh pr view ${prNumber} --json baseRefName --jq .baseRefName) && git fetch origin && git rebase "origin/$BASE_BRANCH" && git push --force-with-lease\`. Cancel stale in-progress runs: \`BRANCH=$(git rev-parse --abbrev-ref HEAD) && gh run list --branch "$BRANCH" --status in_progress --json databaseId --jq '.[].databaseId' | xargs -I{} gh run cancel {}\`.`);
+        instructions.push(`Commit changed files: \`git add <files>\` (not \`git add -A\`) \`&& git commit -m "<descriptive message>"\`.`);
+        instructions.push(`Keep the PR title and description current: if the fixes alter the PR's scope or intent, run \`gh pr edit ${prNumber} --title "<new title>" --body "<new body>"\` to reflect them. Skip if the existing title/body still accurately describe the PR.`);
+        instructions.push(`Rebase and push: \`BASE_BRANCH=$(gh pr view ${prNumber} --json baseRefName --jq .baseRefName) && git fetch origin && git rebase "origin/$BASE_BRANCH" && git push --force-with-lease\`.`);
+        instructions.push(`Cancel stale in-progress runs: \`BRANCH=$(git rev-parse --abbrev-ref HEAD) && CURRENT_SHA=$(git rev-parse HEAD) && gh run list --branch "$BRANCH" --status in_progress --json databaseId,headSha --jq ".[] | select(.headSha != \\"$CURRENT_SHA\\") | .databaseId" | xargs -I{} gh run cancel {}\`.`);
     }
     const requireShaHint = hasCodeItems
-        ? ` Include \`--require-sha $(git rev-parse HEAD)\` only when the commit-and-push step above ran.`
+        ? ` Include \`--require-sha $(git rev-parse HEAD)\` only when the rebase-and-push step above ran.`
         : "";
     const dismissNote = changesRequestedReviews.length > 0
         ? ` For \`--dismiss-review-ids\`: \`--message\` is required with one specific sentence describing the fix or the reason for not acting (no boilerplate like "address review comments"); omit \`--message\` when not dismissing. Review-summary IDs (\`PRR_…\` from \`## Review summaries\`) go into \`--minimize-comment-ids\`, never \`--dismiss-review-ids\`.`

package/bin/commands/resolve.mjs

@@ -3,7 +3,7 @@ import { fetchPrBatch } from "../github/batch.mjs";
 import { getOutdatedThreads } from "../comments/outdated.mjs";
 import { autoResolveOutdated, applyResolveOptions } from "../comments/resolve.mjs";
 import { loadConfig } from "../config/load.mjs";
-import { parseSuggestion } from "../suggestions/parse.mjs";
+import { extractSuggestion } from "../suggestions/extract.mjs";
 import { buildFetchInstructions } from "./resolve-instructions.mjs";
 import { loadSeenSet, markSeen } from "../state/seen-comments.mjs";
 /**
@@ -80,25 +80,6 @@ export async function runResolveFetch(opts) {
     };
     return { ...result, instructions: buildFetchInstructions(prNumber, result) };
 }
-/**
- * Attach a parsed suggestion block to a thread if the comment body contains one
- * and the thread has a resolvable line anchor. Threads without `path`/`line`
- * (rare — usually file-level comments) can't accept a suggestion commit.
- */
-function extractSuggestion(thread) {
-    if (!thread.path || thread.line === null)
-        return null;
-    const parsed = parseSuggestion(thread.body);
-    if (!parsed)
-        return null;
-    const startLine = thread.startLine ?? thread.line;
-    return {
-        startLine,
-        endLine: thread.line,
-        lines: parsed.lines,
-        author: thread.author,
-    };
-}
 /**
  * Mutation mode: resolve/minimize/dismiss by ID.
  */

package/bin/commands/status.mjs

@@ -2,35 +2,46 @@
  * `shepherd status PR1 [PR2 PR3 …]`
  *
  * Fetches readiness status for one or more PRs and prints a table.
- * Uses a separate lightweight GraphQL query (MULTI_PR_STATUS_QUERY) per PR
- * rather than the heavy batch query, since we only need summary data.
+ * Issues a single GraphQL request with one alias per PR number rather than
+ * N separate requests, so the round-trip count is always 1 (plus optional
+ * per-PR pagination calls when a PR has > 100 review threads).
  *
  * Exit code: 0 if all PRs are READY, non-zero otherwise.
  */
 import { graphql, getRepoInfo } from "../github/client.mjs";
-import { MULTI_PR_STATUS_QUERY, MULTI_PR_STATUS_QUERY_WITH_CURSOR } from "../github/queries.mjs";
+import { MULTI_PR_STATUS_QUERY_WITH_CURSOR } from "../github/queries.mjs";
 export async function runStatus(opts) {
+    if (opts.prNumbers.length === 0)
+        return [];
     const repo = await getRepoInfo();
-    const summaries = await Promise.all(opts.prNumbers.map((pr) => fetchSummary(pr, repo.owner, repo.name)));
+    const doc = buildBatchStatusQuery(opts.prNumbers);
+    const result = await graphql(doc, {
+        owner: repo.owner,
+        repo: repo.name,
+    });
+    const summaries = await Promise.all(opts.prNumbers.map((pr) => {
+        const rawPr = result.data.repository[`pr_${pr}`];
+        if (!rawPr) {
+            throw new Error(`PR #${pr} not found in ${repo.owner}/${repo.name}`);
+        }
+        return paginateAndBuild(pr, rawPr, repo.owner, repo.name);
+    }));
     return summaries;
 }
 // ---------------------------------------------------------------------------
 // Internal
 // ---------------------------------------------------------------------------
-async function fetchSummary(pr, owner, repo) {
-    const result = await graphql(MULTI_PR_STATUS_QUERY, {
-        owner,
-        repo,
-        pr,
-    });
-    const p = result.data.repository.pullRequest;
-    if (!p) {
-        throw new Error(`PR #${pr} not found in ${owner}/${repo}`);
-    }
+function buildBatchStatusQuery(prNumbers) {
+    const uniquePrs = [...new Set(prNumbers.filter((n) => n > 0))];
+    const f = "number title state isDraft mergeStateStatus reviewDecision " +
+        "reviewThreads(last:100){totalCount pageInfo{hasPreviousPage startCursor} nodes{isResolved}} " +
+        "commits(last:1){nodes{commit{statusCheckRollup{state}}}}";
+    const aliases = uniquePrs.map((n) => `pr_${n}:pullRequest(number:${n}){${f}}`).join(" ");
+    return `query MultiPrStatusBatch($owner:String!,$repo:String!){repository(owner:$owner,name:$repo){${aliases}}}`;
+}
+async function paginateAndBuild(pr, p, owner, repo) {
     let allNodes = p.reviewThreads.nodes;
-    // If the response was truncated, fetch additional pages to get the full count.
     if (p.reviewThreads.totalCount > p.reviewThreads.nodes.length) {
-        // Fetch additional pages backward until we have all threads.
         const MAX_THREAD_PAGES = 10;
         let pagesFetched = 0;
         const totalCount = p.reviewThreads.totalCount;
@@ -59,7 +70,6 @@ async function fetchSummary(pr, owner, repo) {
     }
     const unresolvedThreads = allNodes.filter((n) => !n.isResolved).length;
     const ciState = p.commits.nodes[0]?.commit.statusCheckRollup?.state ?? null;
-    // If we still have fewer nodes than totalCount, report truncation.
     const threadsTruncated = p.reviewThreads.totalCount > allNodes.length;
     return {
         number: p.number,
@@ -77,17 +87,19 @@ async function fetchSummary(pr, owner, repo) {
 // Output helpers
 // ---------------------------------------------------------------------------
 export function formatStatusTable(summaries, repoFull) {
-    const lines = [`\n# ${repoFull} — PR status (${summaries.length})\n`];
-    for (const s of summaries) {
-        const verdict = deriveVerdict(s);
-        const ciLabel = s.ciState ?? "—";
-        const title = s.title.slice(0, 50);
-        const truncNote = s.threadsTruncated
-            ? " (threads truncated — run shepherd check for full count)"
-            : "";
-        lines.push(`PR #${String(s.number).padEnd(5)} ${title.padEnd(52)} ${verdict.padEnd(12)} ${ciLabel}${truncNote}`);
-    }
-    return lines.join("\n");
+    const heading = `# ${repoFull} — PR status (${summaries.length})`;
+    if (summaries.length === 0)
+        return heading;
+    const rows = summaries.map((s) => {
+        const raw = s.title.length > 50 ? `${s.title.slice(0, 47)}...` : s.title;
+        const title = raw.replace(/\\/g, "\\\\").replace(/\|/g, "\\|").replace(/\n/g, " ");
+        return `| #${s.number} | ${title} | ${deriveVerdict(s)} | ${s.ciState ?? "—"} |`;
+    });
+    const table = ["| PR | Title | Verdict | CI |", "| --- | --- | --- | --- |", ...rows].join("\n");
+    const footnotes = summaries
+        .filter((s) => s.threadsTruncated)
+        .map((s) => `> Note: PR #${s.number} threads truncated — run \`pr-shepherd check ${s.number}\` for full count.`);
+    return [heading, table, ...footnotes].join("\n\n");
 }
 export function deriveVerdict(s) {
     if (s.state === "MERGED")

package/bin/comments/resolve.mjs

@@ -1,32 +1,12 @@
-/**
- * Batched mutations for resolving threads, minimizing comments, and dismissing reviews.
- *
- * The three mutation types (resolve / minimize / dismiss) are run sequentially so total
- * in-flight mutations never exceed CONCURRENCY at once, keeping us well within GitHub's
- * secondary rate-limit window.
- *
- * Push-before-resolve safety:
- *   When `requireSha` is set, shepherd verifies that GitHub has received that
- *   commit before issuing any resolve/dismiss mutations. It polls up to 20 seconds.
- *   If the push hasn't landed, shepherd throws rather than resolving prematurely
- *   (which could allow auto-merge before reviewers see the fix).
- */
 import { graphql, getPrHeadSha } from "../github/client.mjs";
-import { RESOLVE_THREAD_MUTATION, MINIMIZE_COMMENT_MUTATION, DISMISS_REVIEW_MUTATION, } from "../github/queries.mjs";
 import { loadConfig } from "../config/load.mjs";
-/**
- * Execute all requested resolve/minimize/dismiss mutations.
- *
- * @throws Error if `requireSha` is set and GitHub hasn't received that commit
- *              within the polling window.
- */
 export async function applyResolveOptions(pr, repo, opts) {
-    // Require --message when dismissing reviews.
     if ((opts.dismissReviewIds?.length ?? 0) > 0 && !opts.dismissMessage) {
         throw new Error("--message is required when dismissing reviews");
     }
-    // Safety check: verify the push landed before resolving.
     if (opts.requireSha) {
+        // Verify GitHub received the commit before resolving — prevents auto-merge
+        // before reviewers see the fix.
         await waitForSha(pr, repo, opts.requireSha);
     }
     const result = {
@@ -35,55 +15,87 @@ export async function applyResolveOptions(pr, repo, opts) {
         dismissedReviews: [],
         errors: [],
     };
-    await runBatched(opts.resolveThreadIds ?? [], (id) => resolveThread(id), result.resolvedThreads, result.errors);
-    await runBatched(opts.minimizeCommentIds ?? [], (id) => minimizeComment(id, "RESOLVED"), result.minimizedComments, result.errors);
-    await runBatched(opts.dismissReviewIds ?? [], (id) => dismissReview(id, opts.dismissMessage ?? ""), result.dismissedReviews, result.errors);
+    await bulkApply(opts.resolveThreadIds ?? [], opts.minimizeCommentIds ?? [], opts.dismissReviewIds ?? [], opts.dismissMessage ?? "", result);
     return result;
 }
-/**
- * Auto-resolve a batch of outdated threads via the resolveReviewThread mutation.
- */
 export async function autoResolveOutdated(threadIds) {
-    const resolved = [];
-    const errors = [];
-    await runBatched(threadIds, (id) => resolveThread(id), resolved, errors);
-    return { resolved, errors };
-}
-// ---------------------------------------------------------------------------
-// Mutation helpers
-// ---------------------------------------------------------------------------
-async function resolveThread(threadId) {
-    await graphql(RESOLVE_THREAD_MUTATION, { threadId });
-}
-async function minimizeComment(commentId, classifier) {
-    await graphql(MINIMIZE_COMMENT_MUTATION, { commentId, classifier });
+    const result = {
+        resolvedThreads: [],
+        minimizedComments: [],
+        dismissedReviews: [],
+        errors: [],
+    };
+    await bulkApply(threadIds, [], [], "", result);
+    return { resolved: result.resolvedThreads, errors: result.errors };
 }
-async function dismissReview(reviewId, message) {
-    await graphql(DISMISS_REVIEW_MUTATION, { reviewId, message });
+// Chunk at 50 so a single oversized list never fails the entire call.
+const BULK_CHUNK_SIZE = 50;
+function buildBulkMutation(resolveIds, minimizeIds, dismissIds, dismissMessage) {
+    const ops = [];
+    for (let i = 0; i < resolveIds.length; i++) {
+        ops.push(`  r${i}: resolveReviewThread(input: { threadId: ${JSON.stringify(resolveIds[i])} }) { thread { isResolved } }`);
+    }
+    for (let i = 0; i < minimizeIds.length; i++) {
+        ops.push(`  m${i}: minimizeComment(input: { subjectId: ${JSON.stringify(minimizeIds[i])}, classifier: RESOLVED }) { minimizedComment { isMinimized } }`);
+    }
+    for (let i = 0; i < dismissIds.length; i++) {
+        ops.push(`  d${i}: dismissPullRequestReview(input: { pullRequestReviewId: ${JSON.stringify(dismissIds[i])}, message: ${JSON.stringify(dismissMessage)} }) { pullRequestReview { state } }`);
+    }
+    return `mutation BulkApply {\n${ops.join("\n")}\n}`;
 }
-// ---------------------------------------------------------------------------
-// Concurrency helper
-// ---------------------------------------------------------------------------
-async function runBatched(ids, fn, successList, errorList) {
-    const CONCURRENCY = loadConfig().resolve.concurrency;
-    // Process in chunks of CONCURRENCY.
-    for (let i = 0; i < ids.length; i += CONCURRENCY) {
-        const chunk = ids.slice(i, i + CONCURRENCY);
+async function bulkApply(resolveIds, minimizeIds, dismissIds, dismissMessage, result) {
+    const allOps = [
+        ...resolveIds.map((id) => ({ kind: "r", id })),
+        ...minimizeIds.map((id) => ({ kind: "m", id })),
+        ...dismissIds.map((id) => ({ kind: "d", id })),
+    ];
+    for (let i = 0; i < allOps.length; i += BULK_CHUNK_SIZE) {
+        const chunk = allOps.slice(i, i + BULK_CHUNK_SIZE);
         // eslint-disable-next-line no-await-in-loop
-        await Promise.all(chunk.map(async (id) => {
-            try {
-                await fn(id);
-                successList.push(id);
-            }
-            catch (err) {
-                errorList.push(`${id}: ${err instanceof Error ? err.message : String(err)}`);
-            }
-        }));
+        await bulkApplyChunk(chunk.filter((o) => o.kind === "r").map((o) => o.id), chunk.filter((o) => o.kind === "m").map((o) => o.id), chunk.filter((o) => o.kind === "d").map((o) => o.id), dismissMessage, result);
+    }
+}
+async function bulkApplyChunk(resolveIds, minimizeIds, dismissIds, dismissMessage, result) {
+    if (resolveIds.length === 0 && minimizeIds.length === 0 && dismissIds.length === 0)
+        return;
+    const doc = buildBulkMutation(resolveIds, minimizeIds, dismissIds, dismissMessage);
+    let data;
+    try {
+        const resp = await graphql(doc, {});
+        data = resp.data;
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        for (const id of resolveIds)
+            result.errors.push(`${id}: ${msg}`);
+        for (const id of minimizeIds)
+            result.errors.push(`${id}: ${msg}`);
+        for (const id of dismissIds)
+            result.errors.push(`${id}: ${msg}`);
+        return;
+    }
+    for (let i = 0; i < resolveIds.length; i++) {
+        const r = data[`r${i}`];
+        if (r?.thread?.isResolved === true)
+            result.resolvedThreads.push(resolveIds[i]);
+        else
+            result.errors.push(`${resolveIds[i]}: resolve returned null or thread not resolved`);
+    }
+    for (let i = 0; i < minimizeIds.length; i++) {
+        const m = data[`m${i}`];
+        if (m?.minimizedComment?.isMinimized === true)
+            result.minimizedComments.push(minimizeIds[i]);
+        else
+            result.errors.push(`${minimizeIds[i]}: minimize returned null or comment not minimized`);
+    }
+    for (let i = 0; i < dismissIds.length; i++) {
+        const d = data[`d${i}`];
+        if (d?.pullRequestReview != null)
+            result.dismissedReviews.push(dismissIds[i]);
+        else
+            result.errors.push(`${dismissIds[i]}: dismiss returned null`);
     }
 }
-// ---------------------------------------------------------------------------
-// SHA polling
-// ---------------------------------------------------------------------------
 async function waitForSha(pr, repo, expectedSha) {
     const { intervalMs: SHA_POLL_INTERVAL_MS, maxAttempts: SHA_POLL_MAX_ATTEMPTS } = loadConfig().resolve.shaPoll;
     for (let attempt = 0; attempt < SHA_POLL_MAX_ATTEMPTS; attempt++) {
@@ -94,7 +106,6 @@ async function waitForSha(pr, repo, expectedSha) {
                 return;
         }
         catch (err) {
-            // Transient network / 5xx error — keep polling unless this is the last attempt.
             if (attempt === SHA_POLL_MAX_ATTEMPTS - 1)
                 throw err;
         }
@@ -103,7 +114,6 @@ async function waitForSha(pr, repo, expectedSha) {
             await sleep(SHA_POLL_INTERVAL_MS);
         }
     }
-    // Total actual wait = (SHA_POLL_MAX_ATTEMPTS - 1) * SHA_POLL_INTERVAL_MS (no sleep after last poll).
     throw new Error(`Timeout: GitHub PR #${pr} head SHA has not updated to ${expectedSha} after ${((SHA_POLL_MAX_ATTEMPTS - 1) * SHA_POLL_INTERVAL_MS) / 1000}s. Push may still be in transit — retry shortly.`);
 }
 function sleep(ms) {

package/bin/config.json

@@ -12,7 +12,6 @@
     "maxTurns": 50
   },
   "resolve": {
-    "concurrency": 4,
     "shaPoll": {
       "intervalMs": 2000,
       "maxAttempts": 10
@@ -21,7 +20,8 @@
   },
   "checks": {
     "ciTriggerEvents": ["pull_request", "pull_request_target"],
-    "logTailLines": 200
+    "logTailLines": 5,
+    "logTailChars": 200
   },
   "mergeStatus": {
     "blockingReviewerLogins": ["copilot"]

package/bin/github/batch-parsers.mjs

@@ -96,6 +96,8 @@ export function parseRawPr(raw, rawThreadPages, rawCommentNodes, rawReviewNodes,
         mergeStateStatus: raw.mergeStateStatus,
         reviewDecision: (raw.reviewDecision ?? null),
         headRefOid: raw.headRefOid,
+        headRefName: raw.headRefName,
+        headRepoWithOwner: raw.headRepository?.nameWithOwner ?? null,
         baseRefName: raw.baseRefName,
         reviewRequests,
         latestReviews,