@yemi33/minions 0.1.3 → 0.1.5

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 0.1.5 (2026-03-24)
+
+### Engine
+- engine.js
+
+## 0.1.4 (2026-03-24)
+
+### Engine
+- engine.js
+- engine/ado.js
+- engine/github.js
+- engine/lifecycle.js
+
 ## 0.1.3 (2026-03-24)
 
 ### Engine

package/engine/ado.js

@@ -339,6 +339,11 @@ async function reconcilePrs(config) {
         // PR already tracked — write link to pr-links.json if we can extract an ID
         if (confirmedItemId) {
           addPrLink(prId, confirmedItemId);
+          const existing = existingPrs.find(p => p.id === prId);
+          if (existing && !(existing.prdItems || []).includes(confirmedItemId)) {
+            existing.prdItems = Array.isArray(existing.prdItems) ? existing.prdItems : [];
+            existing.prdItems.push(confirmedItemId);
+          }
           projectUpdated++;
         }
         continue;
@@ -354,6 +359,7 @@ async function reconcilePrs(config) {
         status: 'active',
         created: (adoPr.creationDate || '').slice(0, 10) || e.dateStamp(),
         url: prUrl,
+        prdItems: confirmedItemId ? [confirmedItemId] : [],
       });
       if (confirmedItemId) addPrLink(prId, confirmedItemId);
       existingIds.add(prId);

package/engine/github.js

@@ -5,7 +5,7 @@
  */
 
 const shared = require('./shared');
-const { exec, getProjects, projectPrPath, projectWorkItemsPath, safeJson, safeWrite, MINIONS_DIR } = shared;
+const { exec, getProjects, projectPrPath, projectWorkItemsPath, safeJson, safeWrite, MINIONS_DIR, addPrLink } = shared;
 const { getPrs } = require('./queries');
 const path = require('path');
 
@@ -285,14 +285,24 @@ async function reconcilePrs(config) {
 
     for (const ghPr of ghPrs) {
       const prId = `PR-${ghPr.number}`;
-      if (existingIds.has(prId)) continue;
-
       const branch = ghPr.head?.ref || '';
       const wiMatch = branch.match(/(P-[a-f0-9]{6,})/i) || branch.match(/(PL-W\d+)/i);
       const linkedItemId = wiMatch ? wiMatch[1] : null;
       const linkedItem = linkedItemId ? allItems.find(i => i.id === linkedItemId) : null;
       const confirmedItemId = linkedItem ? linkedItemId : null;
 
+      if (existingIds.has(prId)) {
+        if (confirmedItemId) {
+          addPrLink(prId, confirmedItemId);
+          const existing = existingPrs.find(p => p.id === prId);
+          if (existing && !(existing.prdItems || []).includes(confirmedItemId)) {
+            existing.prdItems = Array.isArray(existing.prdItems) ? existing.prdItems : [];
+            existing.prdItems.push(confirmedItemId);
+          }
+        }
+        continue;
+      }
+
       const prUrl = project.prUrlBase ? project.prUrlBase + ghPr.number : ghPr.html_url || '';
 
       existingPrs.push({
@@ -306,6 +316,7 @@ async function reconcilePrs(config) {
         url: prUrl,
         prdItems: confirmedItemId ? [confirmedItemId] : [],
       });
+      if (confirmedItemId) addPrLink(prId, confirmedItemId);
       existingIds.add(prId);
       projectAdded++;
 

package/engine/lifecycle.js

@@ -586,6 +586,7 @@ function syncPrsFromOutput(output, agentId, meta, config) {
       status: 'active',
       created: e.dateStamp(),
       url: targetProject.prUrlBase ? targetProject.prUrlBase + prId : '',
+      prdItems: meta?.item?.id ? [meta.item.id] : [],
       sourcePlan: meta?.item?.sourcePlan || '',
       itemType: meta?.item?.itemType || ''
     });

package/engine.js

@@ -1075,7 +1075,17 @@ function completeDispatch(id, result = 'success', reason = '', resultSummary = '
     if (result === 'error' && item.meta?.dispatchKey && retryableFailure) setCooldownFailure(item.meta.dispatchKey);
 
     if (processWorkItemFailure && result === 'error' && item.meta?.item?.id) {
-      const retries = (item.meta.item._retryCount || 0);
+      let retries = (item.meta.item._retryCount || 0);
+      try {
+        const wiPath = item.meta.source === 'central-work-item' || item.meta.source === 'central-work-item-fanout'
+          ? path.join(MINIONS_DIR, 'work-items.json')
+          : item.meta.project?.name ? projectWorkItemsPath({ name: item.meta.project.name, localPath: item.meta.project.localPath }) : null;
+        if (wiPath) {
+          const items = safeJson(wiPath) || [];
+          const wi = items.find(i => i.id === item.meta.item.id);
+          if (wi) retries = wi._retryCount || 0;
+        }
+      } catch {}
       if (retryableFailure && retries < 3) {
         log('info', `Dispatch error for ${item.meta.item.id} — auto-retry ${retries + 1}/3`);
         updateWorkItemStatus(item.meta, 'pending', '');
@@ -1083,9 +1093,8 @@ function completeDispatch(id, result = 'success', reason = '', resultSummary = '
         if (item.meta?.dispatchKey) {
           try {
             mutateDispatch((dp) => {
-              const before = Array.isArray(dp.completed) ? dp.completed.length : 0;
               dp.completed = Array.isArray(dp.completed) ? dp.completed.filter(d => d.meta?.dispatchKey !== item.meta.dispatchKey) : [];
-              return dp.completed.length !== before ? dp : undefined;
+              return dp;
             });
           } catch {}
         }
@@ -1176,7 +1185,7 @@ function areDependenciesMet(item, config) {
       log('warn', `Dependency ${depId} not found for ${item.id} (plan: ${sourcePlan}) — treating as unmet`);
       return false;
     }
-    if (depItem.status === 'failed' && (depItem._retryCount || 0) >= 3) return 'failed'; // Only cascade after retries exhausted
+    if (depItem.status === 'failed') return 'failed';
     if (depItem.status !== 'done' && depItem.status !== 'in-pr') return false; // Pending, dispatched, or retrying — wait (in-pr accepted for backward compat)
   }
   return true;
@@ -1211,17 +1220,22 @@ function writeInboxAlert(slug, content) {
   } catch {}
 }
 
-// Reconciles work items against known PRs via exact prdItems match only.
-// reconcilePrs (ado.js) and syncPrsFromOutput (lifecycle.js) are responsible for
-// correctly populating prdItems on PRs — this function just reads that linkage.
+// Reconciles work items against known PRs.
+// Primary linkage comes from prdItems in pull-requests.json; fallback linkage
+// uses engine/pr-links.json so matching does not depend on branch/title parsing.
 // onlyIds: if provided, only items whose ID is in this Set are eligible.
 function reconcileItemsWithPrs(items, allPrs, { onlyIds } = {}) {
+  const prLinks = shared.getPrLinks();
   let reconciled = 0;
   for (const wi of items) {
     if (wi.status !== 'pending' || wi._pr) continue;
     if (onlyIds && !onlyIds.has(wi.id)) continue;
 
-    const exactPr = allPrs.find(pr => (pr.prdItems || []).includes(wi.id));
+    let exactPr = allPrs.find(pr => (pr.prdItems || []).includes(wi.id));
+    if (!exactPr) {
+      const linkedPrId = Object.keys(prLinks).find(prId => prLinks[prId] === wi.id);
+      if (linkedPrId) exactPr = allPrs.find(pr => pr.id === linkedPrId) || { id: linkedPrId };
+    }
     if (exactPr) {
       wi.status = 'done';
       wi._pr = exactPr.id;
@@ -2275,6 +2289,18 @@ function buildPrDispatch(agentId, config, project, pr, type, extraVars, taskLabe
   };
 }
 
+function clearPendingHumanFeedbackFlag(projectMeta, prId) {
+  if (!prId) return;
+  try {
+    const prsPath = projectPrPath(projectMeta);
+    const prs = safeJson(prsPath) || [];
+    const target = prs.find(p => p.id === prId);
+    if (!target?.humanFeedback?.pendingFix) return;
+    target.humanFeedback.pendingFix = false;
+    safeWrite(prsPath, prs);
+  } catch {}
+}
+
 /**
  * Scan pull-requests.json for PRs needing review or fixes
  */
@@ -2347,7 +2373,7 @@ function discoverFromPrs(config, project) {
         reviewer: 'Human Reviewer',
         review_note: pr.humanFeedback.feedbackContent || 'See PR thread comments',
       }, `Fix PR ${pr.id} — human feedback`, { dispatchKey: key, source: 'pr-human-feedback', pr, branch: pr.branch, project: projMeta });
-      if (item) { newWork.push(item); pr.humanFeedback.pendingFix = false; setCooldown(key); }
+      if (item) { newWork.push(item); setCooldown(key); }
     }
 
     // PRs with build failures
@@ -2381,6 +2407,7 @@ function discoverFromWorkItems(config, project) {
   const items = safeJson(projectWorkItemsPath(project)) || [];
   const cooldownMs = (src.cooldownMinutes || 0) * 60 * 1000;
   const newWork = [];
+  const prdSyncQueue = [];
   const skipped = { gated: 0, noAgent: 0 };
   let needsWrite = false;
 
@@ -2487,7 +2514,7 @@ function discoverFromWorkItems(config, project) {
     item.status = 'dispatched';
     item.dispatched_at = ts();
     item.dispatched_to = agentId;
-    syncPrdItemStatus(item.id, 'dispatched', item.sourcePlan);
+    prdSyncQueue.push({ id: item.id, sourcePlan: item.sourcePlan });
 
     newWork.push({
       type: workType,
@@ -2506,6 +2533,7 @@ function discoverFromWorkItems(config, project) {
   if (newWork.length > 0) {
     const workItemsPath = projectWorkItemsPath(project);
     safeWrite(workItemsPath, items);
+    for (const s of prdSyncQueue) syncPrdItemStatus(s.id, 'dispatched', s.sourcePlan);
   }
 
   if (needsWrite) safeWrite(projectWorkItemsPath(project), items);
@@ -2945,6 +2973,9 @@ function discoverWork(config) {
 
   for (const item of allWork) {
     addToDispatch(item);
+    if (item.meta?.source === 'pr-human-feedback') {
+      clearPendingHumanFeedbackFlag(item.meta.project, item.meta.pr?.id);
+    }
   }
 
   if (allWork.length > 0) {

package/package.json

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