@rljson/fs-agent 0.0.28 → 0.0.30

package/dist/fs-agent.js

@@ -1925,7 +1925,6 @@ ${err.stack}` : String(err);
             );
             this._currentRef = ref;
             this._persistCurrentRef(ref);
-            this._persistCurrentRef(ref);
             if (ref === this._lastSentRef) {
               return;
             }
@@ -2198,6 +2197,19 @@ ${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 (treeRef === this._lastSentRef) {
+          console.warn(
+            `[FsAgent] ref=${treeRef.slice(0, 8)}… is this agent's own last advertisement echoed back — ignoring it.`
+          );
+          return;
+        }
+        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 +2260,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.30",
   "description": "Rljson fs-agent description",
   "homepage": "https://github.com/rljson/fs-agent",
   "bugs": "https://github.com/rljson/fs-agent/issues",
@@ -19,14 +19,6 @@
     "dist"
   ],
   "type": "module",
-  "scripts": {
-    "build": "pnpm exec vite build && tsc && node scripts/copy-readme-to-dist.js",
-    "test": "cross-env NODE_OPTIONS=--max-old-space-size=8192 pnpm exec vitest run --coverage && pnpm run lint",
-    "prebuild": "npm run test",
-    "prepublishOnly": "npm run build",
-    "lint": "pnpm exec eslint .",
-    "updateGoldens": "cross-env UPDATE_GOLDENS=true pnpm test"
-  },
   "devDependencies": {
     "@rljson/server": "^0.0.43",
     "@types/node": "^25.3.1",
@@ -59,13 +51,11 @@
     "socket.io": "^4.8.3",
     "socket.io-client": "^4.8.3"
   },
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "esbuild"
-    ],
-    "overrides": {
-      "@rljson/rljson": "^0.0.78"
-    }
-  },
-  "packageManager": "pnpm@10.11.0"
-}
+  "scripts": {
+    "build": "pnpm exec vite build && tsc && node scripts/copy-readme-to-dist.js",
+    "test": "cross-env NODE_OPTIONS=--max-old-space-size=8192 pnpm exec vitest run --coverage && pnpm run lint",
+    "prebuild": "npm run test",
+    "lint": "pnpm exec eslint .",
+    "updateGoldens": "cross-env UPDATE_GOLDENS=true pnpm test"
+  }
+}