@link-assistant/hive-mind 1.22.0 → 1.22.2

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 # @link-assistant/hive-mind
 
+## 1.22.2
+
+### Patch Changes
+
+- 5b018dc: fix: prevent CI/CD release blocking by enabling cancel-in-progress for main branch (Issue #1274)
+
+  When multiple commits are pushed to main quickly (e.g., multiple PRs merged in succession),
+  the old concurrency configuration would queue newer runs indefinitely until older runs complete.
+  This caused releases to be blocked when Docker ARM64 builds took too long.
+
+  Changes:
+  - Add `cancel-in-progress: true` for main branch to allow newer releases to proceed
+  - PR branches still queue runs to avoid cancelling checks during development
+  - Document the issue and solution in docs/case-studies/issue-1274/
+
+## 1.22.1
+
+### Patch Changes
+
+- fix: add --merge flag to gh pr merge command to prevent "not running interactively" error (Issue #1269)
+
+  The merge queue was stuck because `gh pr merge` requires an explicit merge method flag
+  (`--merge`, `--squash`, or `--rebase`) when running in a non-interactive context.
+  Without a merge method, the command would fail with:
+  "--merge, --rebase, or --squash required when not running interactively"
+
+  This fix:
+  - Adds `--merge` flag by default to the `mergePullRequest()` function
+  - Adds `mergeMethod` option to configure the merge strategy ('merge', 'squash', 'rebase')
+  - Adds `HIVE_MIND_MERGE_QUEUE_MERGE_METHOD` environment variable for configuration
+
+  Fix release notes to show ALL related pull requests when multiple PRs are merged before a release (Issue #1271)
+  - Extract ALL commit hashes from changelog entry (not just the first one)
+  - Look up PRs for each commit hash via GitHub API
+  - Display all unique PR numbers in release notes (e.g., "Related Pull Requests: #1268, #1270")
+  - Use plural "Pull Requests" label when multiple PRs are found
+  - Add comprehensive case study documentation in docs/case-studies/issue-1271/
+
 ## 1.22.0
 
 ### Minor Changes

package/package.json

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

package/src/config.lib.mjs

@@ -396,6 +396,7 @@ export const version = {
 
 // Merge queue configurations
 // See: https://github.com/link-assistant/hive-mind/issues/1143
+// See: https://github.com/link-assistant/hive-mind/issues/1269
 export const mergeQueue = {
   // Maximum PRs to process in one merge session
   // Default: 10 PRs per session
@@ -409,6 +410,10 @@ export const mergeQueue = {
   // Wait time after merge before processing next PR
   // Default: 1 minute (60000ms) - allows CI to stabilize
   postMergeWaitMs: parseIntWithDefault('HIVE_MIND_MERGE_QUEUE_POST_MERGE_WAIT_MS', 60 * 1000),
+  // Default merge method: 'merge', 'squash', or 'rebase'
+  // Issue #1269: gh pr merge requires explicit method when running non-interactively
+  // Default: 'merge' - creates a merge commit
+  mergeMethod: getenv('HIVE_MIND_MERGE_QUEUE_MERGE_METHOD', 'merge'),
 };
 
 // Helper function to validate configuration values

package/src/github-merge.lib.mjs

@@ -439,19 +439,31 @@ export async function checkPRMergeable(owner, repo, prNumber, verbose = false) {
  * @param {string} repo - Repository name
  * @param {number} prNumber - Pull request number
  * @param {Object} options - Merge options
- * @param {boolean} options.squash - Whether to squash merge (default: false, uses default merge method)
+ * @param {string} options.mergeMethod - Merge method: 'merge', 'squash', or 'rebase' (default: 'merge')
+ *                                       Note: Must specify one method when running non-interactively.
+ *                                       See Issue #1269 for details.
+ * @param {boolean} options.squash - DEPRECATED: Use mergeMethod: 'squash' instead
  * @param {boolean} options.deleteAfter - Whether to delete branch after merge (default: false)
  * @param {boolean} verbose - Whether to log verbose output
  * @returns {Promise<{success: boolean, error: string|null}>}
  */
 export async function mergePullRequest(owner, repo, prNumber, options = {}, verbose = false) {
-  const { squash = false, deleteAfter = false } = options;
+  const { mergeMethod = 'merge', squash = false, deleteAfter = false } = options;
 
   try {
     let mergeArgs = `--repo ${owner}/${repo}`;
-    if (squash) {
+
+    // Issue #1269: gh pr merge requires --merge, --squash, or --rebase when running non-interactively
+    // We must always specify a merge method to prevent the command from hanging or failing
+    if (squash || mergeMethod === 'squash') {
       mergeArgs += ' --squash';
+    } else if (mergeMethod === 'rebase') {
+      mergeArgs += ' --rebase';
+    } else {
+      // Default to --merge for standard merge commits
+      mergeArgs += ' --merge';
     }
+
     if (deleteAfter) {
       mergeArgs += ' --delete-branch';
     }

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

@@ -55,6 +55,7 @@ export const MergeItemStatus = {
  * - HIVE_MIND_MERGE_QUEUE_CI_POLL_INTERVAL_MS: CI polling interval (default: 300000 = 5 minutes)
  * - HIVE_MIND_MERGE_QUEUE_CI_TIMEOUT_MS: CI timeout (default: 1800000 = 30 minutes)
  * - HIVE_MIND_MERGE_QUEUE_POST_MERGE_WAIT_MS: Post-merge wait (default: 10000 = 10 seconds)
+ * - HIVE_MIND_MERGE_QUEUE_MERGE_METHOD: Merge method (default: 'merge', options: 'merge', 'squash', 'rebase')
  */
 export const MERGE_QUEUE_CONFIG = {
   // CI/CD wait settings - check every 5 minutes per issue #1143 feedback
@@ -69,6 +70,10 @@ export const MERGE_QUEUE_CONFIG = {
 
   // 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: mergeQueueConfig.mergeMethod,
 };
 
 /**
@@ -339,8 +344,9 @@ export class MergeQueueProcessor {
       }
 
       // 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 mergePullRequest(this.owner, this.repo, item.pr.number, {}, this.verbose);
+      const mergeResult = await mergePullRequest(this.owner, this.repo, item.pr.number, { mergeMethod: MERGE_QUEUE_CONFIG.MERGE_METHOD }, this.verbose);
 
       if (!mergeResult.success) {
         item.status = MergeItemStatus.FAILED;