@yemi33/minions 0.1.2332 → 0.1.2334

package/engine/projects.js

@@ -125,7 +125,10 @@ function _requeueProjectlessCentralWorkItems(itemIds) {
  * @param {object} [options]
  * @param {'archive'|'keep'|'purge'} [options.dataMode='archive']
  *   archive: move projects/<name>/ to projects/.archived/<name>-YYYYMMDD/
- *   keep:    leave projects/<name>/ in place
+ *   keep:    leave projects/<name>/ in place, but tombstone work-items.json /
+ *            pull-requests.json into projects/<name>/.dropped/ so dropScope()
+ *            (step 9) isn't immediately undone by the *-store.js resync-on-
+ *            read path re-hydrating the still-present JSON (W-mr96oira000g979a)
  *   purge:   rm -rf projects/<name>/
  * @returns {object} summary { ok, project, cancelledItems, killedAgents,
  *   drainedDispatches, cleanedWorktrees, disabledSchedules, archivedTo,
@@ -145,6 +148,7 @@ function removeProject(target, options = {}) {
     pipelineRefs: [],
     archivedTo: null,
     purgedDataDir: false,
+    tombstonedDataFiles: false,
     // P-bfa2d-remove-project-cleanup — soft-delete tag counts for entries in
     // the three central state files that survived the hard-cancel passes
     // (steps 1, 2). See step 7.5 for the orphan-tag policy rationale.
@@ -427,6 +431,35 @@ function removeProject(target, options = {}) {
         summary.archiveError = e.code ? `${e.code}: ${e.message}` : e.message;
         summary.warnings.push('archive data dir: ' + e.message);
       }
+    } else if (dataMode === 'keep') {
+      // W-mr96oira000g979a — 'keep' leaves projects/<name>/ (and therefore
+      // work-items.json / pull-requests.json) at its normal, live-resolving
+      // path. dropScope() below DELETEs the SQL rows for this scope, but the
+      // *-store.js resync-on-read path (_resyncScopeIfJsonDiverged) treats a
+      // scope with an empty SQL table + a still-present JSON file as a
+      // fresh-install first-touch and re-hydrates straight from that JSON —
+      // silently undoing the drop the very next time anything reads this
+      // scope. Tombstone the two live-state files into a `.dropped/`
+      // subdirectory so `_filePathForScope(scope)` (and the read-side
+      // resync/fallback logic keyed off it) no longer resolves to them,
+      // while keeping the historical data on disk for manual inspection —
+      // exactly what 'keep' promises, minus the auto-resurrection.
+      try {
+        const droppedDir = path.join(dataDir, '.dropped');
+        const stamp = new Date().toISOString().replace(/[:.]/g, '-');
+        for (const fname of ['work-items.json', 'pull-requests.json']) {
+          const src = path.join(dataDir, fname);
+          if (!fs.existsSync(src)) continue;
+          fs.mkdirSync(droppedDir, { recursive: true });
+          let dest = path.join(droppedDir, `${fname}.${stamp}`);
+          let n = 1;
+          while (fs.existsSync(dest)) dest = path.join(droppedDir, `${fname}.${stamp}-${++n}`);
+          _renameWithRetry(src, dest);
+          summary.tombstonedDataFiles = true;
+        }
+      } catch (e) {
+        summary.warnings.push('tombstone kept data files: ' + e.message);
+      }
     }
   }
 

package/engine/pull-requests-store.js

@@ -313,7 +313,18 @@ function dropScope(scope) {
   try {
     const { getDb } = require('./db');
     const result = getDb().prepare('DELETE FROM pull_requests WHERE scope = ?').run(scope);
-    _lastMirrorHashByScope.delete(scope);
+    // Mirror the work-items-store.js fix (W-mr96m3hm000fd5d7): don't blindly
+    // forget the mirror-hash. _resyncScopeIfJsonDiverged treats "no recorded
+    // hash" + "zero SQL rows" as a first-install hydrate and rebuilds SQL from
+    // whatever JSON is on disk. removeProject with dataMode:'keep' leaves this
+    // scope's JSON file untouched, so forgetting the hash here would let the
+    // very next read/write resurrect the just-dropped project's stale PR rows.
+    // Adopt the file's current hash instead (or forget it only if the file is
+    // actually gone, e.g. dataMode: 'purge'/'archive').
+    const jsonPath = _filePathForScope(scope);
+    const currentHash = _fileContentHash(jsonPath);
+    if (currentHash == null) _lastMirrorHashByScope.delete(scope);
+    else _lastMirrorHashByScope.set(scope, currentHash);
     if (result && result.changes > 0) {
       try { require('./db-events').emitStateEvent('pull_requests'); } catch { /* optional */ }
     }

package/engine/work-items-store.js

@@ -390,7 +390,21 @@ function dropScope(scope) {
   try {
     const { getDb } = require('./db');
     const result = getDb().prepare('DELETE FROM work_items WHERE scope = ?').run(scope);
-    _lastMirrorHashByScope.delete(scope);
+    // Do NOT simply forget the mirror-hash here. _resyncScopeIfJsonDiverged
+    // treats "no recorded hash" + "zero SQL rows for the scope" as a genuine
+    // first-install hydrate and rebuilds SQL from whatever JSON is on disk.
+    // When the caller is removeProject with dataMode:'keep', the JSON file for
+    // this scope is deliberately left untouched — so the very next read/write
+    // against this scope would silently resurrect the just-dropped project's
+    // stale rows straight back into SQL. Instead, adopt the JSON file's
+    // *current* hash (if it still exists) so the next resync correctly reads
+    // that as "unchanged" and skips the rehydrate. If the file is genuinely
+    // gone (dataMode: 'purge'/'archive'), forgetting the hash is safe since
+    // _resyncScopeIfJsonDiverged no-ops when the file can't be hashed.
+    const jsonPath = _filePathForScope(scope);
+    const currentHash = _fileContentHash(jsonPath);
+    if (currentHash == null) _lastMirrorHashByScope.delete(scope);
+    else _lastMirrorHashByScope.set(scope, currentHash);
     if (result && result.changes > 0) {
       try { require('./db-events').emitStateEvent('work_items'); } catch { /* optional */ }
       try { require('./queries').invalidateWorkItemsCache(); } catch { /* queries not loaded */ }

package/package.json

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