@yemi33/minions 0.1.294 → 0.1.295

package/CHANGELOG.md

@@ -1,14 +1,16 @@
 # Changelog
 
-## 0.1.294 (2026-04-03)
+## 0.1.295 (2026-04-03)
 
 ### Features
+- fix engine.js race conditions — worktree TOCTOU, self-heal, dispatch dedup
 - fix dashboard.js race conditions, input validation, and watcher leaks
 - fix cleanup.js — worktree TOCTOU, readdirSync isolation, KB restore verify
 - harden shared.js — backup verification, lock TOCTOU, docs
 -  all doc-chats use Sonnet with full tools (agent change)
 
 ### Fixes
+-  address PR-124 review feedback — safeJson regression, read-only lock, filter cleanup
 -  address review feedback on PR-122
 -  add behavioral tests for CRITICAL propagation and stale lock ENOENT
 -  CRITICAL errors in safeJson now propagate to callers

package/engine/shared.js

@@ -57,16 +57,12 @@ function safeJson(p) {
         // Verify the restored file matches expected content
         const verifyData = JSON.parse(fs.readFileSync(p, 'utf8'));
         if (JSON.stringify(verifyData) !== JSON.stringify(backupData)) {
-          const errMsg = `[safeJson] CRITICAL: backup restore verification failed for ${p} — written data does not match backup`;
-          console.error(errMsg);
-          throw new Error(errMsg);
+          console.error(`[safeJson] CRITICAL: backup restore verification failed for ${p} — written data does not match backup`);
         }
       } catch (restoreErr) {
-        // Re-throw CRITICAL errors so they propagate to callers
-        if (restoreErr.message && restoreErr.message.includes('CRITICAL')) throw restoreErr;
-        const errMsg = `[safeJson] CRITICAL: backup restore failed for ${p}: ${restoreErr.message}`;
-        console.error(errMsg);
-        throw new Error(errMsg);
+        // Restore-to-primary is best-effort — backupData is already parsed and valid.
+        // Don't throw: disk-full / permission errors should not discard valid data.
+        console.error(`[safeJson] restore write failed for ${p}: ${restoreErr.message}`);
       }
       return backupData;
     } catch (outerErr) {
@@ -158,8 +154,7 @@ function withFileLock(lockPath, fn, {
             // ENOENT: another process deleted the lock between stat and unlink — safe to retry
             if (unlinkErr.code !== 'ENOENT') throw unlinkErr;
           }
-          sleepMs(retryDelayMs); // avoid busy-loop on contention
-          continue;
+          continue; // lock just removed — retry immediately
         }
       } catch (staleErr) {
         // ENOENT from statSync: lock file disappeared between EEXIST and stat — retry will succeed

package/engine.js

@@ -91,6 +91,7 @@ const safeJson = shared.safeJson;
 const safeRead = shared.safeRead;
 const safeWrite = shared.safeWrite;
 const mutateJsonFileLocked = shared.mutateJsonFileLocked;
+const withFileLock = shared.withFileLock;
 
 // ─── Dispatch Management (extracted to engine/dispatch.js) ───────────────────
 
@@ -352,10 +353,15 @@ function spawnAgent(dispatchItem, config) {
                   if (alreadyUsed) {
                     const existingWtPath = findExistingWorktree(rootDir, branchName);
                     if (existingWtPath && fs.existsSync(existingWtPath)) {
-                      const dispatch = safeJson(DISPATCH_PATH) || {};
-                      const activelyUsed = (dispatch.active || []).some(d => {
-                        const dBranch = d.meta?.branch ? sanitizeBranch(d.meta.branch) : '';
-                        return dBranch === branchName && d.id !== id;
+                      // Bug fix: read dispatch under file lock so check-and-act is atomic
+                      // Uses withFileLock directly (read-only) — no unnecessary disk write
+                      let activelyUsed = false;
+                      withFileLock(DISPATCH_PATH + '.lock', () => {
+                        const dp = safeJson(DISPATCH_PATH) || {};
+                        activelyUsed = (dp.active || []).some(d => {
+                          const dBranch = d.meta?.branch ? sanitizeBranch(d.meta.branch) : '';
+                          return dBranch === branchName && d.id !== id;
+                        });
                       });
                       if (activelyUsed) {
                         log('warn', `Branch ${branchName} actively used by another agent at ${existingWtPath} — cannot create worktree`);
@@ -2354,9 +2360,17 @@ async function tickInner() {
   // Only dispatch to agents that aren't already busy (one task per agent at a time).
   // Build set of agents currently active.
   const busyAgents = new Set((dispatch.active || []).map(d => d.agent));
+  // Bug fix #14: deduplicate pending by dispatch ID to prevent double-dispatch.
+  // This guards against the same item appearing twice in the in-memory pending array.
+  const seenPendingIds = new Set();
   const toDispatch = [];
   for (const item of dispatch.pending) {
     if (toDispatch.length >= slotsAvailable) break;
+    if (seenPendingIds.has(item.id)) {
+      log('warn', `Duplicate dispatch ID ${item.id} in pending queue — skipping`);
+      continue;
+    }
+    seenPendingIds.add(item.id);
     if (busyAgents.has(item.agent)) continue; // agent already has an active task
     toDispatch.push(item);
     busyAgents.add(item.agent); // mark busy for this dispatch round too

package/package.json

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