pr-shepherd 0.55.2 → 0.56.0

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

package/README.md

@@ -27,7 +27,7 @@ Full reference: [docs/README.md](docs/README.md). Feature matrix: [docs/features
 
 `pr-shepherd` moves deterministic PR orchestration into a local MCP server, with a CLI for shells and CI. Both interfaces fetch the same GitHub state, emit raw-enough context, and return a numbered plan for the calling agent to follow.
 
-The MCP server exposes canonical `iterate`, `apply`, and `build_suggestion_patches` tools. `apply` accepts ordered review mutations, file-view mutations, and journal entries; the deprecated singular suggestion tool remains temporarily as an adapter. Direct MCP calls require a repository-qualified `pr`: a GitHub PR URL or `owner/repo#N`; the explicit repository is the target for GitHub I/O, even when it differs from the local checkout. The CLI and programmatic API also retain bare-number and current-branch PR discovery. The shipped skills are thin dispatchers for those tools.
+The MCP server exposes `iterate`, `apply`, `build_suggestion_patches`, `extract_journal`, and `get_journal`. `apply` accepts ordered review mutations, file-view mutations, and journal entries; the deprecated singular suggestion tool remains temporarily as an adapter. PR-targeted MCP calls require a repository-qualified `pr`: a GitHub PR URL or `owner/repo#N`; the explicit repository is the target for GitHub I/O, even when it differs from the local checkout. `extract_journal` takes a Markdown body string and performs no I/O. The CLI and programmatic API also retain bare-number and current-branch PR discovery. The shipped skills are thin dispatchers for those tools.
 
 Each tick returns exactly one action:
 
@@ -122,7 +122,7 @@ Grok:
 /pr-shepherd 42
 ```
 
-MCP clients call `iterate` once per tick, then use `apply` for review/file/journal mutations and `build_suggestion_patches` for anchored suggestions. Every direct MCP call supplies the same repository-qualified PR reference. `iterate` returns the same structured action data as the CLI, including its review mutation arguments. The client owns recurrence, so this works consistently in Codex, Claude Code, Grok, and any other stdio MCP client.
+MCP clients call `iterate` once per tick, then use `apply` for review/file/journal mutations and `build_suggestion_patches` for anchored suggestions. To read journal entries, call `extract_journal` with a body already in hand or `get_journal` with a repository-qualified PR reference. `iterate` returns the same structured action data as the CLI, including its review mutation arguments. The client owns recurrence, so this works consistently in Codex, Claude Code, Grok, and any other stdio MCP client.
 
 The CLI remains useful for shell workflows. Its canonical polling form is:
 
@@ -189,6 +189,10 @@ complete Markdown list item with LF line endings. It fails closed for malformed
 containers and ignores journal-shaped examples hidden in Markdown constructs. The full journal API,
 including append and reconciliation helpers, is documented in [docs/api.md](docs/api.md).
 
+MCP clients can call `extract_journal({ body: prBody })` for the same pure result without writing a
+file, or `get_journal({ pr: "owner/repo#123" })` to fetch a PR body through GraphQL and extract it.
+Both return the typed extraction JSON in `structuredContent` and `content`; neither mutates the PR.
+
 For shell automation that already has a PR body, use the equivalent local-only command:
 
 ```sh

package/bin/api.d.mts

@@ -2,6 +2,7 @@ import { type JournalResult } from "./commands/journal/index.mts";
 import { type MarkFilesAsViewedResult } from "./commands/mark-files-as-viewed.mts";
 import type { ResolveResult } from "./comments/resolve.mts";
 import type { BuildSuggestionPatchesResult, CommitSuggestionResult, IterateCommandOptions, IterateResult, PollSummaryResult } from "./types.mts";
+import { type ShepherdJournalExtraction } from "./journal/index.mts";
 export interface CreatePrShepherdOptions {
     /** Working directory used for git, config, and classification-rule lookups. */
     cwd?: string;
@@ -81,12 +82,16 @@ export interface BuildSuggestionPatchesInput {
     pr?: PrReference;
     suggestions: SuggestionPatchInput[];
 }
+export interface GetJournalInput {
+    pr: PrReference;
+}
 export interface PrShepherd {
     iterate(input?: SingleIterateInput): Promise<IterateResult>;
     iterate(input: AggregateIterateInput): Promise<PollSummaryResult>;
     iterate(input: IterateInput): Promise<IterateResult | PollSummaryResult>;
     apply(input: ApplyInput): Promise<ApplyResult>;
     buildSuggestionPatches(input: BuildSuggestionPatchesInput): Promise<BuildSuggestionPatchesResult>;
+    getJournal(input: GetJournalInput): Promise<ShepherdJournalExtraction>;
     /** Compatibility adapter; prefer buildSuggestionPatches. */
     buildSuggestionPatch(input: BuildSuggestionPatchInput): Promise<CommitSuggestionResult>;
 }

package/bin/api.mjs

@@ -10,7 +10,8 @@ import { runMarkFilesAsViewed, } from "./commands/mark-files-as-viewed.mjs";
 import { runResolveMutate } from "./commands/resolve-mutate.mjs";
 import { runWithExecutionCwd } from "./execution-context.mjs";
 import { parsePrReference, normalizeRepositoryIdentity, resolveParsedPrTarget, } from "./pr-reference.mjs";
-import { getRepoInfo } from "./github/client.mjs";
+import { getPullRequestBody, getRepoInfo } from "./github/client.mjs";
+import { extractShepherdJournal } from "./journal/index.mjs";
 /** Raised before any API mutation when an input cannot be validated. */
 export class PrShepherdValidationError extends Error {
     constructor(message) {
@@ -50,6 +51,16 @@ export function createPrShepherd(options = {}) {
     }
     return Object.freeze({
         iterate,
+        getJournal(input) {
+            return runWithExecutionCwd(cwd, async () => {
+                const { prNumber, targetRepository } = resolvePrReference(input.pr);
+                if (!prNumber)
+                    throw new PrShepherdValidationError("getJournal requires a PR reference");
+                const { owner, name } = targetRepository ?? (await getRepoInfo());
+                const { body } = await getPullRequestBody(prNumber, owner, name);
+                return extractShepherdJournal(body);
+            });
+        },
         apply(input) {
             return runWithExecutionCwd(cwd, async () => {
                 validateApplyInput(input);

package/bin/checks/job-log.d.mts

@@ -0,0 +1,9 @@
+import type { RepoInfo } from "../github/client.mts";
+import { type StateKey } from "../state/rest-cache.mts";
+import type { TriageBudget } from "./triage-budget.mts";
+/**
+ * `cacheable` gates the cross-tick cache — only set once the matched job has
+ * a terminal conclusion, so an in-progress job's (possibly partial) log
+ * never gets frozen into the cache.
+ */
+export declare function fetchJobLogExcerpt(jobId: number, repo: RepoInfo, stateKey?: StateKey, cacheable?: boolean, budget?: TriageBudget): Promise<string | undefined>;

package/bin/checks/job-log.mjs

@@ -0,0 +1,30 @@
+import { restText } from "../github/http.mjs";
+import { loadDerived, storeDerived } from "../state/rest-cache.mjs";
+import { buildLogExcerpt } from "./log-excerpt.mjs";
+/**
+ * `cacheable` gates the cross-tick cache — only set once the matched job has
+ * a terminal conclusion, so an in-progress job's (possibly partial) log
+ * never gets frozen into the cache.
+ */
+export async function fetchJobLogExcerpt(jobId, repo, stateKey, cacheable = false, budget) {
+    const cacheName = `joblog-v2-${jobId}`;
+    if (stateKey && cacheable) {
+        const cached = await loadDerived(stateKey, cacheName);
+        if (cached)
+            return cached.value ?? undefined;
+    }
+    const { owner, name } = repo;
+    try {
+        if (!budget?.canScheduleOptional())
+            return undefined;
+        const excerpt = buildLogExcerpt(await restText(`/repos/${owner}/${name}/actions/jobs/${jobId}/logs`, (rateLimit) => budget?.observe(rateLimit)));
+        if (stateKey && cacheable) {
+            await storeDerived(stateKey, cacheName, excerpt ?? null);
+        }
+        return excerpt;
+    }
+    catch (error) {
+        budget?.observeError(error);
+        return undefined;
+    }
+}

package/bin/checks/jobs-types.d.mts

@@ -0,0 +1,14 @@
+export interface ActionsJob {
+    id?: number;
+    name: string;
+    workflow_name?: string;
+    conclusion: string | null;
+    run_attempt?: number;
+    steps?: Array<{
+        name: string;
+        number: number;
+        conclusion: string | null;
+    }>;
+}
+/** Name of the first step with a non-success, non-skipped, non-neutral conclusion. */
+export declare function pickFailedStep(job: ActionsJob): string | undefined;

package/bin/checks/jobs-types.mjs

@@ -0,0 +1,7 @@
+/** Name of the first step with a non-success, non-skipped, non-neutral conclusion. */
+export function pickFailedStep(job) {
+    return job.steps?.find((s) => s.conclusion !== null &&
+        s.conclusion !== "success" &&
+        s.conclusion !== "skipped" &&
+        s.conclusion !== "neutral")?.name;
+}

package/bin/checks/related-jobs.d.mts

@@ -0,0 +1,11 @@
+import type { RepoInfo } from "../github/client.mts";
+import type { StateKey } from "../state/rest-cache.mts";
+import type { RelatedFailedJob } from "../types/check-classification.mts";
+import { type ActionsJob } from "./jobs-types.mts";
+import type { TriageBudget } from "./triage-budget.mts";
+/**
+ * Other failed jobs in the same workflow run, excluding the matched job and any
+ * job already surfaced as its own failing check (`surfacedNames`).
+ */
+export declare function pickRelatedFailedJobs(jobs: ActionsJob[], matchedJobId: number | undefined, surfacedNames: ReadonlySet<string>): ActionsJob[];
+export declare function fetchRelatedJobs(jobs: ActionsJob[], repo: RepoInfo, stateKey?: StateKey, budget?: TriageBudget): Promise<RelatedFailedJob[]>;

package/bin/checks/related-jobs.mjs

@@ -0,0 +1,32 @@
+import { fetchJobLogExcerpt } from "./job-log.mjs";
+import { pickFailedStep } from "./jobs-types.mjs";
+/** Max sibling failed jobs reported (and log-fetched) per workflow run. */
+const MAX_RELATED_JOBS = 5;
+const FAILED_JOB_CONCLUSIONS = new Set(["failure", "timed_out"]);
+/**
+ * Other failed jobs in the same workflow run, excluding the matched job and any
+ * job already surfaced as its own failing check (`surfacedNames`).
+ */
+export function pickRelatedFailedJobs(jobs, matchedJobId, surfacedNames) {
+    return jobs
+        .filter((j) => j.conclusion !== null &&
+        FAILED_JOB_CONCLUSIONS.has(j.conclusion) &&
+        (j.id === undefined || j.id !== matchedJobId) &&
+        !surfacedNames.has(j.name))
+        .slice(0, MAX_RELATED_JOBS);
+}
+export async function fetchRelatedJobs(jobs, repo, stateKey, budget) {
+    const logs = await Promise.all(jobs.map((job) => job.id === undefined
+        ? undefined
+        : fetchJobLogExcerpt(job.id, repo, stateKey, job.conclusion !== null, budget)));
+    return jobs.map((job, i) => {
+        const failedStep = pickFailedStep(job);
+        const logExcerpt = logs[i];
+        return {
+            name: job.name,
+            conclusion: (job.conclusion ?? "").toUpperCase(),
+            ...(failedStep !== undefined && { failedStep }),
+            ...(logExcerpt !== undefined && { logExcerpt }),
+        };
+    });
+}

package/bin/checks/triage-budget.d.mts

@@ -0,0 +1,17 @@
+import type { RateLimitInfo } from "../github/client.mts";
+/** One optional Actions-enrichment budget for the entire PR snapshot. */
+export declare class TriageBudget {
+    private exhausted;
+    private secondaryError;
+    private omitted;
+    private omissionReported;
+    get canSchedule(): boolean;
+    get primaryExhausted(): boolean;
+    /** Call only when a needed optional request is about to be scheduled. */
+    canScheduleOptional(): boolean;
+    observe(rateLimit?: RateLimitInfo): void;
+    observeError(error: unknown): void;
+    throwIfSecondary(): void;
+    reportOmissionIfNeeded(): void;
+    private stopForPrimaryLimit;
+}

package/bin/checks/triage-budget.mjs

@@ -0,0 +1,49 @@
+import { pollRateLimitRetryAfterMs } from "../commands/poll-quota.mjs";
+/** One optional Actions-enrichment budget for the entire PR snapshot. */
+export class TriageBudget {
+    exhausted = false;
+    secondaryError;
+    omitted = false;
+    omissionReported = false;
+    get canSchedule() {
+        return !this.exhausted && this.secondaryError === undefined;
+    }
+    get primaryExhausted() {
+        return this.exhausted;
+    }
+    /** Call only when a needed optional request is about to be scheduled. */
+    canScheduleOptional() {
+        if (this.canSchedule)
+            return true;
+        if (this.exhausted)
+            this.omitted = true;
+        return false;
+    }
+    observe(rateLimit) {
+        if (rateLimit?.remaining === 0)
+            this.stopForPrimaryLimit();
+    }
+    observeError(error) {
+        const retry = pollRateLimitRetryAfterMs(error);
+        if (retry?.kind === "secondary") {
+            this.secondaryError ??= error;
+        }
+        else if (retry?.kind === "primary") {
+            this.stopForPrimaryLimit();
+            this.omitted = true;
+        }
+    }
+    throwIfSecondary() {
+        if (this.secondaryError !== undefined)
+            throw this.secondaryError;
+    }
+    reportOmissionIfNeeded() {
+        if (!this.omitted || this.omissionReported || this.secondaryError !== undefined)
+            return;
+        this.omissionReported = true;
+        process.stderr.write("pr-shepherd: REST core quota is exhausted; optional Actions job and log enrichment is incomplete\n");
+    }
+    stopForPrimaryLimit() {
+        this.exhausted = true;
+    }
+}

package/bin/checks/triage.d.mts

@@ -1,5 +1,8 @@
 import type { CheckRun, ClassifiedCheck, TriagedCheck } from "../types.mts";
 import type { RepoInfo } from "../github/client.mts";
-import { type StateKey } from "../state/rest-cache.mts";
-export declare function triageFailingChecks(failingChecks: ClassifiedCheck[], repo: RepoInfo, stateKey?: StateKey): Promise<TriagedCheck[]>;
-export declare function fetchStartupFailureChecks(repo: RepoInfo, headSha: string, prNumber: number, stateKey?: StateKey): Promise<CheckRun[]>;
+import type { StateKey } from "../state/rest-cache.mts";
+import { TriageBudget } from "./triage-budget.mts";
+export declare function triageFailingChecks(failingChecks: ClassifiedCheck[], repo: RepoInfo, stateKey?: StateKey, budget?: TriageBudget, 
+/** Non-failing checks (ignored, filtered, superseded, …) whose jobs must not resurface as related jobs. */
+otherChecks?: ClassifiedCheck[]): Promise<TriagedCheck[]>;
+export declare function fetchStartupFailureChecks(repo: RepoInfo, headSha: string, prNumber: number, stateKey?: StateKey, budget?: TriageBudget): Promise<CheckRun[]>;

package/bin/checks/triage.mjs

@@ -1,22 +1,38 @@
 /* eslint-disable max-lines */
-import { restWithRateLimit, restText } from "../github/http.mjs";
-import { loadDerived, storeDerived } from "../state/rest-cache.mjs";
-import { buildLogExcerpt } from "./log-excerpt.mjs";
+import { restWithRateLimit } from "../github/http.mjs";
+import { fetchJobLogExcerpt } from "./job-log.mjs";
+import { pickFailedStep } from "./jobs-types.mjs";
+import { pickRelatedFailedJobs, fetchRelatedJobs } from "./related-jobs.mjs";
+import { TriageBudget } from "./triage-budget.mjs";
+import { mapPool } from "../util/pool.mjs";
 const STARTUP_FAILURE_STATUS = "startup_failure";
-export function triageFailingChecks(failingChecks, repo, stateKey) {
+export async function triageFailingChecks(failingChecks, repo, stateKey, budget = new TriageBudget(), 
+/** Non-failing checks (ignored, filtered, superseded, …) whose jobs must not resurface as related jobs. */
+otherChecks = []) {
     const jobsCache = new Map();
-    return Promise.all(failingChecks.map((c) => triageCheck(c, repo, jobsCache, stateKey)));
+    const surfaced = surfacedNamesByRun([...failingChecks, ...otherChecks]);
+    const relatedOwners = firstCheckPerRun(failingChecks);
+    const checks = await mapPool(failingChecks, 4, (check) => triageCheck(check, repo, jobsCache, stateKey, budget, relatedOwners.has(check) ? surfaced.get(check.runId ?? "") : undefined));
+    budget.throwIfSecondary();
+    budget.reportOmissionIfNeeded();
+    return checks;
 }
-async function triageCheck(check, repo, jobsCache, stateKey) {
+async function triageCheck(check, repo, jobsCache, stateKey, budget, relatedSurfaced) {
     if (check.runId === null || check.conclusion === "STARTUP_FAILURE") {
         return { ...check };
     }
-    const jobs = await fetchJobs(check.runId, repo, jobsCache, stateKey);
+    if (!jobsCache.has(check.runId) && !budget?.canScheduleOptional()) {
+        return { ...check };
+    }
+    const jobs = await fetchJobs(check.runId, repo, jobsCache, stateKey, budget);
     const jobInfo = jobs ? pickJobInfo(jobs, check.name) : undefined;
     const runAttempt = jobs ? pickRunAttempt(jobs) : undefined;
     const logExcerpt = check.conclusion !== "CANCELLED" && jobInfo?.jobId
-        ? await fetchJobLogExcerpt(jobInfo.jobId, repo, stateKey, jobInfo.jobConclusion != null)
+        ? await fetchJobLogExcerpt(jobInfo.jobId, repo, stateKey, jobInfo.jobConclusion != null, budget)
         : undefined;
+    const relatedJobs = jobs && relatedSurfaced && check.conclusion !== "CANCELLED"
+        ? await fetchRelatedJobs(pickRelatedFailedJobs(jobs, jobInfo?.jobId, relatedSurfaced), repo, stateKey, budget)
+        : [];
     return {
         ...check,
         ...(runAttempt !== undefined && { runAttempt }),
@@ -24,40 +40,79 @@ async function triageCheck(check, repo, jobsCache, stateKey) {
         ...(jobInfo?.jobName !== undefined && { jobName: jobInfo.jobName }),
         ...(jobInfo?.failedStep !== undefined && { failedStep: jobInfo.failedStep }),
         ...(logExcerpt !== undefined && { logExcerpt }),
+        ...(relatedJobs.length > 0 && { relatedJobs }),
     };
 }
-export async function fetchStartupFailureChecks(repo, headSha, prNumber, stateKey) {
+function surfacedNamesByRun(checks) {
+    const byRun = new Map();
+    for (const check of checks) {
+        if (check.runId === null)
+            continue;
+        const names = byRun.get(check.runId) ?? new Set();
+        names.add(check.name);
+        byRun.set(check.runId, names);
+    }
+    return byRun;
+}
+/** Sibling failed jobs are reported once per run, on its first failing check. */
+function firstCheckPerRun(checks) {
+    const seen = new Set();
+    const first = new Set();
+    for (const check of checks) {
+        if (check.runId === null || seen.has(check.runId))
+            continue;
+        if (check.conclusion === "CANCELLED" || check.conclusion === "STARTUP_FAILURE")
+            continue;
+        seen.add(check.runId);
+        first.add(check);
+    }
+    return first;
+}
+export async function fetchStartupFailureChecks(repo, headSha, prNumber, stateKey, budget = new TriageBudget()) {
     try {
-        return await fetchStartupFailureChecksUncached(repo, headSha, prNumber, stateKey);
+        return await fetchStartupFailureChecksUncached(repo, headSha, prNumber, stateKey, budget);
     }
     catch (err) {
+        budget.observeError(err);
+        budget.throwIfSecondary();
+        if (budget.primaryExhausted)
+            return [];
         const msg = err instanceof Error ? err.message : String(err);
         process.stderr.write(`pr-shepherd: startup-failure run fetch failed for PR #${prNumber} at ${headSha} (ignored): ${msg}\n`);
         return [];
     }
 }
-async function fetchStartupFailureChecksUncached(repo, headSha, prNumber, stateKey) {
+async function fetchStartupFailureChecksUncached(repo, headSha, prNumber, stateKey, budget) {
     const { owner, name } = repo;
     const perPage = 100;
     const MAX_RUN_PAGES = 10;
     const checks = [];
     for (let page = 1; page <= MAX_RUN_PAGES; page++) {
-        const { data, rateLimit } = await restWithRateLimit("GET", `/repos/${owner}/${name}/actions/runs?head_sha=${encodeURIComponent(headSha)}&status=${STARTUP_FAILURE_STATUS}&per_page=${perPage}&page=${page}`, undefined, stateKey
-            ? {
-                conditional: {
-                    key: stateKey,
-                    name: `runs-startupfailure-${headSha}-p${page}`,
-                    headSha,
-                },
-            }
-            : undefined);
+        if (!budget?.canScheduleOptional())
+            break;
+        let result;
+        try {
+            result = await restWithRateLimit("GET", `/repos/${owner}/${name}/actions/runs?head_sha=${encodeURIComponent(headSha)}&status=${STARTUP_FAILURE_STATUS}&per_page=${perPage}&page=${page}`, undefined, stateKey
+                ? {
+                    conditional: {
+                        key: stateKey,
+                        name: `runs-startupfailure-${headSha}-p${page}`,
+                        headSha,
+                    },
+                }
+                : undefined);
+        }
+        catch (error) {
+            budget?.observeError(error);
+            if (budget?.primaryExhausted)
+                break;
+            throw error;
+        }
+        const { data, rateLimit } = result;
+        budget?.observe(rateLimit);
         checks.push(...data.workflow_runs
             .filter((run) => runBelongsToPr(run, prNumber, headSha))
             .map(workflowRunToCheckRun));
-        if (rateLimit?.remaining === 0) {
-            process.stderr.write(`pr-shepherd: REST rate limit remaining is 0 while listing startup-failure runs for ${headSha} — detection may be incomplete\n`);
-            break;
-        }
         if (data.workflow_runs.length < perPage)
             break;
         if (page === MAX_RUN_PAGES) {
@@ -95,15 +150,15 @@ function pickRunAttempt(jobs) {
 function runBelongsToPr(run, prNumber, headSha) {
     return (run.pull_requests ?? []).some((pr) => pr.number === prNumber && (pr.head?.sha ?? headSha) === headSha);
 }
-function fetchJobs(runId, repo, cache, stateKey) {
+function fetchJobs(runId, repo, cache, stateKey, budget) {
     const cached = cache.get(runId);
     if (cached)
         return cached;
-    const promise = fetchJobsUncached(runId, repo, stateKey);
+    const promise = fetchJobsUncached(runId, repo, stateKey, budget);
     cache.set(runId, promise);
     return promise;
 }
-async function fetchJobsUncached(runId, repo, stateKey) {
+async function fetchJobsUncached(runId, repo, stateKey, budget) {
     const { owner, name } = repo;
     const perPage = 100;
     const MAX_JOB_PAGES = 20; // 2000 jobs max
@@ -111,6 +166,8 @@ async function fetchJobsUncached(runId, repo, stateKey) {
     const allJobs = [];
     try {
         for (let page = 1;; page++) {
+            if (!budget?.canScheduleOptional())
+                break;
             if (++pagesFetched > MAX_JOB_PAGES) {
                 process.stderr.write(`pr-shepherd: job pagination cap (${MAX_JOB_PAGES * 100} jobs) reached for run ${runId} — triage may be incomplete\n`);
                 break;
@@ -118,17 +175,15 @@ async function fetchJobsUncached(runId, repo, stateKey) {
             const { data, rateLimit } = await restWithRateLimit("GET", `/repos/${owner}/${name}/actions/runs/${runId}/jobs?filter=latest&per_page=${perPage}&page=${page}`, undefined, stateKey
                 ? { conditional: { key: stateKey, name: `jobs-run-${runId}-p${page}` } }
                 : undefined);
+            budget?.observe(rateLimit);
             allJobs.push(...data.jobs);
-            if (rateLimit?.remaining === 0) {
-                process.stderr.write(`pr-shepherd: REST rate limit remaining is 0 while listing jobs for run ${runId} — triage may be incomplete\n`);
-                break;
-            }
             if (data.jobs.length < perPage)
                 break;
         }
     }
-    catch {
-        return undefined;
+    catch (error) {
+        budget?.observeError(error);
+        return budget?.primaryExhausted ? allJobs : undefined;
     }
     return allJobs;
 }
@@ -140,10 +195,7 @@ function pickJobInfo(jobs, checkName) {
         matchedJobs[0];
     if (!job)
         return undefined;
-    const failedStep = job.steps?.find((s) => s.conclusion !== null &&
-        s.conclusion !== "success" &&
-        s.conclusion !== "skipped" &&
-        s.conclusion !== "neutral")?.name;
+    const failedStep = pickFailedStep(job);
     return {
         ...(job.id !== undefined && { jobId: job.id }),
         workflowName: job.workflow_name,
@@ -152,27 +204,3 @@ function pickJobInfo(jobs, checkName) {
         jobConclusion: job.conclusion,
     };
 }
-/**
- * `cacheable` gates the cross-tick cache — only set once the matched job has
- * a terminal conclusion, so an in-progress job's (possibly partial) log
- * never gets frozen into the cache.
- */
-async function fetchJobLogExcerpt(jobId, repo, stateKey, cacheable = false) {
-    const cacheName = `joblog-v2-${jobId}`;
-    if (stateKey && cacheable) {
-        const cached = await loadDerived(stateKey, cacheName);
-        if (cached)
-            return cached.value ?? undefined;
-    }
-    const { owner, name } = repo;
-    try {
-        const excerpt = buildLogExcerpt(await restText(`/repos/${owner}/${name}/actions/jobs/${jobId}/logs`));
-        if (stateKey && cacheable) {
-            await storeDerived(stateKey, cacheName, excerpt ?? null);
-        }
-        return excerpt;
-    }
-    catch {
-        return undefined;
-    }
-}

package/bin/cli/api-usage-formatter.mjs

@@ -31,9 +31,9 @@ function recommendation(warning) {
         return "- Recommendation: keep polling pr-shepherd at the cadence above; both GraphQL and REST core are below their warning thresholds, so do not shift work between them. Do not substitute `gh pr checks` or `gh pr watch`";
     }
     if (warning.resource === "core") {
-        return "- Recommendation: keep polling pr-shepherd at the cadence above; do not add incidental REST `gh` calls (`gh pr view`, `gh pr review`, `gh api`) while REST core is low. Do not substitute `gh pr checks` or `gh pr watch`";
+        return "- Recommendation: keep polling pr-shepherd at the cadence above; do not add incidental REST `gh api repos/OWNER/REPO/pulls/PR` calls while REST core is low. Do not substitute `gh pr checks` or `gh pr watch`";
     }
-    return "- Recommendation: keep polling pr-shepherd at the cadence above; for incidental PR operations prefer REST `gh` (`gh pr view`, `gh pr review`, `gh api`); do not substitute `gh pr checks` or `gh pr watch`";
+    return "- Recommendation: keep polling pr-shepherd at the cadence above; for incidental PR reads use explicit REST endpoints such as `gh api repos/OWNER/REPO/pulls/PR`; do not substitute `gh pr checks` or `gh pr watch`";
 }
 export function formatApiUsage(usage) {
     if (usage === undefined)

package/bin/cli/fix-formatter.mjs

@@ -6,6 +6,7 @@ import { renderThreadBullet, renderReviewBullet, renderThreadResolutionStatusTag
 import { BODY_TRUNCATE_MAX_CHARS } from "./body-truncate.mjs";
 import { numberInstructions } from "./iterate-instructions.mjs";
 import { renderCheckAnnotation, renderProtectedRun } from "./fix-formatter-extra.mjs";
+import { renderRelatedJobLines } from "./related-jobs-format.mjs";
 import { isFailingAgentCheck } from "../checks/conclusions.mjs";
 import { renderMergeCommand } from "../commands/iterate/merge.mjs";
 import { partitionFixThreads } from "../commands/iterate/fix-instruction-threads.mjs";
@@ -81,6 +82,7 @@ export function formatFixCodeResult(header, result, opts = {}) {
                     lines.push(`  > ${ch.summary}`);
                 if (ch.logExcerpt)
                     lines.push(indentBlockquote(ch.logExcerpt, "  "));
+                lines.push(...renderRelatedJobLines(ch.relatedJobs));
             }
             if (ch.rerunCommand && ch.runId && !seenRerunRunIds.has(ch.runId)) {
                 seenRerunRunIds.add(ch.runId);

package/bin/cli/iterate-checks-formatter.mjs

@@ -1,3 +1,4 @@
+import { renderRelatedJobLines } from "./related-jobs-format.mjs";
 import { renderCheckAnnotation } from "./fix-formatter-extra.mjs";
 export function formatRelevantChecks(checks) {
     if (checks.length === 0)
@@ -14,6 +15,7 @@ function formatRelevantCheck(check) {
     const lines = [`- \`${workflow}${job}\` [conclusion: ${check.conclusion}]`];
     appendCheckFields(lines, check);
     appendLogExcerpt(lines, check.logExcerpt);
+    lines.push(...renderRelatedJobLines(check.relatedJobs));
     appendAnnotations(lines, check.annotations, check.logExcerpt);
     return lines;
 }

package/bin/cli/related-jobs-format.d.mts

@@ -0,0 +1,3 @@
+import type { RelatedFailedJob } from "../types/check-classification.mts";
+/** Shared text rendering of sibling failed jobs under a failing check bullet. */
+export declare function renderRelatedJobLines(jobs: RelatedFailedJob[] | undefined, indent?: string): string[];

package/bin/cli/related-jobs-format.mjs

@@ -0,0 +1,16 @@
+/** Shared text rendering of sibling failed jobs under a failing check bullet. */
+export function renderRelatedJobLines(jobs, indent = "  ") {
+    if (!jobs || jobs.length === 0)
+        return [];
+    const lines = [`${indent}Other failed jobs in this run:`];
+    for (const job of jobs) {
+        lines.push(`${indent}- \`${job.name}\` [conclusion: ${job.conclusion}]`);
+        if (job.failedStep)
+            lines.push(`${indent}  > failed step: ${job.failedStep}`);
+        if (job.logExcerpt) {
+            for (const line of job.logExcerpt.split("\n"))
+                lines.push(`${indent}  > ${line}`);
+        }
+    }
+    return lines;
+}

package/bin/commands/check-execution-context.d.mts

@@ -0,0 +1,12 @@
+import type { RepoInfo } from "../github/client.mts";
+import { readStackTopology } from "../github/stack-read.mts";
+import type { RawSummaryPr } from "../github/poll-summary-raw.mts";
+/** Fresh for each iterate tick; never persisted or exposed in CLI output. */
+export declare function createCheckExecutionContext(readyDelaySeconds?: number): {
+    readStackTopology(pr: number, repo: RepoInfo): ReturnType<typeof readStackTopology>;
+    wantsReceiptSummary(pr: number, repo: RepoInfo): Promise<boolean>;
+    setReceiptSummary(raw: RawSummaryPr | null): void;
+    getReceiptSummary(): RawSummaryPr | null;
+    invalidateReceiptSummary(): void;
+};
+export type CheckExecutionContext = ReturnType<typeof createCheckExecutionContext>;

package/bin/commands/check-execution-context.mjs

@@ -0,0 +1,38 @@
+import { readStackTopology } from "../github/stack-read.mjs";
+import { readReadyReceipt } from "../state/ready-receipts.mjs";
+import { readyDelayElapsed } from "./ready-delay.mjs";
+/** Fresh for each iterate tick; never persisted or exposed in CLI output. */
+export function createCheckExecutionContext(readyDelaySeconds) {
+    const topologies = new Map();
+    let receiptSummary = null;
+    let receiptSummaryInvalidated = false;
+    return {
+        readStackTopology(pr, repo) {
+            const key = `${repo.owner.toLowerCase()}/${repo.name.toLowerCase()}#${pr}`;
+            let pending = topologies.get(key);
+            if (!pending) {
+                pending = readStackTopology(pr, repo);
+                topologies.set(key, pending);
+            }
+            return pending;
+        },
+        async wantsReceiptSummary(pr, repo) {
+            if (readyDelaySeconds === undefined)
+                return false;
+            const key = { owner: repo.owner, repo: repo.name, pr };
+            if (await readReadyReceipt(key))
+                return true;
+            return readyDelayElapsed(pr, repo.owner, repo.name, readyDelaySeconds);
+        },
+        setReceiptSummary(raw) {
+            receiptSummary = raw;
+        },
+        getReceiptSummary() {
+            return receiptSummaryInvalidated ? null : receiptSummary;
+        },
+        invalidateReceiptSummary() {
+            receiptSummaryInvalidated = true;
+            receiptSummary = null;
+        },
+    };
+}