patchrelay 0.36.1 → 0.36.3

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
   "service": "patchrelay",
-  "version": "0.36.1",
-  "commit": "ceada430ca0b",
-  "builtAt": "2026-04-08T23:27:56.372Z"
+  "version": "0.36.3",
+  "commit": "e132192dca38",
+  "builtAt": "2026-04-08T23:42:01.882Z"
 }

package/dist/cli/cluster-health.js

@@ -327,6 +327,21 @@ async function evaluateGitHubIssueHealth(snapshot, config, runCommand, reviewQui
             },
         };
     }
+    if (gateCheckStatus === "success"
+        && reviewDecision === "CHANGES_REQUESTED"
+        && mergeConflictDetected
+        && issue.factoryState !== "changes_requested"
+        && issue.activeRunId === undefined
+        && ageMs >= RECONCILIATION_GRACE_MS) {
+        return {
+            ciEntry,
+            finding: {
+                status: "fail",
+                scope: "github:branch-upkeep",
+                message: "PR is still dirty after requested changes, but no branch-upkeep run is active",
+            },
+        };
+    }
     if (gateCheckStatus === "success"
         && reviewDecision === "CHANGES_REQUESTED"
         && latestBlockingReviewHeadSha === pr.headRefOid
@@ -423,6 +438,9 @@ function deriveCiOwner(params) {
             : "downstream";
     }
     if (params.reviewDecision === "CHANGES_REQUESTED") {
+        if (params.mergeConflictDetected) {
+            return params.factoryState === "changes_requested" ? "patchrelay" : "unknown";
+        }
         if (params.factoryState === "changes_requested")
             return "patchrelay";
         if (params.reviewQuillAttempt)
@@ -451,6 +469,9 @@ function describeCiOwnership(params) {
         && params.latestBlockingReviewHeadSha
         && params.currentHeadSha !== params.latestBlockingReviewHeadSha);
     if (params.owner === "patchrelay") {
+        if (params.mergeConflictDetected) {
+            return "PatchRelay owns the next branch-upkeep move";
+        }
         return params.gateCheckStatus === "failure"
             ? "PatchRelay owns the next CI repair move"
             : "PatchRelay owns the next requested-changes move";
@@ -479,6 +500,11 @@ function describeCiOwnership(params) {
             : "Waiting on external GitHub automation";
     }
     if (params.reviewDecision === "CHANGES_REQUESTED") {
+        if (params.mergeConflictDetected) {
+            return headAdvancedPastBlockingReview
+                ? "PR is still dirty after a newer pushed head and no branch-upkeep run is active"
+                : "PR is still dirty on the current blocked head and no branch-upkeep run is active";
+        }
         return blockingReviewTargetsCurrentHead
             ? "Requested changes still block the same head and no fix run is active"
             : "Waiting on review after a newer pushed head";

package/dist/cli/watch/IssueRow.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from "ink";
 import { summarizeIssueStatusNote } from "./issue-status-note.js";
 import { relativeTime, truncate } from "./format-utils.js";
-import { hasDisplayPrBlocker, isRereviewNeeded, prChecksFact } from "./pr-status.js";
+import { hasDisplayPrBlocker, isApprovedReviewState, isAwaitingReviewState, isChangesRequestedReviewState, isRereviewNeeded, prChecksFact, } from "./pr-status.js";
 // ─── State display ──────────────────────────────────────────────
 const TERMINAL_STATES = new Set(["done", "failed", "escalated"]);
 function needsOperatorIntervention(issue) {
@@ -17,6 +17,8 @@ function effectiveState(issue) {
         return "blocked";
     if (issue.sessionState === "waiting_input")
         return "awaiting_input";
+    if (issue.prNumber !== undefined)
+        return issue.factoryState;
     if (issue.readyForExecution && !issue.activeRunType && !hasDisplayPrBlocker(issue))
         return "ready";
     return issue.factoryState;
@@ -80,18 +82,22 @@ function buildFacts(issue, selected) {
         facts.push({ text: "operator action needed", color: "red" });
     }
     // Review state — only show when it matters (not yet approved, or changes requested)
-    if (issue.prReviewState === "approved") {
+    if (isApprovedReviewState(issue.prReviewState)) {
         facts.push({ text: "approved", color: "green" });
     }
     else if (rereviewNeeded) {
         facts.push({ text: "re-review needed", color: "yellow" });
     }
-    else if (issue.prReviewState === "changes_requested") {
+    else if (isChangesRequestedReviewState(issue.prReviewState)) {
         facts.push({ text: "changes requested", color: "yellow" });
     }
-    else if (issue.prNumber !== undefined && !issue.prReviewState && !TERMINAL_STATES.has(effectiveState(issue))) {
+    else if (issue.prNumber !== undefined
+        && (isAwaitingReviewState(issue.prReviewState) || (!issue.prReviewState && !TERMINAL_STATES.has(effectiveState(issue))))) {
         facts.push({ text: "awaiting review", color: "yellow" });
     }
+    if (issue.factoryState === "awaiting_queue") {
+        facts.push({ text: "merge queue", color: "cyan" });
+    }
     // Check status — compact
     const checksFact = prChecksFact(issue);
     if (checksFact) {
@@ -133,8 +139,10 @@ function blockerText(issue) {
     }
     if (rereviewNeeded)
         return "Awaiting re-review after requested changes";
-    if (issue.prReviewState === "changes_requested")
+    if (isChangesRequestedReviewState(issue.prReviewState))
         return "Review changes requested";
+    if (issue.prNumber !== undefined && isAwaitingReviewState(issue.prReviewState))
+        return "Awaiting review";
     return null;
 }
 // ─── Render ─────────────────────────────────────────────────────

package/dist/cli/watch/detail-rows.js

@@ -3,7 +3,7 @@ import { buildTimelineRows } from "./timeline-presentation.js";
 import { planStepColor, planStepSymbol } from "./plan-helpers.js";
 import { progressBar } from "./format-utils.js";
 import { describePatchRelayFreshness } from "./freshness.js";
-import { hasDisplayPrBlocker, isRereviewNeeded, prChecksFact } from "./pr-status.js";
+import { hasDisplayPrBlocker, isApprovedReviewState, isAwaitingReviewState, isChangesRequestedReviewState, isRereviewNeeded, prChecksFact, } from "./pr-status.js";
 import { renderRichTextLines, renderTextLines } from "./render-rich-text.js";
 const SESSION_DISPLAY = {
     idle: { label: "idle", color: "blueBright" },
@@ -400,12 +400,17 @@ function buildFactSegments(issue, issueContext) {
     const rereviewNeeded = isRereviewNeeded(issue);
     if (issue.prNumber !== undefined)
         facts.push([{ text: `PR #${issue.prNumber}`, color: "cyan" }]);
-    if (issue.prReviewState === "approved")
+    if (isApprovedReviewState(issue.prReviewState))
         facts.push([{ text: "approved", color: "green" }]);
     else if (rereviewNeeded)
         facts.push([{ text: "re-review needed", color: "yellow" }]);
-    else if (issue.prReviewState === "changes_requested")
+    else if (isChangesRequestedReviewState(issue.prReviewState))
         facts.push([{ text: "changes requested", color: "yellow" }]);
+    else if (issue.prNumber !== undefined
+        && (isAwaitingReviewState(issue.prReviewState) || (!issue.prReviewState && issue.factoryState === "pr_open")))
+        facts.push([{ text: "awaiting review", color: "yellow" }]);
+    if (issue.factoryState === "awaiting_queue")
+        facts.push([{ text: "merge queue", color: "cyan" }]);
     if (issue.waitingReason && issue.sessionState === "waiting_input")
         facts.push([{ text: issue.waitingReason, color: "yellow" }]);
     const checks = prChecksFact({
@@ -512,6 +517,8 @@ function effectiveState(issue) {
         return "blocked";
     if (issue.sessionState === "waiting_input")
         return "awaiting_input";
+    if (issue.prNumber !== undefined)
+        return issue.factoryState;
     if (issue.readyForExecution && !issue.activeRunType && !hasDisplayPrBlocker(issue))
         return "ready";
     return issue.factoryState;
@@ -549,10 +556,11 @@ function blockerText(issue, issueContext) {
     }
     if (rereviewNeeded)
         return "Awaiting re-review after requested changes";
-    if (issue.prReviewState === "changes_requested")
+    if (isChangesRequestedReviewState(issue.prReviewState))
         return "Review changes requested";
-    if (issue.prNumber !== undefined && !issue.prReviewState && effectiveState(issue) !== "done")
+    if (issue.prNumber !== undefined && (isAwaitingReviewState(issue.prReviewState) || (!issue.prReviewState && effectiveState(issue) !== "done"))) {
         return "Awaiting review";
+    }
     return null;
 }
 function cleanCommand(raw) {

package/dist/cli/watch/pr-status.js

@@ -7,6 +7,20 @@ function isFailingCheckStatus(status) {
 function isPendingCheckStatus(status) {
     return status === "pending" || status === "in_progress";
 }
+function normalizeReviewState(state) {
+    const normalized = state?.trim().toLowerCase();
+    return normalized && normalized.length > 0 ? normalized : undefined;
+}
+export function isApprovedReviewState(state) {
+    return normalizeReviewState(state) === "approved";
+}
+export function isChangesRequestedReviewState(state) {
+    return normalizeReviewState(state) === "changes_requested";
+}
+export function isAwaitingReviewState(state) {
+    const normalized = normalizeReviewState(state);
+    return normalized === "review_required" || normalized === "commented";
+}
 export function hasPendingPrChecks(issue) {
     const summary = issue.prChecksSummary;
     if (summary?.total) {
@@ -29,7 +43,7 @@ export function arePrChecksCompleteAndGreen(issue) {
     return isPassingCheckStatus(issue.prCheckStatus);
 }
 export function isRereviewNeeded(issue) {
-    return issue.prReviewState === "changes_requested"
+    return isChangesRequestedReviewState(issue.prReviewState)
         && arePrChecksCompleteAndGreen(issue)
         && !issue.activeRunType;
 }
@@ -61,10 +75,13 @@ export function hasDisplayPrBlocker(issue) {
     if (issue.prNumber === undefined || issue.activeRunType) {
         return false;
     }
+    if (issue.factoryState === "pr_open" || issue.factoryState === "awaiting_queue" || issue.factoryState === "repairing_queue") {
+        return true;
+    }
     if (hasPendingPrChecks(issue) || hasFailedPrChecks(issue)) {
         return true;
     }
-    if (issue.prReviewState === "changes_requested" && !isRereviewNeeded(issue)) {
+    if (isChangesRequestedReviewState(issue.prReviewState) && !isRereviewNeeded(issue)) {
         return true;
     }
     if (!issue.prReviewState && issue.factoryState === "pr_open") {

package/dist/cli/watch/watch-state.js

@@ -67,7 +67,7 @@ export function computeAggregates(issues) {
             active++;
         if (!issue.activeRunType && issue.blockedByCount > 0)
             blocked++;
-        if (!issue.activeRunType && issue.readyForExecution && !isDone && !isFailed)
+        if (!issue.activeRunType && issue.prNumber === undefined && issue.readyForExecution && !isDone && !isFailed)
             ready++;
         if (isDone)
             done++;

package/dist/idle-reconciliation.js

@@ -16,6 +16,22 @@ function isReviewDecisionChangesRequested(value) {
 function isReviewDecisionReviewRequired(value) {
     return value?.trim().toUpperCase() === "REVIEW_REQUIRED";
 }
+function buildBranchUpkeepContext(prNumber, baseBranch, mergeStateStatus, headSha) {
+    const promptContext = [
+        `The requested code change may already be present, but GitHub still reports PR #${prNumber} as ${mergeStateStatus ?? "DIRTY"} against latest ${baseBranch}.`,
+        `This turn is branch upkeep on the existing PR branch: update onto latest ${baseBranch}, resolve any conflicts, rerun the narrowest relevant verification, and push a newer head.`,
+        "Do not stop just because the requested code change is already present. Review can only move forward after a new pushed head.",
+    ].join(" ");
+    return {
+        branchUpkeepRequired: true,
+        reviewFixMode: "branch_upkeep",
+        wakeReason: "branch_upkeep",
+        promptContext,
+        ...(mergeStateStatus ? { mergeStateStatus } : {}),
+        ...(headSha ? { failingHeadSha: headSha } : {}),
+        baseBranch,
+    };
+}
 function hasCompletedReviewQuillVerdict(entries) {
     return (entries ?? []).some((entry) => entry.__typename === "CheckRun"
         && entry.name === "review-quill/verdict"
@@ -475,6 +491,23 @@ export class IdleIssueReconciler {
                 mergeConflictDetected,
                 downstreamOwned,
             });
+            if (reactiveIntent?.runType === "branch_upkeep" && mergeConflictDetected) {
+                this.logger.info({ issueKey: issue.issueKey, prNumber: issue.prNumber, mergeable: pr.mergeable, mergeStateStatus: pr.mergeStateStatus }, "Reconciliation: PR still needs branch upkeep after requested changes");
+                this.advanceIdleIssue(issue, reactiveIntent.compatibilityFactoryState, {
+                    pendingRunType: reactiveIntent.runType,
+                    pendingRunContext: buildBranchUpkeepContext(issue.prNumber, project.github?.baseBranch ?? "main", pr.mergeStateStatus, pr.headRefOid),
+                });
+                this.feed?.publish({
+                    level: "warn",
+                    kind: "github",
+                    issueKey: issue.issueKey,
+                    projectId: issue.projectId,
+                    stage: reactiveIntent.compatibilityFactoryState,
+                    status: "branch_upkeep_queued",
+                    summary: `PR #${issue.prNumber} is still dirty after requested changes, dispatching branch upkeep`,
+                });
+                return;
+            }
             if (reactiveIntent?.runType === "queue_repair" && mergeConflictDetected) {
                 this.logger.info({ issueKey: issue.issueKey, prNumber: issue.prNumber, mergeable: pr.mergeable }, "Reconciliation: PR needs queue repair from fresh GitHub truth");
                 this.advanceIdleIssue(issue, reactiveIntent.compatibilityFactoryState, {
@@ -510,7 +543,7 @@ export class IdleIssueReconciler {
                 return;
             }
             if (mergeConflictDetected) {
-                this.logger.debug({ issueKey: issue.issueKey, prNumber: issue.prNumber, mergeable: pr.mergeable, mergeStateStatus: pr.mergeStateStatus }, "Reconciliation: PR is dirty but not yet queue-admitted; leaving PatchRelay in review state");
+                this.logger.debug({ issueKey: issue.issueKey, prNumber: issue.prNumber, mergeable: pr.mergeable, mergeStateStatus: pr.mergeStateStatus }, "Reconciliation: PR is dirty but no automation owner was derived");
             }
         }
         catch (error) {

package/dist/issue-session.js

@@ -59,6 +59,13 @@ export function deriveIssueSessionReactiveIntent(params) {
         };
     }
     if (params.prReviewState === "changes_requested") {
+        if (params.mergeConflictDetected) {
+            return {
+                runType: "branch_upkeep",
+                wakeReason: "branch_upkeep",
+                compatibilityFactoryState: "changes_requested",
+            };
+        }
         return {
             runType: "review_fix",
             wakeReason: "review_changes_requested",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "patchrelay",
-  "version": "0.36.1",
+  "version": "0.36.3",
   "license": "MIT",
   "type": "module",
   "repository": {