@yemi33/minions 0.1.946 → 0.1.948

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.1.946 (2026-04-14)
+## 0.1.948 (2026-04-14)
 
 ### Features
 -  make ADO poll frequency configurable and ungate reconcilePrs
@@ -47,6 +47,8 @@
 - prioritize error_max_turns over permission-blocked in classifyFailure (#1001)
 
 ### Other
+- 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
 - refactor: Make renderLiveChatMessage a thin wrapper over renderAgentOutput
 - test(preflight): add unit tests for findClaudeBinary, runPreflight, printPreflight, checkOrExit (#953)

package/dashboard.js

@@ -21,6 +21,7 @@ const _dashboardVersion = {
 const shared = require('./engine/shared');
 const queries = require('./engine/queries');
 const teams = require('./engine/teams');
+const ado = require('./engine/ado');
 const os = require('os');
 
 const { safeRead, safeReadDir, safeWrite, safeJson, safeJsonObj, safeJsonArr, safeUnlink, mutateJsonFileLocked, mutateWorkItems, getProjects: _getProjects, DONE_STATUSES, WI_STATUS, reopenWorkItem } = shared;
@@ -4228,8 +4229,7 @@ What would you like to discuss or change? When you're happy, say "approve" and I
           } else if (adoMatch) {
             const [, adoOrg, adoProj, adoRepo] = adoMatch;
             try {
-              const { fetchAdoPrMetadata } = require('./engine/ado');
-              prData = await fetchAdoPrMetadata(prNum, adoOrg, adoProj, adoRepo);
+              prData = await ado.fetchAdoPrMetadata(prNum, adoOrg, adoProj, adoRepo);
             } catch { /* ADO token may not be available */ }
           }
           if (!prData) return;

package/engine/ado.js

@@ -16,6 +16,8 @@ function engine() {
   return _engine;
 }
 
+const stripRefsHeads = s => (s || '').replace('refs/heads/', '');
+
 // ─── ADO Token Cache ─────────────────────────────────────────────────────────
 
 let _adoTokenCache = { token: null, expiresAt: 0 };
@@ -117,7 +119,7 @@ async function fetchAdoBuildErrorLog(orgBase, project, failedStatus, token, pr,
     if (!buildId) {
       // Fallback: query recent failed builds for this PR's source branch
       try {
-        const branch = pr?.branch || pr?.sourceRefName?.replace('refs/heads/', '');
+        const branch = pr?.branch || stripRefsHeads(pr?.sourceRefName);
         if (branch) {
           const buildsUrl = `${orgBase}/${project.adoProject}/_apis/build/builds?branchName=refs/heads/${encodeURIComponent(branch)}&statusFilter=completed&resultFilter=failed&$top=3&api-version=7.1`;
           const builds = await adoFetch(buildsUrl, token);
@@ -371,19 +373,17 @@ async function pollPrStatus(config) {
 
     if (newStatus !== PR_STATUS.ACTIVE) return updated;
 
-    // Query builds API directly — status checks (/statuses) are unreliable (stale codecoverage postbacks)
-    // Use refs/pull/{id}/merge — the synthetic merge ref ADO creates for each PR — to scope builds exactly
+    // Query builds API directly — /statuses is unreliable (stale codecoverage postbacks).
+    // refs/pull/{id}/merge scopes server-side to this PR; sourceVersion narrows to the current
+    // merge commit (same ref accumulates builds across all prior pushes to the PR).
     const prNumber = pr.prNumber;
+    const mergeCommitId = prData.lastMergeCommit?.commitId;
     let buildStatus = 'none';
     let buildFailReason = '';
     let buildStatuses = []; // for error log fetching
 
-    const mergeCommitId = prData.lastMergeCommit?.commitId;
     if (prNumber && mergeCommitId) {
       try {
-        // branchName=refs/pull/{id}/merge scopes server-side to this PR's builds.
-        // sourceVersion filter then narrows to the current merge commit — a PR updated
-        // multiple times accumulates builds on the same ref across different commits.
         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);
@@ -650,7 +650,7 @@ async function reconcilePrs(config) {
     let projectUpdated = 0;
     for (const adoPr of adoPrs) {
       const prId = `PR-${adoPr.pullRequestId}`;
-      const branch = (adoPr.sourceRefName || '').replace('refs/heads/', '');
+      const branch = stripRefsHeads(adoPr.sourceRefName);
       const title = adoPr.title || '';
       // Extract item ID from branch name or PR title (e.g., feat(P-2cafdc2a): ...)
       const branchMatch = branch.match(/(P-[a-z0-9]{6,})/i) || branch.match(/(W-[a-z0-9]{6,})/i) || branch.match(/(PL-[a-z0-9]{6,})/i);
@@ -768,19 +768,17 @@ async function checkLiveReviewStatus(pr, project) {
   }
 }
 
-// Fetch basic PR metadata (title, description, branch, author) for a manually-linked ADO PR.
-// Uses adoFetch so retry logic and circuit breaker apply — dashboard.js PR enrichment calls this.
 async function fetchAdoPrMetadata(prNum, adoOrg, adoProj, adoRepo) {
   const token = await getAdoToken();
   if (!token) return null;
   const url = `https://dev.azure.com/${adoOrg}/${adoProj}/_apis/git/repositories/${adoRepo}/pullrequests/${prNum}?api-version=7.1`;
-  const d = await adoFetch(url, token);
-  if (!d) return null;
+  const pr = await adoFetch(url, token);
+  if (!pr) return null;
   return {
-    title: d.title || '',
-    description: d.description || '',
-    branch: d.sourceRefName?.replace('refs/heads/', '') || '',
-    author: d.createdBy?.displayName || '',
+    title: pr.title || '',
+    description: pr.description || '',
+    branch: stripRefsHeads(pr.sourceRefName),
+    author: pr.createdBy?.displayName || '',
   };
 }
 

package/package.json

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