patchrelay 0.37.1 → 0.38.0

package/dist/github-webhook-handler.js

@@ -34,7 +34,6 @@ export class GitHubWebhookHandler {
     failureContextResolver;
     ciSnapshotResolver;
     fetchImpl;
-    patchRelayAuthorLogins = new Set();
     constructor(config, db, linearProvider, enqueueIssue, logger, codex, feed, failureContextResolver = createGitHubFailureContextResolver(), ciSnapshotResolver = createGitHubCiSnapshotResolver(), fetchImpl = fetch) {
         this.config = config;
         this.db = db;
@@ -46,18 +45,6 @@ export class GitHubWebhookHandler {
         this.failureContextResolver = failureContextResolver;
         this.ciSnapshotResolver = ciSnapshotResolver;
         this.fetchImpl = fetchImpl;
-        for (const login of resolvePatchRelayAuthorLoginsFromEnv()) {
-            this.patchRelayAuthorLogins.add(login);
-        }
-    }
-    setPatchRelayAuthorLogins(logins) {
-        this.patchRelayAuthorLogins.clear();
-        for (const login of logins) {
-            const normalized = normalizeAuthorLogin(login);
-            if (normalized) {
-                this.patchRelayAuthorLogins.add(normalized);
-            }
-        }
     }
     async acceptGitHubWebhook(params) {
         // Deduplicate
@@ -130,13 +117,17 @@ export class GitHubWebhookHandler {
             this.logger.debug({ eventType: params.eventType }, "GitHub webhook: unrecognized event type or action");
             return;
         }
-        // Route to issue via branch name
-        const issue = this.db.issues.getIssueByBranch(event.branchName);
+        const project = this.config.projects.find((candidate) => candidate.github?.repoFullName === event.repoFullName);
+        if (!project) {
+            this.logger.debug({ repoFullName: event.repoFullName, triggerEvent: event.triggerEvent }, "GitHub webhook: no configured project for repository");
+            return;
+        }
+        const resolved = this.resolveIssueForEvent(project, event);
+        const issue = resolved?.issue;
         if (!issue) {
-            this.logger.debug({ branchName: event.branchName, triggerEvent: event.triggerEvent }, "GitHub webhook: no matching issue for branch");
+            this.logger.debug({ repoFullName: event.repoFullName, branchName: event.branchName, prNumber: event.prNumber, triggerEvent: event.triggerEvent }, "GitHub webhook: no matching tracked issue");
             return;
         }
-        const project = this.config.projects.find((p) => p.id === issue.projectId);
         const immediateCheckStatus = this.deriveImmediatePrCheckStatus(issue, event, project);
         // Update PR state on the issue
         this.db.issues.upsertIssue({
@@ -149,6 +140,7 @@ export class GitHubWebhookHandler {
             ...(event.prAuthorLogin !== undefined ? { prAuthorLogin: event.prAuthorLogin } : {}),
             ...(event.reviewState !== undefined ? { prReviewState: event.reviewState } : {}),
             ...(immediateCheckStatus !== undefined ? { prCheckStatus: immediateCheckStatus } : {}),
+            ...(resolved.linkedBy === "issue_key" ? { branchName: event.branchName } : {}),
             ...(event.reviewState === "changes_requested"
                 ? { lastBlockingReviewHeadSha: event.reviewCommitId ?? event.headSha ?? null }
                 : event.reviewState === "approved"
@@ -230,10 +222,57 @@ export class GitHubWebhookHandler {
             await this.handleTerminalPrEvent(freshIssue, event);
         }
     }
+    resolveIssueForEvent(project, event) {
+        if (event.prNumber !== undefined) {
+            const byPr = this.db.issues.getIssueByPrNumber(event.prNumber);
+            if (byPr && byPr.projectId === project.id) {
+                return { issue: byPr, linkedBy: "pr" };
+            }
+        }
+        const byBranch = this.db.issues.getIssueByBranch(event.branchName);
+        if (byBranch && byBranch.projectId === project.id) {
+            return { issue: byBranch, linkedBy: "branch" };
+        }
+        const byIssueKey = this.resolveIssueByExplicitIssueKey(project, event);
+        if (byIssueKey) {
+            return { issue: byIssueKey, linkedBy: "issue_key" };
+        }
+        return undefined;
+    }
+    resolveIssueByExplicitIssueKey(project, event) {
+        const candidates = new Set();
+        const sources = [event.prTitle, event.prBody, event.branchName];
+        for (const prefix of project.issueKeyPrefixes) {
+            const normalizedPrefix = prefix.trim();
+            if (!normalizedPrefix)
+                continue;
+            const pattern = new RegExp(`\\b${escapeRegExp(normalizedPrefix)}-\\d+\\b`, "gi");
+            for (const source of sources) {
+                if (!source)
+                    continue;
+                for (const match of source.matchAll(pattern)) {
+                    candidates.add(match[0].toUpperCase());
+                }
+            }
+        }
+        if (candidates.size !== 1) {
+            return undefined;
+        }
+        const [issueKey] = [...candidates];
+        if (!issueKey) {
+            return undefined;
+        }
+        const issue = this.db.issues.getIssueByKey(issueKey);
+        return issue?.projectId === project.id ? issue : undefined;
+    }
     resolveFactoryStateForEvent(issue, event, project) {
         if (event.triggerEvent === "pr_closed") {
             return undefined;
         }
+        const effectiveCurrentState = (issue.factoryState === "awaiting_input" || issue.factoryState === "delegated")
+            && (event.prState === "open" || event.prNumber !== undefined)
+            ? "pr_open"
+            : issue.factoryState;
         if (event.triggerEvent === "check_failed"
             && this.isQueueEvictionFailure(issue, event, project)
             && issue.prState === "open"
@@ -241,10 +280,17 @@ export class GitHubWebhookHandler {
             && !isIssueTerminal(issue)) {
             return "repairing_queue";
         }
-        return resolveFactoryStateFromGitHub(event.triggerEvent, issue.factoryState, {
+        const resolved = resolveFactoryStateFromGitHub(event.triggerEvent, effectiveCurrentState, {
             prReviewState: issue.prReviewState,
             activeRunId: issue.activeRunId,
         });
+        if (resolved !== undefined) {
+            return resolved;
+        }
+        if (effectiveCurrentState !== issue.factoryState) {
+            return effectiveCurrentState;
+        }
+        return undefined;
     }
     async updateCiSnapshot(issue, event, project) {
         if (event.triggerEvent === "pr_merged") {
@@ -327,15 +373,15 @@ export class GitHubWebhookHandler {
         // merge_group_failed after pr_merged) must not resurrect done issues.
         if (isIssueTerminal(issue))
             return;
-        if (!this.isPatchRelayOwnedPr(issue)) {
+        if (!issue.delegatedToPatchRelay) {
             this.feed?.publish({
                 level: "info",
                 kind: "github",
                 issueKey: issue.issueKey,
                 projectId: issue.projectId,
                 stage: issue.factoryState,
-                status: "ignored_non_patchrelay_pr",
-                summary: `Ignored ${event.triggerEvent} on non-PatchRelay-owned PR`,
+                status: "ignored_undelegated",
+                summary: `Ignored ${event.triggerEvent} because the issue is undelegated`,
             });
             return;
         }
@@ -372,7 +418,6 @@ export class GitHubWebhookHandler {
                     }),
                     dedupeKey: failureContext.failureSignature,
                 });
-                this.db.issueSessions.setBranchOwnerRespectingActiveLease(issue.projectId, issue.linearIssueId, "patchrelay");
                 const queuedRunType = hadPendingWake
                     ? this.peekPendingSessionWakeRunType(issue.projectId, issue.linearIssueId)
                     : this.enqueuePendingSessionWake(issue.projectId, issue.linearIssueId);
@@ -430,7 +475,6 @@ export class GitHubWebhookHandler {
                     }),
                     dedupeKey: failureContext.failureSignature,
                 });
-                this.db.issueSessions.setBranchOwnerRespectingActiveLease(issue.projectId, issue.linearIssueId, "patchrelay");
                 const queuedRunType = hadPendingWake
                     ? this.peekPendingSessionWakeRunType(issue.projectId, issue.linearIssueId)
                     : this.enqueuePendingSessionWake(issue.projectId, issue.linearIssueId);
@@ -476,7 +520,6 @@ export class GitHubWebhookHandler {
                     event.reviewerName ?? "unknown-reviewer",
                 ].join("::"),
             });
-            this.db.issueSessions.setBranchOwnerRespectingActiveLease(issue.projectId, issue.linearIssueId, "patchrelay");
             const queuedRunType = hadPendingWake
                 ? this.peekPendingSessionWakeRunType(issue.projectId, issue.linearIssueId)
                 : this.enqueuePendingSessionWake(issue.projectId, issue.linearIssueId);
@@ -554,7 +597,6 @@ export class GitHubWebhookHandler {
                 eventType: "delegated",
                 dedupeKey: `github_pr_closed:implementation:${issue.linearIssueId}`,
             });
-            this.db.issueSessions.setBranchOwnerRespectingActiveLease(issue.projectId, issue.linearIssueId, "patchrelay");
             if (this.db.issueSessions.peekIssueSessionWake(issue.projectId, issue.linearIssueId)) {
                 this.enqueueIssue(issue.projectId, issue.linearIssueId);
             }
@@ -709,7 +751,7 @@ export class GitHubWebhookHandler {
         if (!signature)
             return false;
         const pendingWake = this.db.issueSessions.peekIssueSessionWake(issue.projectId, issue.linearIssueId);
-        if (pendingWake?.runType === runType) {
+        if (pendingWake?.runType === runType && pendingWake.eventIds.length > 0) {
             const existing = pendingWake.context;
             if (existing?.failureSignature === signature
                 && (headSha === undefined || existing.failureHeadSha === headSha || existing.headSha === headSha)) {
@@ -945,8 +987,6 @@ export class GitHubWebhookHandler {
         const issue = this.db.issues.getIssueByPrNumber(prNumber);
         if (!issue)
             return;
-        if (!this.isPatchRelayOwnedPr(issue))
-            return;
         this.feed?.publish({
             level: "info",
             kind: "comment",
@@ -1009,30 +1049,9 @@ export class GitHubWebhookHandler {
         this.enqueueIssue(projectId, issueId);
         return wake.runType;
     }
-    isPatchRelayOwnedPr(issue) {
-        const author = normalizeAuthorLogin(issue.prAuthorLogin);
-        if (author) {
-            if (this.patchRelayAuthorLogins.size > 0) {
-                return this.patchRelayAuthorLogins.has(author);
-            }
-            return author.includes("patchrelay");
-        }
-        // Transitional fallback for rows written before author tracking existed.
-        return issue.prNumber !== undefined && issue.branchOwner === "patchrelay";
-    }
-}
-function normalizeAuthorLogin(login) {
-    const normalized = login?.trim().toLowerCase();
-    return normalized ? normalized : undefined;
 }
-function resolvePatchRelayAuthorLoginsFromEnv() {
-    return [
-        process.env.PATCHRELAY_GITHUB_BOT_LOGIN,
-        process.env.PATCHRELAY_GITHUB_BOT_NAME,
-    ]
-        .flatMap((value) => (value ?? "").split(","))
-        .map((value) => normalizeAuthorLogin(value))
-        .filter((value) => Boolean(value));
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function buildGitHubReviewUrl(repoFullName, prNumber, reviewId) {
     if (!repoFullName || prNumber === undefined || reviewId === undefined) {

package/dist/github-webhooks.js

@@ -61,6 +61,8 @@ function normalizePullRequestEvent(payload, repoFullName) {
         repoFullName,
         branchName: pr.head.ref,
         headSha: pr.head.sha,
+        prTitle: pr.title ?? undefined,
+        prBody: pr.body ?? undefined,
         prNumber: pr.number,
         prUrl: pr.html_url,
         prState,
@@ -98,6 +100,8 @@ function normalizePullRequestReviewEvent(payload, repoFullName) {
         repoFullName,
         branchName: pr.head.ref,
         headSha: pr.head.sha,
+        prTitle: pr.title ?? undefined,
+        prBody: pr.body ?? undefined,
         prNumber: pr.number,
         prUrl: pr.html_url,
         prState: "open",

package/dist/idle-reconciliation.js

@@ -1,4 +1,3 @@
-import {} from "./factory-state.js";
 import { resolveMergeQueueProtocol } from "./merge-queue-protocol.js";
 import { parseGitHubFailureContext } from "./github-failure-context.js";
 import { deriveGateCheckStatusFromRollup } from "./github-rollup.js";
@@ -90,15 +89,6 @@ function hasFailureProvenance(issue) {
         || issue.lastAttemptedFailureHeadSha
         || issue.lastAttemptedFailureSignature);
 }
-export function resolveBranchOwnerForStateTransition(newState, pendingRunType) {
-    if (pendingRunType)
-        return "patchrelay";
-    if (newState === "awaiting_queue")
-        return "patchrelay";
-    if (newState === "repairing_ci" || newState === "repairing_queue")
-        return "patchrelay";
-    return undefined;
-}
 export class IdleIssueReconciler {
     db;
     config;
@@ -154,6 +144,8 @@ export class IdleIssueReconciler {
             await this.reconcileFromGitHub(issue);
         }
         for (const issue of this.db.issues.listBlockedDelegatedIssues()) {
+            if (!issue.delegatedToPatchRelay)
+                continue;
             const unresolved = this.db.issues.countUnresolvedBlockers(issue.projectId, issue.linearIssueId);
             if (unresolved === 0) {
                 this.db.issueSessions.appendIssueSessionEventRespectingActiveLease(issue.projectId, issue.linearIssueId, {
@@ -207,10 +199,6 @@ export class IdleIssueReconciler {
                 }
                 : {}),
         });
-        const branchOwner = resolveBranchOwnerForStateTransition(newState, options?.pendingRunType);
-        if (branchOwner) {
-            this.db.issues.setBranchOwner(issue.projectId, issue.linearIssueId, branchOwner);
-        }
         if (options?.pendingRunType) {
             this.appendWakeEvent(issue, options.pendingRunType, options.pendingRunContext, "idle_reconciliation");
         }
@@ -255,6 +243,9 @@ export class IdleIssueReconciler {
         });
     }
     async routeFailedIssue(issue) {
+        if (!issue.delegatedToPatchRelay) {
+            return;
+        }
         issue = await this.refreshMissingFailureProvenance(issue);
         issue = await this.reclassifyStaleBranchFailure(issue);
         const latestRun = this.db.runs.getLatestRunForIssue(issue.projectId, issue.linearIssueId);
@@ -457,11 +448,17 @@ export class IdleIssueReconciler {
                     this.logger.info({ issueKey: issue.issueKey, prNumber: issue.prNumber, factoryState: issue.factoryState }, "Reconciliation: PR was closed on a terminal issue; preserving terminal state");
                     return;
                 }
-                this.logger.info({ issueKey: issue.issueKey, prNumber: issue.prNumber }, "Reconciliation: PR was closed on unfinished work, re-delegating for implementation");
-                this.advanceIdleIssue(issue, "delegated", {
-                    pendingRunType: "implementation",
-                    clearFailureProvenance: true,
-                });
+                if (issue.delegatedToPatchRelay) {
+                    this.logger.info({ issueKey: issue.issueKey, prNumber: issue.prNumber }, "Reconciliation: PR was closed on unfinished delegated work, re-delegating for implementation");
+                    this.advanceIdleIssue(issue, "delegated", {
+                        pendingRunType: "implementation",
+                        clearFailureProvenance: true,
+                    });
+                }
+                else {
+                    this.logger.info({ issueKey: issue.issueKey, prNumber: issue.prNumber }, "Reconciliation: PR was closed while undelegated; preserving paused local-work state");
+                    this.advanceIdleIssue(issue, "delegated", { clearFailureProvenance: true });
+                }
                 return;
             }
             const headAdvanced = Boolean(pr.headRefOid && pr.headRefOid !== previousHeadSha);
@@ -481,7 +478,8 @@ export class IdleIssueReconciler {
                     return;
                 }
             }
-            if (isReviewDecisionReviewRequired(pr.reviewDecision)
+            if (issue.delegatedToPatchRelay
+                && isReviewDecisionReviewRequired(pr.reviewDecision)
                 && gateCheckStatus === "success"
                 && hasCompletedReviewQuillVerdict(pr.statusCheckRollup)) {
                 this.logger.warn({ issueKey: issue.issueKey, prNumber: issue.prNumber, reviewDecision: pr.reviewDecision }, "Reconciliation: review-quill completed without a decisive GitHub review; escalating for operator input");
@@ -509,7 +507,8 @@ export class IdleIssueReconciler {
                 mergeConflictDetected,
                 downstreamOwned,
             });
-            if ((issue.factoryState === "escalated" || issue.factoryState === "failed")
+            if (issue.delegatedToPatchRelay
+                && (issue.factoryState === "escalated" || issue.factoryState === "failed")
                 && (reactiveIntent?.runType === "review_fix" || reactiveIntent?.runType === "branch_upkeep")) {
                 if (issue.reviewFixAttempts >= DEFAULT_REVIEW_FIX_BUDGET) {
                     this.logger.debug({
@@ -538,7 +537,7 @@ export class IdleIssueReconciler {
                 });
                 return;
             }
-            if (reactiveIntent?.runType === "branch_upkeep" && mergeConflictDetected) {
+            if (issue.delegatedToPatchRelay && 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,
@@ -555,7 +554,7 @@ export class IdleIssueReconciler {
                 });
                 return;
             }
-            if (reactiveIntent?.runType === "queue_repair" && mergeConflictDetected) {
+            if (issue.delegatedToPatchRelay && 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, {
                     pendingRunType: reactiveIntent.runType,

package/dist/issue-overview-query.js

@@ -138,6 +138,7 @@ export class IssueOverviewQuery {
         const liveThread = await this.readLiveThread(activeRun);
         const failureContext = parseGitHubFailureContext(issueRecord?.lastGitHubFailureContextJson);
         const waitingReason = session.waitingReason ?? derivePatchRelayWaitingReason({
+            delegatedToPatchRelay: issueRecord?.delegatedToPatchRelay,
             ...(activeRun ? { activeRunType: activeRun.runType } : {}),
             blockedByKeys,
             factoryState: issueRecord?.factoryState ?? "delegated",
@@ -154,6 +155,7 @@ export class IssueOverviewQuery {
             id: issueRecord?.id ?? session.id,
             projectId: session.projectId,
             linearIssueId: session.linearIssueId,
+            delegatedToPatchRelay: issueRecord?.delegatedToPatchRelay ?? true,
             ...(session.issueKey ? { issueKey: session.issueKey } : {}),
             ...(issueRecord?.title ? { title: issueRecord.title } : {}),
             ...(issueRecord?.url ? { issueUrl: issueRecord.url } : {}),
@@ -169,6 +171,7 @@ export class IssueOverviewQuery {
             readyForExecution: isIssueSessionReadyForExecution({
                 sessionState: session.sessionState,
                 factoryState: issueRecord?.factoryState ?? "delegated",
+                delegatedToPatchRelay: issueRecord?.delegatedToPatchRelay,
                 ...(activeRun ? { activeRunId: activeRun.id } : {}),
                 blockedByCount: unresolvedBlockedBy.length,
                 hasPendingWake: this.db.issueSessions.peekIssueSessionWake(session.projectId, session.linearIssueId) !== undefined,

package/dist/issue-session-projector.js

@@ -26,6 +26,7 @@ export function syncIssueSessionFromIssue(params) {
     });
     const lastWakeReason = options?.lastWakeReason
         ?? deriveIssueSessionWakeReason({
+            delegatedToPatchRelay: issue.delegatedToPatchRelay,
             pendingRunType: issue.pendingRunType,
             factoryState: issue.factoryState,
             prNumber: issue.prNumber,

package/dist/issue-session.js

@@ -14,6 +14,8 @@ export function deriveIssueSessionWaitingReason(params) {
     return derivePatchRelayWaitingReason(params);
 }
 export function deriveIssueSessionWakeReason(params) {
+    if (params.delegatedToPatchRelay === false)
+        return undefined;
     if (params.pendingRunType === "implementation")
         return "delegated";
     if (params.pendingRunType === "review_fix")
@@ -27,6 +29,7 @@ export function deriveIssueSessionWakeReason(params) {
     if (params.factoryState === "awaiting_input")
         return "waiting_for_human_reply";
     const reactiveIntent = deriveIssueSessionReactiveIntent({
+        delegatedToPatchRelay: params.delegatedToPatchRelay,
         prNumber: params.prNumber,
         prState: params.prState,
         prReviewState: params.prReviewState,
@@ -38,6 +41,8 @@ export function deriveIssueSessionWakeReason(params) {
     return undefined;
 }
 export function deriveIssueSessionReactiveIntent(params) {
+    if (params.delegatedToPatchRelay === false)
+        return undefined;
     if (params.activeRunId !== undefined)
         return undefined;
     if (params.prNumber === undefined)
@@ -75,6 +80,8 @@ export function deriveIssueSessionReactiveIntent(params) {
     return undefined;
 }
 export function isIssueSessionReadyForExecution(params) {
+    if (params.delegatedToPatchRelay === false)
+        return false;
     if (params.activeRunId !== undefined)
         return false;
     if (params.blockedByCount > 0)
@@ -92,6 +99,7 @@ export function isIssueSessionReadyForExecution(params) {
         return false;
     }
     if (deriveIssueSessionReactiveIntent({
+        delegatedToPatchRelay: params.delegatedToPatchRelay,
         prNumber: params.prNumber,
         prState: params.prState,
         prReviewState: params.prReviewState,

package/dist/linear-session-reporting.js

@@ -193,7 +193,10 @@ export function summarizeIssueStateForLinear(issue) {
         case "running":
             return issue.waitingReason ?? (issue.prNumber && !isClosedPrState(issue.prState) ? `PR #${issue.prNumber} is actively running.` : "Actively running.");
         case "idle":
-            return issue.waitingReason ?? (issue.prNumber && !isClosedPrState(issue.prState) ? `PR #${issue.prNumber} is idle.` : "Idle.");
+            if (!issue.delegatedToPatchRelay) {
+                break;
+            }
+            return issue.waitingReason ?? (issue.prNumber ? `PR #${issue.prNumber} is idle.` : "Idle.");
         case "done":
             if (issue.prNumber && issue.prState === "merged")
                 return `PR #${issue.prNumber} has merged.`;
@@ -204,9 +207,35 @@ export function summarizeIssueStateForLinear(issue) {
             return issue.waitingReason ?? (issue.prNumber && !isClosedPrState(issue.prState) ? `PR #${issue.prNumber} needs help to recover.` : "Needs help to recover.");
     }
     switch (issue.factoryState) {
+        case "delegated":
+            if (!issue.delegatedToPatchRelay) {
+                return "PatchRelay is queued to start work, but automation is paused.";
+            }
+            return "Queued to start work.";
+        case "implementing":
+            if (!issue.delegatedToPatchRelay) {
+                return "Implementation is paused because the issue is undelegated.";
+            }
+            return "Implementation in progress.";
         case "pr_open":
+            if (!issue.delegatedToPatchRelay && issue.prNumber) {
+                return `PR #${issue.prNumber} is awaiting review while PatchRelay is paused.`;
+            }
             return issue.prNumber ? `PR #${issue.prNumber} is awaiting review.` : "Awaiting review.";
+        case "changes_requested":
+            if (!issue.delegatedToPatchRelay && issue.prNumber) {
+                return `PR #${issue.prNumber} has requested changes while PatchRelay is paused.`;
+            }
+            return issue.prNumber ? `PR #${issue.prNumber} has requested changes.` : "Requested changes received.";
+        case "repairing_ci":
+            if (!issue.delegatedToPatchRelay && issue.prNumber) {
+                return `PR #${issue.prNumber} has failing CI while PatchRelay is paused.`;
+            }
+            return issue.prNumber ? `PR #${issue.prNumber} has failing CI.` : "Failing CI.";
         case "awaiting_queue":
+            if (!issue.delegatedToPatchRelay && issue.prNumber) {
+                return `PR #${issue.prNumber} is approved and awaiting merge while PatchRelay is paused.`;
+            }
             return issue.prNumber ? `PR #${issue.prNumber} is approved and awaiting merge.` : "Approved and awaiting merge.";
         case "done":
             if (issue.prNumber && issue.prState === "merged")

package/dist/linear-session-sync.js

@@ -29,9 +29,17 @@ export class LinearSessionSync {
             if (!linear)
                 return;
             const trackedIssue = this.db.getTrackedIssue(syncedIssue.projectId, syncedIssue.linearIssueId);
+            const visibleIssue = trackedIssue
+                ? {
+                    ...trackedIssue,
+                    delegatedToPatchRelay: syncedIssue.delegatedToPatchRelay,
+                    prNumber: syncedIssue.prNumber,
+                    prUrl: syncedIssue.prUrl,
+                }
+                : syncedIssue;
             await syncActiveWorkflowState({ db: this.db, issue: syncedIssue, linear, ...(trackedIssue ? { trackedIssue } : {}), ...(options ? { options } : {}) });
             await this.agentSessions.syncSessionPlan(syncedIssue, linear, options);
-            if (shouldSyncVisibleIssueComment(trackedIssue ?? syncedIssue, Boolean(syncedIssue.agentSessionId))) {
+            if (shouldSyncVisibleIssueComment(visibleIssue, Boolean(syncedIssue.agentSessionId))) {
                 await syncVisibleStatusComment({
                     db: this.db,
                     issue: syncedIssue,

package/dist/linear-status-comment-sync.js

@@ -2,6 +2,7 @@ import { extractCompletionCheck } from "./completion-check.js";
 import { deriveIssueStatusNote } from "./status-note.js";
 import { derivePatchRelayWaitingReason } from "./waiting-reason.js";
 import { isClosedPrState } from "./pr-state.js";
+import { isUndelegatedPausedIssue } from "./paused-issue-state.js";
 export async function syncVisibleStatusComment(params) {
     const { db, issue, linear, logger, trackedIssue, options } = params;
     try {
@@ -32,6 +33,9 @@ export function shouldSyncVisibleIssueComment(issue, hasAgentSession) {
         || issue.factoryState === "awaiting_input" || issue.factoryState === "failed" || issue.factoryState === "escalated") {
         return true;
     }
+    if (isUndelegatedPausedIssue(issue)) {
+        return true;
+    }
     if ((issue.sessionState === "done" || issue.factoryState === "done")
         && ((issue.prNumber === undefined && !issue.prUrl)
             || isClosedPrState(issue.prState))) {
@@ -47,6 +51,7 @@ function renderStatusComment(db, issue, trackedIssue, options) {
         ? (options?.activeRunType ?? activeRun?.runType)
         : undefined;
     const waitingReason = trackedIssue?.waitingReason ?? derivePatchRelayWaitingReason({
+        delegatedToPatchRelay: issue.delegatedToPatchRelay,
         ...(activeRunType ? { activeRunType } : {}),
         ...(issue.activeRunId !== undefined ? { activeRunId: issue.activeRunId } : {}),
         factoryState: issue.factoryState,
@@ -62,7 +67,15 @@ function renderStatusComment(db, issue, trackedIssue, options) {
     const lines = [
         "## PatchRelay status",
         "",
-        statusHeadline(trackedIssue ?? issue, activeRunType),
+        statusHeadline(trackedIssue
+            ? {
+                ...trackedIssue,
+                delegatedToPatchRelay: issue.delegatedToPatchRelay,
+                prNumber: issue.prNumber,
+                prReviewState: issue.prReviewState,
+                prCheckStatus: issue.prCheckStatus,
+            }
+            : issue, activeRunType),
     ];
     const statusNote = trackedIssue?.statusNote ?? deriveIssueStatusNote({ issue, latestRun, latestEvent, waitingReason });
     if (waitingReason) {
@@ -124,6 +137,26 @@ function statusHeadline(issue, activeRunType) {
         default:
             break;
     }
+    if (!issue.delegatedToPatchRelay && issue.prNumber !== undefined) {
+        if (issue.factoryState === "awaiting_queue" || issue.prReviewState === "approved") {
+            return `PR #${issue.prNumber} is awaiting downstream merge while PatchRelay is paused`;
+        }
+        if (issue.factoryState === "changes_requested" || issue.prReviewState === "changes_requested") {
+            return `PR #${issue.prNumber} has requested changes while PatchRelay is paused`;
+        }
+        if (issue.factoryState === "repairing_ci" || issue.prCheckStatus === "failed" || issue.prCheckStatus === "failure") {
+            return `PR #${issue.prNumber} has failing CI while PatchRelay is paused`;
+        }
+        return `PR #${issue.prNumber} is awaiting review while PatchRelay is paused`;
+    }
+    if (!issue.delegatedToPatchRelay) {
+        if (issue.factoryState === "implementing") {
+            return "Implementation is paused because the issue is undelegated";
+        }
+        if (issue.factoryState === "delegated") {
+            return "Queued to start work while PatchRelay is paused";
+        }
+    }
     switch (issue.factoryState) {
         case "delegated":
             return "Queued to start work";

package/dist/linear-workflow-state-sync.js

@@ -53,14 +53,14 @@ function resolveDesiredActiveWorkflowState(issue, trackedIssue, options, liveIss
         || trackedIssue?.sessionState === "waiting_input" || trackedIssue?.sessionState === "failed") {
         return resolvePreferredHumanNeededLinearState(liveIssue);
     }
-    const activelyWorking = issue.activeRunId !== undefined
+    const activelyWorking = issue.delegatedToPatchRelay !== false && (issue.activeRunId !== undefined
         || options?.activeRunType !== undefined
         || trackedIssue?.sessionState === "running"
         || issue.factoryState === "delegated"
         || issue.factoryState === "implementing"
         || issue.factoryState === "changes_requested"
         || issue.factoryState === "repairing_ci"
-        || issue.factoryState === "repairing_queue";
+        || issue.factoryState === "repairing_queue");
     if (activelyWorking) {
         return resolvePreferredImplementingLinearState(liveIssue);
     }

package/dist/operator-retry-event.js

@@ -9,7 +9,7 @@ function parseObjectJson(value) {
         return undefined;
     }
 }
-export function buildOperatorRetryEvent(issue, runType) {
+export function buildOperatorRetryEvent(issue, runType, source = "operator_retry") {
     if (runType === "queue_repair") {
         const queueIncident = parseObjectJson(issue.lastQueueIncidentJson);
         const failureContext = parseObjectJson(issue.lastGitHubFailureContextJson);
@@ -18,9 +18,9 @@ export function buildOperatorRetryEvent(issue, runType) {
             eventJson: JSON.stringify({
                 ...(queueIncident ?? {}),
                 ...(failureContext ?? {}),
-                source: "operator_retry",
+                source,
             }),
-            dedupeKey: `operator_retry:queue_repair:${issue.linearIssueId}:${issue.prHeadSha ?? issue.lastGitHubFailureHeadSha ?? "unknown-sha"}`,
+            dedupeKey: `${source}:queue_repair:${issue.linearIssueId}:${issue.prHeadSha ?? issue.lastGitHubFailureHeadSha ?? "unknown-sha"}`,
         };
     }
     if (runType === "ci_repair") {
@@ -29,9 +29,9 @@ export function buildOperatorRetryEvent(issue, runType) {
             eventType: "settled_red_ci",
             eventJson: JSON.stringify({
                 ...(failureContext ?? {}),
-                source: "operator_retry",
+                source,
             }),
-            dedupeKey: `operator_retry:ci_repair:${issue.linearIssueId}:${issue.lastGitHubFailureSignature ?? issue.prHeadSha ?? "unknown-sha"}`,
+            dedupeKey: `${source}:ci_repair:${issue.linearIssueId}:${issue.lastGitHubFailureSignature ?? issue.prHeadSha ?? "unknown-sha"}`,
         };
     }
     if (runType === "review_fix" || runType === "branch_upkeep") {
@@ -39,20 +39,23 @@ export function buildOperatorRetryEvent(issue, runType) {
             eventType: "review_changes_requested",
             eventJson: JSON.stringify({
                 reviewBody: runType === "branch_upkeep"
-                    ? "Operator requested retry of branch upkeep after requested changes."
-                    : "Operator requested retry of review-fix work.",
+                    ? `${humanizeSource(source)} requested retry of branch upkeep after requested changes.`
+                    : `${humanizeSource(source)} requested retry of review-fix work.`,
                 ...(runType === "branch_upkeep" ? { branchUpkeepRequired: true, wakeReason: "branch_upkeep" } : {}),
-                source: "operator_retry",
+                source,
             }),
-            dedupeKey: `operator_retry:${runType}:${issue.linearIssueId}:${issue.prHeadSha ?? "unknown-sha"}`,
+            dedupeKey: `${source}:${runType}:${issue.linearIssueId}:${issue.prHeadSha ?? "unknown-sha"}`,
         };
     }
     return {
         eventType: "delegated",
         eventJson: JSON.stringify({
-            promptContext: "Operator requested retry of PatchRelay work.",
-            source: "operator_retry",
+            promptContext: `${humanizeSource(source)} requested PatchRelay work resume.`,
+            source,
         }),
-        dedupeKey: `operator_retry:implementation:${issue.linearIssueId}`,
+        dedupeKey: `${source}:implementation:${issue.linearIssueId}`,
     };
 }
+function humanizeSource(source) {
+    return source.replaceAll("_", " ");
+}