@yemi33/minions 0.1.891 → 0.1.893

package/CHANGELOG.md

@@ -1,11 +1,17 @@
 # Changelog
 
-## 0.1.891 (2026-04-11)
+## 0.1.893 (2026-04-11)
+
+### Fixes
+- suppress conflict-fix re-dispatch during ADO mergeStatus recompute lag (#921)
+
+## 0.1.892 (2026-04-11)
 
 ### Features
 -  add 13 missing CC action types for full dashboard parity
 
 ### Fixes
+- merge version bump PR immediately with --admin instead of --auto
 - parse review verdict from agent output for GitHub self-approval (#912) (#918)
 - verify PRD file exists before marking plan-to-prd done (#893) (#911)
 - re-open done work items when PRD item reset to missing (#906) (#910)

package/engine/ado.js

@@ -485,6 +485,7 @@ async function pollPrStatus(config) {
       }
     } else if (pr._mergeConflict) {
       delete pr._mergeConflict;
+      delete pr._conflictFixedAt; // ADO confirmed clean — allow re-dispatch if conflicts recur
       updated = true;
     }
 

package/engine/github.js

@@ -432,6 +432,7 @@ async function pollPrStatus(config) {
       }
     } else if (pr._mergeConflict) {
       delete pr._mergeConflict;
+      delete pr._conflictFixedAt; // confirmed clean — allow re-dispatch if conflicts recur
       updated = true;
     }
 

package/engine.js

@@ -1899,14 +1899,29 @@ 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)) {
+      // 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.
+      const conflictFixedAt = pr._conflictFixedAt;
+      const withinLag = conflictFixedAt && Date.now() - new Date(conflictFixedAt).getTime() < 10 * 60 * 1000;
+      if (!withinLag && !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.id}: ${pr.title || ''}`, { dispatchKey: key, source: 'pr', pr, branch: pr.branch, project: projMeta });
-          if (item) { newWork.push(item); setCooldown(key); }
+          if (item) {
+            newWork.push(item);
+            setCooldown(key);
+            // Record dispatch timestamp so re-dispatch is suppressed during ADO lag window
+            try {
+              mutatePullRequests(projectPrPath(project), prs => {
+                const target = prs.find(p => p.id === pr.id);
+                if (target) target._conflictFixedAt = new Date().toISOString();
+              });
+            } catch (e) { log('warn', `conflict-fix timestamp: ${e.message}`); }
+          }
         }
       }
     }

package/package.json

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