@link-assistant/hive-mind 2.11.13 → 2.12.1

package/src/telegram-merge-queue.lib.mjs

@@ -15,14 +15,12 @@
  *
  * @see https://github.com/link-assistant/hive-mind/issues/1143
  */
-
 import { getAllReadyPRs, checkPRCIStatus, checkPRMergeable, mergePullRequest, waitForCI, ensureReadyLabel, waitForBranchCI, getDefaultBranch, waitForCommitCI, checkBranchCIHealth, getMergeCommitSha, getPRStatus, syncReadyTags, closeLinkedIssueIfNotAutoClosed } from './github-merge.lib.mjs';
 import { resolveMergeTargetItems } from './github-merge-targets.lib.mjs';
 import { waitForPRReady as waitForPRReadyHelper } from './telegram-merge-wait.lib.mjs';
 import { mergeQueue as mergeQueueConfig } from './config.lib.mjs';
 import { getProgressBar } from './limits.lib.mjs';
 import { cancellableSleep as cancellableSleepUntil } from './interruptible-sleep.lib.mjs';
-
 /**
  * Status enum for merge queue operations
  */
@@ -34,7 +32,6 @@ export const MergeStatus = {
   FAILED: 'failed',
   CANCELLED: 'cancelled',
 };
-
 /**
  * Status enum for individual merge items
  */
@@ -48,14 +45,10 @@ export const MergeItemStatus = {
   MERGED: 'merged',
   FAILED: 'failed',
   SKIPPED: 'skipped',
-  // Issue #1805: states reached during the post-queue `--auto-resolve` pass.
-  // RESOLVING is set while a `/solve <pr> --auto-merge` session is being
-  // spawned for a previously-skipped PR; RESOLVE_FAILED records that the
-  // spawn (or the resolution itself) didn't succeed.
+  // Issue #1805: states reached during the post-queue `--auto-resolve` pass. RESOLVING is set while a `/solve <pr> --auto-merge` session is being spawned for a previously-skipped PR; RESOLVE_FAILED records that the spawn (or the resolution itself) didn't succeed.
   RESOLVING: 'resolving',
   RESOLVE_FAILED: 'resolve_failed',
 };
-
 /**
  * Marker that identifies SKIPPED items that the auto-resolve pass should
  * pick up. The same string is returned by `checkPRMergeable()` for
@@ -65,7 +58,6 @@ export const MergeItemStatus = {
  * @see https://github.com/link-assistant/hive-mind/issues/1805
  */
 export const MERGE_CONFLICT_SKIP_REASON = 'PR has merge conflicts';
-
 /**
  * Configuration for merge queue operations
  * Values are loaded from config.lib.mjs which supports environment variable overrides.
@@ -81,39 +73,28 @@ export const MERGE_QUEUE_CONFIG = {
   // CI/CD wait settings - check every 5 minutes per issue #1143 feedback
   CI_POLL_INTERVAL_MS: mergeQueueConfig.ciPollIntervalMs,
   CI_TIMEOUT_MS: mergeQueueConfig.ciTimeoutMs,
-
   // Post-merge wait settings
   POST_MERGE_WAIT_MS: mergeQueueConfig.postMergeWaitMs,
-
   // Telegram message update interval - same as CI polling
   MESSAGE_UPDATE_INTERVAL_MS: mergeQueueConfig.ciPollIntervalMs,
-
   // Maximum PRs to process in one session (configurable, default 10)
   MAX_PRS_PER_SESSION: mergeQueueConfig.maxPrsPerSession,
-
-  // Merge method: 'merge', 'squash', or 'rebase' (Issue #1269)
-  // gh pr merge requires explicit method when running non-interactively
+  // Merge method: 'merge', 'squash', or 'rebase' (Issue #1269) gh pr merge requires explicit method when running non-interactively
   MERGE_METHOD: mergeQueueConfig.mergeMethod,
-
   // Issue #1307: Wait for target branch CI before first merge
   WAIT_FOR_TARGET_BRANCH_CI: mergeQueueConfig.waitForTargetBranchCI,
   TARGET_BRANCH_CI_TIMEOUT_MS: mergeQueueConfig.targetBranchCITimeoutMs,
   TARGET_BRANCH_CI_POLL_INTERVAL_MS: mergeQueueConfig.targetBranchCIPollIntervalMs,
-
   // Issue #1341: Wait for post-merge CI to complete before merging next PR
   WAIT_FOR_POST_MERGE_CI: mergeQueueConfig.waitForPostMergeCI,
   STOP_ON_POST_MERGE_CI_FAILURE: mergeQueueConfig.stopOnPostMergeCIFailure,
   CHECK_BRANCH_CI_HEALTH_BEFORE_START: mergeQueueConfig.checkBranchCIHealthBeforeStart,
   POST_MERGE_CI_TIMEOUT_MS: mergeQueueConfig.postMergeCITimeoutMs,
   POST_MERGE_CI_POLL_INTERVAL_MS: mergeQueueConfig.postMergeCIPollIntervalMs,
-
-  // Issue #1807: Sequential auto-resolve — wait for each `/solve --auto-merge`
-  // session to land its PR (or fail) before spawning the next one. These
-  // timeouts apply to the polling loop in `waitForAutoResolveCompletion`.
+  // Issue #1807: Sequential auto-resolve — wait for each `/solve --auto-merge` session to land its PR (or fail) before spawning the next one. These timeouts apply to the polling loop in `waitForAutoResolveCompletion`.
   AUTO_RESOLVE_WAIT_TIMEOUT_MS: mergeQueueConfig.autoResolveWaitTimeoutMs,
   AUTO_RESOLVE_POLL_INTERVAL_MS: mergeQueueConfig.autoResolvePollIntervalMs,
 };
-
 /**
  * Merge queue item representing a PR to merge
  */
@@ -130,7 +111,6 @@ class MergeQueueItem {
     // Issue #1341: Track merge commit SHA for post-merge CI waiting
     this.mergeCommitSha = null;
   }
-
   /**
    * Get a display-friendly description
    */
@@ -138,7 +118,6 @@ class MergeQueueItem {
     const issueRef = this.issue ? ` (Issue #${this.issue.number})` : '';
     return `PR #${this.pr.number}: ${this.pr.title}${issueRef}`;
   }
-
   /**
    * Get emoji for current status
    */
@@ -172,7 +151,6 @@ class MergeQueueItem {
     }
   }
 }
-
 /**
  * Merge Queue Processor
  * Handles sequential merging of PRs with CI/CD monitoring
@@ -193,7 +171,6 @@ export class MergeQueueProcessor {
     this.spawnSolveSession = typeof options.spawnSolveSession === 'function' ? options.spawnSolveSession : null;
     this.target = options.target || { mode: 'repository', owner: this.owner, repo: this.repo, url: `https://github.com/${this.owner}/${this.repo}` };
     this.waitForUnfinished = options.waitForUnfinished !== false;
-
     // State
     this.items = [];
     this.currentIndex = 0;
@@ -227,7 +204,6 @@ export class MergeQueueProcessor {
     this.getAllReadyPRs = typeof options.getAllReadyPRs === 'function' ? options.getAllReadyPRs : getAllReadyPRs;
     this.targetItemsTimeoutMs = options.targetItemsTimeoutMs ?? MERGE_QUEUE_CONFIG.CI_TIMEOUT_MS;
     this.targetItemsPollIntervalMs = options.targetItemsPollIntervalMs ?? MERGE_QUEUE_CONFIG.CI_POLL_INTERVAL_MS;
-
     // Statistics
     this.stats = {
       total: 0,
@@ -241,7 +217,6 @@ export class MergeQueueProcessor {
       autoResolveFailed: 0,
     };
   }
-
   /**
    * Log message if verbose mode is enabled
    */
@@ -250,7 +225,6 @@ export class MergeQueueProcessor {
       console.log(`[VERBOSE] /merge-queue: ${message}`);
     }
   }
-
   /**
    * Initialize the merge queue by fetching ready PRs
    * @returns {Promise<{success: boolean, error: string|null}>}
@@ -258,7 +232,6 @@ export class MergeQueueProcessor {
   async initialize() {
     try {
       this.log(`Initializing merge queue for ${this.owner}/${this.repo}`);
-
       // Ensure ready label exists
       const labelResult = await this.ensureReadyLabel(this.owner, this.repo, this.verbose);
       if (!labelResult.success) {
@@ -267,7 +240,6 @@ export class MergeQueueProcessor {
       if (labelResult.created) {
         this.log("Created 'ready' label in repository");
       }
-
       let readyPRs;
       if (this.target?.mode && this.target.mode !== 'repository') {
         readyPRs = await this.resolveMergeTargetItemsWithWait();
@@ -281,25 +253,19 @@ export class MergeQueueProcessor {
         if (syncResult.errors > 0) {
           this.log(`Tag sync had ${syncResult.errors} error(s) (non-fatal, proceeding)`);
         }
-
         // Fetch all ready PRs
         readyPRs = await this.getAllReadyPRs(this.owner, this.repo, this.verbose);
       }
-
       if (readyPRs.length === 0) {
         const message = this.target?.mode === 'issue' ? `No open PRs linked to issue #${this.target.issueNumber} found` : this.target?.mode === 'pull' ? `Pull request #${this.target.prNumber} was not found` : "No PRs with 'ready' label found";
         return { success: true, error: null, message };
       }
-
       // Limit to max PRs per session
       const limitedPRs = readyPRs.slice(0, MERGE_QUEUE_CONFIG.MAX_PRS_PER_SESSION);
-
       // Create queue items
       this.items = limitedPRs.map(pr => new MergeQueueItem(pr));
       this.stats.total = this.items.length;
-
       this.log(`Initialized with ${this.items.length} PRs to merge`);
-
       return {
         success: true,
         error: null,
@@ -312,7 +278,6 @@ export class MergeQueueProcessor {
       return { success: false, error: error.message };
     }
   }
-
   /**
    * Start processing the merge queue
    * @returns {Promise<{success: boolean, stats: Object, error: string|null}>}
@@ -321,15 +286,12 @@ export class MergeQueueProcessor {
     if (this.status === MergeStatus.RUNNING) {
       return { success: false, stats: this.stats, error: 'Queue is already running' };
     }
-
     if (this.items.length === 0) {
       return { success: true, stats: this.stats, error: null };
     }
-
     this.status = MergeStatus.RUNNING;
     this.startedAt = new Date();
     this.isCancelled = false;
-
     try {
       // Issue #1341: Check if the default branch has any failed CI runs before starting
       // This prevents merging on top of a broken branch
@@ -341,11 +303,9 @@ export class MergeQueueProcessor {
           this.completedAt = new Date();
           // Store the failed runs for the error report
           this.branchCIFailedRuns = healthCheckResult.failedRuns;
-
           if (this.onError) {
             await this.onError(new Error(healthCheckResult.error));
           }
-
           return {
             success: false,
             stats: this.stats,
@@ -353,34 +313,28 @@ export class MergeQueueProcessor {
           };
         }
       }
-
       // Issue #1307: Wait for any active CI runs on the target branch before processing
       // This prevents merging while post-merge CI from previous merges is still running
       if (MERGE_QUEUE_CONFIG.WAIT_FOR_TARGET_BRANCH_CI) {
         await this.waitForTargetBranchCI();
       }
-
       // Process each PR sequentially
       for (this.currentIndex = 0; this.currentIndex < this.items.length; this.currentIndex++) {
         if (this.isCancelled) {
           this.status = MergeStatus.CANCELLED;
           break;
         }
-
         const item = this.items[this.currentIndex];
         await this.processItem(item);
-
         // Report progress
         if (this.onProgress) {
           await this.onProgress(this.getProgressUpdate());
         }
-
         // Issue #1341: If merged successfully, wait for post-merge CI to complete
         // This ensures each PR's CI completes (including releases) before merging the next
         if (item.status === MergeItemStatus.MERGED && this.currentIndex < this.items.length - 1) {
           if (MERGE_QUEUE_CONFIG.WAIT_FOR_POST_MERGE_CI && item.mergeCommitSha) {
             const postMergeCIResult = await this.waitForPostMergeCI(item);
-
             // Issue #1341: Stop the queue if post-merge CI failed
             if (!postMergeCIResult.success && MERGE_QUEUE_CONFIG.STOP_ON_POST_MERGE_CI_FAILURE) {
               this.status = MergeStatus.FAILED;
@@ -388,11 +342,9 @@ export class MergeQueueProcessor {
               this.completedAt = new Date();
               // Store the failed runs for the error report
               this.postMergeCIFailedRuns = postMergeCIResult.failedRuns;
-
               if (this.onError) {
                 await this.onError(new Error(postMergeCIResult.error));
               }
-
               return {
                 success: false,
                 stats: this.stats,
@@ -406,7 +358,6 @@ export class MergeQueueProcessor {
           }
         }
       }
-
       // Issue #1805: After the normal queue settles, optionally hand off
       // every PR that was SKIPPED with a merge-conflict reason to the
       // `/solve <pr> --auto-merge` flow. This lets a single `/merge`
@@ -415,14 +366,11 @@ export class MergeQueueProcessor {
       if (this.autoResolve && !this.isCancelled) {
         await this.runAutoResolve();
       }
-
       this.completedAt = new Date();
       this.status = this.isCancelled ? MergeStatus.CANCELLED : MergeStatus.COMPLETED;
-
       if (this.onComplete) {
         await this.onComplete(this.getFinalReport());
       }
-
       return {
         success: true,
         stats: this.stats,
@@ -432,11 +380,9 @@ export class MergeQueueProcessor {
       this.status = MergeStatus.FAILED;
       this.error = error.message;
       this.completedAt = new Date();
-
       if (this.onError) {
         await this.onError(error);
       }
-
       return {
         success: false,
         stats: this.stats,
@@ -444,7 +390,6 @@ export class MergeQueueProcessor {
       };
     }
   }
-
   /**
    * Resolve targeted PR data, waiting for issue-linked PRs that may be created
    * shortly after a replied `/codex <issue>` message.
@@ -454,28 +399,22 @@ export class MergeQueueProcessor {
   async resolveMergeTargetItemsWithWait() {
     const maxPollInterval = Math.max(1, this.targetItemsPollIntervalMs || 1);
     const maxAttempts = Math.max(1, Math.ceil((this.targetItemsTimeoutMs || 0) / maxPollInterval));
-
     for (let attempt = 0; attempt <= maxAttempts; attempt++) {
       if (this.isCancelled) {
         return [];
       }
-
       const items = (await this.resolveMergeTargetItems(this.target, this.verbose)) || [];
       if (items.length > 0 || this.target?.mode !== 'issue') {
         return items;
       }
-
       if (attempt === maxAttempts) {
         return [];
       }
-
       this.log(`Waiting for a linked PR to appear for issue #${this.target.issueNumber}`);
       await this.sleep(this.targetItemsPollIntervalMs);
     }
-
     return [];
   }
-
   async waitForPRReady(item, initialCheck) {
     return waitForPRReadyHelper(this, item, initialCheck, {
       MergeItemStatus,
@@ -484,7 +423,6 @@ export class MergeQueueProcessor {
       pollIntervalMs: MERGE_QUEUE_CONFIG.CI_POLL_INTERVAL_MS,
     });
   }
-
   /**
    * Process a single merge queue item
    * @param {MergeQueueItem} item
@@ -492,13 +430,11 @@ export class MergeQueueProcessor {
   async processItem(item) {
     this.log(`Processing ${item.getDescription()}`);
     item.startedAt = new Date();
-
     try {
       // Step 1: Check if PR is mergeable
       item.status = MergeItemStatus.CHECKING_CI;
       // Issue #2072: pass cancellation down so the UNKNOWN-mergeability retry delay aborts early
       const mergeableCheck = await this.checkPRMergeable(this.owner, this.repo, item.pr.number, this.verbose, { isCancelled: () => this.isCancelled });
-
       // Issue #2072: a cancel during the mergeability check must skip the PR, not fail it.
       if (mergeableCheck.cancelled || this.isCancelled) {
         item.status = MergeItemStatus.SKIPPED;
@@ -507,7 +443,6 @@ export class MergeQueueProcessor {
         this.log(`Skipped PR #${item.pr.number}: cancelled during mergeability check`);
         return;
       }
-
       if (mergeableCheck.terminal) {
         item.status = MergeItemStatus.FAILED;
         item.error = mergeableCheck.reason || 'GitHub repository, pull request, issue, or branch is no longer accessible';
@@ -515,7 +450,6 @@ export class MergeQueueProcessor {
         this.log(`Failed PR #${item.pr.number}: ${item.error}`);
         return;
       }
-
       if (!mergeableCheck.mergeable) {
         if (!this.waitForUnfinished || mergeableCheck.reason === MERGE_CONFLICT_SKIP_REASON) {
           item.status = MergeItemStatus.SKIPPED;
@@ -524,7 +458,6 @@ export class MergeQueueProcessor {
           this.log(`Skipped PR #${item.pr.number}: ${mergeableCheck.reason}`);
           return;
         }
-
         const waitForReadyResult = await this.waitForPRReady(item, mergeableCheck);
         if (!waitForReadyResult.success) {
           if (waitForReadyResult.status === 'cancelled' || waitForReadyResult.status === 'conflict') {
@@ -534,7 +467,6 @@ export class MergeQueueProcessor {
             this.log(`Skipped PR #${item.pr.number}: ${waitForReadyResult.error}`);
             return;
           }
-
           item.status = MergeItemStatus.FAILED;
           item.error = waitForReadyResult.error;
           this.stats.failed++;
@@ -542,11 +474,9 @@ export class MergeQueueProcessor {
           return;
         }
       }
-
       // Step 2: Check CI status
       const ciStatus = await this.checkPRCIStatus(this.owner, this.repo, item.pr.number, this.verbose);
       item.ciStatus = ciStatus;
-
       if (ciStatus.status === 'failure') {
         item.status = MergeItemStatus.FAILED;
         item.error = 'CI checks failed';
@@ -554,7 +484,6 @@ export class MergeQueueProcessor {
         this.log(`Failed PR #${item.pr.number}: CI checks failed`);
         return;
       }
-
       if (ciStatus.status === 'terminal_github_entity_error') {
         item.status = MergeItemStatus.FAILED;
         item.error = ciStatus.error || 'GitHub repository, pull request, issue, or branch is no longer accessible';
@@ -562,11 +491,9 @@ export class MergeQueueProcessor {
         this.log(`Failed PR #${item.pr.number}: ${item.error}`);
         return;
       }
-
       // Step 3: Wait for CI if pending
       if (ciStatus.status === 'pending') {
         item.status = MergeItemStatus.WAITING_CI;
-
         const waitResult = await this.waitForCI(
           this.owner,
           this.repo,
@@ -585,7 +512,6 @@ export class MergeQueueProcessor {
           },
           this.verbose
         );
-
         if (!waitResult.success) {
           // Issue #1407: If cancelled during CI wait, mark as skipped (not failed)
           // so the queue can cleanly stop without misleading failure statistics
@@ -603,12 +529,10 @@ export class MergeQueueProcessor {
           return;
         }
       }
-
       // Step 4: Merge the PR
       // Issue #1269: Pass the configured merge method to prevent "not running interactively" error
       item.status = MergeItemStatus.MERGING;
       const mergeResult = await this.mergePullRequest(this.owner, this.repo, item.pr.number, { mergeMethod: MERGE_QUEUE_CONFIG.MERGE_METHOD }, this.verbose);
-
       if (!mergeResult.success) {
         item.status = MergeItemStatus.FAILED;
         item.error = mergeResult.error;
@@ -616,13 +540,11 @@ export class MergeQueueProcessor {
         this.log(`Failed to merge PR #${item.pr.number}: ${mergeResult.error}`);
         return;
       }
-
       // Success!
       item.status = MergeItemStatus.MERGED;
       item.completedAt = new Date();
       this.stats.merged++;
       this.log(`Successfully merged PR #${item.pr.number}`);
-
       // Issue #1895: GitHub does not auto-close linked issues for PRs merged into
       // a non-default branch. Close the linked issue explicitly in that case.
       try {
@@ -633,7 +555,6 @@ export class MergeQueueProcessor {
       } catch (closeError) {
         this.log(`Could not close linked issue for PR #${item.pr.number}: ${closeError.message}`);
       }
-
       // Issue #1341: Get the merge commit SHA for post-merge CI tracking
       // Need a small delay to allow GitHub to update the PR state
       await this.sleep(5000);
@@ -657,7 +578,6 @@ export class MergeQueueProcessor {
       this.log(`Error processing PR #${item.pr.number}: ${error.message}`);
     }
   }
-
   /**
    * Cancel the merge queue operation
    */
@@ -665,7 +585,6 @@ export class MergeQueueProcessor {
     this.isCancelled = true;
     this.log('Cancellation requested');
   }
-
   /**
    * Issue #1805: Return queue items that were skipped because of merge
    * conflicts. These are the candidates the auto-resolve pass hands off
@@ -676,7 +595,6 @@ export class MergeQueueProcessor {
   getConflictedItems() {
     return this.items.filter(item => item.status === MergeItemStatus.SKIPPED && item.error === MERGE_CONFLICT_SKIP_REASON);
   }
-
   /**
    * Issue #1805 / #1807: Iterate every conflict-skipped item and hand it off
    * to a `/solve <pr-url> --auto-merge` session via the injected
@@ -698,7 +616,6 @@ export class MergeQueueProcessor {
       this.log('Auto-resolve: no merge-conflict skips to process');
       return;
     }
-
     if (!this.spawnSolveSession) {
       // Guard against misconfiguration — the queue can't resolve without a
       // spawner. Surface this to the user via the same channel as other
@@ -714,7 +631,6 @@ export class MergeQueueProcessor {
       }
       return;
     }
-
     this.autoResolveActive = true;
     this.log(`Auto-resolve: dispatching ${conflicted.length} conflict PR(s) sequentially to /solve --auto-merge`);
     try {
@@ -723,7 +639,6 @@ export class MergeQueueProcessor {
           this.log('Auto-resolve: cancelled mid-pass');
           break;
         }
-
         item.status = MergeItemStatus.RESOLVING;
         this.autoResolveCurrent = item.pr.number;
         this.autoResolvePhase = 'spawning';
@@ -731,7 +646,6 @@ export class MergeQueueProcessor {
         if (this.onProgress) {
           await this.onProgress(this.getProgressUpdate());
         }
-
         // Step 1 — spawn the solve session.
         let spawned = false;
         try {
@@ -742,7 +656,6 @@ export class MergeQueueProcessor {
             prNumber: item.pr.number,
             title: item.pr.title,
           });
-
           if (result && result.success) {
             item.autoResolveSession = result.sessionName || result.session || null;
             this.log(`Auto-resolve: spawned solve session for PR #${item.pr.number}${item.autoResolveSession ? ` (session ${item.autoResolveSession})` : ''}`);
@@ -759,7 +672,6 @@ export class MergeQueueProcessor {
           this.stats.autoResolveFailed++;
           console.error(`[ERROR] /merge-queue: auto-resolve error for PR #${item.pr.number}: ${item.autoResolveError}`);
         }
-
         if (!spawned) {
           this.autoResolvePhase = null;
           this.autoResolveWaitStartedAt = null;
@@ -768,7 +680,6 @@ export class MergeQueueProcessor {
           }
           continue;
         }
-
         // Step 2 — wait for the spawned session to actually land (or fail)
         // before starting the next one. This is the heart of issue #1807.
         this.autoResolvePhase = 'awaiting-resolution';
@@ -776,9 +687,7 @@ export class MergeQueueProcessor {
         if (this.onProgress) {
           await this.onProgress(this.getProgressUpdate());
         }
-
         const waitResult = await this.waitForAutoResolveCompletion(item);
-
         if (waitResult.outcome === 'merged') {
           // Treat the PR as merged for accounting purposes. We bump the
           // dedicated `autoResolved` counter (kept for backwards-compat with
@@ -794,7 +703,6 @@ export class MergeQueueProcessor {
           // we don't double-count it.
           if (this.stats.skipped > 0) this.stats.skipped--;
           this.log(`Auto-resolve: PR #${item.pr.number} merged by solve session`);
-
           // Best-effort: capture the merge commit SHA so post-merge CI wait
           // has something to poll on.
           try {
@@ -806,7 +714,6 @@ export class MergeQueueProcessor {
           } catch (error) {
             this.log(`Auto-resolve: could not get merge commit SHA for PR #${item.pr.number}: ${error.message}`);
           }
-
           // Step 3 — drain the merged PR's CI before continuing. We reuse
           // the same `waitForPostMergeCI` path the main loop already uses so
           // release workflows finish before the next resolution starts.
@@ -848,7 +755,6 @@ export class MergeQueueProcessor {
           this.stats.autoResolveFailed++;
           this.log(`Auto-resolve: error waiting for PR #${item.pr.number}: ${item.autoResolveError}`);
         }
-
         this.autoResolvePhase = null;
         this.autoResolveWaitStartedAt = null;
         if (this.onProgress) {
@@ -862,7 +768,6 @@ export class MergeQueueProcessor {
       this.autoResolveWaitStartedAt = null;
     }
   }
-
   /**
    * Issue #1807: Poll the PR's lifecycle state until the spawned solve
    * session either lands (MERGED), gives up (CLOSED without merge), or the
@@ -887,14 +792,11 @@ export class MergeQueueProcessor {
     const startTime = Date.now();
     let consecutiveErrors = 0;
     const MAX_CONSECUTIVE_ERRORS = 5;
-
     this.log(`Auto-resolve: polling PR #${item.pr.number} until merged/closed (timeout=${Math.round(timeout / 60000)}m, poll=${Math.round(pollInterval / 1000)}s)`);
-
     while (Date.now() - startTime < timeout) {
       if (this.isCancelled) {
         return { outcome: 'cancelled' };
       }
-
       let status;
       try {
         status = await this.getPRStatus(this.owner, this.repo, item.pr.number, this.verbose);
@@ -907,7 +809,6 @@ export class MergeQueueProcessor {
         await this.sleep(pollInterval);
         continue;
       }
-
       if (status && !status.error) {
         consecutiveErrors = 0;
         if (status.state === 'MERGED') {
@@ -922,13 +823,10 @@ export class MergeQueueProcessor {
           return { outcome: 'error', error: status.error };
         }
       }
-
       await this.sleep(pollInterval);
     }
-
     return { outcome: 'timeout' };
   }
-
   /**
    * Wait for any active CI runs on the target branch to complete
    * Issue #1307: Prevents merging while post-merge CI from previous merges is still running
@@ -938,12 +836,10 @@ export class MergeQueueProcessor {
     // Track if we're waiting for CI (for progress updates)
     this.waitingForTargetBranchCI = true;
     this.targetBranchCIStatus = null;
-
     try {
       // Get the default branch (usually 'main' or 'master')
       const targetBranch = await getDefaultBranch(this.owner, this.repo, this.verbose);
       this.log(`Checking for active CI runs on ${targetBranch} branch before processing queue...`);
-
       const waitResult = await waitForBranchCI(
         this.owner,
         this.repo,
@@ -953,7 +849,6 @@ export class MergeQueueProcessor {
           pollInterval: MERGE_QUEUE_CONFIG.TARGET_BRANCH_CI_POLL_INTERVAL_MS,
           onStatusUpdate: async status => {
             this.targetBranchCIStatus = status;
-
             // Report progress while waiting
             if (this.onProgress) {
               await this.onProgress(this.getProgressUpdate());
@@ -964,7 +859,6 @@ export class MergeQueueProcessor {
         },
         this.verbose
       );
-
       if (!waitResult.success) {
         // Log warning but don't fail - proceed with merge anyway
         console.warn(`[WARN] /merge-queue: ${waitResult.error}. Proceeding with merge anyway.`);
@@ -978,7 +872,6 @@ export class MergeQueueProcessor {
       this.targetBranchCIStatus = null;
     }
   }
-
   /**
    * Check if the default branch has any failed CI runs before starting the queue
    * Issue #1341: Prevents merging on top of a broken branch
@@ -988,9 +881,7 @@ export class MergeQueueProcessor {
     try {
       const targetBranch = await getDefaultBranch(this.owner, this.repo, this.verbose);
       this.log(`Checking CI health on ${targetBranch} branch before starting queue...`);
-
       const healthResult = await checkBranchCIHealth(this.owner, this.repo, targetBranch, {}, this.verbose);
-
       if (!healthResult.healthy) {
         this.log(`Branch ${targetBranch} has ${healthResult.failedRuns.length} failed CI run(s)`);
         return {
@@ -999,7 +890,6 @@ export class MergeQueueProcessor {
           error: `Cannot start merge queue: ${healthResult.error}. Please fix the CI failures first.`,
         };
       }
-
       // Issue #1425: If the latest commit's CI is still in progress, wait for it to complete
       // rather than proceeding immediately. The WAIT_FOR_TARGET_BRANCH_CI step (below) will
       // also wait, but checking here ensures we don't skip the health check entirely.
@@ -1012,7 +902,6 @@ export class MergeQueueProcessor {
           error: null,
         };
       }
-
       this.log(`Branch ${targetBranch} CI is healthy. Ready to proceed.`);
       return {
         healthy: true,
@@ -1029,7 +918,6 @@ export class MergeQueueProcessor {
       };
     }
   }
-
   /**
    * Wait for post-merge CI to complete for a merged PR
    * Issue #1341: Ensures each PR's CI completes (including releases) before merging the next
@@ -1041,15 +929,12 @@ export class MergeQueueProcessor {
       this.log(`No merge commit SHA available for PR #${item.pr.number}, skipping post-merge CI wait`);
       return { success: true, failedRuns: [], error: null };
     }
-
     // Track that we're waiting for post-merge CI (for progress updates)
     this.waitingForPostMergeCI = true;
     this.postMergeCIStatus = null;
     this.currentPostMergePR = item.pr.number;
-
     try {
       this.log(`Waiting for post-merge CI on commit ${item.mergeCommitSha.substring(0, 7)} (PR #${item.pr.number})...`);
-
       const waitResult = await waitForCommitCI(
         this.owner,
         this.repo,
@@ -1059,7 +944,6 @@ export class MergeQueueProcessor {
           pollInterval: MERGE_QUEUE_CONFIG.POST_MERGE_CI_POLL_INTERVAL_MS,
           onStatusUpdate: async status => {
             this.postMergeCIStatus = status;
-
             // Report progress while waiting
             if (this.onProgress) {
               await this.onProgress(this.getProgressUpdate());
@@ -1070,7 +954,6 @@ export class MergeQueueProcessor {
         },
         this.verbose
       );
-
       if (waitResult.success) {
         if (waitResult.status === 'no_runs') {
           this.log(`No CI runs found for merge commit ${item.mergeCommitSha.substring(0, 7)}. Proceeding.`);
@@ -1092,14 +975,12 @@ export class MergeQueueProcessor {
       this.currentPostMergePR = null;
     }
   }
-
   /**
    * Get current progress update
    */
   getProgressUpdate() {
     const currentItem = this.items[this.currentIndex];
     const processed = this.stats.merged + this.stats.failed + this.stats.skipped;
-
     return {
       status: this.status,
       current: currentItem ? currentItem.getDescription() : null,
@@ -1138,13 +1019,11 @@ export class MergeQueueProcessor {
       })),
     };
   }
-
   /**
    * Get final report
    */
   getFinalReport() {
     const duration = this.completedAt && this.startedAt ? Math.round((this.completedAt - this.startedAt) / 1000) : 0;
-
     return {
       status: this.status,
       duration: `${Math.floor(duration / 60)}m ${duration % 60}s`,
@@ -1170,7 +1049,6 @@ export class MergeQueueProcessor {
       })),
     };
   }
-
   /**
    * Format a Telegram message for the current progress
    * Progress bar is rendered in a code block for better style (per issue #1143)
@@ -1178,29 +1056,24 @@ export class MergeQueueProcessor {
    */
   formatProgressMessage() {
     const update = this.getProgressUpdate();
-
     let message = `*Merge Queue*\n`;
     // Issue #1292: Escape owner/repo for MarkdownV2 (may contain hyphens, underscores, etc.)
     message += `${this.escapeMarkdown(this.owner)}/${this.escapeMarkdown(this.repo)}\n\n`;
-
     // Progress bar in code block for better style
     const progressBar = getProgressBar(update.progress.percentage);
     message += '```\n';
     message += `${progressBar} ${update.progress.percentage}%\n`;
     message += `${update.progress.processed}/${update.progress.total} PRs processed\n`;
     message += '```\n\n';
-
     // Issue #1407: Show cancelling indicator when cancellation requested but queue still running
     if (this.isCancelled) {
       message += `🛑 *Cancelling\\.\\.\\.*\n\n`;
     }
-
     // Status summary with emojis
     message += `✅ Merged: ${update.stats.merged}  `;
     message += `❌ Failed: ${update.stats.failed}  `;
     message += `⏭️ Skipped: ${update.stats.skipped}  `;
     message += `⏳ Pending: ${update.stats.total - update.progress.processed}\n\n`;
-
     // Issue #1307: Show waiting status for target branch CI
     if (this.waitingForTargetBranchCI && this.targetBranchCIStatus) {
       const elapsedSec = Math.round(this.targetBranchCIStatus.elapsedMs / 1000);
@@ -1210,7 +1083,6 @@ export class MergeQueueProcessor {
     } else if (this.waitingForTargetBranchCI) {
       message += `⏱️ Checking for active CI runs on target branch\\.\\.\\.\n\n`;
     }
-
     // Issue #1341: Show waiting status for post-merge CI
     if (this.waitingForPostMergeCI && this.postMergeCIStatus) {
       const elapsedSec = Math.round(this.postMergeCIStatus.elapsedMs / 1000);
@@ -1223,7 +1095,6 @@ export class MergeQueueProcessor {
     } else if (this.waitingForPostMergeCI) {
       message += `⏱️ Waiting for post\\-merge CI \\(PR \\#${this.currentPostMergePR}\\)\\.\\.\\.\n\n`;
     }
-
     // Issue #1805: surface the auto-resolve pass when it is currently
     // active. This appears in place of "current item" because by then the
     // main queue loop has finished.
@@ -1261,7 +1132,6 @@ export class MergeQueueProcessor {
         message += `${statusEmoji} ${this.escapeMarkdown(update.current)}\n\n`;
       }
     }
-
     // Show errors/failures/skips inline so user gets immediate feedback (Issue #1269, #1294)
     // Include both FAILED and SKIPPED items with their reasons
     const problemItems = update.items.filter(item => (item.status === MergeItemStatus.FAILED || item.status === MergeItemStatus.SKIPPED) && item.error);
@@ -1279,21 +1149,17 @@ export class MergeQueueProcessor {
       }
       message += '\n';
     }
-
     // PRs list with emojis (Issue #1805: render as clickable MarkdownV2 links)
     message += `*Queue:*\n`;
     for (const item of update.items.slice(0, 10)) {
       message += `${item.emoji} ${this.formatPrLink(item.prNumber, item.title, item.prUrl)}\n`;
     }
-
     if (update.items.length > 10) {
       // Issue #1339: escape the ellipsis '...' for MarkdownV2
       message += `_\\.\\.\\.and ${update.items.length - 10} more_\n`;
     }
-
     return message;
   }
-
   /**
    * Format a Telegram message for the final report
    * Progress bar is rendered in a code block for better style (per issue #1143)
@@ -1301,7 +1167,6 @@ export class MergeQueueProcessor {
    */
   formatFinalMessage() {
     const report = this.getFinalReport();
-
     let statusEmoji, statusText;
     switch (report.status) {
       case MergeStatus.COMPLETED:
@@ -1320,11 +1185,9 @@ export class MergeQueueProcessor {
         statusEmoji = '❓';
         statusText = report.status;
     }
-
     let message = `${statusEmoji} *Merge Queue ${statusText}*\n`;
     // Issue #1292: Escape owner/repo for MarkdownV2 (may contain hyphens, underscores, etc.)
     message += `${this.escapeMarkdown(this.owner)}/${this.escapeMarkdown(this.repo)}\n\n`;
-
     // Final progress bar in code block
     const percentage = report.stats.total > 0 ? Math.round((report.stats.merged / report.stats.total) * 100) : 0;
     const progressBar = getProgressBar(percentage);
@@ -1332,13 +1195,11 @@ export class MergeQueueProcessor {
     message += `${progressBar} ${percentage}%\n`;
     message += `Duration: ${report.duration}\n`;
     message += '```\n\n';
-
     // Summary with emojis
     message += `✅ Merged: ${report.stats.merged}  `;
     message += `❌ Failed: ${report.stats.failed}  `;
     message += `⏭️ Skipped: ${report.stats.skipped}  `;
     message += `📋 Total: ${report.stats.total}\n`;
-
     // Issue #1805: surface the auto-resolve pass summary when it ran. We
     // always show the line when the flag was set so users see "0 dispatched"
     // when there was nothing to do.
@@ -1349,9 +1210,7 @@ export class MergeQueueProcessor {
       }
       message += '\n';
     }
-
     message += '\n';
-
     // Issue #1341: Show branch CI health failure details if applicable
     if (this.branchCIFailedRuns && this.branchCIFailedRuns.length > 0) {
       message += `⚠️ *Branch CI Failures \\(blocked queue\\):*\n`;
@@ -1366,7 +1225,6 @@ export class MergeQueueProcessor {
       }
       message += '\n';
     }
-
     // Issue #1341: Show post-merge CI failure details if applicable
     if (this.postMergeCIFailedRuns && this.postMergeCIFailedRuns.length > 0) {
       message += `⚠️ *Post\\-Merge CI Failures \\(stopped queue\\):*\n`;
@@ -1381,7 +1239,6 @@ export class MergeQueueProcessor {
       }
       message += '\n';
     }
-
     // Details (Issue #1805: render PR and issue references as clickable
     // MarkdownV2 links so the user can jump directly to the PR or issue).
     if (report.items.length > 0) {
@@ -1403,17 +1260,14 @@ export class MergeQueueProcessor {
         message += `${item.emoji} ${prLink}${issueRef}${reasonText}\n`;
       }
     }
-
     return message;
   }
-
   /**
    * Escape special characters for Telegram Markdown
    */
   escapeMarkdown(text) {
     return String(text).replace(/[_*[\]()~`>#+\-=|{}.!]/g, '\\$&');
   }
-
   /**
    * Issue #1805: Escape `)` and `\` inside a URL for a MarkdownV2 inline link.
    * URLs must NOT be passed through `escapeMarkdown()` because that would also
@@ -1422,7 +1276,6 @@ export class MergeQueueProcessor {
   escapeMarkdownLinkUrl(url) {
     return String(url).replace(/[\\)]/g, '\\$&');
   }
-
   /**
    * Issue #1805: Build a clickable MarkdownV2 link for a PR's `\#N: title`
    * reference. Falls back to plain escaped text when no URL is available so
@@ -1438,7 +1291,6 @@ export class MergeQueueProcessor {
     if (!url) return label;
     return `[${label}](${this.escapeMarkdownLinkUrl(url)})`;
   }
-
   /**
    * Issue #1805: Build the ` (Issue #N)` suffix as a clickable link. The
    * outer parentheses are literal MarkdownV2 (escaped), so the inner inline
@@ -1450,7 +1302,6 @@ export class MergeQueueProcessor {
     if (!url) return ` \\(${label}\\)`;
     return ` \\([${label}](${this.escapeMarkdownLinkUrl(url)})\\)`;
   }
-
   /**
    * Sleep helper.
    *
@@ -1465,7 +1316,6 @@ export class MergeQueueProcessor {
     return cancellableSleepUntil(ms, () => this.isCancelled);
   }
 }
-
 /**
  * Create and run a merge queue processor
  * @param {string} owner - Repository owner
@@ -1479,10 +1329,8 @@ export async function createMergeQueueProcessor(owner, repo, options = {}) {
     repo,
     ...options,
   });
-
   return processor;
 }
-
 export default {
   MergeStatus,
   MergeItemStatus,