patchrelay 0.36.1 → 0.36.2

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.2",
+  "commit": "45b497cfbf8e",
+  "builtAt": "2026-04-08T23:32:38.896Z"
 }

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/package.json

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