@yemi33/minions 0.1.1003 → 0.1.1005

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.1.1003 (2026-04-15)
+## 0.1.1005 (2026-04-16)
 
 ### Features
 - fix stopAfter=0 watch expiry — run forever for all conditions (#1117)
@@ -25,6 +25,7 @@
 - gate auto-fix conflict dispatch behind autoFixConflicts flag
 
 ### Fixes
+-  harden repo-scoped PR identity handling
 -  only gate reviews/fixes when no free agent slots remain
 -  extend auto-link fallback to ADO projects
 -  auto-link existing GitHub PR when agent completes without creating one
@@ -44,9 +45,9 @@
 -  defer review setCooldown to post-gating in discoverWork
 -  move review verdict check before updateWorkItemStatus(DONE)
 -  address review feedback — move writeToInbox outside lock, add absolute condition auto-expire
-- fix watches feature gaps — human notifications, branch stub, status-change init, unique keys
 
 ### Other
+- refactor: migrate PR links to array format and consolidate shared helpers
 - docs: update CLAUDE.md with recent Minions architecture changes
 - chore: stop tracking runtime pipeline state
 - chore: strengthen prompts and routing

package/dashboard.js

@@ -2172,7 +2172,11 @@ const server = http.createServer(async (req, res) => {
       }
 
       // Build a manifest of all KB entries with their content (skip pinned — user wants to keep them)
-      const pinnedKeys = new Set(body.pinnedKeys || []);
+      const requestPinnedKeys = Array.isArray(body.pinnedKeys)
+        ? body.pinnedKeys.filter(k => typeof k === 'string' && k.startsWith('knowledge/'))
+        : [];
+      const serverPinnedKeys = shared.getPinnedItems().filter(k => k.startsWith('knowledge/'));
+      const pinnedKeys = new Set([...serverPinnedKeys, ...requestPinnedKeys]);
       const manifest = [];
       for (const e of entries) {
         if (pinnedKeys.has('knowledge/' + e.cat + '/' + e.file)) continue;
@@ -2180,6 +2184,11 @@ const server = http.createServer(async (req, res) => {
         if (!content) continue;
         manifest.push({ category: e.cat, file: e.file, title: e.title, agent: e.agent, date: e.date, content: content.slice(0, 3000) });
       }
+      if (manifest.length < 2) {
+        global._kbSweepLastResult = { ok: true, summary: 'nothing to sweep (< 2 unpinned entries)' };
+        global._kbSweepLastCompletedAt = Date.now();
+        return;
+      }
 
       const { callLLM, trackEngineUsage } = require('./engine/llm');
       const BATCH_SIZE = 30; // ~30 entries per batch to stay within Haiku context
@@ -2533,7 +2542,7 @@ If nothing to do: { "duplicates": [], "reclassify": [], "remove": [] }`;
         const prLinks = shared.getPrLinks();
         const implContext = (plan.missing_features || []).map(f => {
           const wi = planWis.find(w => w.id === f.id);
-          const pr = allPrs.find(p => prLinks[p.id] === f.id || (p.prdItems || []).includes(f.id));
+          const pr = allPrs.find(p => (prLinks[p.id] || []).includes(f.id) || (p.prdItems || []).includes(f.id));
           return `- **${f.id}**: ${f.name} [status: ${wi?.status || f.status}]${pr ? ` (PR: ${pr.id}, branch: \`${pr.branch}\`)` : ''}`;
         }).join('\n');
 
@@ -4364,7 +4373,7 @@ What would you like to discuss or change? When you're happy, say "approve" and I
       // Extract PR number from URL
       const prNumMatch = url.match(/\/pull\/(\d+)|pullrequest\/(\d+)/);
       const prNum = prNumMatch ? (prNumMatch[1] || prNumMatch[2]) : Date.now().toString().slice(-6);
-      const prId = 'PR-' + prNum;
+      const prId = shared.getCanonicalPrId(targetProject, prNum, url);
 
       // Atomic check-and-insert to prevent duplicates and races with polling loops
       let duplicate = false;
@@ -4373,6 +4382,7 @@ What would you like to discuss or change? When you're happy, say "approve" and I
         if (prs.some(p => p.id === prId || p.url === url)) { duplicate = true; return prs; }
         prs.push({
           id: prId,
+          prNumber: parseInt(prNum, 10) || null,
           title: (title || 'PR #' + prNum + ' (polling...)').slice(0, 120),
           description: '',
           agent: 'human',

package/engine/ado-status.js

@@ -57,7 +57,8 @@ const prNumber = parseInt(prNumberArg, 10);
 function findInCache(projects) {
   for (const project of projects) {
     const prs = safeJsonArr(projectPrPath(project));
-    const pr = prs.find(p => p.prNumber === prNumber || p.id === `PR-${prNumber}`);
+    shared.normalizePrRecords(prs, project);
+    const pr = prs.find(p => p.prNumber === prNumber || p.id === shared.getCanonicalPrId(project, prNumber) || shared.getPrDisplayId(p) === `PR-${prNumber}`);
     if (!pr) continue;
     const out = {
       prNumber: pr.prNumber || prNumber,

package/engine/ado.js

@@ -17,6 +17,11 @@ function engine() {
 }
 
 const stripRefsHeads = s => (s || '').replace('refs/heads/', '');
+const getAdoPrUrl = (project, prNumber) => {
+  if (project.prUrlBase) return `${project.prUrlBase}${prNumber}`;
+  const repoPath = encodeURIComponent(project.repoName || project.repositoryId || '');
+  return `https://dev.azure.com/${project.adoOrg}/${project.adoProject}/_git/${repoPath}/pullrequest/${prNumber}`;
+};
 
 // ── Build/Review Status Helpers ───────────────────────────────────────────────
 
@@ -250,7 +255,7 @@ async function forEachActivePr(config, token, callback) {
     for (let i = 0; i < activePrs.length; i += CONCURRENCY) {
       const batch = activePrs.slice(i, i + CONCURRENCY);
       const results = await Promise.allSettled(batch.map(async (pr) => {
-        const prNum = (pr.id || '').replace('PR-', '');
+        const prNum = shared.getPrNumber(pr);
         if (!prNum) return false;
         return callback(project, pr, prNum, orgBase);
       }));
@@ -675,6 +680,7 @@ async function reconcilePrs(config) {
 
     const prPath = shared.projectPrPath(project);
     const existingPrs = shared.safeJson(prPath) || [];
+    shared.normalizePrRecords(existingPrs, project);
     const existingIds = new Set(existingPrs.map(p => p.id));
     let projectAdded = 0;
 
@@ -687,7 +693,8 @@ async function reconcilePrs(config) {
 
     let projectUpdated = 0;
     for (const adoPr of adoPrs) {
-      const prId = `PR-${adoPr.pullRequestId}`;
+      const prUrl = getAdoPrUrl(project, adoPr.pullRequestId);
+      const prId = shared.getCanonicalPrId(project, adoPr.pullRequestId, prUrl);
       const branch = stripRefsHeads(adoPr.sourceRefName);
       const title = adoPr.title || '';
       // Extract item ID from branch name or PR title (e.g., feat(P-2cafdc2a): ...)
@@ -705,7 +712,7 @@ async function reconcilePrs(config) {
         }
         // PR already tracked — write link to pr-links.json if we can extract an ID
         if (confirmedItemId) {
-          addPrLink(prId, confirmedItemId);
+          addPrLink(prId, confirmedItemId, { project, prNumber: adoPr.pullRequestId, url: prUrl });
           if (existing && !(existing.prdItems || []).includes(confirmedItemId)) {
             existing.prdItems = Array.isArray(existing.prdItems) ? existing.prdItems : [];
             existing.prdItems.push(confirmedItemId);
@@ -720,7 +727,6 @@ async function reconcilePrs(config) {
       // are human-authored and should not be auto-tracked or auto-reviewed.
       if (!confirmedItemId) continue;
 
-      const prUrl = project.prUrlBase ? project.prUrlBase + adoPr.pullRequestId : '';
       existingPrs.push({
         id: prId,
         prNumber: adoPr.pullRequestId,
@@ -733,7 +739,7 @@ async function reconcilePrs(config) {
         url: prUrl,
         prdItems: [confirmedItemId],
       });
-      addPrLink(prId, confirmedItemId);
+      addPrLink(prId, confirmedItemId, { project, prNumber: adoPr.pullRequestId, url: prUrl });
       existingIds.add(prId);
       projectAdded++;
       log('info', `PR reconciliation: added ${prId} (branch: ${branch}, linked to ${confirmedItemId}) to ${project.name}`);
@@ -742,22 +748,13 @@ async function reconcilePrs(config) {
     // Backfill prNumber from pr.id for any PR missing it (e.g. created before prNumber was stored)
     for (const pr of existingPrs) {
       if (pr.prNumber == null) {
-        const derived = parseInt((pr.id || '').replace(/^PR-/, ''), 10);
+        const derived = shared.getPrNumber(pr);
         if (derived) pr.prNumber = derived;
       }
     }
 
     // Backfill prdItems from pr-links for any PR with empty array
-    const prLinks = shared.getPrLinks();
-    let backfilled = 0;
-    for (const pr of existingPrs) {
-      const linked = prLinks[pr.id];
-      if (linked && !(pr.prdItems || []).includes(linked)) {
-        pr.prdItems = Array.isArray(pr.prdItems) ? pr.prdItems : [];
-        pr.prdItems.push(linked);
-        backfilled++;
-      }
-    }
+    const backfilled = shared.backfillPrPrdItems(existingPrs, shared.getPrLinks());
 
     if (projectAdded > 0 || projectUpdated > 0 || backfilled > 0) {
       mutateJsonFileLocked(prPath, (currentPrs) => {
@@ -790,7 +787,8 @@ async function checkLiveReviewStatus(pr, project) {
     const token = await getAdoToken();
     if (!token) return null;
     const orgBase = shared.getAdoOrgBase(project);
-    const prNum = (pr.id || '').replace(/^PR-/, '');
+    const prNum = shared.getPrNumber(pr);
+    if (!prNum) return null;
     const url = `${orgBase}/${project.adoProject}/_apis/git/repositories/${project.repositoryId}/pullrequests/${prNum}?api-version=7.1`;
     const result = await execAsync(`curl -s --max-time 4 -H "Authorization: Bearer ${token}" "${url}"`, { encoding: 'utf-8', timeout: 5000, windowsHide: true });
     const prData = JSON.parse(result);
@@ -855,7 +853,7 @@ async function fetchSinglePrBuildStatus(project, prNumber) {
       }));
       const logParts = [];
       const seenBuildIds = new Set();
-      const pr = { id: `PR-${prNumber}`, branch: stripRefsHeads(prData.sourceRefName) };
+      const pr = { id: shared.getCanonicalPrId(project, prNumber, getAdoPrUrl(project, 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);
@@ -865,7 +863,7 @@ async function fetchSinglePrBuildStatus(project, prNumber) {
   }
 
   const votes = (prData.reviewers || []).map(r => r.vote);
-  const prUrl = `https://dev.azure.com/${project.adoOrg}/${project.adoProject}/_git/${project.repositoryId}/pullrequest/${prNumber}`;
+  const prUrl = getAdoPrUrl(project, prNumber);
 
   return {
     prNumber,
@@ -900,6 +898,10 @@ const getAdoThrottleState = () => _adoThrottle.getState();
  */
 async function findOpenPrOnBranch(project, branch) {
   if (!project.adoOrg || !project.adoProject || !project.repositoryId || !branch) return null;
+  if (isAdoThrottled()) {
+    log('debug', `[ado] Skipping branch PR lookup for ${project.name || project.repoName || 'unknown project'}:${branch} — throttled`);
+    return null;
+  }
   const token = await getAdoToken();
   if (!token) return null;
   const orgBase = shared.getAdoOrgBase(project);
@@ -909,7 +911,7 @@ async function findOpenPrOnBranch(project, branch) {
   const pr = (data.value || [])[0];
   if (!pr) return null;
   const prNumber = pr.pullRequestId;
-  const prUrl = project.prUrlBase ? `${project.prUrlBase}${prNumber}` : `https://dev.azure.com/${project.adoOrg}/${project.adoProject}/_git/${project.repositoryId}/pullrequest/${prNumber}`;
+  const prUrl = getAdoPrUrl(project, prNumber);
   return { prNumber, url: prUrl };
 }
 
@@ -940,4 +942,3 @@ module.exports = {
   _resetAdoThrottle, // exported for testing
   _setAdoThrottleForTest, // exported for testing
 };
-

package/engine/consolidation.js

@@ -25,7 +25,8 @@ function consolidateInbox(config) {
 
   const { ENGINE_DEFAULTS } = shared;
   const threshold = config.engine?.inboxConsolidateThreshold || ENGINE_DEFAULTS.inboxConsolidateThreshold;
-  const files = getInboxFiles().filter(f => !_processingFiles.has(f));
+  const pinnedInboxKeys = new Set(shared.getPinnedItems().filter(k => k.startsWith('notes/inbox/')));
+  const files = getInboxFiles().filter(f => !_processingFiles.has(f) && !pinnedInboxKeys.has('notes/inbox/' + f));
   if (files.length < threshold) return;
   // Auto-reset stale flag if consolidation has been running for >5 minutes (process died without cleanup)
   if (_consolidationInFlight && (Date.now() - _consolidationStartedAt) > 300000) {
@@ -485,4 +486,3 @@ module.exports = {
   classifyToKnowledgeBase,
   checkDuplicateHash,
 };
-

package/engine/dispatch.js

@@ -223,7 +223,7 @@ function completeDispatch(id, result = DISPATCH_RESULT.SUCCESS, reason = '', res
         try {
           const prsPath = projectPrPath(project);
           mutatePullRequests(prsPath, prs => {
-            const target = prs.find(p => p.id === prId);
+            const target = shared.findPrRecord(prs, { id: prId }, project);
             if (target?.humanFeedback) target.humanFeedback.pendingFix = true;
           });
           log('info', `Restored pendingFix=true on ${prId} after failed human-feedback fix`);
@@ -246,9 +246,10 @@ function completeDispatch(id, result = DISPATCH_RESULT.SUCCESS, reason = '', res
 
 function writeInboxAlert(slug, content) {
   try {
-    const file = path.join(INBOX_DIR, `engine-alert-${slug}-${dateStamp()}.md`);
+    const safeSlug = shared.safeSlugComponent(slug, 100);
+    const file = path.join(INBOX_DIR, `engine-alert-${safeSlug}-${dateStamp()}.md`);
     // Dedupe: don't write the same alert twice in the same day
-    const existing = safeReadDir(INBOX_DIR).find(f => f.startsWith(`engine-alert-${slug}-${dateStamp()}`));
+    const existing = safeReadDir(INBOX_DIR).find(f => f.startsWith(`engine-alert-${safeSlug}-${dateStamp()}`));
     if (existing) return;
     safeWrite(file, content);
   } catch (e) { log('warn', 'write inbox alert: ' + e.message); }

package/engine/github.js

@@ -5,7 +5,7 @@
  */
 
 const shared = require('./shared');
-const { exec, execAsync, getProjects, projectPrPath, projectWorkItemsPath, safeJson, safeWrite, mutateJsonFileLocked, MINIONS_DIR, addPrLink, getPrLinks, log, ts, dateStamp, PR_STATUS, PR_POLLABLE_STATUSES, createThrottleTracker } = shared;
+const { exec, execAsync, getProjects, projectPrPath, projectWorkItemsPath, safeJson, safeWrite, mutateJsonFileLocked, MINIONS_DIR, addPrLink, getPrLinks, backfillPrPrdItems, log, ts, dateStamp, PR_STATUS, PR_POLLABLE_STATUSES, createThrottleTracker } = shared;
 const { getPrs } = require('./queries');
 const path = require('path');
 
@@ -199,7 +199,7 @@ async function forEachActiveGhPr(config, callback) {
     let projectUpdated = 0;
 
     for (const pr of activePrs) {
-      const prNum = (pr.id || '').replace('PR-', '');
+      const prNum = shared.getPrNumber(pr);
       if (!prNum) continue;
 
       try {
@@ -621,6 +621,7 @@ async function reconcilePrs(config) {
 
     const prPath = projectPrPath(project);
     const currentPrs = safeJson(prPath) || [];
+    shared.normalizePrRecords(currentPrs, project);
     const existingIds = new Set(currentPrs.map(p => p.id));
     let projectAdded = 0;
 
@@ -632,7 +633,8 @@ async function reconcilePrs(config) {
     const allItems = [...workItems, ...centralItems];
 
     for (const ghPr of ghPrs) {
-      const prId = `PR-${ghPr.number}`;
+      const prUrl = project.prUrlBase ? project.prUrlBase + ghPr.number : ghPr.html_url || '';
+      const prId = shared.getCanonicalPrId(project, ghPr.number, prUrl);
       const branch = ghPr.head?.ref || '';
       const wiMatch = branch.match(/(P-[a-z0-9]{6,})/i) || branch.match(/(W-[a-z0-9]{6,})/i) || branch.match(/(PL-[a-z0-9]{6,})/i);
       const linkedItemId = wiMatch ? wiMatch[1] : null;
@@ -646,7 +648,7 @@ async function reconcilePrs(config) {
           existing.prNumber = ghPr.number;
         }
         if (confirmedItemId) {
-          addPrLink(prId, confirmedItemId);
+          addPrLink(prId, confirmedItemId, { project, prNumber: ghPr.number, url: prUrl });
           if (existing && !(existing.prdItems || []).includes(confirmedItemId)) {
             existing.prdItems = Array.isArray(existing.prdItems) ? existing.prdItems : [];
             existing.prdItems.push(confirmedItemId);
@@ -661,8 +663,6 @@ async function reconcilePrs(config) {
       // Only auto-track PRs linked to a minions work item — skip human-authored PRs
       if (!confirmedItemId && !isE2eBranch) continue;
 
-      const prUrl = project.prUrlBase ? project.prUrlBase + ghPr.number : ghPr.html_url || '';
-
       currentPrs.push({
         id: prId,
         prNumber: ghPr.number,
@@ -675,7 +675,7 @@ async function reconcilePrs(config) {
         url: prUrl,
         prdItems: [confirmedItemId],
       });
-      addPrLink(prId, confirmedItemId);
+      addPrLink(prId, confirmedItemId, { project, prNumber: ghPr.number, url: prUrl });
       existingIds.add(prId);
       projectAdded++;
 
@@ -685,22 +685,13 @@ async function reconcilePrs(config) {
     // Backfill prNumber from pr.id for any PR missing it (e.g. created before prNumber was stored)
     for (const pr of currentPrs) {
       if (pr.prNumber == null) {
-        const derived = parseInt((pr.id || '').replace(/^PR-/, ''), 10);
+        const derived = shared.getPrNumber(pr);
         if (derived) pr.prNumber = derived;
       }
     }
 
     // Backfill prdItems from pr-links for any PR with empty array
-    const prLinks = getPrLinks();
-    let backfilled = 0;
-    for (const pr of currentPrs) {
-      const linked = prLinks[pr.id];
-      if (linked && !(pr.prdItems || []).includes(linked)) {
-        pr.prdItems = Array.isArray(pr.prdItems) ? pr.prdItems : [];
-        pr.prdItems.push(linked);
-        backfilled++;
-      }
-    }
+    const backfilled = backfillPrPrdItems(currentPrs, getPrLinks());
 
     if (projectAdded > 0 || backfilled > 0) {
       mutateJsonFileLocked(prPath, (lockedPrs) => {
@@ -728,7 +719,8 @@ async function checkLiveReviewStatus(pr, project) {
   try {
     const slug = getRepoSlug(project);
     if (!slug) return null;
-    const prNum = (pr.id || '').replace(/^PR-/, '');
+    const prNum = shared.getPrNumber(pr);
+    if (!prNum) return null;
     const reviews = await ghApi(`/pulls/${prNum}/reviews`, slug);
     if (!reviews || !Array.isArray(reviews)) return null;
     const latestByUser = new Map();
@@ -761,4 +753,3 @@ module.exports = {
   _ghPollBackoff,
   _ghThrottle, // exported for testing
 };
-