@link-assistant/hive-mind 1.50.3 → 1.50.5

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @link-assistant/hive-mind
 
+## 1.50.5
+
+### Patch Changes
+
+- 61b2a32: fix: prevent solution draft log and ready to merge comments from appearing between limit reached and auto resume (#1571)
+  - `autoContinueWhenLimitResets()` now awaits child process exit instead of returning immediately after spawn
+  - Added defense-in-depth guard in solve.mjs to skip post-processing when limit was reached with auto-continue enabled
+  - This ensures the correct comment ordering: Limit Reached → Auto Resume → Solution Draft Log → Ready to merge
+
+## 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.5",
   "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/solve.auto-continue.lib.mjs

@@ -182,8 +182,16 @@ export const autoContinueWhenLimitResets = async (issueUrl, sessionId, argv, sho
       env: process.env,
     });
 
-    child.on('close', code => {
-      process.exit(code);
+    // Issue #1571: Await child process exit to prevent parent from continuing
+    // to post "Solution Draft Log" and "Ready to merge" comments before the
+    // resumed session starts. Without this await, the parent process would
+    // return from this function and continue executing verifyResults() and
+    // startAutoRestartUntilMergeable(), causing confusing comment ordering.
+    await new Promise(resolve => {
+      child.on('close', code => {
+        process.exit(code);
+        resolve(); // Won't be reached due to process.exit, but included for completeness
+      });
     });
   } catch (error) {
     reportError(error, {

package/src/solve.auto-merge.lib.mjs

@@ -62,10 +62,7 @@ export const watchUntilMergeable = async params => {
   const { issueUrl, owner, repo, issueNumber, prNumber, prBranch, branchName, tempDir, argv } = params;
 
   const rawWatchInterval = argv.watchInterval || 60; // seconds
-  // Issue #1503: Enforce minimum CI check interval to conserve GitHub API rate limits.
-  // Issue #1567: Reduced from 5 minutes (300s) to 2 minutes (120s) to decrease wait times
-  // between working session finish and "Ready to merge" / next action detection.
-  // This also applies uniformly whether CI/CD is configured or not.
+  // Issue #1567: Minimum 120s interval to conserve API rate limits while keeping responsiveness
   const MIN_CI_CHECK_INTERVAL_SECONDS = 120;
   const watchInterval = Math.max(rawWatchInterval, MIN_CI_CHECK_INTERVAL_SECONDS);
   const isAutoMerge = argv.autoMerge || false;
@@ -76,39 +73,19 @@ export const watchUntilMergeable = async params => {
   let latestSessionId = null;
   let latestAnthropicCost = null;
 
-  // Issue #1323: Track actual restart count separately from check cycle iteration
-  // `iteration` counts check cycles (how many times we check for blockers)
-  // `restartCount` counts actual AI tool executions (when we actually restart the AI)
+  // Issue #1323: Track actual AI restarts separately from check cycle iterations
   let restartCount = 0;
 
-  // Issue #1371: Track whether a "Ready to merge" comment was posted in THIS session.
-  // This replaces the all-time history check (checkForExistingComment) which incorrectly
-  // suppressed new notifications when a previous solve run had already posted one.
-  // In-memory deduplication correctly handles the case where multiple check cycles in
-  // the same run detect mergeability simultaneously, without blocking fresh runs.
+  // Issue #1371: In-memory dedup for "Ready to merge" comment (per-session, not all-time)
   let readyToMergeCommentPosted = false;
 
   let currentBackoffSeconds = watchInterval;
 
-  // Issue #1503: Track consecutive "no workflow runs" checks per-SHA separately from iteration count.
-  // The `checkCount` parameter in getMergeBlockers is a safety valve that triggers after
-  // MAX_NO_RUNS_CHECKS (5) consecutive checks with zero workflow runs, concluding CI was
-  // genuinely not triggered (paths-ignore, fork PRs, etc.). Previously, `iteration` (total
-  // loop count) was passed as `checkCount`, which meant after 5 iterations (regardless of
-  // CI state), any new push would immediately trigger the safety valve because checkCount
-  // was already >= 5. This caused false positive "Ready to merge" when a new commit was
-  // pushed and CI hadn't registered yet.
-  //
-  // Fix: Track the HEAD SHA and reset the counter when it changes (new push detected).
+  // Issue #1503: Track consecutive "no workflow runs" checks per-SHA (reset on new push)
   let consecutiveNoRunsChecks = 0;
   let lastKnownHeadSha = null;
 
-  // Issue #1567: Initial cooldown before first check.
-  // Wait at least MIN_CI_CHECK_INTERVAL_SECONDS after working session finishes before
-  // starting to check. This ensures:
-  // 1. Solution Draft Log is fully posted before any "Ready to merge" can appear
-  // 2. CI/CD checks have time to register with GitHub (avoids false "no CI" detection)
-  // 3. Consistent behavior whether CI/CD is configured or not
+  // Issue #1567: Initial cooldown to let CI register and solution logs post
   const INITIAL_COOLDOWN_SECONDS = MIN_CI_CHECK_INTERVAL_SECONDS;
 
   await log('');
@@ -161,9 +138,7 @@ export const watchUntilMergeable = async params => {
     await log(formatAligned('🔍', `Check #${iteration}:`, currentTime.toLocaleTimeString()));
 
     try {
-      // Issue #1503: Get the current HEAD SHA to detect new pushes and reset the
-      // consecutive no-runs counter. This prevents false positives where the counter
-      // from a previous commit's checks carries over to a new commit.
+      // Issue #1503: Get current HEAD SHA to detect new pushes and reset no-runs counter
       let currentHeadSha = null;
       try {
         const shaResult = await $`gh pr view ${prNumber} --repo ${owner}/${repo} --json headRefOid --jq .headRefOid`;
@@ -184,17 +159,13 @@ export const watchUntilMergeable = async params => {
         readyToMergeCommentPosted = false;
       }
 
-      // Issue #1503: Increment counter; getMergeBlockers will use it as a safety valve.
-      // If getMergeBlockers sees no workflow runs on this check, the counter stays incremented.
-      // If it sees workflow runs or checks, the counter is irrelevant (different code paths).
+      // Issue #1503: Increment counter; getMergeBlockers uses it as a safety valve
       consecutiveNoRunsChecks++;
 
       // Get merge blockers
       const { blockers, noCiConfigured, noCiTriggered, workflowRunConclusions, ciStatus } = await getMergeBlockers(owner, repo, prNumber, argv.verbose, consecutiveNoRunsChecks, prBranch);
 
-      // Issue #1503: Reset consecutive counter when CI checks or workflow runs were found.
-      // This ensures the safety valve only fires after truly consecutive "no runs" checks,
-      // not after interleaved pending/success/failure states that happened to reach the count.
+      // Issue #1503: Reset counter when CI checks exist (safety valve only for consecutive "no runs")
       if (ciStatus && ciStatus.status !== 'no_checks') {
         // CI checks exist (pending, success, failure, etc.) — the "no runs" counter is irrelevant
         consecutiveNoRunsChecks = 0;

package/src/solve.mjs

@@ -1077,13 +1077,10 @@ try {
     }
   }
 
-  // Handle failure cases, but skip exit if limit reached with auto-resume enabled
-  // This allows the code to continue to showSessionSummary() where autoContinueWhenLimitResets() is called
+  // Skip failure exit if limit reached with auto-resume (continues to showSessionSummary/autoContinueWhenLimitResets)
   const shouldSkipFailureExitForAutoLimitContinue = limitReached && argv.autoResumeOnLimitReset;
-
   if (!success && !shouldSkipFailureExitForAutoLimitContinue) {
     // Show claude resume command only for --tool claude (or default) on failure
-    // Uses the (cd ... && claude --resume ...) pattern for a fully copyable, executable command
     const toolForFailure = argv.tool || 'claude';
     if (sessionId && toolForFailure === 'claude') {
       const claudeResumeCmd = buildClaudeResumeCommand({ tempDir, sessionId, model: argv.model });
@@ -1094,9 +1091,7 @@ try {
       await log('');
     }
 
-    // If --attach-logs is enabled, attach failure logs before exiting
-    // Note: sessionId is not required - logs should be uploaded even if agent failed before establishing a session
-    // Issues #1212, #1462: Fall back to uploading logs to the issue if PR is not available
+    // Attach failure logs before exiting (Issues #1212, #1462: fall back to issue if no PR)
     const hasPR = global.createdPR && global.createdPR.number;
     const hasIssue = global.issueNumber;
     const logTargetType = hasPR ? 'pr' : hasIssue ? 'issue' : null;
@@ -1148,8 +1143,7 @@ try {
     await safeExit(1, `${argv.tool.toUpperCase()} execution failed`);
   }
 
-  // Clean up .playwright-mcp/ folder before checking for uncommitted changes
-  // This prevents browser automation artifacts from triggering auto-restart (Issue #1124)
+  // Clean up .playwright-mcp/ to prevent browser artifacts from triggering auto-restart (Issue #1124)
   if (argv.playwrightMcpAutoCleanup !== false) {
     const playwrightMcpDir = path.join(tempDir, '.playwright-mcp');
     try {
@@ -1179,6 +1173,13 @@ try {
   // Show summary of session and log file
   await showSessionSummary(sessionId, limitReached, argv, issueUrl, tempDir, shouldAttachLogs);
 
+  // Issue #1571: Defense-in-depth guard. autoContinueWhenLimitResets() awaits child exit
+  // and calls process.exit(), so this should not be reached. Skip post-processing to
+  // prevent "Solution Draft Log" / "Ready to merge" comments before "Auto Resume".
+  if (limitReached && (argv.autoResumeOnLimitReset || argv.autoRestartOnLimitReset) && global.limitResetTime) {
+    await safeExit(0, 'Auto-continue child process will handle post-processing');
+  }
+
   // Issue #1263: Handle solution summary attachment
   // --attach-solution-summary: Always attach if result summary is available
   // --auto-attach-solution-summary: Only attach if AI didn't create any comments during session

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
       );