@rljson/fs-agent 0.0.27 → 0.0.29

package/dist/fs-agent.js

@@ -2194,9 +2194,17 @@ ${err.stack}` : String(err);
     let fromDbTimer = null;
     let pendingRecoveryAttempt = 0;
     let pendingPredecessorRefs;
-    const processRef = async (treeRef, recoveryAttempt = 0, predecessorRefs) => {
+    let pendingIsNewest = true;
+    const processRef = async (treeRef, recoveryAttempt = 0, predecessorRefs, isNewestFromSender = true) => {
       const maxAttempts = this._timeouts.processRefRetries + 1;
       for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+        if (!isNewestFromSender) {
+          console.warn(
+            `[FsAgent] ref=${treeRef.slice(0, 8)}… is not the newest its sender has advertised — ignoring it.`
+          );
+          connector.invalidateReceived(treeRef);
+          return;
+        }
         this._scanner.pauseWatch();
         this._remoteApplyInFlight = true;
         try {
@@ -2250,7 +2258,7 @@ ${err.stack}` : String(err);
           const applyOptions = restoreOptions?.cleanTarget && ancestryExpected && !declaresAncestry ? { ...restoreOptions, cleanTarget: false } : restoreOptions;
           if (applyOptions !== restoreOptions) {
             console.warn(
-              `[FsAgent] ref=${treeRef.slice(0, 8)}… declares no ancestry — applying additively, not pruning. A sender that cannot say what it descends from must not delete.`
+              `[FsAgent] ref=${treeRef.slice(0, 8)}… declares no ancestry — applying additively, not pruning.`
             );
           }
           await FsAgent._withTimeout(
@@ -2322,30 +2330,38 @@ ${err.stack}` : String(err);
         );
       }
     };
-    const scheduleProcess = (ref, delayMs, recoveryAttempt, predecessorRefs) => {
+    const scheduleProcess = (ref, delayMs, recoveryAttempt, predecessorRefs, isNewestFromSender = true) => {
       if (pendingRef && pendingRef !== ref) {
         connector.invalidateReceived(pendingRef);
       }
       pendingRef = ref;
       pendingRecoveryAttempt = recoveryAttempt;
       pendingPredecessorRefs = predecessorRefs;
+      pendingIsNewest = isNewestFromSender;
       if (fromDbTimer) clearTimeout(fromDbTimer);
       fromDbTimer = setTimeout(async () => {
         fromDbTimer = null;
         const r = pendingRef;
         const ra = pendingRecoveryAttempt;
         const pr = pendingPredecessorRefs;
+        const newest = pendingIsNewest;
         pendingRef = null;
         if (r) {
-          await processRef(r, ra, pr);
+          await processRef(r, ra, pr, newest);
         }
       }, delayMs);
     };
-    const syncCallback = (treeRef, predecessorRefs) => {
+    const syncCallback = (treeRef, predecessorRefs, info) => {
       if (!treeRef || typeof treeRef !== "string") {
         return Promise.resolve();
       }
-      scheduleProcess(treeRef, this._timeouts.debounceMs, 0, predecessorRefs);
+      scheduleProcess(
+        treeRef,
+        this._timeouts.debounceMs,
+        0,
+        predecessorRefs,
+        info?.isNewestFromSender ?? true
+      );
       return Promise.resolve();
     };
     connector.listen(syncCallback);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rljson/fs-agent",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "Rljson fs-agent description",
   "homepage": "https://github.com/rljson/fs-agent",
   "bugs": "https://github.com/rljson/fs-agent/issues",
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "@rljson/bs": "^0.0.21",
-    "@rljson/db": "^0.0.31",
+    "@rljson/db": "^0.0.32",
     "@rljson/hash": "^0.0.18",
     "@rljson/io": "^0.0.66",
     "@rljson/json": "^0.0.23",