pr-shepherd 0.52.1 → 0.53.1

package/bin/state/graphql-quota-policy.mjs

@@ -4,40 +4,67 @@ export function evaluateGraphqlQuotaWarning(bands, sample, previous, observedAt
         previous.resource !== sample.resource ||
         previous.limit !== sample.limit ||
         windowRolled ||
-        (sample.used !== undefined && previous.lastUsed !== undefined
-            ? sample.used < previous.lastUsed
-            : sample.remaining > previous.lastRemaining);
-    const warned = new Set(rearm ? [] : previous.warnedThresholds);
+        fingerprintChanged(previous, sample);
+    const effective = !rearm && previous !== null && usageRegressed(previous, sample)
+        ? newerSavedSample(previous)
+        : sample;
+    const warned = new Set(rearm || previous === null ? [] : previous.warnedThresholds);
     const rearmEpoch = rearm ? (previous?.rearmEpoch ?? 0) + 1 : (previous?.rearmEpoch ?? 0);
-    const crossed = bands.filter((band) => sample.remaining * 100 <= sample.limit * band.remainingPercent);
+    const crossed = bands.filter((band) => effective.remaining * 100 <= effective.limit * band.remainingPercent);
     const newCrossed = crossed.filter((band) => !warned.has(band.remainingPercent));
     for (const band of crossed)
         warned.add(band.remainingPercent);
     const active = newCrossed.at(-1);
+    const credentialFingerprint = effective.credentialFingerprint ?? previous?.credentialFingerprint;
     const state = {
-        resource: sample.resource,
-        limit: sample.limit,
-        ...(sample.used !== undefined && { lastUsed: sample.used }),
-        lastRemaining: sample.remaining,
-        resetAt: sample.resetAt,
+        resource: effective.resource,
+        limit: effective.limit,
+        ...(effective.used !== undefined && { lastUsed: effective.used }),
+        lastRemaining: effective.remaining,
+        resetAt: effective.resetAt,
         warnedThresholds: bands
             .map((band) => band.remainingPercent)
             .filter((threshold) => warned.has(threshold)),
+        ...(credentialFingerprint !== undefined && { credentialFingerprint }),
         rearmEpoch,
     };
     if (active === undefined)
         return { state };
     return {
         warning: {
-            resource: "graphql",
+            resource: sample.resource === "core" ? "core" : "graphql",
             thresholdPercent: active.remainingPercent,
-            remaining: sample.remaining,
-            limit: sample.limit,
-            ...(sample.used !== undefined && { used: sample.used }),
-            resetAt: sample.resetAt,
+            remaining: effective.remaining,
+            limit: effective.limit,
+            ...(effective.used !== undefined && { used: effective.used }),
+            resetAt: effective.resetAt,
             pollIntervalMinutes: active.pollIntervalMinutes,
             pollTimeoutMinutes: active.pollIntervalMinutes * 2,
         },
         state,
     };
 }
+function fingerprintChanged(previous, sample) {
+    return (previous.credentialFingerprint !== undefined &&
+        sample.credentialFingerprint !== undefined &&
+        previous.credentialFingerprint !== sample.credentialFingerprint);
+}
+/** An older observation of the same window: lower used, or higher remaining when used is absent. */
+function usageRegressed(previous, sample) {
+    if (sample.used !== undefined && previous.lastUsed !== undefined) {
+        return sample.used < previous.lastUsed;
+    }
+    return sample.remaining > previous.lastRemaining;
+}
+function newerSavedSample(previous) {
+    return {
+        resource: previous.resource,
+        limit: previous.limit,
+        ...(previous.lastUsed !== undefined && { used: previous.lastUsed }),
+        remaining: previous.lastRemaining,
+        resetAt: previous.resetAt,
+        ...(previous.credentialFingerprint !== undefined && {
+            credentialFingerprint: previous.credentialFingerprint,
+        }),
+    };
+}

package/bin/state/graphql-quota-warnings.d.mts

@@ -1,6 +1,6 @@
 import type { GraphqlQuotaWarningBand } from "../config/load.mts";
-import type { GraphqlQuotaWarning, GraphqlApiUsage } from "../types.mts";
+import type { ApiResourceUsage, GraphqlQuotaWarning } from "../types.mts";
 export declare function evaluateWorktreeGraphqlQuotaWarning(key: {
     owner: string;
     repo: string;
-}, bands: GraphqlQuotaWarningBand[], sample: GraphqlApiUsage, persist: boolean, now?: number): Promise<GraphqlQuotaWarning | undefined>;
+}, bands: GraphqlQuotaWarningBand[], sample: ApiResourceUsage, persist: boolean, now?: number): Promise<GraphqlQuotaWarning | undefined>;

package/bin/state/graphql-quota-warnings.mjs

@@ -10,9 +10,10 @@ const sessionStates = new Map();
 export async function evaluateWorktreeGraphqlQuotaWarning(key, bands, sample, persist, now = Date.now() / 1000) {
     if (bands.length === 0)
         return undefined;
-    const path = await warningStatePath(key);
+    const quotaResource = sample.resource === "core" ? "core" : "graphql";
+    const path = await warningStatePath(key, quotaResource);
     if (path === undefined) {
-        const sessionKey = `${key.owner}/${key.repo}`;
+        const sessionKey = `${key.owner}/${key.repo}/${quotaResource}`;
         if (!persist) {
             return evaluateGraphqlQuotaWarning(bands, sample, sessionStates.get(sessionKey) ?? null, now)
                 .warning;
@@ -50,7 +51,7 @@ async function serializeStateUpdate(key, update) {
     });
     return result;
 }
-async function warningStatePath(key) {
+async function warningStatePath(key, resource) {
     let worktreeKey;
     try {
         worktreeKey = await getWorktreeKey();
@@ -58,7 +59,7 @@ async function warningStatePath(key) {
     catch {
         return undefined;
     }
-    return join(resolveRepoStateDir(key), "worktrees", `${worktreeKey}-graphql-quota-warnings.json`);
+    return join(resolveRepoStateDir(key), "worktrees", `${worktreeKey}-${resource}-quota-warnings.json`);
 }
 async function readState(path) {
     try {
@@ -70,6 +71,8 @@ async function readState(path) {
             !Array.isArray(parsed.warnedThresholds)) {
             return null;
         }
+        if (typeof parsed.credentialFingerprint !== "string")
+            delete parsed.credentialFingerprint;
         return parsed;
     }
     catch {

package/bin/types/api-usage.d.mts

@@ -5,6 +5,8 @@ export interface ApiResourceUsage {
     used?: number;
     remaining: number;
     resetAt: number;
+    /** Truncated SHA-256 of the credential. Quota state only; summarized usage omits it. */
+    credentialFingerprint?: string;
 }
 export interface GraphqlApiUsage extends ApiResourceUsage {
     /** Exact sum reported by rateLimit.cost for GraphQL queries in this command. */
@@ -14,13 +16,22 @@ export interface GraphqlApiUsage extends ApiResourceUsage {
     /** Exact sum reported by rateLimit.nodeCount for measured GraphQL queries. */
     nodeCount: number;
 }
+/** One budget inside a combined GraphQL and REST core warning. */
+export interface QuotaWarningBudget {
+    resource: "graphql" | "core";
+    thresholdPercent: number;
+    remaining: number;
+    limit: number;
+    used?: number;
+    resetAt: number;
+}
 export interface ApiUsage {
     credentialSources: string[];
     graphql?: GraphqlApiUsage;
     rest?: ApiResourceUsage[];
 }
 export interface GraphqlQuotaWarning {
-    resource: "graphql";
+    resource: "graphql" | "core" | "combined";
     thresholdPercent: number;
     remaining: number;
     limit: number;
@@ -28,4 +39,6 @@ export interface GraphqlQuotaWarning {
     resetAt: number;
     pollIntervalMinutes: number;
     pollTimeoutMinutes: number;
+    /** Both budgets when GraphQL and REST core are low together. */
+    budgets?: QuotaWarningBudget[];
 }

package/bin/types/merge-requirements.d.mts

@@ -39,23 +39,13 @@ export interface StackStatus {
     position: number;
     baseRefName: string;
 }
-/** Why an open native stack layer does not yet let the layers above it advance. */
+/** Why an open native stack layer is not ready to merge. */
 export type StackLayerBlockReason = "closed" | "draft" | "conflicting" | "queue-removal" | "failing-checks" | "review-work" | "checks-in-progress" | "merge-state" | "no-ready-receipt" | "stale-ancestry";
-/** The lowest native stack layer that keeps an upper draft from being marked ready. */
-export interface StackLowerLayerBlock {
-    pr: number;
-    reason: StackLayerBlockReason;
-}
 /**
- * Why a native stack layer stays in draft on a WAIT tick. Repeating the same one-PR
- * session cannot advance it, so the caller returns to the stack selector. A named
- * `lowerLayer` is the layer to advance first; without one, the lower layers could not
- * be verified.
+ * A native stack draft stays in draft on a WAIT tick because this session will not
+ * mark it ready. The caller returns to the stack selector.
  */
 export type StackDraftHold = {
-    kind: "lower-layer-not-ready";
-    lowerLayer?: StackLowerLayerBlock;
-} | {
     kind: "auto-mark-ready-disabled";
 };
 /** Extra batch-PR fields for merge-queue, stacks, and folded branch rules. */

package/bin/types/poll-summary.d.mts

@@ -65,8 +65,6 @@ export interface PollSummaryItem {
     pollProbe?: true;
     /** A current one-PR READY-after-delay completion was verified. */
     readyReceipt?: true;
-    /** Lowest unready ancestor that prevents this layer from being stack-mergeable. */
-    blockedByPr?: number;
 }
 export type PollSummarySelection = {
     kind: "prs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pr-shepherd",
-  "version": "0.52.1",
+  "version": "0.53.1",
   "description": "Autonomous PR CI monitor and review-comment resolver for agentic coding tools",
   "keywords": [
     "automation",

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

@@ -1,6 +1,6 @@
 {
   "name": "pr-shepherd",
-  "version": "0.52.1",
+  "version": "0.53.1",
   "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.52.1", "pr-shepherd-mcp"]
+      "args": ["--yes", "--package", "pr-shepherd@0.53.1", "pr-shepherd-mcp"]
     }
   }
 }

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

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