@yemi33/minions 0.1.785 → 0.1.787

package/CHANGELOG.md

@@ -1,11 +1,13 @@
 # Changelog
 
-## 0.1.785 (2026-04-10)
+## 0.1.787 (2026-04-10)
 
 ### Features
 -  cap review→fix cycles at evalMaxIterations (default 3)
 
 ### Fixes
+-  5 bugs from comprehensive audit
+-  stale ADO build detection + merge conflict auto-fix for both platforms
 -  don't overwrite reviewStatus when platform vote hasn't propagated
 -  don't overwrite approval with 'waiting' when platform API lags
 

package/engine/ado.js

@@ -362,9 +362,8 @@ async function pollPrStatus(config) {
         // Find builds where sourceVersion matches the PR's merge commit
         const buildsUrl = `${orgBase}/${project.adoProject}/_apis/build/builds?$top=10&api-version=7.1`;
         const buildsData = await adoFetch(buildsUrl, token);
-        const prBuilds = (buildsData?.value || []).filter(b =>
-          b.sourceVersion === mergeCommitId || b.sourceBranch === prData.sourceRefName
-        );
+        // Only match builds against the current merge commit — sourceBranch match catches stale builds
+        const prBuilds = (buildsData?.value || []).filter(b => b.sourceVersion === mergeCommitId);
 
         if (prBuilds.length > 0) {
           // partiallySucceeded = warnings, not failures — counts as passing
@@ -396,8 +395,9 @@ async function pollPrStatus(config) {
       pr.buildStatus = buildStatus;
       if (buildFailReason) pr.buildFailReason = buildFailReason;
       else delete pr.buildFailReason;
-      // Build transitioned — clear grace period so next failure can trigger immediately
+      // Build transitioned — clear grace period and auto-complete flag
       delete pr._buildFixPushedAt;
+      if (buildStatus === 'failing') delete pr._autoCompleted;
       if (buildStatus !== 'failing') {
         delete pr._buildFailNotified;
         delete pr.buildErrorLog;
@@ -447,6 +447,18 @@ async function pollPrStatus(config) {
       }
     }
 
+    // Merge conflict detection
+    if (prData.mergeStatus === 'conflicts') {
+      if (!pr._mergeConflict) {
+        pr._mergeConflict = true;
+        log('info', `PR ${pr.id} has merge conflicts — will dispatch fix if not already in progress`);
+        updated = true;
+      }
+    } else if (pr._mergeConflict) {
+      delete pr._mergeConflict;
+      updated = true;
+    }
+
     return updated;
     } catch (err) {
       // Auth errors → mark build status stale so dashboard shows uncertainty

package/engine/github.js

@@ -400,8 +400,9 @@ async function pollPrStatus(config) {
           pr.buildStatus = buildStatus;
           if (buildFailReason) pr.buildFailReason = buildFailReason;
           else delete pr.buildFailReason;
-          // Build transitioned — clear grace period so next failure can trigger immediately
+          // Build transitioned — clear grace period and auto-complete flag
           delete pr._buildFixPushedAt;
+          if (buildStatus === 'failing') delete pr._autoCompleted; // allow re-merge after fix
           if (buildStatus !== 'failing') {
             delete pr._buildFailNotified;
             delete pr.buildErrorLog;
@@ -423,6 +424,18 @@ async function pollPrStatus(config) {
       }
     }
 
+    // Merge conflict detection
+    if (prData.state === 'open' && prData.mergeable === false) {
+      if (!pr._mergeConflict) {
+        pr._mergeConflict = true;
+        log('info', `PR ${pr.id} has merge conflicts — will dispatch fix if not already in progress`);
+        updated = true;
+      }
+    } else if (pr._mergeConflict) {
+      delete pr._mergeConflict;
+      updated = true;
+    }
+
     // Auto-complete: merge PR when builds green + review approved
     if (pr.status === PR_STATUS.ACTIVE && pr.reviewStatus === 'approved' && pr.buildStatus === 'passing' && !pr._autoCompleted) {
       const autoComplete = config.engine?.autoCompletePrs === true; // opt-in

package/engine.js

@@ -1576,10 +1576,11 @@ async function discoverFromPrs(config, project) {
     // The poller holds reviewStatus at 'waiting' until the reviewer acts on the new code.
     const awaitingReReview = reviewStatus === 'waiting' && !!pr.minionsReview?.fixedAt;
 
-    // Review→fix cycle cap — stop after N iterations, alert human
+    // Review→fix cycle cap — stop review/fix dispatch after N iterations, but allow build fixes and conflict fixes
     const evalMax = config.engine?.evalMaxIterations ?? DEFAULTS.evalMaxIterations;
     const evalCycles = pr._reviewFixCycles || 0;
-    if (evalCycles >= evalMax && !pr._evalEscalated) {
+    const evalEscalated = evalCycles >= evalMax;
+    if (evalEscalated && !pr._evalEscalated) {
       writeInboxAlert(`eval-escalated-${pr.agent || 'unassigned'}-${pr.id}`,
         `# Review Loop Escalation\n\n**PR ${pr.id}** on branch \`${pr.branch || 'unknown'}\` has gone through **${evalCycles}** review→fix cycles without approval.\n\n` +
         `Last review: ${pr.minionsReview?.note ? pr.minionsReview.note.slice(0, 200) : 'See PR thread'}\n\n` +
@@ -1591,13 +1592,12 @@ async function discoverFromPrs(config, project) {
         });
       } catch (e) { log('warn', 'mark eval escalated: ' + e.message); }
       log('warn', `PR ${pr.id}: review→fix escalated after ${evalCycles} cycles — suspending auto-dispatch`);
-      continue;
     }
 
     // PRs needing review: pending review status and not already reviewed without new commits
     const autoReview = config.engine?.autoReview !== false;
     const alreadyReviewed = pr.lastReviewedAt && (!pr.lastPushedAt || pr.lastPushedAt <= pr.lastReviewedAt);
-    const needsReview = autoReview && reviewStatus === 'pending' && !alreadyReviewed;
+    const needsReview = autoReview && reviewStatus === 'pending' && !alreadyReviewed && !evalEscalated;
     if (needsReview) {
       const key = `review-${project?.name || 'default'}-${pr.id}`;
       if (isAlreadyDispatched(key) || isOnCooldown(key, cooldownMs)) continue;
@@ -1634,7 +1634,7 @@ async function discoverFromPrs(config, project) {
 
     // PRs with changes requested → route back to author for fix
     let fixDispatched = false;
-    if (reviewStatus === 'changes-requested' && !awaitingReReview) {
+    if (reviewStatus === 'changes-requested' && !awaitingReReview && !evalEscalated) {
       const key = `fix-${project?.name || 'default'}-${pr.id}`;
       if (isAlreadyDispatched(key) || isOnCooldown(key, cooldownMs)) continue;
       const agentId = resolveAgent('fix', config, pr.agent);
@@ -1683,7 +1683,15 @@ async function discoverFromPrs(config, project) {
         reviewer: 'Human Reviewer',
         review_note: reviewNote,
       }, `Fix PR ${pr.id} — human feedback`, { dispatchKey: key, source: 'pr-human-feedback', pr, branch: pr.branch, project: projMeta });
-      if (item) { newWork.push(item); setCooldown(key); }
+      if (item) {
+        newWork.push(item); setCooldown(key); fixDispatched = true;
+        try {
+          mutatePullRequests(projectPrPath(project), prs => {
+            const target = prs.find(p => p.id === pr.id);
+            if (target) target._reviewFixCycles = (target._reviewFixCycles || 0) + 1;
+          });
+        } catch (e) { log('warn', 'increment review-fix cycles (human): ' + e.message); }
+      }
     }
 
     // PRs with build failures — route to author (has session context from implementing)
@@ -1771,6 +1779,21 @@ async function discoverFromPrs(config, project) {
       }
     }
 
+    // PRs with merge conflicts — dispatch fix to resolve
+    if (pr.status === PR_STATUS.ACTIVE && pr._mergeConflict && !fixDispatched) {
+      const key = `conflict-fix-${project?.name || 'default'}-${pr.id}`;
+      if (!isAlreadyDispatched(key) && !isOnCooldown(key, cooldownMs)) {
+        const agentId = resolveAgent('fix', config, pr.agent);
+        if (agentId) {
+          const item = buildPrDispatch(agentId, config, project, pr, 'fix', {
+            pr_id: pr.id, pr_branch: pr.branch || '',
+            review_note: `This PR has merge conflicts with the target branch. Resolve the conflicts:\n\n1. Pull latest from main/master\n2. Resolve all conflicts (prefer PR branch changes unless main has critical fixes)\n3. Build and test after resolving\n4. Push the resolved branch`,
+          }, `Fix merge conflicts on PR ${pr.id}`, { dispatchKey: key, source: 'pr', pr, branch: pr.branch, project: projMeta });
+          if (item) { newWork.push(item); setCooldown(key); }
+        }
+      }
+    }
+
   }
   // Build & test now runs once at PRD completion (via verify task), not per-PR.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yemi33/minions",
-  "version": "0.1.785",
+  "version": "0.1.787",
   "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"