patchrelay 0.66.0 → 0.67.0

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
   "service": "patchrelay",
-  "version": "0.66.0",
-  "commit": "552ba486bf93",
-  "builtAt": "2026-05-05T14:36:59.557Z"
+  "version": "0.67.0",
+  "commit": "3f61030e2318",
+  "builtAt": "2026-05-05T14:42:27.010Z"
 }

package/dist/db/issue-store.js

@@ -224,6 +224,10 @@ export class IssueStore {
                 sets.push("last_published_head_sha = @lastPublishedHeadSha");
                 values.lastPublishedHeadSha = params.lastPublishedHeadSha;
             }
+            if (params.parentPrBranch !== undefined) {
+                sets.push("parent_pr_branch = @parentPrBranch");
+                values.parentPrBranch = params.parentPrBranch;
+            }
             if (params.ciRepairAttempts !== undefined) {
                 sets.push("ci_repair_attempts = @ciRepairAttempts");
                 values.ciRepairAttempts = params.ciRepairAttempts;
@@ -264,6 +268,7 @@ export class IssueStore {
           last_queue_signal_at, last_queue_incident_json,
           last_attempted_failure_head_sha, last_attempted_failure_signature, last_attempted_failure_at,
           last_published_patch_id, last_published_integration_tree_id, last_published_head_sha,
+          parent_pr_branch,
           ci_repair_attempts, queue_repair_attempts, review_fix_attempts, zombie_recovery_attempts, last_zombie_recovery_at, orchestration_settle_until,
           updated_at
         ) VALUES (
@@ -278,6 +283,7 @@ export class IssueStore {
           @lastQueueSignalAt, @lastQueueIncidentJson,
           @lastAttemptedFailureHeadSha, @lastAttemptedFailureSignature, @lastAttemptedFailureAt,
           @lastPublishedPatchId, @lastPublishedIntegrationTreeId, @lastPublishedHeadSha,
+          @parentPrBranch,
           @ciRepairAttempts, @queueRepairAttempts, @reviewFixAttempts, @zombieRecoveryAttempts, @lastZombieRecoveryAt, @orchestrationSettleUntil,
           @now
         )
@@ -336,6 +342,7 @@ export class IssueStore {
                 lastPublishedPatchId: params.lastPublishedPatchId ?? null,
                 lastPublishedIntegrationTreeId: params.lastPublishedIntegrationTreeId ?? null,
                 lastPublishedHeadSha: params.lastPublishedHeadSha ?? null,
+                parentPrBranch: params.parentPrBranch ?? null,
                 ciRepairAttempts: params.ciRepairAttempts ?? 0,
                 queueRepairAttempts: params.queueRepairAttempts ?? 0,
                 reviewFixAttempts: params.reviewFixAttempts ?? 0,
@@ -419,6 +426,16 @@ export class IssueStore {
             .all();
         return rows.map(mapIssueRow);
     }
+    // Plan §8.3: parent-of-child index. Given a parent's branch name,
+    // list every issue whose `parent_pr_branch` matches — i.e. PRs
+    // stacked on that parent. The index is hit on every
+    // `pr_synchronize` for a parent so it must stay cheap.
+    listIssuesWithParentBranch(branchName) {
+        const rows = this.connection
+            .prepare(`SELECT * FROM issues WHERE parent_pr_branch = ? AND factory_state NOT IN ('done', 'failed')`)
+            .all(branchName);
+        return rows.map(mapIssueRow);
+    }
     // Issues that are approved by review-quill but stuck in In Review
     // because branch CI is failing — the merge-steward never admits them.
     // Plan §6.2: surface this as IN_REVIEW_STUCK so an operator notices
@@ -731,6 +748,9 @@ export function mapIssueRow(row) {
         ...(row.last_published_head_sha !== null && row.last_published_head_sha !== undefined
             ? { lastPublishedHeadSha: String(row.last_published_head_sha) }
             : {}),
+        ...(row.parent_pr_branch !== null && row.parent_pr_branch !== undefined
+            ? { parentPrBranch: String(row.parent_pr_branch) }
+            : {}),
         ciRepairAttempts: Number(row.ci_repair_attempts ?? 0),
         queueRepairAttempts: Number(row.queue_repair_attempts ?? 0),
         reviewFixAttempts: Number(row.review_fix_attempts ?? 0),

package/dist/db/migrations.js

@@ -35,6 +35,7 @@ CREATE TABLE IF NOT EXISTS issues (
   ci_repair_attempts INTEGER NOT NULL DEFAULT 0,
   queue_repair_attempts INTEGER NOT NULL DEFAULT 0,
   orchestration_settle_until TEXT,
+  parent_pr_branch TEXT,
   updated_at TEXT NOT NULL,
   UNIQUE(project_id, linear_issue_id)
 );
@@ -345,6 +346,9 @@ export function runPatchRelayMigrations(connection) {
     addColumnIfMissing(connection, "issues", "last_published_patch_id", "TEXT");
     addColumnIfMissing(connection, "issues", "last_published_integration_tree_id", "TEXT");
     addColumnIfMissing(connection, "issues", "last_published_head_sha", "TEXT");
+    // Plan §8.3: parent-of-child index for stacked PRs.
+    addColumnIfMissing(connection, "issues", "parent_pr_branch", "TEXT");
+    connection.exec(`CREATE INDEX IF NOT EXISTS idx_issues_parent_pr_branch ON issues(parent_pr_branch);`);
     addColumnIfMissing(connection, "linear_installations", "health_status", "TEXT NOT NULL DEFAULT 'ok'");
     addColumnIfMissing(connection, "linear_installations", "health_reason", "TEXT");
     addColumnIfMissing(connection, "linear_installations", "health_updated_at", "TEXT");
@@ -422,6 +426,7 @@ function removeRetiredIssueColumnsIfPresent(connection) {
         last_published_patch_id TEXT,
         last_published_integration_tree_id TEXT,
         last_published_head_sha TEXT,
+        parent_pr_branch TEXT,
         ci_repair_attempts INTEGER NOT NULL DEFAULT 0,
         queue_repair_attempts INTEGER NOT NULL DEFAULT 0,
         review_fix_attempts INTEGER NOT NULL DEFAULT 0,
@@ -488,6 +493,7 @@ function removeRetiredIssueColumnsIfPresent(connection) {
         last_published_patch_id,
         last_published_integration_tree_id,
         last_published_head_sha,
+        parent_pr_branch,
         ci_repair_attempts,
         queue_repair_attempts,
         review_fix_attempts,
@@ -552,6 +558,7 @@ function removeRetiredIssueColumnsIfPresent(connection) {
         last_published_patch_id,
         last_published_integration_tree_id,
         last_published_head_sha,
+        parent_pr_branch,
         COALESCE(ci_repair_attempts, 0),
         COALESCE(queue_repair_attempts, 0),
         COALESCE(review_fix_attempts, 0),
@@ -568,6 +575,7 @@ function removeRetiredIssueColumnsIfPresent(connection) {
       CREATE INDEX IF NOT EXISTS idx_issues_key ON issues(issue_key);
       CREATE INDEX IF NOT EXISTS idx_issues_ready ON issues(pending_run_type, active_run_id);
       CREATE INDEX IF NOT EXISTS idx_issues_branch ON issues(branch_name);
+      CREATE INDEX IF NOT EXISTS idx_issues_parent_pr_branch ON issues(parent_pr_branch);
     `);
     }
     finally {

package/dist/github-webhook-handler.js

@@ -8,6 +8,7 @@ import { maybeCloseLatePublishedImplementationPr } from "./github-webhook-late-p
 import { projectGitHubWebhookState } from "./github-webhook-state-projector.js";
 import { maybeEnqueueGitHubReactiveRun } from "./github-webhook-reactive-run.js";
 import { maybeRunSequenceBackstop } from "./github-webhook-sequence-backstop.js";
+import { maybeFanChildRebaseWakes } from "./github-webhook-stack-coordination.js";
 import { handleGitHubTerminalPrEvent } from "./github-webhook-terminal-handler.js";
 export class GitHubWebhookHandler {
     config;
@@ -142,6 +143,19 @@ export class GitHubWebhookHandler {
                 this.logger.warn({ err: error }, "sequence-check backstop failed");
             });
         }
+        // Plan §8.3: parent-moved trigger. When a PR's head advances,
+        // any child PR stacked on it becomes stale relative to its
+        // declared base — enqueue a `branch_upkeep` run on each child
+        // so it rebases onto the new parent head.
+        if (event.triggerEvent === "pr_synchronize") {
+            maybeFanChildRebaseWakes({
+                db: this.db,
+                logger: this.logger,
+                ...(this.feed ? { feed: this.feed } : {}),
+                enqueueIssue: this.enqueueIssue,
+                event,
+            });
+        }
         if (event.triggerEvent === "pr_merged" || event.triggerEvent === "pr_closed") {
             await handleGitHubTerminalPrEvent({
                 config: this.config,

package/dist/github-webhook-stack-coordination.js

@@ -0,0 +1,42 @@
+// Plan §8.3-8.4: when a parent PR's head moves (review-fix push,
+// eviction repair, base-branch update), child PRs stacked on it
+// become stale. Patchrelay treats this as a wake event for each
+// matching child and enqueues a `branch_upkeep` run to rebase the
+// child onto the new parent head.
+export function maybeFanChildRebaseWakes(params) {
+    const { db, logger, feed, enqueueIssue, event } = params;
+    if (event.triggerEvent !== "pr_synchronize")
+        return;
+    if (!event.branchName)
+        return;
+    const children = db.issues.listIssuesWithParentBranch(event.branchName);
+    if (children.length === 0)
+        return;
+    for (const child of children) {
+        if (child.activeRunId !== undefined) {
+            // Child already has a run going; let it complete and the next
+            // reconcile cycle pick up the new parent state.
+            logger.debug({ parentBranch: event.branchName, childIssue: child.issueKey, childRunId: child.activeRunId }, "Skipping child-rebase wake — child has an active run");
+            continue;
+        }
+        db.issues.upsertIssue({
+            projectId: child.projectId,
+            linearIssueId: child.linearIssueId,
+            pendingRunType: "branch_upkeep",
+        });
+        enqueueIssue(child.projectId, child.linearIssueId);
+        logger.info({
+            parentBranch: event.branchName,
+            parentHeadSha: event.headSha,
+            childIssue: child.issueKey,
+            childPrNumber: child.prNumber,
+        }, "Enqueued branch_upkeep on stacked child after parent PR head moved");
+        feed?.publish({
+            level: "info",
+            kind: "github",
+            summary: `Parent PR head moved on ${event.branchName} — branch_upkeep queued for child PR #${child.prNumber ?? "?"}`,
+            ...(child.issueKey ? { issueKey: child.issueKey } : {}),
+            ...(child.projectId ? { projectId: child.projectId } : {}),
+        });
+    }
+}

package/dist/github-webhook-state-projector.js

@@ -8,6 +8,12 @@ export async function projectGitHubWebhookState(deps, issue, event, project, lin
     const failureContextResolver = deps.failureContextResolver ?? createGitHubFailureContextResolver();
     const ciSnapshotResolver = deps.ciSnapshotResolver ?? createGitHubCiSnapshotResolver();
     const immediateCheckStatus = deriveImmediatePrCheckStatus(issue, event, project);
+    // Plan §8.3: when a PR's base ref differs from the repo default,
+    // it's stacked on another open PR. Cache the parent branch so we
+    // can fan child-rebase wakes on parent's `pr_synchronize`. Clear
+    // the field when a base ref reverts to the default (e.g. parent
+    // landed and GitHub auto-retargeted) or when the PR closes.
+    const parentPrBranch = computeParentPrBranchUpdate(event, project);
     deps.db.issues.upsertIssue({
         projectId: issue.projectId,
         linearIssueId: issue.linearIssueId,
@@ -19,6 +25,7 @@ export async function projectGitHubWebhookState(deps, issue, event, project, lin
         ...(event.reviewState !== undefined ? { prReviewState: event.reviewState } : {}),
         ...(immediateCheckStatus !== undefined ? { prCheckStatus: immediateCheckStatus } : {}),
         ...(linkedBy === "issue_key" ? { branchName: event.branchName } : {}),
+        ...(parentPrBranch !== undefined ? { parentPrBranch } : {}),
         ...(event.reviewState === "changes_requested"
             ? { lastBlockingReviewHeadSha: event.reviewCommitId ?? event.headSha ?? null }
             : event.reviewState === "approved"
@@ -118,6 +125,23 @@ export async function projectGitHubWebhookState(deps, issue, event, project, lin
     });
     return freshIssue;
 }
+// Plan §8.3: derive the cached parent-PR-branch state from a webhook
+// event. Returns `undefined` to mean "no change" (event isn't a
+// PR-shape event with a base ref); returns `null` to mean "clear the
+// field" (PR closed, or base ref is now the repo default).
+function computeParentPrBranchUpdate(event, project) {
+    if (event.triggerEvent === "pr_closed" || event.triggerEvent === "pr_merged") {
+        return null;
+    }
+    if (event.prBaseRef === undefined) {
+        return undefined;
+    }
+    const repoDefault = project?.github?.baseBranch ?? "main";
+    if (!event.prBaseRef || event.prBaseRef === repoDefault) {
+        return null;
+    }
+    return event.prBaseRef;
+}
 // Plan §4.4: when the mid-run-approval transition fires, the active
 // review_fix run's premise no longer holds — there is no fix to
 // publish. Mark it superseded and set the publication-suppression

package/dist/github-webhooks.js

@@ -70,6 +70,7 @@ function normalizePullRequestEvent(payload, repoFullName) {
         prLabels: Array.isArray(pr.labels)
             ? pr.labels.map((label) => label?.name).filter((label) => typeof label === "string" && label.trim().length > 0)
             : undefined,
+        prBaseRef: pr.base.ref,
     };
 }
 function normalizePullRequestReviewEvent(payload, repoFullName) {

package/package.json

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