@yemi33/minions 0.1.785 → 0.1.786

package/CHANGELOG.md

@@ -1,11 +1,12 @@
 # Changelog
 
-## 0.1.785 (2026-04-10)
+## 0.1.786 (2026-04-10)
 
 ### Features
 -  cap review→fix cycles at evalMaxIterations (default 3)
 
 ### Fixes
+-  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
@@ -447,6 +446,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

@@ -423,6 +423,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

@@ -1771,6 +1771,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.786",
   "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"