patchrelay 0.68.6 → 0.68.7

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
   "service": "patchrelay",
-  "version": "0.68.6",
-  "commit": "b47d248df282",
-  "builtAt": "2026-05-19T20:34:54.989Z"
+  "version": "0.68.7",
+  "commit": "56a3e7ae8d45",
+  "builtAt": "2026-05-21T21:06:57.848Z"
 }

package/dist/cli/data.js

@@ -220,6 +220,7 @@ export class CliDataAccess extends CliOperatorApiClient {
                 prState: dbIssue.prState,
                 prReviewState: dbIssue.prReviewState,
                 prCheckStatus: dbIssue.prCheckStatus,
+                factoryState: dbIssue.factoryState,
                 pendingRunType: dbIssue.pendingRunType,
                 lastRunType: issueSession?.lastRunType,
                 lastGitHubFailureSource: issue.latestFailureSource,

package/dist/manual-issue-actions.js

@@ -6,6 +6,11 @@ export function resolveRetryTarget(params) {
     if (hasOpenPr(params.prNumber, params.prState) && params.lastGitHubFailureSource === "queue_eviction") {
         return { runType: "queue_repair", factoryState: "repairing_queue" };
     }
+    if (hasOpenPr(params.prNumber, params.prState)
+        && params.prReviewState === "approved"
+        && (params.factoryState === "awaiting_queue" || params.lastRunType === "queue_repair")) {
+        return { runType: "queue_repair", factoryState: "repairing_queue" };
+    }
     if (hasOpenPr(params.prNumber, params.prState)
         && (params.prCheckStatus === "failed" || params.prCheckStatus === "failure" || params.lastGitHubFailureSource === "branch_ci")) {
         return { runType: "ci_repair", factoryState: "repairing_ci" };

package/dist/operator-retry-event.js

@@ -19,6 +19,13 @@ export function buildOperatorRetryEvent(issue, runType, source = "operator_retry
                 ...(queueIncident ?? {}),
                 ...(failureContext ?? {}),
                 source,
+                requiresFreshHead: true,
+                promptContext: [
+                    "Operator retry is recovering a merge queue rejection on an approved PR.",
+                    "If the previous repair left the same head SHA in place, merge-steward may still consider it terminally evicted.",
+                    "Preserve the approved diff, but publish a new head SHA on the existing PR branch before finishing.",
+                    "If rebasing onto the current base produces no content change, create an empty queue-kick commit.",
+                ].join(" "),
             }),
             dedupeKey: `${source}:queue_repair:${issue.linearIssueId}:${issue.prHeadSha ?? issue.lastGitHubFailureHeadSha ?? "unknown-sha"}`,
         };

package/dist/prompting/patchrelay.js

@@ -531,7 +531,7 @@ function buildPrePushSelfReviewSection(target, runType) {
     }
     return lines;
 }
-function buildPublicationContract(runType, issueClass) {
+function buildPublicationContract(runType, issueClass, context) {
     if (issueClass === "orchestration") {
         return [
             "## Publish",
@@ -554,6 +554,7 @@ function buildPublicationContract(runType, issueClass) {
             ...buildPrePushSelfReviewSection("new_pr", runType),
         ].join("\n");
     }
+    const requiresFreshQueueHead = runType === "queue_repair" && context?.requiresFreshHead === true;
     return [
         "## Publish",
         "",
@@ -561,8 +562,16 @@ function buildPublicationContract(runType, issueClass) {
         "Do not open a new PR.",
         "A PR-less stop is not a successful outcome for a repair run unless a genuine external blocker prevents any correct push.",
         "",
-        "Before pushing, compute `git diff $(git merge-base origin/main HEAD)..HEAD | git patch-id --stable` and compare its first field to the `Last published patch-id` shown in the prompt header (if any).",
-        "If they match, do not push — finish the run as a no-op. Edit the PR body via `gh pr edit` instead if a textual update is needed.",
+        ...(requiresFreshQueueHead
+            ? [
+                "This queue repair requires a fresh PR head SHA because the previous head was terminally evicted by merge-steward.",
+                "Before pushing, compute `git diff $(git merge-base origin/main HEAD)..HEAD | git patch-id --stable` and compare its first field to the `Last published patch-id` shown in the prompt header (if any).",
+                "If the patch-id matches, preserve the approved diff and still push a new head SHA on the existing PR branch. Prefer a real rebase onto current `origin/main`; if that produces no content change, create an empty queue-kick commit.",
+            ]
+            : [
+                "Before pushing, compute `git diff $(git merge-base origin/main HEAD)..HEAD | git patch-id --stable` and compare its first field to the `Last published patch-id` shown in the prompt header (if any).",
+                "If they match, do not push — finish the run as a no-op. Edit the PR body via `gh pr edit` instead if a textual update is needed.",
+            ]),
         "",
         ...buildPrePushSelfReviewSection("existing_pr", runType),
     ].join("\n");
@@ -586,7 +595,7 @@ function buildSections(issue, runType, repoPath, context, followUp = false) {
     if (workflow) {
         sections.push({ id: "workflow-guidance", content: workflow });
     }
-    sections.push({ id: "publication-contract", content: buildPublicationContract(runType, issueClass) });
+    sections.push({ id: "publication-contract", content: buildPublicationContract(runType, issueClass, context) });
     return sections;
 }
 function filterAllowedReplacements(promptLayer) {

package/dist/queue-health-monitor.js

@@ -12,6 +12,8 @@ function isDuplicateProbe(issue, context) {
     const headSha = typeof context?.failureHeadSha === "string" ? context.failureHeadSha : undefined;
     if (!signature)
         return false;
+    if (context?.requiresFreshHead === true)
+        return false;
     return issue.lastAttemptedFailureSignature === signature
         && (headSha === undefined || issue.lastAttemptedFailureHeadSha === headSha);
 }
@@ -133,12 +135,25 @@ export class QueueHealthMonitor {
         if (isDirty || hasEvictionCheckRun) {
             const headRefOid = pr.headRefOid ?? "unknown";
             const reason = hasEvictionCheckRun ? "queue_eviction_missed" : "preemptive_conflict";
-            const signature = `preemptive_queue_conflict:${headRefOid}`;
+            const signature = hasEvictionCheckRun
+                ? `same_head_queue_eviction:${headRefOid}`
+                : `preemptive_queue_conflict:${headRefOid}`;
             const pendingRunContext = {
                 source: "queue_health_monitor",
                 failureReason: reason,
                 failureHeadSha: headRefOid,
                 failureSignature: signature,
+                ...(hasEvictionCheckRun
+                    ? {
+                        requiresFreshHead: true,
+                        promptContext: [
+                            `merge-steward/queue is already failed on PR #${issue.prNumber} at head ${headRefOid}.`,
+                            "merge-steward will not re-admit the same evicted head SHA.",
+                            "Preserve the approved diff, but publish a new head SHA on the existing PR branch before finishing.",
+                            "If rebasing onto the current base produces no content change, create an empty queue-kick commit.",
+                        ].join(" "),
+                    }
+                    : {}),
             };
             if (isDuplicateProbe(issue, pendingRunContext)) {
                 return;

package/dist/service-issue-actions.js

@@ -108,6 +108,7 @@ export class ServiceIssueActions {
             prState: issue.prState,
             prReviewState: issue.prReviewState,
             prCheckStatus: issue.prCheckStatus,
+            factoryState: issue.factoryState,
             pendingRunType: issue.pendingRunType,
             lastRunType: issueSession?.lastRunType,
             lastGitHubFailureSource: issue.lastGitHubFailureSource,

package/package.json

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