pr-shepherd 0.46.7 → 0.47.0

package/bin/github/queries.mjs

@@ -9,10 +9,13 @@
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
 const gql = (name) => readFileSync(join(import.meta.dirname, "gql", name), "utf8");
+const withSharedFragments = (query) => `${gql("pr-merge-policy.gql")}\n${gql("commit-check-suites.gql")}\n${query}`;
 /** The primary batch query that fetches CI + comments + merge status in one round-trip. */
-export const BATCH_PR_QUERY = gql("batch-pr.gql");
+export const BATCH_PR_QUERY = withSharedFragments(gql("batch-pr.gql"));
 /** Slim @include follow-up for outstanding batch-query connections. */
 export const BATCH_PR_PAGE_QUERY = gql("batch-pr-page.gql");
+/** Cheap PR fingerprint used to skip an unchanged BatchPr snapshot. */
+export const PR_FINGERPRINT_QUERY = withSharedFragments(gql("pr-fingerprint.gql"));
 /** PR head fields plus a single review thread for `commit-suggestion`. */
 export const SUGGESTION_THREADS_QUERY = gql("suggestion-threads.gql");
 /** Fetches additional comments for a single review thread when its nested connection paginates. */

package/bin/merge-status/requirements-format.mjs

@@ -33,7 +33,7 @@ export function formatMergeRequirementLines(req) {
         lines.push(formatMergeQueue(req.mergeQueue));
     if (req.stack) {
         const { number, position, size, baseRefName } = req.stack;
-        lines.push(`Stack: #${number} ${position}/${size} (base ${baseRefName})`);
+        lines.push(`Stack: ${number} (layer ${position}/${size}, base ${baseRefName})`);
     }
     return lines;
 }

package/bin/state/pr-fingerprint.d.mts

@@ -0,0 +1,20 @@
+import type { PrFingerprint } from "../github/fingerprint.mts";
+import type { PrShepherdConfig } from "../config/load.mts";
+import type { ShepherdReport } from "../types.mts";
+export interface StoredPrFingerprint {
+    version: number;
+    inputDigest: string;
+    fingerprint: PrFingerprint;
+    report: ShepherdReport;
+}
+export declare function fingerprintInputDigest(config: PrShepherdConfig): string;
+export declare function loadPrFingerprint(key: {
+    owner: string;
+    repo: string;
+    pr: number;
+}): Promise<StoredPrFingerprint | null>;
+export declare function storePrFingerprint(key: {
+    owner: string;
+    repo: string;
+    pr: number;
+}, fingerprint: PrFingerprint, report: ShepherdReport, config: PrShepherdConfig): Promise<void>;

package/bin/state/pr-fingerprint.mjs

@@ -0,0 +1,90 @@
+import { createHash, randomUUID } from "node:crypto";
+import { readFileSync } from "node:fs";
+import { mkdir, readFile, rename, unlink, writeFile } from "node:fs/promises";
+import { dirname } from "node:path";
+import { resolvePrStatePath } from "./base.mjs";
+import { discoverRuleFiles } from "../classify/loader.mjs";
+import { getEffectiveCwd } from "../execution-context.mjs";
+const VERSION = 3;
+export function fingerprintInputDigest(config) {
+    const hash = createHash("sha256");
+    hash.update(JSON.stringify({
+        ignoreChecks: config.ignoreChecks,
+        botUsernames: config.botUsernames,
+        iterate: config.iterate,
+        watch: { readyDelayMinutes: config.watch.readyDelayMinutes },
+        checks: config.checks,
+        mergeStatus: config.mergeStatus,
+        actions: {
+            autoMinimizeSuppressed: config.actions.autoMinimizeSuppressed,
+            autoMarkReady: config.actions.autoMarkReady,
+            neverCancelRuns: config.actions.neverCancelRuns,
+            workWhileQueued: config.actions.workWhileQueued,
+        },
+    }));
+    for (const file of discoverRuleFiles(getEffectiveCwd())) {
+        hash.update("\0");
+        hash.update(file);
+        hash.update("\0");
+        try {
+            hash.update(readFileSync(file));
+        }
+        catch {
+            hash.update("missing");
+        }
+    }
+    return hash.digest("hex").slice(0, 16);
+}
+export async function loadPrFingerprint(key) {
+    const path = resolvePrStatePath(key, "fingerprint.json");
+    try {
+        const parsed = JSON.parse(await readFile(path, "utf8"));
+        if (!isStoredFingerprint(parsed))
+            return null;
+        return parsed;
+    }
+    catch {
+        return null;
+    }
+}
+export async function storePrFingerprint(key, fingerprint, report, config) {
+    const path = resolvePrStatePath(key, "fingerprint.json");
+    let tmp;
+    try {
+        await mkdir(dirname(path), { recursive: true });
+        tmp = `${path}.${randomUUID()}.tmp`;
+        const payload = {
+            version: VERSION,
+            inputDigest: fingerprintInputDigest(config),
+            fingerprint,
+            report,
+        };
+        await writeFile(tmp, `${JSON.stringify(payload)}\n`, "utf8");
+        await rename(tmp, path);
+        tmp = undefined;
+    }
+    catch {
+        // Fingerprint cache is an optimization; a failed write just means the next tick refetches.
+    }
+    finally {
+        if (tmp !== undefined) {
+            try {
+                await unlink(tmp);
+            }
+            catch {
+                // best-effort cleanup
+            }
+        }
+    }
+}
+function isStoredFingerprint(value) {
+    if (value === null || typeof value !== "object" || Array.isArray(value))
+        return false;
+    const record = value;
+    return (record["version"] === VERSION &&
+        typeof record["inputDigest"] === "string" &&
+        record["fingerprint"] !== null &&
+        typeof record["fingerprint"] === "object" &&
+        record["report"] !== null &&
+        typeof record["report"] === "object");
+}

package/bin/types/iterate.d.mts

@@ -44,6 +44,7 @@ export interface IterateResultBase {
     mergeQueue?: import("./merge-queue.mts").MergeQueueReport;
     apiUsage?: ApiUsage;
     quotaWarning?: GraphqlQuotaWarning;
+    fingerprintReused?: true;
 }
 interface IterateResultWait extends IterateResultBase {
     action: "wait";
@@ -141,6 +142,14 @@ export interface IterateCommandOptions extends GlobalOptions {
      * only by `runPollCore`; excluded from the public `IterateInput` in api.mts.
      */
     persistSeen?: boolean;
+    /**
+     * Internal. `true` allows fingerprint reuse of a previous WAIT-shaped report.
+     * Poll sets this only for internal WAIT/MARK_READY continuation ticks — never the
+     * tick returned to the caller, never FIX_CODE debounce, never single-tick iterate.
+     * Writes still happen after a full fetch so the next poll can skip. Excluded from
+     * the public `IterateInput` in api.mts.
+     */
+    fingerprintCache?: boolean;
     /** Shepherd through readiness and emit the exact merge/queue command when ready. */
     merge?: boolean;
     /**

package/bin/types/report.d.mts

@@ -23,6 +23,8 @@ export interface ShepherdReport {
     nodeId: string;
     /** GitHub PR head OID from the same batch used to decide the action. */
     headSha?: string;
+    /** Internal. True when this report was reused from the fingerprint cache. */
+    fingerprintReused?: true;
     repo: string;
     /** Raw GitHub viewer fields used to decide which remote actions may be offered. */
     viewerAuthorization?: ViewerAuthorization;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pr-shepherd",
-  "version": "0.46.7",
+  "version": "0.47.0",
   "description": "Autonomous PR CI monitor and review-comment resolver for agentic coding tools",
   "keywords": [
     "automation",
@@ -89,7 +89,7 @@
     "husky": "^9.1.7",
     "knip": "^6.14.1",
     "marked": "^18.0.11",
-    "oxfmt": "^0.64.0",
+    "oxfmt": "^0.65.0",
     "oxlint": "^1.60.0",
     "typescript": "^7.0.2",
     "vitest": "^4.1.4"

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

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

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

@@ -2,7 +2,7 @@
   "mcpServers": {
     "pr-shepherd": {
       "command": "npx",
-      "args": ["--yes", "--package", "pr-shepherd@0.46.7", "pr-shepherd-mcp"]
+      "args": ["--yes", "--package", "pr-shepherd@0.47.0", "pr-shepherd-mcp"]
     }
   }
 }

package/plugins/pr-shepherd/.mcp.json

@@ -1,6 +1,6 @@
 {
   "pr-shepherd": {
     "command": "npx",
-    "args": ["--yes", "--package", "pr-shepherd@0.46.7", "pr-shepherd-mcp"]
+    "args": ["--yes", "--package", "pr-shepherd@0.47.0", "pr-shepherd-mcp"]
   }
 }