@yemi33/minions 0.1.2393 → 0.1.2394

package/engine/lifecycle.js

@@ -2629,7 +2629,7 @@ function normalizePrFixBranchName(branch) {
 }
 
 function getPrFixBaselineHead(pr) {
-  return String(pr?.headSha || pr?._adoSourceCommit || pr?._adoHeadCommit || '').trim();
+  return String(pr?.headRefOid || pr?.headSha || pr?._adoSourceCommit || pr?._adoHeadCommit || '').trim();
 }
 
 function findPrFixWorktree(meta, project, config) {
@@ -5962,7 +5962,14 @@ async function runPostCompletionHooks(dispatchItem, agentId, code, stdout, confi
   }
   if (effectiveSuccess && !skipDoneStatus) {
     // Coding WIs and direct PR-sourced fix dispatches share this follow-up path.
-    try { autoDispatchLiveValidationWi(meta, config, dispatchItem); } catch (err) { log('warn', `autoDispatchLiveValidationWi: ${err.message}`); }
+    const verifiedHeadSha = prFixBranchChange?.evidence === 'remote-head'
+      ? prFixBranchChange.afterHead
+      : '';
+    try {
+      autoDispatchLiveValidationWi(meta, config, dispatchItem, { verifiedHeadSha });
+    } catch (err) {
+      log('warn', `autoDispatchLiveValidationWi: ${err.message}`);
+    }
   }
   // Failure retry is handled by completeDispatch in dispatch.js — not duplicated here.
   // Only clear _decomposing flag on failure so decompose items don't get permanently stuck.
@@ -6943,9 +6950,9 @@ function collapseAllDuplicatePrRecords(config) {
 // always a canonical `test` WI with the PR-focused `build-and-test` playbook;
 // liveValidation.type controls routing, not the semantic type of the task.
 //
-// Deduplicates per codingWiId: any non-terminal WI with
-// meta.liveValidationFor === codingWiId blocks a second dispatch, so only one
-// validation task is ever in flight per coding completion.
+// Deduplicates both per codingWiId and per canonical PR source revision. This
+// keeps concurrent/repeated fixes for one unchanged PR head from queueing
+// duplicate validations while allowing a fresh validation after the head moves.
 //
 // W-mr9u39az000db5c2 — guard against a self-referential recursive cascade.
 // When liveValidation.type overlaps with a coding WI's own type set (e.g.
@@ -6970,7 +6977,7 @@ const ELIGIBLE_LIVE_VALIDATION_TYPES = new Set([
   WORK_TYPE.BUILD_FIX_COMPLEX,
 ]);
 
-function autoDispatchLiveValidationWi(meta, config, dispatchItem = null) {
+function autoDispatchLiveValidationWi(meta, config, dispatchItem = null, options = {}) {
   const item = meta?.item || null;
   const sourceType = item?.type || dispatchItem?.type || null;
   const sourceKey = item?.id || dispatchItem?.id || null;
@@ -7033,27 +7040,48 @@ function autoDispatchLiveValidationWi(meta, config, dispatchItem = null) {
   const prTarget = prUrl || (prId != null ? String(prId) : null);
   if (!prTarget) return;
 
+  const prIdentityRef = {
+    id: prId != null ? String(prId) : prTarget,
+    url: prUrl || '',
+  };
+  let currentPr = typeof prRef === 'object' ? prRef : null;
+  try {
+    currentPr = shared.findPrRecord(shared.readPullRequests(project), prIdentityRef, project) || currentPr;
+  } catch (err) {
+    log('warn', `liveValidation: could not resolve tracked PR ${prTarget}: ${err.message}`);
+  }
+  const liveValidationPrId = shared.getPrIdentityKey(currentPr || prIdentityRef, project);
+  if (!liveValidationPrId) return;
+  const liveValidationHeadSha = String(options?.verifiedHeadSha || '').trim()
+    || getPrFixBaselineHead(currentPr);
+
   const codingWiId = sourceKey;
   const wiScope = item ? resolveWorkItemScope(meta) : projectName;
   if (!wiScope) return;
 
   try {
-    mutateWorkItems(wiScope, items => {
+    mutateWorkItems(wiScope, (items, comparisonItems) => {
       if (!Array.isArray(items)) return items;
 
-      // Dedup: only one validation WI in flight per coding WI. Any non-terminal
-      // WI already tracking this coding WI (meta.liveValidationFor) blocks a
-      // second dispatch, regardless of its validation type. (Back-compat: WIs
-      // created before meta.liveValidationType existed are matched too, since
-      // we key solely on liveValidationFor.)
-      const existing = items.find(i =>
-        i &&
-        i.meta &&
-        i.meta.liveValidationFor === codingWiId &&
-        !PLAN_TERMINAL_STATUSES.has(i.status)
-      );
+      // Keep the source-WI guard and revision guard in this same mutation as the
+      // insert, and compare both supported scopes while the SQLite write
+      // transaction is held. Legacy live-validation WIs predate the persisted
+      // revision fields, so derive their identity from structured PR fields and
+      // conservatively treat a missing head as matching until terminal.
+      const existing = comparisonItems.find(i => {
+        if (!i?.meta?.liveValidationFor || PLAN_TERMINAL_STATUSES.has(i.status)) return false;
+        if (i.meta.liveValidationFor === codingWiId) return true;
+
+        const existingPrRef = i.meta.liveValidationPrId || shared.extractStructuredWorkItemPrRef(i);
+        if (!existingPrRef) return false;
+        const existingPrId = shared.getPrIdentityKey(existingPrRef, project);
+        if (existingPrId !== liveValidationPrId) return false;
+
+        const existingHeadSha = String(i.meta.liveValidationHeadSha || '').trim();
+        return !existingHeadSha || !liveValidationHeadSha || existingHeadSha === liveValidationHeadSha;
+      });
       if (existing) {
-        log('info', `liveValidation: dedup — non-terminal validation WI ${existing.id} already exists for ${codingWiId}`);
+        log('info', `liveValidation: dedup — non-terminal validation WI ${existing.id} blocks another validation for ${codingWiId} (${liveValidationPrId}@${liveValidationHeadSha || 'unknown'})`);
         return items;
       }
 
@@ -7081,6 +7109,8 @@ function autoDispatchLiveValidationWi(meta, config, dispatchItem = null) {
         meta: {
           liveValidationFor: codingWiId,
           liveValidationType: validationType,
+          liveValidationPrId,
+          ...(liveValidationHeadSha ? { liveValidationHeadSha } : {}),
           playbook: 'build-and-test',
           ...(dispatchItem?.id ? { sourceDispatchId: dispatchItem.id } : {}),
         },
@@ -7093,7 +7123,7 @@ function autoDispatchLiveValidationWi(meta, config, dispatchItem = null) {
       items.push(validationWi);
       log('info', `liveValidation: auto-dispatched validation WI ${validationWi.id} (type=${validationType}) for coding WI ${codingWiId}`);
       return items;
-    });
+    }, { readScopes: ['central', projectName] });
   } catch (err) {
     log('warn', `autoDispatchLiveValidationWi for ${codingWiId}: ${err.message}`);
   }

package/engine/shared.js

@@ -7702,12 +7702,17 @@ function readWorkItems(source = null) {
   return require('./work-items-store').readWorkItemsForScope(stateScope(source));
 }
 
-function mutateWorkItems(source, mutator) {
+function mutateWorkItems(source, mutator, opts = {}) {
   const store = require('./work-items-store');
-  const { wrote, result } = store.applyWorkItemsMutation(stateScope(source), (items) => {
+  const scope = stateScope(source);
+  const normalizedOpts = { ...opts };
+  if (Array.isArray(opts.readScopes)) {
+    normalizedOpts.readScopes = opts.readScopes.map(stateScope);
+  }
+  const { wrote, result } = store.applyWorkItemsMutation(scope, (items, comparisonItems) => {
     if (!Array.isArray(items)) items = [];
-    return mutator(items) || items;
-  });
+    return mutator(items, comparisonItems) || items;
+  }, normalizedOpts);
   if (wrote) {
     try { require('./db-events').emitStateEvent('work_items'); } catch { /* optional */ }
     try { require('./queries').invalidateWorkItemsCache(); } catch { /* queries not loaded */ }

package/engine/work-items-store.js

@@ -128,13 +128,14 @@ function _applyWorkItemsDiff(db, diff) {
 
 // Apply a mutation to the work-items array for a given scope. Wrapped in
 // a single transaction so the diff and apply can't race against a
-// concurrent reader/writer.
+// concurrent reader/writer. Optional readScopes are exposed to the mutator
+// as a combined comparison set; only target-scope mutations are persisted.
 //
 // Returns { wrote, result }:
 //   wrote  — true iff at least one INSERT/UPDATE/DELETE landed
 //   result — the post-mutation array (legacy return shape of
 //            mutateJsonFileLocked)
-function applyWorkItemsMutation(scope, mutator, opts) {
+function applyWorkItemsMutation(scope, mutator, opts = {}) {
   const { getDb, withTransaction } = require('./db');
   const db = getDb();
 
@@ -144,8 +145,14 @@ function applyWorkItemsMutation(scope, mutator, opts) {
     // added by readAllWorkItems only and would round-trip as garbage into
     // the data column otherwise.
     for (const wi of before) { if (wi && wi._source) delete wi._source; }
+    const comparisonItems = [...before];
+    const readScopes = Array.isArray(opts.readScopes) ? opts.readScopes : [];
+    for (const readScope of new Set(readScopes)) {
+      if (readScope === scope) continue;
+      comparisonItems.push(...readWorkItemsForScope(readScope));
+    }
     const beforeSnapshot = JSON.parse(JSON.stringify(before));
-    const next = mutator(before);
+    const next = mutator(before, comparisonItems);
     const after = (next === undefined || next === null)
       ? before
       : (Array.isArray(next) ? next : before);

package/package.json

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