@link-assistant/hive-mind 1.50.3 → 1.50.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @link-assistant/hive-mind
 
+## 1.50.4
+
+### Patch Changes
+
+- 15f25db: Make merge queue cancel immediate during CI waits so users don't have to wait for CI to finish before cancellation takes effect
+
 ## 1.50.3
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "1.50.3",
+  "version": "1.50.4",
   "description": "AI-powered issue solver and hive mind for collaborative problem solving",
   "main": "src/hive.mjs",
   "type": "module",

package/src/github-merge-ci.lib.mjs

@@ -29,7 +29,7 @@ const exec = promisify(execCallback);
  * @returns {Promise<{success: boolean, status: string, runs: Array, failedRuns: Array, error: string|null}>}
  */
 export async function waitForCommitCI(owner, repo, sha, options = {}, verbose = false) {
-  const { timeout = 60 * 60 * 1000, pollInterval = 30 * 1000, onStatusUpdate = null } = options;
+  const { timeout = 60 * 60 * 1000, pollInterval = 30 * 1000, onStatusUpdate = null, isCancelled = null } = options;
 
   const startTime = Date.now();
   let noRunsIterations = 0;
@@ -40,6 +40,9 @@ export async function waitForCommitCI(owner, repo, sha, options = {}, verbose =
   }
 
   while (Date.now() - startTime < timeout) {
+    // Issue #1588: Check for cancellation before each poll to allow early exit
+    if (isCancelled?.()) return { success: false, status: 'cancelled', runs: [], failedRuns: [], error: 'Operation was cancelled' };
+
     let runs;
     try {
       runs = await getWorkflowRunsForSha(owner, repo, sha, verbose);

package/src/github-merge.lib.mjs

@@ -16,7 +16,6 @@ import { exec as execCallback } from 'child_process';
 
 const exec = promisify(execCallback);
 
-// Import GitHub URL parser
 import { parseGitHubUrl } from './github.lib.mjs';
 
 // Issue #1413: Import ready tag sync, timeline, and label constant from separate module
@@ -728,7 +727,7 @@ export async function getActiveBranchRuns(owner, repo, branch = 'main', verbose
  * @returns {Promise<{success: boolean, waitedForRuns: boolean, completedRuns: number, error: string|null}>}
  */
 export async function waitForBranchCI(owner, repo, branch = 'main', options = {}, verbose = false) {
-  const { timeout = 45 * 60 * 1000, pollInterval = 30 * 1000, onStatusUpdate = null } = options;
+  const { timeout = 45 * 60 * 1000, pollInterval = 30 * 1000, onStatusUpdate = null, isCancelled = null } = options;
 
   const startTime = Date.now();
   let totalWaitedRuns = 0;
@@ -738,6 +737,7 @@ export async function waitForBranchCI(owner, repo, branch = 'main', options = {}
   }
 
   while (Date.now() - startTime < timeout) {
+    if (isCancelled?.()) return { success: false, waitedForRuns: totalWaitedRuns > 0, completedRuns: totalWaitedRuns, error: 'Operation was cancelled' };
     let activeRuns;
     try {
       activeRuns = await getActiveBranchRuns(owner, repo, branch, verbose);

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

@@ -238,11 +238,13 @@ export function registerMergeCommand(bot, options) {
           // Update message with progress and cancel button
           try {
             const message = processor.formatProgressMessage();
+            // Issue #1588: Do not show cancel button once cancellation has been requested.
+            // Without this check, progress updates from CI wait loops would re-add
+            // the cancel button after the cancel handler had already removed it.
+            const replyMarkup = processor.isCancelled ? undefined : { inline_keyboard: [[{ text: '🛑 Cancel', callback_data: `merge_cancel_${repoKey}` }]] };
             await ctx.telegram.editMessageText(statusMessage.chat.id, statusMessage.message_id, undefined, message, {
               parse_mode: 'MarkdownV2',
-              reply_markup: {
-                inline_keyboard: [[{ text: '🛑 Cancel', callback_data: `merge_cancel_${repoKey}` }]],
-              },
+              ...(replyMarkup ? { reply_markup: replyMarkup } : {}),
             });
           } catch (err) {
             // Ignore message edit errors (e.g., message not modified)

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

@@ -513,6 +513,8 @@ export class MergeQueueProcessor {
               await this.onProgress(this.getProgressUpdate());
             }
           },
+          // Issue #1588: Pass cancellation check so branch CI wait can abort early
+          isCancelled: () => this.isCancelled,
         },
         this.verbose
       );
@@ -617,6 +619,8 @@ export class MergeQueueProcessor {
               await this.onProgress(this.getProgressUpdate());
             }
           },
+          // Issue #1588: Pass cancellation check so post-merge CI wait can abort early
+          isCancelled: () => this.isCancelled,
         },
         this.verbose
       );