@yemi33/minions 0.1.949 → 0.1.951

package/CHANGELOG.md

@@ -1,8 +1,9 @@
 # Changelog
 
-## 0.1.949 (2026-04-14)
+## 0.1.951 (2026-04-14)
 
 ### Features
+- gate auto-fix conflict dispatch behind autoFixConflicts flag
 - add PR/build status CLI shim and agent guidance
 -  make ADO poll frequency configurable and ungate reconcilePrs
 - update render-work-items.js output viewer to use renderAgentOutput
@@ -22,7 +23,6 @@
 - fix dispatch.js mutator fallback to use nullish coalescing (#966)
 - fix stall recovery nested lock violation (#965)
 - fix pending-rebases.json race condition with file locking (#964)
-- add missing resolveWorkItemPath import in engine.js (#963)
 
 ### Fixes
 - tighten build query guard to require mergeCommitId
@@ -47,6 +47,7 @@
 - prioritize error_max_turns over permission-blocked in classifyFailure (#1001)
 
 ### Other
+- refactor(ado): simplify ado-status and extract build/review status helpers
 - refactor(ado): extract stripRefsHeads helper, deduplicate refs/heads/ stripping
 - refactor(ado): simplify comments, fix declaration order, promote ado import
 - refactor(ado): move PR enrichment fetch into fetchAdoPrMetadata helper

package/dashboard/js/settings.js

@@ -49,6 +49,7 @@ async function openSettings() {
       settingsToggle('Auto-decompose', 'set-autoDecompose', e.autoDecompose !== false, 'Large implement items are auto-split into sub-tasks') +
       settingsToggle('Allow Temp Agents', 'set-allowTempAgents', !!e.allowTempAgents, 'Spawn ephemeral agents when all permanent agents are busy') +
       settingsToggle('Auto-archive Plans', 'set-autoArchive', !!e.autoArchive, 'Automatically archive plans after verify completes (off = manual archive via dashboard)') +
+      settingsToggle('Auto-fix Conflicts', 'set-autoFixConflicts', e.autoFixConflicts !== false, 'Auto-dispatch fix agents when a PR has merge conflicts') +
       settingsToggle('ADO Polling', 'set-adoPollEnabled', e.adoPollEnabled !== false, 'Poll ADO PR status and comments each tick (reconciliation always runs)') +
       settingsToggle('GitHub Polling', 'set-ghPollEnabled', e.ghPollEnabled !== false, 'Poll GitHub PR status and comments each tick (reconciliation always runs)') +
     '</div>' +
@@ -237,6 +238,7 @@ async function saveSettings() {
       autoDecompose: document.getElementById('set-autoDecompose').checked,
       allowTempAgents: document.getElementById('set-allowTempAgents').checked,
       autoArchive: document.getElementById('set-autoArchive').checked,
+      autoFixConflicts: document.getElementById('set-autoFixConflicts').checked,
       adoPollEnabled: document.getElementById('set-adoPollEnabled').checked,
       ghPollEnabled: document.getElementById('set-ghPollEnabled').checked,
       adoPollStatusEvery: document.getElementById('set-adoPollStatusEvery').value,

package/engine/ado-status.js

@@ -23,7 +23,7 @@
 
 const path = require('path');
 const shared = require('./shared');
-const { safeJsonArr, projectPrPath, getProjects } = shared;
+const { safeJson, safeJsonArr, projectPrPath, getProjects } = shared;
 
 // ── Arg parsing ──────────────────────────────────────────────────────────────
 
@@ -54,13 +54,6 @@ const prNumber = parseInt(prNumberArg, 10);
 
 // ── Helpers ──────────────────────────────────────────────────────────────────
 
-function getConfig() {
-  // Avoid pulling in queries.js to keep startup fast; read config directly.
-  const configPath = path.join(__dirname, '..', 'config.json');
-  try { return JSON.parse(require('fs').readFileSync(configPath, 'utf8')); }
-  catch { return {}; }
-}
-
 function findInCache(projects) {
   for (const project of projects) {
     const prs = safeJsonArr(projectPrPath(project));
@@ -88,7 +81,8 @@ function findInCache(projects) {
 // ── Main ─────────────────────────────────────────────────────────────────────
 
 async function main() {
-  const config = getConfig();
+  // Use safeJson directly — pulling in queries.js would load all cached state unnecessarily
+  const config = safeJson(path.join(__dirname, '..', 'config.json')) || {};
   const allProjects = getProjects(config).filter(p => p.repoHost === 'ado' || !p.repoHost);
   const projects = projectName
     ? allProjects.filter(p => p.name === projectName)
@@ -103,7 +97,6 @@ async function main() {
   }
 
   if (!live) {
-    // Fast path: read engine-maintained pull-requests.json
     const result = findInCache(projects);
     if (result) { console.log(JSON.stringify(result, null, 2)); return; }
     console.error(`PR #${prNumber} not found in cached pull-requests.json`);
@@ -111,26 +104,25 @@ async function main() {
     process.exit(1);
   }
 
-  // Live path: call ADO API via ado.js (handles auth, retry, circuit breaking)
+  // Live path: query all projects in parallel, return first match
   const ado = require('./ado');
+  const settled = await Promise.allSettled(
+    projects.map(p => ado.fetchSinglePrBuildStatus(p, prNumber))
+  );
 
-  // Try each project until we find the PR
-  for (const project of projects) {
-    try {
-      const result = await ado.fetchSinglePrBuildStatus(project, prNumber);
-      if (result) { console.log(JSON.stringify(result, null, 2)); return; }
-    } catch (e) {
-      // 404 or similar — PR not in this project, try the next one
-      if (!e.message?.includes('404') && !e.message?.includes('not found')) {
-        console.error(`Error querying ${project.name}: ${e.message}`);
-      }
+  const found = settled.find(r => r.status === 'fulfilled' && r.value);
+  if (found) { console.log(JSON.stringify(found.value, null, 2)); return; }
+
+  // Log unexpected errors (not 404s — those just mean PR isn't in that project)
+  for (const { status, reason } of settled) {
+    if (status === 'rejected' && !reason?.message?.includes('404') && !reason?.message?.includes('not found')) {
+      console.error(`ADO query error: ${reason.message}`);
     }
   }
 
-  // Live lookup failed — fall back to cache
+  // Fall back to cache with a note that live lookup failed
   const cached = findInCache(projects);
   if (cached) {
-    cached._liveFailed = true;
     cached.source = 'cached (live lookup failed — check ADO auth)';
     console.log(JSON.stringify(cached, null, 2));
     return;

package/engine/ado.js

@@ -18,6 +18,30 @@ function engine() {
 
 const stripRefsHeads = s => (s || '').replace('refs/heads/', '');
 
+// ── Build/Review Status Helpers ───────────────────────────────────────────────
+
+/** Classify an array of ADO build records into a single status string. */
+function classifyBuildStatus(prBuilds) {
+  if (!prBuilds.length) return 'none';
+  // partiallySucceeded = warnings, not failures — counts as passing
+  const hasFailed = prBuilds.some(b => b.result === 'failed' || b.result === 'canceled');
+  const allDone = prBuilds.every(b => b.status === 'completed');
+  const allPassed = prBuilds.every(b => b.result === 'succeeded' || b.result === 'partiallySucceeded');
+  const hasRunning = prBuilds.some(b => b.status === 'inProgress' || b.status === 'notStarted');
+  if (hasFailed && allDone) return 'failing';
+  if (allDone && allPassed) return 'passing';
+  if (hasRunning) return 'running';
+  return 'none';
+}
+
+/** Map ADO reviewer vote array to a review status string. */
+function votesToReviewStatus(votes) {
+  if (votes.some(v => v === -10)) return 'changes-requested';
+  if (votes.some(v => v >= 5)) return 'approved';
+  if (votes.some(v => v === -5)) return 'waiting';
+  return 'pending';
+}
+
 // ─── ADO Token Cache ─────────────────────────────────────────────────────────
 
 let _adoTokenCache = { token: null, expiresAt: 0 };
@@ -390,14 +414,8 @@ async function pollPrStatus(config) {
         const prBuilds = (buildsData?.value || []).filter(b => b.sourceVersion === mergeCommitId);
 
         if (prBuilds.length > 0) {
-          // partiallySucceeded = warnings, not failures — counts as passing
-          const hasFailed = prBuilds.some(b => b.result === 'failed' || b.result === 'canceled');
-          const allDone = prBuilds.every(b => b.status === 'completed');
-          const allPassed = prBuilds.every(b => b.result === 'succeeded' || b.result === 'partiallySucceeded');
-          const hasRunning = prBuilds.some(b => b.status === 'inProgress' || b.status === 'notStarted');
-
-          if (hasFailed && allDone) {
-            buildStatus = 'failing';
+          buildStatus = classifyBuildStatus(prBuilds);
+          if (buildStatus === 'failing') {
             const failed = prBuilds.find(b => b.result === 'failed');
             buildFailReason = failed?.definition?.name || 'Build failed';
             // Build fake status objects for error log fetching
@@ -405,10 +423,6 @@ async function pollPrStatus(config) {
               state: 'failed', targetUrl: `${orgBase}/${project.adoProject}/_build/results?buildId=${b.id}`,
               _buildId: String(b.id),
             }));
-          } else if (allDone && allPassed) {
-            buildStatus = 'passing';
-          } else if (hasRunning) {
-            buildStatus = 'running';
           }
         }
       } catch (e) { log('warn', `ADO build query for ${pr.id}: ${e.message}`); }
@@ -758,10 +772,7 @@ async function checkLiveReviewStatus(pr, project) {
     const prData = JSON.parse(result);
     const votes = (prData.reviewers || []).map(r => r.vote).filter(v => v !== undefined);
     if (votes.length === 0) return 'pending';
-    if (votes.some(v => v === -10)) return 'changes-requested';
-    if (votes.some(v => v >= 5)) return 'approved';
-    if (votes.some(v => v === -5)) return 'waiting';
-    return 'pending';
+    return votesToReviewStatus(votes);
   } catch (e) {
     log('warn', `Live review check for ${pr.id}: ${e.message}`);
     return null;
@@ -794,55 +805,42 @@ async function fetchSinglePrBuildStatus(project, prNumber) {
 
   const orgBase = getAdoOrgBase(project);
   const repoBase = `${orgBase}/${project.adoProject}/_apis/git/repositories/${project.repositoryId}`;
-  const prData = await adoFetch(`${repoBase}/pullrequests/${prNumber}?api-version=7.1`, token);
+  const mergeRef = encodeURIComponent(`refs/pull/${prNumber}/merge`);
+  const buildsUrl = `${orgBase}/${project.adoProject}/_apis/build/builds?branchName=${mergeRef}&repositoryId=${project.repositoryId}&repositoryType=TfsGit&$top=25&api-version=7.1`;
+
+  // Fetch PR metadata and builds in parallel
+  const [prData, buildsData] = await Promise.all([
+    adoFetch(`${repoBase}/pullrequests/${prNumber}?api-version=7.1`, token),
+    adoFetch(buildsUrl, token).catch(() => null),
+  ]);
   if (!prData) return null;
 
   const mergeCommitId = prData.lastMergeCommit?.commitId;
-  let buildStatus = 'none';
+  const prBuilds = mergeCommitId
+    ? (buildsData?.value || []).filter(b => b.sourceVersion === mergeCommitId)
+    : [];
+
+  let buildStatus = classifyBuildStatus(prBuilds);
   let buildErrorLog = null;
 
-  if (mergeCommitId) {
+  if (buildStatus === 'failing') {
     try {
-      const mergeRef = encodeURIComponent(`refs/pull/${prNumber}/merge`);
-      const buildsUrl = `${orgBase}/${project.adoProject}/_apis/build/builds?branchName=${mergeRef}&repositoryId=${project.repositoryId}&repositoryType=TfsGit&$top=25&api-version=7.1`;
-      const buildsData = await adoFetch(buildsUrl, token);
-      const prBuilds = (buildsData?.value || []).filter(b => b.sourceVersion === mergeCommitId);
-
-      if (prBuilds.length > 0) {
-        const hasFailed = prBuilds.some(b => b.result === 'failed' || b.result === 'canceled');
-        const allDone = prBuilds.every(b => b.status === 'completed');
-        const allPassed = prBuilds.every(b => b.result === 'succeeded' || b.result === 'partiallySucceeded');
-        const hasRunning = prBuilds.some(b => b.status === 'inProgress' || b.status === 'notStarted');
-
-        if (hasFailed && allDone) {
-          buildStatus = 'failing';
-          const failedBuilds = prBuilds.filter(b => b.result === 'failed').map(b => ({
-            state: 'failed', _buildId: String(b.id),
-            targetUrl: `${orgBase}/${project.adoProject}/_build/results?buildId=${b.id}`,
-          }));
-          const logParts = [];
-          const seenBuildIds = new Set();
-          for (const fb of failedBuilds.slice(0, 3)) {
-            const errorLog = await fetchAdoBuildErrorLog(orgBase, project, fb, token, { id: `PR-${prNumber}` }, seenBuildIds);
-            if (errorLog) logParts.push(errorLog);
-          }
-          if (logParts.length > 0) buildErrorLog = logParts.join('\n\n');
-        } else if (allDone && allPassed) {
-          buildStatus = 'passing';
-        } else if (hasRunning) {
-          buildStatus = 'running';
-        }
+      const failedBuilds = prBuilds.filter(b => b.result === 'failed').map(b => ({
+        state: 'failed', _buildId: String(b.id),
+        targetUrl: `${orgBase}/${project.adoProject}/_build/results?buildId=${b.id}`,
+      }));
+      const logParts = [];
+      const seenBuildIds = new Set();
+      const pr = { id: `PR-${prNumber}`, branch: stripRefsHeads(prData.sourceRefName) };
+      for (const fb of failedBuilds.slice(0, 3)) {
+        const errorLog = await fetchAdoBuildErrorLog(orgBase, project, fb, token, pr, seenBuildIds);
+        if (errorLog) logParts.push(errorLog);
       }
-    } catch (e) { log('warn', `fetchSinglePrBuildStatus build query for PR #${prNumber}: ${e.message}`); }
+      if (logParts.length > 0) buildErrorLog = logParts.join('\n\n');
+    } catch (e) { log('warn', `fetchSinglePrBuildStatus error log for PR #${prNumber}: ${e.message}`); }
   }
 
   const votes = (prData.reviewers || []).map(r => r.vote);
-  let reviewStatus = 'pending';
-  if (votes.some(v => v === -10)) reviewStatus = 'changes-requested';
-  else if (votes.some(v => v >= 5)) reviewStatus = 'approved';
-  else if (votes.some(v => v === -5)) reviewStatus = 'waiting';
-
-  // Reconstruct a human-readable PR URL from the API URL
   const prUrl = `https://dev.azure.com/${project.adoOrg}/${project.adoProject}/_git/${project.repositoryId}/pullrequest/${prNumber}`;
 
   return {
@@ -850,9 +848,9 @@ async function fetchSinglePrBuildStatus(project, prNumber) {
     title: prData.title || '',
     branch: stripRefsHeads(prData.sourceRefName),
     status: prData.status || 'unknown',
-    reviewStatus,
+    reviewStatus: votesToReviewStatus(votes),
     buildStatus,
-    buildErrorLog: buildErrorLog || undefined,
+    ...(buildErrorLog ? { buildErrorLog } : {}),
     mergeConflict: prData.mergeStatus === 'conflicts',
     url: prUrl,
     project: project.name,

package/engine/shared.js

@@ -533,6 +533,7 @@ const ENGINE_DEFAULTS = {
   autoApprovePlans: false, // auto-approve PRDs without waiting for human approval
   autoArchive: false, // opt-in: auto-archive plans after verify completes (false = mark ready, user archives manually)
   autoReview: true, // auto-dispatch review agents for new PRs (disable for manual review workflow)
+  autoFixConflicts: true, // auto-dispatch fix agents when a PR has merge conflicts
   meetingRoundTimeout: 600000, // 10min per meeting round before auto-advance
   evalLoop: true, // enable review→fix loop after implementation completes
   evalMaxIterations: 3, // max review→fix cycles before escalating to human

package/engine.js

@@ -2118,8 +2118,9 @@ async function discoverFromPrs(config, project) {
       }
     }
 
-    // PRs with merge conflicts — dispatch fix to resolve
-    if (pr.status === PR_STATUS.ACTIVE && pr._mergeConflict && !fixDispatched) {
+    // PRs with merge conflicts — dispatch fix to resolve (gated by autoFixConflicts)
+    const autoFixConflicts = config.engine?.autoFixConflicts ?? ENGINE_DEFAULTS.autoFixConflicts;
+    if (autoFixConflicts && pr.status === PR_STATUS.ACTIVE && pr._mergeConflict && !fixDispatched) {
       const key = `conflict-fix-${project?.name || 'default'}-${pr.id}`;
       // 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

package/package.json

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