@yemi33/minions 0.1.2090 → 0.1.2091

package/engine.js

@@ -4816,7 +4816,28 @@ async function discoverFromPrs(config, project) {
     }
     const autoFixBuilds = config.engine?.autoFixBuilds ?? ENGINE_DEFAULTS.autoFixBuilds;
     if (pollEnabled && autoFixBuilds && pr.status === PR_STATUS.ACTIVE && pr.buildStatus === 'failing'
+      && !fixDispatched
       && !isPrNoOpFixCauseSuppressed(pr, shared.PR_FIX_CAUSE.BUILD_FAILURE)) {
+      // W-mpritzcr0004afc5 (#2955): "don't fan out a parallel build-failure
+      // fix while the review-feedback path owns the PR" — implemented via
+      // the `!fixDispatched` gate above (mirrors the merge-conflict block
+      // below). This preserves W-mphnm6a1000281b8 / PR #57 starvation fix:
+      // when the review-feedback dispatch is suppressed by its own cooldown,
+      // `fixDispatched` stays false and the build-fix path still gets to
+      // run. An earlier draft used a bare `reviewStatus === 'changes-requested'`
+      // skip, which broke that starvation guarantee.
+      //
+      // W-mpritzcr0004afc5 (#2955): receive-side cap from lifecycle.js
+      // (`updatePrAfterFix` BUILD_FAILURE branch) flagged this PR as
+      // unrecoverable by auto-retry after `engine.maxBuildFixRetries`
+      // consecutive unverified pushes. Honor the flag here so the dispatcher
+      // stops queuing fix agents — a human must inspect the worktree or
+      // branch protection. Cleared by the same lifecycle path on the next
+      // verified push (lifecycle.js:~2184).
+      if (pr._buildFixNeedsHumanRebase) {
+        log('info', `Skipping build-fix for ${pr.id}: _buildFixNeedsHumanRebase is set — engine reached maxBuildFixRetries, awaiting human rescue`);
+        continue;
+      }
       // P-b7e1c4d2: skip when the most recent BUILD-FAILURE dispatch already
       // noop'd against the same head SHA — chronic across PRs #2315–#2323
       // where every fix agent rebutted "this is a pre-existing master baseline"
@@ -4907,8 +4928,16 @@ async function discoverFromPrs(config, project) {
       if (!prBranch) continue;
 
       const reviewNote = [
+        `Cause: ${shared.PR_FIX_CAUSE.BUILD_FAILURE}.`,
         `Build is failing: ${pr.buildFailReason || 'check CI pipeline for details'}.`,
         'Inspect the live PR checks/build logs yourself, decide the root cause, fix it, run the relevant local validation, and push.',
+        // W-mpritzcr0004afc5 (#2955): the engine-fetched build error log on the
+        // PR record is intentionally not inlined here — the build-error-log
+        // feature regression test in test/unit/build-error-log-feature.test.js
+        // locks the "let the agent inspect live CI" design so the engine does
+        // not have to stay in sync with each CI provider's log format. The
+        // Cause label above plus the build-fail reason is enough to disambiguate
+        // this dispatch from review-feedback / merge-conflict triggers.
         pr.url ? `PR URL: ${pr.url}` : '',
       ].filter(Boolean).join('\n');
 
@@ -4949,8 +4978,30 @@ async function discoverFromPrs(config, project) {
     const autoFixConflicts = config.engine?.autoFixConflicts ?? ENGINE_DEFAULTS.autoFixConflicts;
     if (pollEnabled && autoFixConflicts && pr.status === PR_STATUS.ACTIVE && pr._mergeConflict && !fixDispatched
       && !isPrNoOpFixCauseSuppressed(pr, shared.PR_FIX_CAUSE.MERGE_CONFLICT)) {
+      // W-mpritzcr0004afc5 (#2955): "don't fan out a parallel conflict-fix
+      // while the review-feedback path owns the PR" is already handled by
+      // the existing `!fixDispatched` gate above. When review-feedback is
+      // queued in this same iteration, fixDispatched=true and this block
+      // skips. When review-feedback is suppressed by its own cooldown, this
+      // block can still fire — preserving the W-mphnm6a1000281b8 / PR #57
+      // starvation guarantee.
       const conflictCauseKey = getPrAutomationCauseKey('merge-conflict', pr);
       const key = getPrAutomationDispatchKey(`conflict-fix-${project?.name || 'default'}-${prDisplayId}`, conflictCauseKey);
+      // W-mpritzcr0004afc5 (#2955): per-cause same-head guard mirroring the
+      // build-failure block above. `_conflictFixedAt` is a 10-min wall-clock
+      // suppression for ADO/GH mergeStatus lag; `_lastDispatchByCause` is a
+      // headSha-pinned suppression for repeated agent noops on an unchanged
+      // base+head pair. Both must fire (their windows are independent).
+      const currentHeadSha = String(pr.headSha || pr._adoSourceCommit || pr._adoHeadCommit || '').trim();
+      const lastConflictDispatch = pr._lastDispatchByCause?.[shared.PR_FIX_CAUSE.MERGE_CONFLICT];
+      const skipConflictFix = !!(lastConflictDispatch?.outcome === 'noop'
+        && lastConflictDispatch.headSha
+        && currentHeadSha
+        && lastConflictDispatch.headSha === currentHeadSha);
+      if (skipConflictFix) {
+        log('info', `Skipping conflict-fix for ${pr.id}: last merge-conflict dispatch was noop on the same head ${currentHeadSha.slice(0, 8)} (${(lastConflictDispatch.reason || '').slice(0, 120)})`);
+        continue;
+      }
       // Suppress re-dispatch for 10 min after last attempt — ADO/GitHub recomputes
       // mergeStatus asynchronously (1–5 min lag), so the flag may stay set even after
       // a successful push. _conflictFixedAt is cleared when the poller confirms clean status.
@@ -4985,9 +5036,14 @@ async function discoverFromPrs(config, project) {
           if (agentId) {
             const prBranch = ensurePrBranchForDispatch(project, pr, 'conflict-fix');
             if (!prBranch) continue;
+            const conflictReviewNote = [
+              `Cause: ${shared.PR_FIX_CAUSE.MERGE_CONFLICT}.`,
+              'This PR has merge conflicts with the target branch. Inspect the live PR and repository history, choose the safest merge/rebase/update strategy, resolve all conflicts, validate the result, and push the branch.',
+              pr.url ? `PR URL: ${pr.url}` : '',
+            ].filter(Boolean).join('\n');
             const item = buildPrDispatch(agentId, config, project, pr, 'fix', {
               pr_id: pr.id, pr_branch: prBranch,
-              review_note: `This PR has merge conflicts with the target branch. Inspect the live PR and repository history, choose the safest merge/rebase/update strategy, resolve all conflicts, validate the result, and push the branch.`,
+              review_note: conflictReviewNote,
             }, `Fix merge conflicts on ${pr.id}: ${pr.title || ''}`, { dispatchKey: key, cooldownKey: key, automationCauseKey: conflictCauseKey, source: 'pr', pr, branch: prBranch, project: projMeta });
             if (item) {
               newWork.push(item);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yemi33/minions",
-  "version": "0.1.2090",
+  "version": "0.1.2091",
   "description": "Multi-agent AI dev team that runs from ~/.minions/ — five autonomous agents share a single engine, dashboard, and knowledge base",
   "bin": {
     "minions": "bin/minions.js"