@link-assistant/hive-mind 1.34.4 → 1.34.6

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @link-assistant/hive-mind
 
+## 1.34.6
+
+### Patch Changes
+
+- 3157192: Optimize CI/CD to skip checks for .gitkeep-only changes and harden .gitkeep cleanup logic (Issue #1436).
+
+  CI/CD jobs `version-check` and `helm-pr-check` now skip when only `.gitkeep` files changed, saving ~21 seconds of runner time per PR on the initial commit. The `detect-code-changes.mjs` script now excludes `.gitkeep` files from code change detection and outputs a `gitkeep-only` flag.
+
+  The `.gitkeep` cleanup logic in `solve.results.lib.mjs` is hardened with: (1) full commit message body detection (`%B` instead of `%s`) so `.gitkeep` references in commit body are found, (2) fallback file detection via `git diff-tree`, and (3) post-cleanup verification with direct removal fallback to prevent leftover `.gitkeep` files.
+
+  Also removes the leftover `.gitkeep` file from the repository that was left behind by PR #1420.
+
+## 1.34.5
+
+### Patch Changes
+
+- ab070db: Use workflow runs API to detect when CI is not triggered, preventing infinite loop (Issue #1442)
+
+  When `--auto-restart-until-mergeable` monitors a PR in a repo that has active GitHub Actions workflows but CI checks never start (e.g., fork PRs needing maintainer approval, `paths-ignore` filtering all changed files, workflow trigger conditions not matching), the monitoring loop now exits immediately instead of waiting indefinitely.
+
+  Instead of using a timeout-based approach, the fix uses the GitHub Actions workflow runs API (`repos/{owner}/{repo}/actions/runs?head_sha={sha}`) to definitively determine if any workflow runs were triggered for the PR's commit. If zero workflow runs exist, CI was not triggered and there is nothing to wait for — the system exits immediately with a diagnostic PR comment.
+
 ## 1.34.4
 
 ### Patch Changes

package/package.json

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

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

@@ -197,6 +197,7 @@ const getMergeBlockers = async (owner, repo, prNumber, verbose = false) => {
     // No CI checks exist yet - this could be:
     // 1. A race condition after push (checks haven't started yet) - wait
     // 2. A repository with no CI/CD configured at all - should be mergeable immediately
+    // 3. CI workflows exist but were not triggered for this commit (fork PR, paths-ignore, etc.)
     //
     // Issue #1345: Distinguish by checking the PR's mergeability status.
     // If GitHub says the PR is MERGEABLE (mergeStateStatus === 'CLEAN'),
@@ -215,16 +216,33 @@ const getMergeBlockers = async (owner, repo, prNumber, verbose = false) => {
       // - check_runs=[] (CI hasn't started yet — race condition)
       const repoWorkflows = await getActiveRepoWorkflows(owner, repo, verbose);
       if (repoWorkflows.hasWorkflows) {
-        // Repo HAS workflows — this is a race condition, not "no CI configured"
-        // Wait for CI checks to appear
-        if (verbose) {
-          console.log(`[VERBOSE] /merge: PR #${prNumber} has no CI checks yet, but repo has ${repoWorkflows.count} active workflow(s) - treating as race condition (CI hasn't started)`);
+        // Repo HAS workflows — but were they triggered for this commit?
+        // Issue #1442: Use the GitHub Actions workflow runs API to definitively check
+        // if any workflow runs were triggered for this PR's HEAD SHA. This avoids
+        // the need for timeout-based detection:
+        //   - workflow_runs.length > 0 → genuine race condition (CI started, check-runs not yet registered)
+        //   - workflow_runs.length === 0 → CI was NOT triggered (fork PR, paths-ignore, etc.)
+        const workflowRuns = await getWorkflowRunsForSha(owner, repo, ciStatus.sha, verbose);
+        if (workflowRuns.length > 0) {
+          // Workflow runs exist but check-runs haven't appeared yet — genuine race condition
+          if (verbose) {
+            console.log(`[VERBOSE] /merge: PR #${prNumber} has no CI check-runs yet, but ${workflowRuns.length} workflow run(s) were triggered for SHA ${ciStatus.sha.substring(0, 7)} - genuine race condition (waiting for check-runs to appear)`);
+          }
+          blockers.push({
+            type: 'ci_pending',
+            message: `CI/CD checks have not started yet (${workflowRuns.length} workflow run(s) triggered, waiting for check-runs to appear)`,
+            details: workflowRuns.map(r => r.name),
+          });
+        } else {
+          // No workflow runs for this SHA — CI was definitively NOT triggered
+          // Issue #1442: This is the root cause of the infinite loop. Fork PRs needing
+          // maintainer approval, paths-ignore filtering, workflow conditions not matching,
+          // etc. all result in zero workflow runs. No need for timeout — exit immediately.
+          if (verbose) {
+            console.log(`[VERBOSE] /merge: PR #${prNumber} has no CI checks and no workflow runs for SHA ${ciStatus.sha.substring(0, 7)} — CI was not triggered (fork PR, paths-ignore, workflow conditions, etc.)`);
+          }
+          return { blockers, ciStatus, noCiConfigured: false, noCiTriggered: true };
         }
-        blockers.push({
-          type: 'ci_pending',
-          message: `CI/CD checks have not started yet (${repoWorkflows.count} workflow(s) configured, waiting for checks to appear)`,
-          details: repoWorkflows.workflows.map(wf => wf.name),
-        });
       } else {
         // Repo has NO workflows — this is truly "no CI configured"
         // PR is already mergeable with no CI checks configured.
@@ -323,7 +341,7 @@ const getMergeBlockers = async (owner, repo, prNumber, verbose = false) => {
     });
   }
 
-  return { blockers, ciStatus, noCiConfigured: false };
+  return { blockers, ciStatus, noCiConfigured: false, noCiTriggered: false };
 };
 
 /**
@@ -368,12 +386,6 @@ export const watchUntilMergeable = async params => {
   let iteration = 0;
   let lastCheckTime = new Date();
 
-  // Issue #1335: Cache whether the repo has CI workflows to avoid repeated API calls.
-  // When 'no_checks' is seen, we check if the repo actually has workflows configured.
-  // - If no workflows exist → 'no_checks' is permanent; treat PR as CI-passing and exit.
-  // - If workflows exist → 'no_checks' is a transient race condition; keep waiting.
-  let repoHasWorkflows = null; // null = not yet checked; true/false = cached result
-
   while (true) {
     iteration++;
     const currentTime = new Date();
@@ -402,7 +414,7 @@ export const watchUntilMergeable = async params => {
 
     try {
       // Get merge blockers
-      const { blockers, noCiConfigured } = await getMergeBlockers(owner, repo, prNumber, argv.verbose);
+      const { blockers, noCiConfigured, noCiTriggered } = await getMergeBlockers(owner, repo, prNumber, argv.verbose);
 
       // Check for new comments from non-bot users
       const { hasNewComments, comments } = await checkForNonBotComments(owner, repo, prNumber, issueNumber, lastCheckTime, argv.verbose);
@@ -410,6 +422,12 @@ export const watchUntilMergeable = async params => {
       // Check for uncommitted changes using shared utility
       const hasUncommittedChanges = await checkForUncommittedChanges(tempDir, argv);
 
+      // Issue #1442: If CI workflows exist but were not triggered for this commit,
+      // log why before proceeding to the mergeable path.
+      if (noCiTriggered) {
+        await log(formatAligned('ℹ️', 'CI not triggered:', 'Workflows exist but no workflow runs for this commit (fork PR, paths-ignore, workflow conditions)', 2));
+      }
+
       // If PR is mergeable, no blockers, no new comments, and no uncommitted changes
       if (blockers.length === 0 && !hasNewComments && !hasUncommittedChanges) {
         await log(formatAligned('✅', 'PR IS MERGEABLE!', ''));
@@ -426,7 +444,7 @@ export const watchUntilMergeable = async params => {
             // Post success comment
             try {
               // Issue #1345: Differentiate message when no CI is configured
-              const ciLine = noCiConfigured ? '- No CI/CD checks are configured for this repository' : '- All CI checks have passed';
+              const ciLine = noCiConfigured ? '- No CI/CD checks are configured for this repository' : noCiTriggered ? '- CI workflows exist but were not triggered for this commit' : '- All CI checks have passed';
               const commentBody = `## 🎉 Auto-merged\n\nThis pull request has been automatically merged by hive-mind.\n${ciLine}\n\n---\n*Auto-merged by hive-mind with --auto-merge flag*`;
               await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${commentBody}`;
             } catch {
@@ -450,7 +468,7 @@ export const watchUntilMergeable = async params => {
           try {
             if (!readyToMergeCommentPosted) {
               // Issue #1345: Differentiate message when no CI is configured
-              const ciLine = noCiConfigured ? '- No CI/CD checks are configured for this repository' : '- All CI checks have passed';
+              const ciLine = noCiConfigured ? '- No CI/CD checks are configured for this repository' : noCiTriggered ? '- CI workflows exist but were not triggered for this commit' : '- All CI checks have passed';
               const commentBody = `## ✅ Ready to merge\n\nThis pull request is now ready to be merged:\n${ciLine}\n- No merge conflicts\n- No pending changes\n\n---\n*Monitored by hive-mind with --auto-restart-until-mergeable flag*`;
               await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${commentBody}`;
               readyToMergeCommentPosted = true;
@@ -888,63 +906,14 @@ Once the billing issue is resolved, you can re-run the CI checks or push a new c
         // Issue #1314: Distinguish between different waiting reasons
         const pendingBlocker = blockers.find(b => b.type === 'ci_pending');
         const cancelledOnly = blockers.every(b => b.type === 'ci_cancelled' || b.type === 'ci_pending');
+        const cancelledBlocker = blockers.find(b => b.type === 'ci_cancelled');
 
-        // Issue #1335: Detect permanent 'no_checks' state (repo has no CI workflows).
-        // The 'ci_pending' blocker with message 'have not started yet' means GitHub returned
-        // zero check-runs and zero commit statuses for this PR's HEAD SHA. This is ambiguous:
-        //   (a) Transient race condition — CI workflows exist but haven't queued yet after push.
-        //   (b) Permanent state — the repository has no CI/CD workflows configured at all.
-        // We resolve the ambiguity by checking if the repo actually has workflow files via the
-        // GitHub API. If it has none, the 'no_checks' state is permanent and the PR should be
-        // treated as CI-passing (no CI = nothing to wait for).
-        const isNoCIChecks = pendingBlocker && pendingBlocker.message.includes('have not started yet');
-        if (isNoCIChecks) {
-          // Lazy-check whether the repo has workflows (cache result to avoid repeated API calls)
-          if (repoHasWorkflows === null) {
-            const workflowCheck = await getActiveRepoWorkflows(owner, repo, argv.verbose);
-            repoHasWorkflows = workflowCheck.hasWorkflows;
-            if (argv.verbose) {
-              await log(formatAligned('', 'Repo workflow check:', repoHasWorkflows ? `${workflowCheck.count} workflow(s) found — CI check is a transient race condition` : 'No workflows configured — no CI expected', 2));
-            }
-          }
-
-          if (!repoHasWorkflows) {
-            // Root cause confirmed: repo has no CI. The 'no_checks' state is permanent.
-            // Treat the PR as CI-passing and exit the monitoring loop immediately.
-            await log('');
-            await log(formatAligned('ℹ️', 'NO CI WORKFLOWS CONFIGURED', 'Repository has no GitHub Actions workflows'));
-            await log(formatAligned('', 'Conclusion:', 'No CI expected — treating PR as CI-passing', 2));
-            await log(formatAligned('', 'Action:', 'Exiting monitoring loop', 2));
-            await log('');
-
-            // Post a comment explaining the situation
-            try {
-              const commentBody = `## ℹ️ No CI Workflows Detected
-
-No CI/CD checks are configured for this pull request. The repository has no GitHub Actions workflow files in \`.github/workflows/\`.
-
-The auto-restart-until-mergeable monitor is stopping since there is no CI to wait for. The PR may be ready to merge if there are no other issues.
-
----
-*Monitored by hive-mind with --auto-restart-until-mergeable flag*`;
-              await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${commentBody}`;
-            } catch {
-              // Don't fail if comment posting fails
-            }
-
-            return { success: true, reason: 'no_ci_checks', latestSessionId, latestAnthropicCost };
-          } else {
-            // Repo has workflows but CI hasn't started yet — transient race condition, keep waiting
-            await log(formatAligned('⏳', 'Waiting for CI:', 'No checks yet (CI workflows exist, waiting for them to start)', 2));
-          }
+        if (cancelledOnly && cancelledBlocker) {
+          await log(formatAligned('🔄', 'Waiting for re-triggered CI:', cancelledBlocker.details.join(', '), 2));
+        } else if (pendingBlocker) {
+          await log(formatAligned('⏳', 'Waiting for CI:', pendingBlocker.details.length > 0 ? pendingBlocker.details.join(', ') : pendingBlocker.message, 2));
         } else {
-          if (cancelledOnly && cancelledBlocker) {
-            await log(formatAligned('🔄', 'Waiting for re-triggered CI:', cancelledBlocker.details.join(', '), 2));
-          } else if (pendingBlocker) {
-            await log(formatAligned('⏳', 'Waiting for CI:', pendingBlocker.details.length > 0 ? pendingBlocker.details.join(', ') : pendingBlocker.message, 2));
-          } else {
-            await log(formatAligned('⏳', 'Waiting for:', blockers.map(b => b.message).join(', '), 2));
-          }
+          await log(formatAligned('⏳', 'Waiting for:', blockers.map(b => b.message).join(', '), 2));
         }
       } else {
         await log(formatAligned('', 'No action needed', 'Continuing to monitor...', 2));

package/src/solve.results.lib.mjs

@@ -251,11 +251,19 @@ export const cleanupClaudeFile = async (tempDir, branchName, claudeCommitHash =
       await log(`   Detected initial commit: ${claudeCommitHash.substring(0, 7)}`, { verbose: true });
     }
 
-    // Determine which file was used based on the commit message or flags
-    // Check the commit message to determine which file was committed
-    const commitMsgResult = await $({ cwd: tempDir })`git log -1 --format=%s ${claudeCommitHash} 2>&1`;
+    // Determine which file was used based on the commit message or actual files changed
+    // Use %B (full message including body) instead of %s (subject only) to catch ".gitkeep" in body
+    // Also check the actual files changed as a fallback (Issue #1436)
+    const commitMsgResult = await $({ cwd: tempDir })`git log -1 --format=%B ${claudeCommitHash} 2>&1`;
     const commitMsg = commitMsgResult.stdout?.trim() || '';
-    const isGitkeepFile = commitMsg.includes('.gitkeep');
+    let isGitkeepFile = commitMsg.includes('.gitkeep');
+
+    // Fallback: check actual files changed in the commit if message doesn't mention .gitkeep
+    if (!isGitkeepFile) {
+      const filesResult = await $({ cwd: tempDir })`git diff-tree --no-commit-id --name-only -r ${claudeCommitHash} 2>&1`;
+      const files = filesResult.stdout?.trim().split('\n').filter(Boolean) || [];
+      isGitkeepFile = files.includes('.gitkeep');
+    }
     const fileName = isGitkeepFile ? '.gitkeep' : 'CLAUDE.md';
 
     await log(formatAligned('🔄', 'Cleanup:', `Reverting ${fileName} commit`));
@@ -381,6 +389,31 @@ export const cleanupClaudeFile = async (tempDir, branchName, claudeCommitHash =
         }
       }
     }
+    // Post-cleanup verification: check if the file was actually removed (Issue #1436)
+    // This catches cases where revert/push succeeded in logs but file still exists
+    const verifyResult = await $({ cwd: tempDir })`git ls-files ${fileName} 2>&1`;
+    const fileStillExists = verifyResult.code === 0 && verifyResult.stdout && verifyResult.stdout.trim();
+    if (fileStillExists) {
+      await log(`   ⚠️  WARNING: ${fileName} still exists after cleanup — attempting direct removal...`);
+      // Check if the file existed before the initial commit (parent)
+      const parentCommit = `${claudeCommitHash}~1`;
+      const parentFileExists = await $({ cwd: tempDir })`git cat-file -e ${parentCommit}:${fileName} 2>&1`;
+      if (parentFileExists.code !== 0) {
+        // File didn't exist before the session — force remove it
+        await $({ cwd: tempDir })`git rm -f ${fileName} 2>&1`;
+        const fallbackCommit = await $({ cwd: tempDir })`git commit -m "Remove leftover ${fileName} (post-cleanup fallback, Issue #1436)" 2>&1`;
+        if (fallbackCommit.code === 0) {
+          const fallbackPush = await $({ cwd: tempDir })`git push origin ${branchName} 2>&1`;
+          if (fallbackPush.code === 0) {
+            await log(`   ✅ ${fileName} removed via post-cleanup fallback`);
+          } else {
+            await log(`   ⚠️  ${fileName} removed locally but push failed`, { verbose: true });
+          }
+        }
+      } else {
+        await log(`   ℹ️  ${fileName} existed before this session — keeping pre-existing file`, { verbose: true });
+      }
+    }
   } catch (e) {
     reportError(e, {
       context: 'cleanup_claude_file',