@yemi33/minions 0.1.2121 → 0.1.2123

package/engine.js

@@ -123,7 +123,7 @@ const { mutateDispatch, addToDispatch, addToDispatchWithValidation, isRetryableF
 
 // ─── Timeout / Steering / Idle (extracted to engine/timeout.js) ──────────────
 
-const { checkTimeouts, checkSteering, checkIdleThreshold } = require('./engine/timeout');
+const { checkTimeouts, checkSteering, checkIdleThreshold, dropSteeringForPurgedSession } = require('./engine/timeout');
 const steering = require('./engine/steering');
 
 // ─── Cleanup (extracted to engine/cleanup.js) ────────────────────────────────
@@ -528,6 +528,11 @@ function promoteCheckpointSteeringForClose(agentId, procInfo, runtime, liveOutpu
   const checkpointEntries = mergePendingSteeringEntries(pendingDeferred, lateCheckpoint);
   if (checkpointEntries.length === 0) {
     delete procInfo._deferredSteeringFiles;
+    // Gap B housekeeping: drop the per-entry deferred timestamps + stranded
+    // guard so a future spawn under the same procInfo (test harnesses + engine
+    // re-attach) starts with a clean slate.
+    delete procInfo._deferredSteeringQueuedAt;
+    delete procInfo._deferredSteeringStrandedFiles;
     return { status: 'none', entries: [] };
   }
 
@@ -548,6 +553,8 @@ function promoteCheckpointSteeringForClose(agentId, procInfo, runtime, liveOutpu
   procInfo._steeringEntry = checkpointEntries;
   procInfo._steeringDeferredCheckpoint = true;
   delete procInfo._deferredSteeringFiles;
+  delete procInfo._deferredSteeringQueuedAt;
+  delete procInfo._deferredSteeringStrandedFiles;
   // W-mq066js7000fff1f-a (Gap D): transition each promoted entry to
   // 're_spawning' — captures that the engine has committed to deliver
   // these messages via session resume at the natural checkpoint.
@@ -2683,9 +2690,14 @@ async function spawnAgent(dispatchItem, config) {
     updateAgentStatus(id, code === 0 ? AGENT_STATUS.FINISHED : AGENT_STATUS.FAILED,
       code === 0 ? 'Agent completed successfully' : `Agent exited with code ${code}`);
 
-    // Clear stale session if resume failed — prevents burning all retries on the same bad session
+    // Clear stale session if resume failed — prevents burning all retries on the same bad session.
+    // W-mq066js7000fff1f-c (Gap G): drop any in-flight steering-store entries
+    // bound to the purged session BEFORE unlinking session.json, so the human
+    // sees a [steering-failed] line + can re-send instead of silently watching
+    // their message strand against a dead session.
     if (code !== 0 && cachedSessionId && stderr.includes('No conversation found')) {
       log('warn', `Stale session ${cachedSessionId} for ${agentId} — clearing session.json`);
+      try { dropSteeringForPurgedSession(agentId, cachedSessionId, liveOutputPath); } catch {}
       try { shared.safeUnlink(path.join(AGENTS_DIR, agentId, 'session.json')); } catch {}
     }
 
@@ -3932,7 +3944,7 @@ function reconcileItemsWithPrs(items, allPrs, { onlyIds } = {}) {
 // ─── Inbox Consolidation (extracted to engine/consolidation.js) ──────────────
 
 const { consolidateInbox } = require('./engine/consolidation');
-const { pollPrStatus, pollPrHumanComments, reconcilePrs, checkLiveReviewStatus: adoCheckLiveReview, checkLiveBuildAndConflict: adoCheckLiveBuildAndConflict, needsAdoPollRetry, getAdoToken, isAdoThrottled } = require('./engine/ado');
+const { pollPrStatus, pollPrHumanComments, reconcilePrs, checkLiveReviewStatus: adoCheckLiveReview, checkLiveBuildAndConflict: adoCheckLiveBuildAndConflict, needsAdoPollRetry, getAdoToken, isAdoThrottled, getAdoThrottleStateAll } = require('./engine/ado');
 const { pollPrStatus: ghPollPrStatus, pollPrHumanComments: ghPollPrHumanComments, reconcilePrs: ghReconcilePrs, checkLiveReviewStatus: ghCheckLiveReview, checkLiveBuildAndConflict: ghCheckLiveBuildAndConflict, isGhThrottled } = require('./engine/github');
 
 // ─── State Snapshot ─────────────────────────────────────────────────────────
@@ -6866,12 +6878,35 @@ async function discoverWork(config) {
         mutateJsonFileLocked(centralPath, (items) => {
           if (!Array.isArray(items)) items = [];
           let added = 0;
+          // Snapshot active dedup keys BEFORE the loop so multiple items in the
+          // same harness mission (same _missionId) all land in one tick. Without
+          // this snapshot, the first item's push would block subsequent items
+          // in the same mission from joining (W-mq07a9gf000jbc2b — tri-agent
+          // harness mode requires Planner+Generator+Evaluator to land together).
+          const activeMissionIds = new Set();
+          const activeScheduleIds = new Set();
+          for (const existing of items) {
+            if (existing.status === WI_STATUS.DONE || existing.status === WI_STATUS.FAILED) continue;
+            if (existing._missionId) activeMissionIds.add(existing._missionId);
+            if (existing._scheduleId) activeScheduleIds.add(existing._scheduleId);
+          }
+          const addedScheduleIdsThisTick = new Set();
           for (const item of taskItems) {
-            if (!items.some(i => i._scheduleId === item._scheduleId && i.status !== WI_STATUS.DONE && i.status !== WI_STATUS.FAILED)) {
-              items.push(item);
-              added++;
-              log('info', `Scheduled task fired: ${item._scheduleId} → ${item.title}`);
+            // Mission items dedup by _missionId against pre-existing rows only
+            // (the trio's other items added later in this loop must not block
+            // each other). Plain scheduled items keep the original scheduleId
+            // dedup AND skip if a sibling item from the same tick already
+            // claimed the schedule slot.
+            if (item._missionId) {
+              if (activeMissionIds.has(item._missionId)) continue;
+            } else {
+              if (activeScheduleIds.has(item._scheduleId)) continue;
+              if (addedScheduleIdsThisTick.has(item._scheduleId)) continue;
             }
+            items.push(item);
+            if (!item._missionId && item._scheduleId) addedScheduleIdsThisTick.add(item._scheduleId);
+            added++;
+            log('info', `Scheduled task fired: ${item._scheduleId} → ${item.title}`);
           }
           return items;
         }, { defaultValue: [] });
@@ -7337,10 +7372,18 @@ async function tickInner() {
     lastPrStatusPollAt = now;
     // Build promise array — enabled+unthrottled polls run concurrently via Promise.allSettled
     const statusPolls = [];
-    if (adoPollEnabled && !isAdoThrottled()) {
-      statusPolls.push(pollPrStatus(config).catch(err => { log('warn', `ADO PR status poll error: ${err?.message || err}${err?.stack ? ' | ' + err.stack.split('\n')[1]?.trim() : ''}`); }));
-    } else if (adoPollEnabled && isAdoThrottled()) {
-      log('info', '[ado] PR status poll skipped — throttled');
+    if (adoPollEnabled) {
+      // Per-org throttle skip happens inside forEachActivePr (one log line per skipped project).
+      // Top-level short-circuit: when every known ADO org is throttled, skip the whole phase
+      // with one log line to avoid the per-project iteration cost.
+      const adoThrottleStates = getAdoThrottleStateAll() || {};
+      const adoOrgCount = Object.keys(adoThrottleStates).length;
+      const allAdoThrottled = adoOrgCount > 0 && Object.values(adoThrottleStates).every(s => s && s.throttled);
+      if (allAdoThrottled) {
+        log('info', `[ado] PR status poll skipped — all ${adoOrgCount} known orgs throttled`);
+      } else {
+        statusPolls.push(pollPrStatus(config).catch(err => { log('warn', `ADO PR status poll error: ${err?.message || err}${err?.stack ? ' | ' + err.stack.split('\n')[1]?.trim() : ''}`); }));
+      }
     }
     if (ghPollEnabled && !isGhThrottled()) {
       statusPolls.push(ghPollPrStatus(config).catch(err => { log('warn', `GitHub PR status poll error: ${err?.message || err}${err?.stack ? ' | ' + err.stack.split('\n')[1]?.trim() : ''}`); }));
@@ -7383,10 +7426,18 @@ async function tickInner() {
     lastPrCommentsPollAt = now;
     // Build promise array — enabled+unthrottled comment polls run concurrently via Promise.allSettled
     const commentPolls = [];
-    if (adoPollEnabled && !isAdoThrottled()) {
-      commentPolls.push(pollPrHumanComments(config).catch(err => { log('warn', `ADO PR comment poll error: ${err?.message || err}${err?.stack ? ' | ' + err.stack.split('\n')[1]?.trim() : ''}`); }));
-    } else if (adoPollEnabled && isAdoThrottled()) {
-      log('info', '[ado] PR comment poll skipped — throttled');
+    if (adoPollEnabled) {
+      // Per-org throttle skip happens inside forEachActivePr (one log line per skipped project).
+      // Top-level short-circuit: when every known ADO org is throttled, skip the whole phase
+      // with one log line to avoid the per-project iteration cost.
+      const adoThrottleStates = getAdoThrottleStateAll() || {};
+      const adoOrgCount = Object.keys(adoThrottleStates).length;
+      const allAdoThrottled = adoOrgCount > 0 && Object.values(adoThrottleStates).every(s => s && s.throttled);
+      if (allAdoThrottled) {
+        log('info', `[ado] PR comment poll skipped — all ${adoOrgCount} known orgs throttled`);
+      } else {
+        commentPolls.push(pollPrHumanComments(config).catch(err => { log('warn', `ADO PR comment poll error: ${err?.message || err}${err?.stack ? ' | ' + err.stack.split('\n')[1]?.trim() : ''}`); }));
+      }
     }
     if (ghPollEnabled && !isGhThrottled()) {
       commentPolls.push(ghPollPrHumanComments(config).catch(err => { log('warn', `GitHub PR comment poll error: ${err?.message || err}${err?.stack ? ' | ' + err.stack.split('\n')[1]?.trim() : ''}`); }));

package/package.json

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