/ opencodehub / src / lib / merge-queue.ts
swadhinbiswas Enforce required reviewer approvals in merge gates · 2/18/2026
8e0d0e7
773 lines · 27.2 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
/**
 * Merge Queue Library
 * Stack-aware merge queue with CI optimization
 * Uses distributed locking for multi-instance safety
 */

import { eq, and, asc, desc, inArray, lt, gt } from "drizzle-orm";
import type { NodePgDatabase } from "drizzle-orm/node-postgres";
import { getDatabase, schema } from "@/db";
import { generateId } from "./utils";
import { getStack, getStackForPr } from "./stacks";
import { recordPrMetrics } from "./developer-metrics";
import { emitQueueEvent } from "./realtime";
import { withLock, isDistributedLocking } from "./distributed-lock";
import { logger } from "./logger";
import { resolveRepoPath } from "./git-storage";

// Types
export interface MergeQueueItem {
    entry: typeof schema.mergeQueue.$inferSelect;
    pr: typeof schema.pullRequests.$inferSelect;
    stack?: {
        id: string;
        name: string | null;
        entries: Array<{
            prNumber: number;
            prState: string;
            isMerged: boolean;
        }>;
    };
}

export interface AddToQueueOptions {
    repositoryId: string;
    pullRequestId: string;
    addedById: string;
    priority?: number;
    mergeMethod?: "merge" | "squash" | "rebase";
}

/**
 * Add a PR to the merge queue
 * Uses distributed lock to prevent race conditions
 */
export async function addToMergeQueue(options: AddToQueueOptions): Promise<typeof schema.mergeQueue.$inferSelect> {
    const lockKey = `merge-queue:add:${options.repositoryId}`;

    return withLock(lockKey, async () => {
        const db = getDatabase() as NodePgDatabase<typeof schema>;

        // Check if already in queue
        const existing = await db.query.mergeQueue.findFirst({
            where: and(
                eq(schema.mergeQueue.pullRequestId, options.pullRequestId),
                eq(schema.mergeQueue.status, "pending")
            ),
        });

        if (existing) {
            throw new Error("PR is already in the merge queue");
        }

        // Get current max position
        const queueItems = await db.query.mergeQueue.findMany({
            where: and(
                eq(schema.mergeQueue.repositoryId, options.repositoryId),
                eq(schema.mergeQueue.status, "pending")
            ),
            orderBy: [desc(schema.mergeQueue.position)],
            limit: 1,
        });

        const maxPosition = queueItems.length > 0 ? (queueItems[0].position || 0) : 0;

        // Check if PR is part of a stack
        const stackInfo = await getStackForPr(options.pullRequestId);

        const entry = {
            id: generateId(),
            repositoryId: options.repositoryId,
            pullRequestId: options.pullRequestId,
            stackId: stackInfo?.stack.id || null,
            status: "pending",
            priority: options.priority || 0,
            position: maxPosition + 1,
            ciStatus: "pending",
            addedById: options.addedById,
            addedAt: new Date(),
            mergeMethod: options.mergeMethod || "merge",
            deleteOnMerge: true,
        };

        await db.insert(schema.mergeQueue).values(entry);

        logger.info({
            repositoryId: options.repositoryId,
            prId: options.pullRequestId,
            position: entry.position,
            distributed: isDistributedLocking
        }, "PR added to merge queue");

        return entry as typeof schema.mergeQueue.$inferSelect;
    }, { ttlSeconds: 10, retryCount: 5 });
}

/**
 * Remove a PR from the merge queue
 */
export async function removeFromMergeQueue(pullRequestId: string): Promise<void> {
    const db = getDatabase() as NodePgDatabase<typeof schema>;

    await db.delete(schema.mergeQueue)
        .where(eq(schema.mergeQueue.pullRequestId, pullRequestId));
}

/**
 * Get the merge queue for a repository
 */
export async function getMergeQueue(repositoryId: string): Promise<MergeQueueItem[]> {
    const db = getDatabase() as NodePgDatabase<typeof schema>;

    const queueEntries = await db.query.mergeQueue.findMany({
        where: and(
            eq(schema.mergeQueue.repositoryId, repositoryId),
            eq(schema.mergeQueue.status, "pending")
        ),
        orderBy: [desc(schema.mergeQueue.priority), asc(schema.mergeQueue.position)],
    });

    const items: MergeQueueItem[] = [];

    for (const entry of queueEntries) {
        const pr = await db.query.pullRequests.findFirst({
            where: eq(schema.pullRequests.id, entry.pullRequestId),
        });

        if (!pr) continue;

        let stack = undefined;
        if (entry.stackId) {
            const stackInfo = await getStack(entry.stackId);
            if (stackInfo) {
                stack = {
                    id: stackInfo.stack.id,
                    name: stackInfo.stack.name,
                    entries: stackInfo.entries.map(e => ({
                        prNumber: e.pr.number,
                        prState: e.pr.state,
                        isMerged: e.pr.isMerged || false,
                    })),
                };
            }
        }

        items.push({ entry, pr, stack });
    }

    return items;
}

/**
 * Create a speculative branch for parallel CI execution
 */
async function createSpeculativeBranch(
    repoDiskPath: string,
    baseBranch: string,
    prs: { headBranch: string; number: number }[]
): Promise<{ branchName: string; success: boolean; message?: string }> {
    const { createBranch, mergeBranch, deleteBranch } = await import("./git");
    const localRepoPath = await resolveRepoPath(repoDiskPath);
    const simpleGit = (await import("simple-git")).simpleGit(localRepoPath);

    // Generate unique temp branch name
    const timestamp = Date.now();
    const prNumbers = prs.map(p => p.number).join("-");
    const branchName = `mq-spec-${timestamp}-${prNumbers}`;

    try {
        // 1. Create temp branch from base
        await simpleGit.checkout(baseBranch);
        await simpleGit.pull();
        await simpleGit.checkoutLocalBranch(branchName);

        // 2. Merge each PR in order
        for (const pr of prs) {
            try {
                // Must fetch the PR branch first
                await simpleGit.fetch("origin", pr.headBranch);
                await simpleGit.merge([`origin/${pr.headBranch}`]);
            } catch (e) {
                // Conflict detected
                await simpleGit.checkout(baseBranch);
                await deleteBranch(localRepoPath, branchName);
                return {
                    branchName,
                    success: false,
                    message: `Conflict merging PR #${pr.number} during speculative build`
                };
            }
        }

        // 3. Push to trigger CI
        await simpleGit.push("origin", branchName, ["--force"]);

        return { branchName, success: true };
    } catch (error: any) {
        return { branchName, success: false, message: error.message };
    }
}

/**
 * Process a batch of queue items speculatively
 */
export async function processQueueBatch(repositoryId: string, batchSize: number = 3): Promise<void> {
    const db = getDatabase() as NodePgDatabase<typeof schema>;

    const queueItems = await db.query.mergeQueue.findMany({
        where: and(
            eq(schema.mergeQueue.repositoryId, repositoryId),
            eq(schema.mergeQueue.status, "pending")
        ),
        orderBy: [desc(schema.mergeQueue.priority), asc(schema.mergeQueue.position)],
        limit: batchSize,
    });

    if (queueItems.length === 0) return;

    // Get full PR details for the batch
    const prs: any[] = [];
    for (const item of queueItems) {
        const pr = await db.query.pullRequests.findFirst({
            where: eq(schema.pullRequests.id, item.pullRequestId),
        });
        if (pr) prs.push(pr);
    }

    if (prs.length === 0) return;

    const baseBranch = prs[0].baseBranch;
    const repo = await db.query.repositories.findFirst({
        where: eq(schema.repositories.id, repositoryId),
    });

    if (!repo) return;

    // Create speculative combinations
    // 1. Base + PR1
    // 2. Base + PR1 + PR2
    // ...

    const accummulatedPrs: typeof prs = [];

    for (const pr of prs) {
        accummulatedPrs.push(pr);

        // Skip if we just have 1 PR (handled by normal flow, or maybe we unify flow?)
        if (accummulatedPrs.length === 1) continue;

        logger.info({ prNumbers: accummulatedPrs.map(p => p.number) }, "Creating speculative branch");

        const result = await createSpeculativeBranch(
            repo.diskPath,
            baseBranch,
            accummulatedPrs.map(p => ({ headBranch: p.headBranch, number: p.number }))
        );

        // Track the speculative run in the database
        const runId = crypto.randomUUID();
        const prIds = accummulatedPrs.map(p => p.id).join(",");

        await db.insert(schema.mergeQueueSpeculativeRuns).values({
            id: runId,
            repositoryId: repositoryId,
            pullRequestIds: prIds,
            branchName: result.branchName,
            baseBranch: baseBranch,
            status: result.success ? "pending" : "failed",
            createdAt: new Date(),
            failureReason: result.success ? null : result.message,
        });

        if (result.success) {
            logger.info({ runId, branchName: result.branchName }, "Started speculative build");
        } else {
            logger.warn({ runId, message: result.message }, "Speculative build creation failed");
            // Stop chain if conflict found
            break;
        }
    }
}

/**
 * Check if a PR can be merged (all parent PRs in stack must be merged first)
 */
export async function canMerge(pullRequestId: string): Promise<{ canMerge: boolean; reason?: string }> {
    const db = getDatabase() as NodePgDatabase<typeof schema>;

    // Get the PR
    const pr = await db.query.pullRequests.findFirst({
        where: eq(schema.pullRequests.id, pullRequestId),
    });

    if (!pr) {
        return { canMerge: false, reason: "PR not found" };
    }

    if (pr.state !== "open") {
        return { canMerge: false, reason: "PR is not open" };
    }

    if (pr.isMerged) {
        return { canMerge: false, reason: "PR is already merged" };
    }

    // Check if part of a stack
    const stackInfo = await getStackForPr(pullRequestId);

    if (stackInfo) {
        // Find this PR's position in the stack
        const prEntry = stackInfo.entries.find(e => e.pr.id === pullRequestId);
        if (prEntry && prEntry.entry.parentPrId) {
            // Check if parent is merged
            const parentPr = await db.query.pullRequests.findFirst({
                where: eq(schema.pullRequests.id, prEntry.entry.parentPrId),
            });

            if (parentPr && !parentPr.isMerged) {
                return {
                    canMerge: false,
                    reason: `Parent PR #${parentPr.number} must be merged first`
                };
            }
        }
    }

    const runsForHead = await db.query.workflowRuns.findMany({
        where: and(
            eq(schema.workflowRuns.pullRequestId, pr.id),
            eq(schema.workflowRuns.headSha, pr.headSha)
        ),
        orderBy: [desc(schema.workflowRuns.createdAt)],
    });

    // Check Branch Protection Rules
    const rules = await db.query.branchProtection.findMany({
        where: and(
            eq(schema.branchProtection.repositoryId, pr.repositoryId),
            eq(schema.branchProtection.active, true)
        )
    });

    const matchingRule = rules.find(rule => {
        if (rule.pattern === pr.baseBranch) return true;
        if (rule.pattern.endsWith("*")) {
            return pr.baseBranch.startsWith(rule.pattern.slice(0, -1));
        }
        return false;
    });

    const reviewRequirements = await db.query.reviewRequirements.findFirst({
        where: eq(schema.reviewRequirements.repositoryId, pr.repositoryId),
    });

    const requiredApprovals = Math.max(
        reviewRequirements?.minApprovals ?? 0,
        matchingRule ? (matchingRule.requiredApprovals ?? 1) : 0
    );

    // Evaluate by each reviewer's latest review state.
    const allReviews = await db.query.pullRequestReviews.findMany({
        where: eq(schema.pullRequestReviews.pullRequestId, pr.id),
        orderBy: [desc(schema.pullRequestReviews.submittedAt)],
    });
    const latestReviewsByUser = new Map<string, typeof allReviews[number]>();
    for (const review of allReviews) {
        if (!latestReviewsByUser.has(review.reviewerId)) {
            latestReviewsByUser.set(review.reviewerId, review);
        }
    }
    const latestApprovedReviews = Array.from(latestReviewsByUser.values()).filter((review) => review.state === "approved");
    const latestBlockingReviews = Array.from(latestReviewsByUser.values()).filter((review) => review.state === "changes_requested");

    if (latestApprovedReviews.length < requiredApprovals) {
        return {
            canMerge: false,
            reason: `At least ${requiredApprovals} approval(s) required (has ${latestApprovedReviews.length})`
        };
    }

    if (latestBlockingReviews.length > 0) {
        return { canMerge: false, reason: "Changes requested by reviewer" };
    }

    // Enforce explicitly required reviewers (multi-reviewer rule depth).
    const requiredReviewers = await db.query.pullRequestReviewers.findMany({
        where: and(
            eq(schema.pullRequestReviewers.pullRequestId, pr.id),
            eq(schema.pullRequestReviewers.isRequired, true)
        ),
    });
    if (requiredReviewers.length > 0) {
        const missingRequiredApprovals: string[] = [];
        for (const reviewer of requiredReviewers) {
            const latestReview = latestReviewsByUser.get(reviewer.userId);
            if (!latestReview || latestReview.state !== "approved") {
                missingRequiredApprovals.push(reviewer.userId);
            }
        }

        if (missingRequiredApprovals.length > 0) {
            return {
                canMerge: false,
                reason: `Required reviewer approvals missing (${missingRequiredApprovals.length})`
            };
        }
    }

    const statusChecks = await db.query.requiredStatusChecks.findMany({
        where: and(
            eq(schema.requiredStatusChecks.repositoryId, pr.repositoryId),
            eq(schema.requiredStatusChecks.isRequired, true)
        ),
    });
    const requiredChecksForBranch = statusChecks.filter((check) => {
        if (check.branch === pr.baseBranch) return true;
        if (check.branch.endsWith("*")) {
            return pr.baseBranch.startsWith(check.branch.slice(0, -1));
        }
        return false;
    });

    if (requiredChecksForBranch.length > 0) {
        if (runsForHead.length === 0) {
            return { canMerge: false, reason: "Required status checks not found for latest commit" };
        }

        const successfulRunNames = new Set(
            runsForHead
                .filter((run) => {
                    if (run.status === "success") return true;
                    if (run.status === "completed" && run.conclusion === "success") return true;
                    return false;
                })
                .map((run) => run.name)
        );

        for (const requiredCheck of requiredChecksForBranch) {
            if (!successfulRunNames.has(requiredCheck.checkName)) {
                return {
                    canMerge: false,
                    reason: `Required status check "${requiredCheck.checkName}" has not succeeded`
                };
            }
        }
    } else {
        // Fallback: if there is a latest run for this head, it must not be failing.
        const latestRun = runsForHead[0];
        if (latestRun) {
            const running = latestRun.status === "running" || latestRun.status === "queued" || latestRun.status === "in_progress";
            const failed =
                latestRun.status === "failed" ||
                (latestRun.status === "completed" && latestRun.conclusion === "failure");
            if (running) return { canMerge: false, reason: "CI is still running" };
            if (failed) return { canMerge: false, reason: "CI checks failed" };
        }
    }

    const externalConfigs = await db.query.externalCIConfigs.findMany({
        where: and(
            eq(schema.externalCIConfigs.repositoryId, pr.repositoryId),
            eq(schema.externalCIConfigs.isEnabled, true),
            eq(schema.externalCIConfigs.syncStatus, true)
        ),
    });

    if (externalConfigs.length > 0) {
        const configIds = externalConfigs.map((config) => config.id);
        const externalBuilds = await db.query.externalBuilds.findMany({
            where: and(
                eq(schema.externalBuilds.pullRequestId, pr.id),
                inArray(schema.externalBuilds.configId, configIds)
            ),
            orderBy: [desc(schema.externalBuilds.createdAt)],
        });

        for (const config of externalConfigs) {
            const latestBuild = externalBuilds.find((build) => build.configId === config.id);
            if (!latestBuild) {
                return {
                    canMerge: false,
                    reason: `External CI "${config.name}" has not reported status for this pull request`
                };
            }
            const status = (latestBuild.status || "").toLowerCase();
            if (status === "pending" || status === "running" || status === "queued" || status === "in_progress") {
                return { canMerge: false, reason: `External CI "${config.name}" is still running` };
            }
            if (status !== "success" && status !== "passed") {
                return { canMerge: false, reason: `External CI "${config.name}" did not pass` };
            }
        }
    }

    if ((reviewRequirements?.requireCodeOwner ?? false) || (matchingRule?.requireCodeOwnerReviews ?? false)) {
        const { checkCodeOwnerApprovalsForPR } = await import("./pr-codeowner");
        const codeOwnerCheck = await checkCodeOwnerApprovalsForPR(db, pr.id);
        if (!codeOwnerCheck.ok) {
            return { canMerge: false, reason: codeOwnerCheck.reason || "Code owner approval required" };
        }
    }

    if (reviewRequirements?.requireReReviewOnPush) {
        const { checkStaleReviews } = await import("./multi-reviewer");
        const staleInfo = await checkStaleReviews(pr.id);
        if (staleInfo.stale) {
            return { canMerge: false, reason: "Stale reviews require re-review" };
        }
    }

    if (reviewRequirements?.dismissStaleReviews) {
        const { dismissStaleReviews } = await import("./multi-reviewer");
        await dismissStaleReviews(pr.id, pr.authorId);
    }

    return { canMerge: true };
}

/**
 * Process the next item in the merge queue
 * Uses distributed lock to prevent concurrent processing
 */
export async function processNextInQueue(repositoryId: string): Promise<{
    processed: boolean;
    entry?: typeof schema.mergeQueue.$inferSelect;
    reason?: string;
}> {
    const lockKey = `merge-queue:process:${repositoryId}`;

    return withLock(lockKey, async () => {
        const db = getDatabase() as NodePgDatabase<typeof schema>;

        // Get next item to process
        const nextItem = await db.query.mergeQueue.findFirst({
            where: and(
                eq(schema.mergeQueue.repositoryId, repositoryId),
                eq(schema.mergeQueue.status, "pending")
            ),
            orderBy: [desc(schema.mergeQueue.priority), asc(schema.mergeQueue.position)],
        });

        if (!nextItem) {
            return { processed: false, reason: "Queue is empty" };
        }

        // Check if it can be merged
        const mergeCheck = await canMerge(nextItem.pullRequestId);

        if (!mergeCheck.canMerge) {
            // Skip this item and try next
            await db.update(schema.mergeQueue)
                .set({ status: "failed", failureReason: mergeCheck.reason })
                .where(eq(schema.mergeQueue.id, nextItem.id));

            return { processed: false, entry: nextItem, reason: mergeCheck.reason };
        }

        // Get the PR and repo
        const pr = await db.query.pullRequests.findFirst({
            where: eq(schema.pullRequests.id, nextItem.pullRequestId),
        });

        const repo = await db.query.repositories.findFirst({
            where: eq(schema.repositories.id, repositoryId),
            with: { owner: true }
        });

        if (!pr || !repo) {
            await db.update(schema.mergeQueue)
                .set({ status: "failed", failureReason: "PR or repo not found" })
                .where(eq(schema.mergeQueue.id, nextItem.id));
            return { processed: false, entry: nextItem, reason: "PR or repo not found" };
        }

            const prAuthor = await db.query.users.findFirst({
                where: eq(schema.users.id, pr.authorId)
            });
            const mergedById = nextItem.addedById || pr.authorId;
            const mergedByUser = await db.query.users.findFirst({
                where: eq(schema.users.id, mergedById)
            });

        // Mark as merging
        await db.update(schema.mergeQueue)
            .set({
                status: "merging",
                startedAt: new Date()
            })
            .where(eq(schema.mergeQueue.id, nextItem.id));

        try {
            // Import git merge function
            const { mergeBranch, deleteBranch } = await import("./git");
            const localRepoPath = await resolveRepoPath(repo.diskPath);

            // Perform the actual merge
            const mergeResult = await mergeBranch(
                localRepoPath,
                pr.baseBranch,
                pr.headBranch,
                `Merge pull request #${pr.number} from ${pr.headBranch}\n\n${pr.title}`
            );

            if (!mergeResult.success) {
                // Merge failed
                await db.update(schema.mergeQueue)
                    .set({
                        status: "failed",
                        failureReason: mergeResult.message,
                        completedAt: new Date()
                    })
                    .where(eq(schema.mergeQueue.id, nextItem.id));

                return { processed: false, entry: nextItem, reason: mergeResult.message };
            }

            // Update PR status
            await db.update(schema.pullRequests)
                .set({
                    state: "merged",
                    isMerged: true, // Keep this as it's a separate flag
                    mergedAt: new Date(),
                    mergedById,
                    mergeCommitSha: mergeResult.sha, // Assuming mergeResult.sha contains the merge commit SHA
                    mergeSha: mergeResult.sha,
                    mergeMethod: nextItem.mergeMethod || "merge",
                    updatedAt: new Date()
                })
                .where(eq(schema.pullRequests.id, pr.id));

            try {
                const stackInfo = await getStackForPr(pr.id);
                if (stackInfo) {
                    const remaining = stackInfo.entries.filter(
                        (entry) => entry.pr.state === "open" && entry.entry.stackOrder > (stackInfo.entries.find(e => e.pr.id === pr.id)?.entry.stackOrder || 0)
                    );

                    if (remaining.length > 0) {
                        const { autoUpdateStack } = await import("./stack-rebase");
                        await autoUpdateStack(stackInfo.stack.id);
                    }
                }
            } catch (e) {
                logger.warn({ error: e, prId: pr.id }, "Failed to auto-update stack after merge");
            }

            try {
                const { closeLinkedIssuesOnMerge } = await import("./pr-issue-linking");
                await closeLinkedIssuesOnMerge(pr.id, mergedById);
            } catch (e) {
                logger.error({ error: e, prId: pr.id }, "Failed to close linked issues on merge");
            }

            // Delete the head branch if requested
            if (nextItem.deleteOnMerge) {
                try {
                    await deleteBranch(localRepoPath, pr.headBranch);
                } catch (e) {
                    // Branch deletion is optional, don't fail the merge
                }
            }

            await recordPrMetrics(pr.id);

            // Trigger Webhooks
            try {
                const { triggerWebhooks } = await import("./webhooks");
                await triggerWebhooks(repositoryId, "pull_request", {
                    action: "closed",
                    pull_request: {
                        id: pr.id,
                        number: pr.number,
                        state: "merged",
                        merged: true,
                        title: pr.title,
                        user: { login: mergedByUser?.username || prAuthor?.username || "unknown" },
                        head: { ref: pr.headBranch, sha: mergeResult.sha }, // Approximate
                        base: { ref: pr.baseBranch },
                    },
                    repository: {
                        id: repositoryId,
                        name: repo.name,
                        owner: { login: repo.owner.username }
                    }
                });
            } catch (e) {
                console.error("Failed to trigger webhook", e);
            }

            // Mark queue item as completed
            await db.update(schema.mergeQueue)
                .set({
                    status: "merged",
                    completedAt: new Date()
                })
                .where(eq(schema.mergeQueue.id, nextItem.id));

            // Update queue positions
            await updateQueuePositions(repositoryId);

            return { processed: true, entry: nextItem };

        } catch (error: any) {
            // Handle unexpected errors
            await db.update(schema.mergeQueue)
                .set({
                    status: "failed",
                    failureReason: error.message || "Unexpected error",
                    completedAt: new Date()
                })
                .where(eq(schema.mergeQueue.id, nextItem.id));

            return { processed: false, entry: nextItem, reason: error.message };
        }
    }, { ttlSeconds: 120, retryCount: 3 }); // Longer TTL for merge operations
}

/**
 * Update queue positions after a merge
 */
export async function updateQueuePositions(repositoryId: string): Promise<void> {
    const db = getDatabase() as NodePgDatabase<typeof schema>;

    const items = await db.query.mergeQueue.findMany({
        where: and(
            eq(schema.mergeQueue.repositoryId, repositoryId),
            eq(schema.mergeQueue.status, "pending")
        ),
        orderBy: [desc(schema.mergeQueue.priority), asc(schema.mergeQueue.position)],
    });

    for (let i = 0; i < items.length; i++) {
        await db.update(schema.mergeQueue)
            .set({ position: i + 1 })
            .where(eq(schema.mergeQueue.id, items[i].id));
    }
}

/**
 * Get estimated merge time based on queue position and average CI time
 */
export function estimateMergeTime(
    position: number,
    avgCiTimeMinutes: number = 10
): Date {
    const now = new Date();
    const estimatedMinutes = position * avgCiTimeMinutes;
    return new Date(now.getTime() + estimatedMinutes * 60 * 1000);
}

/**
 * Reprioritize a queue item
 */
export async function updateQueuePriority(
    entryId: string,
    newPriority: number
): Promise<void> {
    const db = getDatabase() as NodePgDatabase<typeof schema>;

    await db.update(schema.mergeQueue)
        .set({ priority: newPriority })
        .where(eq(schema.mergeQueue.id, entryId));
}