patchrelay 0.36.0 → 0.36.2

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
   "service": "patchrelay",
-  "version": "0.36.0",
-  "commit": "75e78336dd48",
-  "builtAt": "2026-04-08T22:47:52.865Z"
+  "version": "0.36.2",
+  "commit": "45b497cfbf8e",
+  "builtAt": "2026-04-08T23:32:38.896Z"
 }

package/dist/cli/cluster-health.js

@@ -96,6 +96,7 @@ export async function collectClusterHealth(config, db, runCommand) {
             });
         }
     }
+    checks.push(...await collectActiveOverlapFindings(snapshots, runCommand));
     for (const snapshot of snapshots) {
         if (!snapshot.issue.prNumber) {
             continue;
@@ -523,6 +524,70 @@ async function collectReviewQuillAttemptOwners(snapshots, config, runCommand) {
     }
     return owners;
 }
+async function collectActiveOverlapFindings(snapshots, runCommand) {
+    const findings = [];
+    const diffsByProject = new Map();
+    for (const snapshot of snapshots) {
+        const { issue } = snapshot;
+        if (issue.activeRunId === undefined || !issue.worktreePath) {
+            continue;
+        }
+        const files = await listModifiedTrackedFiles(runCommand, issue.worktreePath);
+        if (files.size === 0) {
+            continue;
+        }
+        const projectDiffs = diffsByProject.get(issue.projectId) ?? [];
+        projectDiffs.push({ issue, files });
+        diffsByProject.set(issue.projectId, projectDiffs);
+    }
+    for (const [projectId, diffs] of diffsByProject) {
+        for (let leftIndex = 0; leftIndex < diffs.length; leftIndex += 1) {
+            const left = diffs[leftIndex];
+            for (let rightIndex = leftIndex + 1; rightIndex < diffs.length; rightIndex += 1) {
+                const right = diffs[rightIndex];
+                const overlap = [...left.files].filter((file) => right.files.has(file)).sort();
+                if (overlap.length === 0) {
+                    continue;
+                }
+                findings.push({
+                    status: "warn",
+                    scope: "issue:overlap",
+                    message: `Active work overlaps with ${right.issue.issueKey ?? right.issue.linearIssueId}: ${overlap.slice(0, 3).join(", ")}${overlap.length > 3 ? " ..." : ""}`,
+                    ...(left.issue.issueKey ? { issueKey: left.issue.issueKey } : {}),
+                    projectId,
+                });
+            }
+        }
+    }
+    return findings;
+}
+async function listModifiedTrackedFiles(runCommand, worktreePath) {
+    let result;
+    try {
+        result = await runCommand("git", ["-C", worktreePath, "status", "--porcelain", "--untracked-files=no"]);
+    }
+    catch {
+        return new Set();
+    }
+    if (result.exitCode !== 0) {
+        return new Set();
+    }
+    const files = new Set();
+    for (const line of result.stdout.split("\n")) {
+        if (line.trim().length === 0)
+            continue;
+        const rawPath = line.slice(3).trim();
+        if (!rawPath)
+            continue;
+        const normalized = rawPath.includes(" -> ")
+            ? rawPath.split(" -> ").at(-1)?.trim()
+            : rawPath;
+        if (normalized) {
+            files.add(normalized);
+        }
+    }
+    return files;
+}
 function getGateCheckNames(project) {
     const configured = project?.gateChecks?.map((entry) => entry.trim()).filter(Boolean) ?? [];
     return configured.length > 0 ? configured : ["verify"];

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) {
@@ -110,6 +116,10 @@ function blockerText(issue) {
         return issue.waitingReason ?? "Waiting for input";
     if (needsOperatorIntervention(issue))
         return issue.statusNote ?? issue.waitingReason ?? "Needs operator intervention";
+    if (issue.waitingReason && issue.activeRunType && issue.factoryState === "pr_open")
+        return issue.waitingReason;
+    if (issue.waitingReason && issue.activeRunType && issue.factoryState === "awaiting_queue")
+        return issue.waitingReason;
     if (issue.waitingReason && !issue.activeRunType)
         return issue.waitingReason;
     if (issue.blockedByCount > 0)
@@ -129,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;
@@ -523,6 +530,10 @@ function blockerText(issue, issueContext) {
     if (issue.sessionState === "failed" || issue.factoryState === "failed" || issue.factoryState === "escalated") {
         return issue.statusNote ?? issue.waitingReason ?? "Needs operator intervention";
     }
+    if (issue.waitingReason && issue.activeRunType && issue.factoryState === "pr_open")
+        return issue.waitingReason;
+    if (issue.waitingReason && issue.activeRunType && issue.factoryState === "awaiting_queue")
+        return issue.waitingReason;
     if (issue.waitingReason && !issue.activeRunType)
         return issue.waitingReason;
     if (issue.blockedByCount > 0)
@@ -545,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/db.js

@@ -1189,6 +1189,9 @@ export class PatchRelayDatabase {
             return explicitSummaryText;
         }
         const latestSummary = extractLatestAssistantSummary(latestRun);
+        if (latestRun && (latestRun.status === "queued" || latestRun.status === "running")) {
+            return latestSummary;
+        }
         if (this.shouldKeepPreviousIssueSummary(issue, latestRun)) {
             return this.findLatestCompletedRunSummary(issue.projectId, issue.linearIssueId)
                 ?? existingSummaryText

package/dist/issue-session-events.js

@@ -1,3 +1,4 @@
+import { sanitizeOperatorFacingText } from "./presentation-text.js";
 const TERMINAL_SESSION_EVENTS = new Set([
     "stop_requested",
     "undelegated",
@@ -116,7 +117,7 @@ export function extractLatestAssistantSummary(run) {
         try {
             const parsed = JSON.parse(run.summaryJson);
             if (typeof parsed.latestAssistantMessage === "string" && parsed.latestAssistantMessage.trim()) {
-                return parsed.latestAssistantMessage;
+                return sanitizeOperatorFacingText(parsed.latestAssistantMessage);
             }
         }
         catch {
@@ -129,14 +130,14 @@ export function extractLatestAssistantSummary(run) {
             if (Array.isArray(parsed.assistantMessages)) {
                 const latest = parsed.assistantMessages.findLast((value) => typeof value === "string" && value.trim());
                 if (typeof latest === "string")
-                    return latest;
+                    return sanitizeOperatorFacingText(latest);
             }
         }
         catch {
             // ignore malformed report json
         }
     }
-    return run.failureReason;
+    return sanitizeOperatorFacingText(run.failureReason);
 }
 function parseEventJson(raw) {
     if (!raw)

package/dist/linear-session-reporting.js

@@ -1,9 +1,10 @@
 import { formatRunTypeLabel } from "./agent-session-plan.js";
+import { sanitizeOperatorFacingText } from "./presentation-text.js";
 function lowerRunTypeLabel(runType) {
     return formatRunTypeLabel(runType).toLowerCase();
 }
 function trimSummary(summary, maxLength = 300) {
-    const value = summary?.trim();
+    const value = sanitizeOperatorFacingText(summary);
     if (!value) {
         return undefined;
     }
@@ -153,7 +154,7 @@ export function summarizeIssueStateForLinear(issue) {
         case "waiting_input":
             return issue.waitingReason ?? (issue.prNumber ? `PR #${issue.prNumber} is waiting for input.` : "Waiting for input.");
         case "running":
-            return issue.prNumber ? `PR #${issue.prNumber} is actively running.` : "Actively running.";
+            return issue.waitingReason ?? (issue.prNumber ? `PR #${issue.prNumber} is actively running.` : "Actively running.");
         case "idle":
             return issue.waitingReason ?? (issue.prNumber ? `PR #${issue.prNumber} is idle.` : "Idle.");
         case "done":

package/dist/presentation-text.js

@@ -0,0 +1,12 @@
+function unwrapShellWrappedCommand(text) {
+    return text
+        .replace(/`(?:\/bin\/bash|bash|\/bin\/sh|sh)\s+-lc\s+'([^`\n]+)'`/g, "`$1`")
+        .replace(/`(?:\/bin\/bash|bash|\/bin\/sh|sh)\s+-lc\s+"([^`\n]+)"`/g, "`$1`");
+}
+export function sanitizeOperatorFacingText(text) {
+    const trimmed = text?.trim();
+    if (!trimmed) {
+        return undefined;
+    }
+    return unwrapShellWrappedCommand(trimmed);
+}

package/dist/service.js

@@ -31,6 +31,8 @@ function shouldSuppressStatusNote(params) {
     if (!note)
         return true;
     return note === "codex turn was interrupted"
+        || note.startsWith("zombie: never started")
+        || note === "stale thread after restart"
         || note === "patchrelay received your mention. delegate the issue to patchrelay to start work.";
 }
 export function parseCiSnapshotSummary(snapshotJson) {

package/dist/status-note.js

@@ -1,7 +1,7 @@
 import { extractLatestAssistantSummary } from "./issue-session-events.js";
+import { sanitizeOperatorFacingText } from "./presentation-text.js";
 function clean(value) {
-    const trimmed = value?.trim();
-    return trimmed ? trimmed : undefined;
+    return sanitizeOperatorFacingText(value);
 }
 function eventStatusNote(event) {
     if (!event)

package/dist/waiting-reason.js

@@ -1,5 +1,7 @@
 export const PATCHRELAY_WAITING_REASONS = {
     activeWork: "PatchRelay is actively working",
+    finalizingPublishedPr: "PatchRelay is finalizing a published PR",
+    finalizingMergedChange: "PatchRelay is finalizing a merged change",
     waitingForOperatorInput: "Waiting on operator input",
     waitingForReviewFeedback: "Waiting to address review feedback",
     waitingForReviewOnNewHead: "Waiting on review of a newer pushed head",
@@ -12,6 +14,12 @@ export const PATCHRELAY_WAITING_REASONS = {
 };
 export function derivePatchRelayWaitingReason(params) {
     if (params.activeRunType) {
+        if (params.prNumber !== undefined && (params.factoryState === "pr_open" || params.factoryState === "awaiting_queue")) {
+            return PATCHRELAY_WAITING_REASONS.finalizingPublishedPr;
+        }
+        if (params.factoryState === "done") {
+            return PATCHRELAY_WAITING_REASONS.finalizingMergedChange;
+        }
         return `PatchRelay is running ${humanize(params.activeRunType)}`;
     }
     if (params.activeRunId !== undefined) {

package/package.json

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