@rljson/fs-agent 0.0.28 → 0.0.29

package/dist/fs-agent.js

@@ -2198,6 +2198,13 @@ ${err.stack}` : String(err);
     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 {
@@ -2248,12 +2255,10 @@ ${err.stack}` : String(err);
           }
           const ancestryExpected = this._resolveConflicts;
           const declaresAncestry = (predecessorRefs?.length ?? 0) > 0;
-          const staleAdvertisement = !isNewestFromSender;
-          const withholdPrune = ancestryExpected && !declaresAncestry || staleAdvertisement;
-          const applyOptions = restoreOptions?.cleanTarget && withholdPrune ? { ...restoreOptions, cleanTarget: false } : restoreOptions;
+          const applyOptions = restoreOptions?.cleanTarget && ancestryExpected && !declaresAncestry ? { ...restoreOptions, cleanTarget: false } : restoreOptions;
           if (applyOptions !== restoreOptions) {
             console.warn(
-              `[FsAgent] ref=${treeRef.slice(0, 8)}… ` + (staleAdvertisement ? "is not the newest its sender has advertised" : "declares no ancestry") + ` — applying additively, not pruning.`
+              `[FsAgent] ref=${treeRef.slice(0, 8)}… declares no ancestry — applying additively, not pruning.`
             );
           }
           await FsAgent._withTimeout(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rljson/fs-agent",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "description": "Rljson fs-agent description",
   "homepage": "https://github.com/rljson/fs-agent",
   "bugs": "https://github.com/rljson/fs-agent/issues",