@gamaze/hicortex 0.20.6 → 0.20.7

package/dist/reconsolidation.js

@@ -133,13 +133,6 @@ exports.DEFAULT_RECONSOLIDATION_MAX_MINUTES = 120;
  * Invalid → default.
  */
 exports.DEFAULT_RECONSOLIDATION_MAX_CALLS = 600;
-/**
- * Candidates between mid-scan cursor persists (#401). The cursor also
- * persists at EVERY scan-loop exit path (deadline, call/budget cap,
- * discovery failure), so a killed run loses at most K-1 candidates of scan
- * progress instead of the whole night.
- */
-const RECONSOLIDATION_CURSOR_PERSIST_EVERY = 50;
 /** Neighbor pool size before older/similarity filtering narrows to top 5 (supersession mirror). */
 const CORRECTION_NEIGHBOR_POOL = 15;
 /** Older-neighbor pairs kept per candidate after filtering (supersession mirror). */
@@ -615,21 +608,36 @@ async function stageReconsolidation(db, llm, budget, embedFn, dryRun, stateDir,
     };
     // ---- #401: mid-scan cursor persistence. Called at EVERY scan-loop exit
     // path (deadline, call/budget cap, mark-verify budget stop, discovery
-    // failure) plus a every-K batch tick, so a killed run loses at most K-1
-    // candidates of scan progress instead of the whole night. The end-of-stage
-    // updateState below stays the authoritative final write (it also applies
-    // the pendingMinRowid hold — pendingMinRowid is only ever set AFTER the
-    // scan loop, so the raw cursor is the effective cursor at every call site
-    // here). updateState is load→mutate→temp-rename atomic.
-    let scanBatch = 0;
+    // failure) AND after every fully-considered candidate, so a killed run
+    // loses at most the candidate in flight. The end-of-stage updateState
+    // below stays the authoritative final write (it also applies the
+    // pendingMinRowid hold — that variable is only ever set AFTER the scan
+    // loop, so it is null at every call site here). updateState is
+    // load→mutate→temp-rename atomic.
     let callsUsed = 0;
     let deadlineStopped = false;
     let callCapStopped = false;
+    // #402 follow-up (reviewer note 1): the hard-kill orphan floor. Queued
+    // merges and open rewrite groups are applied only in the POST-scan
+    // phases — until then their verdicts exist only in memory, and a
+    // SIGKILL/OOM between two persists would strand them BEHIND the persisted
+    // cursor (the next run would skip them forever). This tracks the smallest
+    // candidate rowid contributing to queued-but-unapplied work;
+    // persistCursor clamps every checkpoint below it so a resumed run
+    // re-detects the pairs (dup-over-loss). Deliberately SEPARATE from the
+    // post-loop pendingMinRowid hold above — different lifetime, different
+    // writers.
+    let scanPendingMinRowid = null;
+    const notePendingRowid = (rowid) => {
+        scanPendingMinRowid =
+            scanPendingMinRowid === null ? rowid : Math.min(scanPendingMinRowid, rowid);
+    };
     const persistCursor = () => {
         if (dryRun)
             return;
+        const checkpoint = scanPendingMinRowid !== null ? Math.min(cursor, scanPendingMinRowid - 1) : cursor;
         (0, state_js_1.updateState)((s) => {
-            s.reconsolidationCursor = cursor;
+            s.reconsolidationCursor = checkpoint;
         }, stateDir);
     };
     const groups = new Map();
@@ -648,6 +656,7 @@ async function stageReconsolidation(db, llm, budget, embedFn, dryRun, stateDir,
                 candidateRowid: trigger.__rowid,
                 explicit,
             });
+            notePendingRowid(trigger.__rowid); // orphan floor — group unapplied until the rewrite phase
         }
     };
     for (const candidate of rows) {
@@ -784,6 +793,7 @@ async function stageReconsolidation(db, llm, budget, embedFn, dryRun, stateDir,
                 }
                 else {
                     queuedMerges.push({ oldId: neighbor.id, newId: candidate.id, candidateRowid: candidate.__rowid });
+                    notePendingRowid(candidate.__rowid); // orphan floor — merge unapplied until the merge phase
                 }
                 continue;
             }
@@ -817,12 +827,12 @@ async function stageReconsolidation(db, llm, budget, embedFn, dryRun, stateDir,
             // verdict "none" → nothing to do
         }
         cursor = candidate.__rowid;
-        // #401: batch-tick persistence every K candidates — a kill between exit
-        // paths loses at most K-1 candidates of scan progress.
-        if (!dryRun && ++scanBatch >= RECONSOLIDATION_CURSOR_PERSIST_EVERY) {
-            persistCursor();
-            scanBatch = 0;
-        }
+        // #402 follow-up (reviewer note 1): persist after EVERY fully-considered
+        // candidate — the 50-candidate batch left a kill window that could
+        // strand several candidates of scan progress. updateState is an atomic
+        // temp-rename of a small file and the loop cadence is seconds per
+        // candidate; the cost is negligible.
+        persistCursor();
     }
     if (deadlineStopped) {
         console.log(`[hicortex] Reconsolidation: wall-clock deadline reached (reconsolidationMaxMinutes) — ` +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gamaze/hicortex",
-  "version": "0.20.6",
+  "version": "0.20.7",
   "description": "Persistent agent identity for AI agents \u2014 a hand-edited identity layer, nightly-distilled experience, and lessons injected every session, shared across your whole fleet. Works with Hermes, OpenClaw, Claude Code, Pi, and opencode.",
   "main": "dist/index.js",
   "bin": {