@yemi33/minions 0.1.2029 → 0.1.2030

package/engine/dispatch.js

@@ -7,7 +7,7 @@ const fs = require('fs');
 const path = require('path');
 const shared = require('./shared');
 const queries = require('./queries');
-const { setCooldownFailure } = require('./cooldown');
+const { setCooldown, setCooldownFailure } = require('./cooldown');
 
 const { safeJson, mutateJsonFileLocked, mutateWorkItems,
   mutatePullRequests, getProjects, projectWorkItemsPath, projectPrPath, log, ts, dateStamp,
@@ -170,7 +170,27 @@ function addToDispatch(item) {
     added = true;
     return dispatch;
   });
-  if (added) log('info', `Queued dispatch: ${item.id} (${item.type} → ${item.agent})`);
+  if (added) {
+    log('info', `Queued dispatch: ${item.id} (${item.type} → ${item.agent})`);
+    // W-mph8xt88000ke0fc — Stamp the dispatch cooldown ONLY when the item
+    // actually survives the queue-time dedup gauntlet. Discover-side blocks
+    // (discoverFromPrs build-failure / review-feedback / merge-conflict,
+    // discoverFromWorkItems, discoverCentralWorkItems) used to call
+    // setCooldown(key) inline the instant a candidate item was built,
+    // BEFORE addToDispatch ran the prDedupeKey / workItem-id / dispatchKey
+    // dedup checks. The losing candidate left an orphan cooldown that
+    // blocked re-dispatch of that cause for `cooldownMinutes || 30` minutes
+    // even though no agent ever ran (live repro:
+    // ado:office/iss/constellation#5227109 on 2026-05-22 — build-fix and
+    // human-fix landed within 38 ms; only the human-fix ran but the orphan
+    // build-fix cooldown blocked the next 24 min of retries).
+    //
+    // Callers opt in by setting `item.meta.cooldownKey`. When absent (e.g.
+    // lifecycle.js auto-redispatches that intentionally bypass the cooldown
+    // ladder), no stamp fires — same as the pre-fix behavior for those
+    // paths.
+    if (item.meta?.cooldownKey) setCooldown(item.meta.cooldownKey);
+  }
   return item.id;
 }
 

package/engine.js

@@ -4315,7 +4315,7 @@ async function discoverFromPrs(config, project) {
       const item = buildPrDispatch(agentId, config, project, pr, 'review', {
         pr_id: pr.id, pr_number: prNumber, pr_title: pr.title || '', pr_branch: prBranch,
         pr_author: pr.agent || '', pr_url: pr.url || '',
-      }, `Review ${pr.id}: ${pr.title}`, { dispatchKey: key, source: 'pr', pr, branch: prBranch, project: projMeta });
+      }, `Review ${pr.id}: ${pr.title}`, { dispatchKey: key, cooldownKey: key, source: 'pr', pr, branch: prBranch, project: projMeta });
       if (item) { newWork.push(item); fixDispatched = true; }
     }
 
@@ -4424,7 +4424,7 @@ async function discoverFromPrs(config, project) {
         pr_id: pr.id, pr_number: prNumber, pr_title: pr.title || '', pr_branch: prBranch,
         reviewer: 'Human Reviewer',
         review_note: reviewNote,
-      }, `Fix ${pr.id}: ${pr.title || ''} — human feedback`, { dispatchKey: key, automationCauseKey: humanCauseKey, source: 'pr-human-feedback', pr, branch: prBranch, project: projMeta });
+      }, `Fix ${pr.id}: ${pr.title || ''} — human feedback`, { dispatchKey: key, cooldownKey: key, automationCauseKey: humanCauseKey, source: 'pr-human-feedback', pr, branch: prBranch, project: projMeta });
       if (item) { newWork.push(item); fixDispatched = true; }
       } // end if (!skipHumanFeedback) — cause-local guard for #2632
     }
@@ -4478,7 +4478,7 @@ async function discoverFromPrs(config, project) {
           pr_id: pr.id, pr_number: prNumber, pr_title: pr.title || '', pr_branch: prBranch,
           pr_author: pr.agent || '', pr_url: pr.url || '',
         }, `Review ${pr.id}: ${pr.title}`, {
-          dispatchKey: key, source: 'pr', pr, branch: prBranch, project: projMeta,
+          dispatchKey: key, cooldownKey: key, source: 'pr', pr, branch: prBranch, project: projMeta,
           deferReviewerResolution: true,
         });
         if (deferred) {
@@ -4492,7 +4492,7 @@ async function discoverFromPrs(config, project) {
       const item = buildPrDispatch(agentId, config, project, pr, 'review', {
         pr_id: pr.id, pr_number: prNumber, pr_title: pr.title || '', pr_branch: prBranch,
         pr_author: pr.agent || '', pr_url: pr.url || '',
-      }, `Review ${pr.id}: ${pr.title}`, { dispatchKey: key, source: 'pr', pr, branch: prBranch, project: projMeta });
+      }, `Review ${pr.id}: ${pr.title}`, { dispatchKey: key, cooldownKey: key, source: 'pr', pr, branch: prBranch, project: projMeta });
       if (item) { newWork.push(item); }
     }
 
@@ -4513,7 +4513,7 @@ async function discoverFromPrs(config, project) {
         pr_id: pr.id, pr_branch: prBranch,
         review_note: pr.minionsReview?.note || pr.reviewNote || 'See PR thread comments',
       }, `Fix ${pr.id}: ${pr.title || ''} — review feedback`, {
-        dispatchKey: key, automationCauseKey: reviewCauseKey, source: 'pr', pr, branch: prBranch, project: projMeta,
+        dispatchKey: key, cooldownKey: key, automationCauseKey: reviewCauseKey, source: 'pr', pr, branch: prBranch, project: projMeta,
         // W-mpg58wv3 — closure-loop binding. Carries the originating minion review
         // WI id (and any ADO thread ids it cited) onto the fix WI so the
         // post-completion path in lifecycle.js can auto-dispatch a re-review
@@ -4523,7 +4523,7 @@ async function discoverFromPrs(config, project) {
         addresses_threads: Array.isArray(pr.minionsReview?.threads) ? pr.minionsReview.threads.slice() : [],
       });
       if (item) {
-        newWork.push(item); setCooldown(key); fixDispatched = true;
+        newWork.push(item); fixDispatched = true;
       }
     }
 
@@ -4635,9 +4635,9 @@ async function discoverFromPrs(config, project) {
       const item = buildPrDispatch(agentId, config, project, pr, 'fix', {
         pr_id: pr.id, pr_branch: prBranch,
         review_note: reviewNote,
-      }, `Fix build failure on ${pr.id}: ${pr.title || ''}`, { dispatchKey: key, automationCauseKey: buildCauseKey, source: 'pr', pr, branch: prBranch, project: projMeta });
+      }, `Fix build failure on ${pr.id}: ${pr.title || ''}`, { dispatchKey: key, cooldownKey: key, automationCauseKey: buildCauseKey, source: 'pr', pr, branch: prBranch, project: projMeta });
       if (item) {
-        newWork.push(item); setCooldown(key); fixDispatched = true;
+        newWork.push(item); fixDispatched = true;
         try {
           const prPath = projectPrPath(project);
           mutatePullRequests(prPath, prs => {
@@ -4707,10 +4707,9 @@ async function discoverFromPrs(config, project) {
             const item = buildPrDispatch(agentId, config, project, pr, 'fix', {
               pr_id: pr.id, pr_branch: prBranch,
               review_note: `This PR has merge conflicts with the target branch. Inspect the live PR and repository history, choose the safest merge/rebase/update strategy, resolve all conflicts, validate the result, and push the branch.`,
-            }, `Fix merge conflicts on ${pr.id}: ${pr.title || ''}`, { dispatchKey: key, automationCauseKey: conflictCauseKey, source: 'pr', pr, branch: prBranch, project: projMeta });
+            }, `Fix merge conflicts on ${pr.id}: ${pr.title || ''}`, { dispatchKey: key, cooldownKey: key, automationCauseKey: conflictCauseKey, source: 'pr', pr, branch: prBranch, project: projMeta });
             if (item) {
               newWork.push(item);
-              setCooldown(key);
               // Record dispatch timestamp so re-dispatch is suppressed during ADO lag window
               try {
                 mutatePullRequests(projectPrPath(project), prs => {
@@ -5123,10 +5122,9 @@ function discoverFromWorkItems(config, project) {
       agentRole: config.agents[agentId]?.role || tempAgents.get(agentId)?.role || 'Agent',
       task: `[${project?.name || 'project'}] ${item.title || item.description?.slice(0, 80) || item.id}`,
       prompt,
-      meta: { dispatchKey: key, source: 'work-item', branch: branchName, branchStrategy: item.branchStrategy || 'parallel', useExistingBranch: !!(isPrTargeted || (item.branchStrategy === 'shared-branch' && item.featureBranch)), item: promptItem, project: { name: project?.name, localPath: project?.localPath }, deferAgentResolution: deferredAgentResolution, ...(linkedPr ? { pr: linkedPr } : {}) }
+      meta: { dispatchKey: key, cooldownKey: key, source: 'work-item', branch: branchName, branchStrategy: item.branchStrategy || 'parallel', useExistingBranch: !!(isPrTargeted || (item.branchStrategy === 'shared-branch' && item.featureBranch)), item: promptItem, project: { name: project?.name, localPath: project?.localPath }, deferAgentResolution: deferredAgentResolution, ...(linkedPr ? { pr: linkedPr } : {}) }
     });
 
-    setCooldown(key);
     } catch (err) { log('warn', `discoverFromWorkItems: skipping ${item.id}: ${err.message}`); }
   }
 
@@ -5567,7 +5565,7 @@ function discoverCentralWorkItems(config) {
           task: `[fan-out] ${item.title} → ${agent.name}${assignedProject ? ' → ' + assignedProject.name : ''}`,
           prompt,
           meta: {
-            dispatchKey: fanKey, source: 'central-work-item-fanout', item, parentKey: key,
+            dispatchKey: fanKey, cooldownKey: key, source: 'central-work-item-fanout', item, parentKey: key,
             branch: fanBranch,
             deadline: item.timeout ? Date.now() + item.timeout : Date.now() + (config.engine?.fanOutTimeout || config.engine?.agentTimeout || ENGINE_DEFAULTS.agentTimeout)
           }
@@ -5579,7 +5577,6 @@ function discoverCentralWorkItems(config) {
         scope: 'fan-out',
         fanOutAgents: idleAgents.map(a => a.id),
       });
-      setCooldown(key);
       log('info', `Fan-out: ${item.id} queued for ${idleAgents.length} agents: ${idleAgents.map(a => a.name).join(', ')}`);
 
     } else {
@@ -5793,10 +5790,8 @@ function discoverCentralWorkItems(config) {
         agentRole,
         task: item.title || item.description?.slice(0, 80) || item.id,
         prompt,
-        meta: { dispatchKey: key, source: 'central-work-item', item: { ...item, ...mutations.get(item.id) }, planFileName: item.planFile || mutations.get(item.id)?._planFileName || null, branch: centralBranch, ...(targetProject ? { project: { name: targetProject.name, localPath: targetProject.localPath } } : {}) }
+        meta: { dispatchKey: key, cooldownKey: key, source: 'central-work-item', item: { ...item, ...mutations.get(item.id) }, planFileName: item.planFile || mutations.get(item.id)?._planFileName || null, branch: centralBranch, ...(targetProject ? { project: { name: targetProject.name, localPath: targetProject.localPath } } : {}) }
       });
-
-      setCooldown(key);
     }
     } catch (err) { log('warn', `discoverCentralWorkItems: skipping ${item.id}: ${err.message}`); }
   }
@@ -6004,7 +5999,10 @@ async function discoverWork(config) {
 
   for (const item of allWork) {
     await addToDispatchWithValidation(item, { config });
-    if (item.meta?.dispatchKey) setCooldown(item.meta.dispatchKey);
+    // W-mph8xt88000ke0fc — Cooldowns are stamped by addToDispatch ONLY on
+    // successful append (post-dedup). Stamping unconditionally here used to
+    // leave orphan cooldowns for items collapsed by prDedupeKey / workItem-id
+    // / dispatchKey dedup or routed to the pre-dispatch review queue.
     if (item.meta?.source === 'pr-human-feedback') {
       clearPendingHumanFeedbackFlag(item.meta.project, item.meta.pr?.id);
     }

package/package.json

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