@rljson/fs-agent 0.0.59 → 0.0.61

package/dist/fs-agent.d.ts

@@ -190,6 +190,16 @@ export declare const RESTORED_BLOB_MEMORY_MAX = 50000;
  * high concurrency is how a client runs out of heap.
  */
 export declare const RESTORE_FETCH_CONCURRENCY = 16;
+/**
+ * How many of its own past states a node remembers.
+ *
+ * Used to recognise a sender that is BEHIND this node — one that declares a
+ * state this node has held and left. A burst on a large folder produces a few
+ * dozen states, so this is generous; forgetting the oldest costs only the
+ * ability to spot a very stale sender, which the mass-delete guard still
+ * catches.
+ */
+export declare const STATE_HISTORY_MAX = 1000;
 /**
  * What an agent concluded about an inbound ref.
  *
@@ -290,6 +300,25 @@ export declare class FsAgent {
     /** Files written vs left alone by the current {@link restore}. */
     private _restoreWritten;
     private _restoreSkipped;
+    /**
+     * Absolute paths deleted here since the last announcement.
+     *
+     * The mirror of {@link _announcedFiles}. Between a local unlink and the push
+     * that announces it, this node's advertised state still CONTAINS the file —
+     * so a peer pushing in that window descends from a state the file is in, and
+     * an apply re-creates it. The local scan then sees the file present, and the
+     * deletion is never announced at all: silently undone, everywhere.
+     */
+    private readonly _pendingDeletes;
+    /**
+     * The states this node has held, oldest first.
+     *
+     * A push declaring one of these — but not the current one — comes from a
+     * sender that is behind this node. Applying such a tree is what puts a
+     * deleted file back, so it is ignored outright rather than applied
+     * additively.
+     */
+    private readonly _stateHistory;
     /**
      * Absolute paths of the files this agent has actually TOLD anyone about.
      *
@@ -753,6 +782,27 @@ export declare class FsAgent {
      * its own pushes, and the states it adopts from theirs.
      * @param tree - The tree that just went out, or was adopted as ours.
      */
+    /**
+     * Records a state this node is now in.
+     * @param ref - The content ref of that state.
+     */
+    private _rememberState;
+    /**
+     * Whether a push comes from a sender this node has already moved past.
+     * @param predecessorRefs - What the push declares it descends from.
+     * @returns True when every declared parent is a state this node has left.
+     */
+    private _senderIsBehind;
+    /**
+     * Marks an incoming tree's files as known to the network.
+     *
+     * A union, not a replacement: {@link _rememberAnnounced} answers "what this
+     * node has told the network", and this answers "what the network has told
+     * this node". Both make a file prunable; neither alone is the whole set, and
+     * treating the first as the whole set is what made deletions vanish.
+     * @param tree - The tree just applied.
+     */
+    private _rememberReceived;
     private _rememberAnnounced;
     private _adoptAppliedRef;
     /**

package/dist/fs-agent.js

@@ -1080,6 +1080,7 @@ const REFUSAL_ANSWER_COOLDOWN_MS = 5e3;
 const TREE_FETCH_CONCURRENCY = 64;
 const RESTORED_BLOB_MEMORY_MAX = 5e4;
 const RESTORE_FETCH_CONCURRENCY = 16;
+const STATE_HISTORY_MAX = 1e3;
 const VERDICT_REASON = {
   "own-echo": "is this agent's own last advertisement echoed back",
   stale: "is not the newest its sender has advertised"
@@ -1153,6 +1154,25 @@ class FsAgent {
   /** Files written vs left alone by the current {@link restore}. */
   _restoreWritten = 0;
   _restoreSkipped = 0;
+  /**
+   * Absolute paths deleted here since the last announcement.
+   *
+   * The mirror of {@link _announcedFiles}. Between a local unlink and the push
+   * that announces it, this node's advertised state still CONTAINS the file —
+   * so a peer pushing in that window descends from a state the file is in, and
+   * an apply re-creates it. The local scan then sees the file present, and the
+   * deletion is never announced at all: silently undone, everywhere.
+   */
+  _pendingDeletes = /* @__PURE__ */ new Set();
+  /**
+   * The states this node has held, oldest first.
+   *
+   * A push declaring one of these — but not the current one — comes from a
+   * sender that is behind this node. Applying such a tree is what puts a
+   * deleted file back, so it is ignored outright rather than applied
+   * additively.
+   */
+  _stateHistory = [];
   /**
    * Absolute paths of the files this agent has actually TOLD anyone about.
    *
@@ -1268,6 +1288,7 @@ class FsAgent {
     }
   }
   _persistCurrentRef(ref) {
+    this._rememberState(ref);
     try {
       writeFileSync(
         join(this._rootPath, AGENT_STATE_FILE),
@@ -1594,6 +1615,10 @@ ${err.stack}` : String(err);
           this._restoreSkipped++;
           return;
         }
+        if (this._pendingDeletes.has(filePath)) {
+          this._restoreSkipped++;
+          return;
+        }
         let fileBlob;
         try {
           fileBlob = await this._bs.getBlob(meta.blobId);
@@ -2035,9 +2060,12 @@ ${err.stack}` : String(err);
     this._flushDeferredRescan = () => {
       if (!this._rescanDeferred) return;
       this._rescanDeferred = false;
-      debouncedSync({ type: "safety-rescan" });
+      debouncedSync({ type: "safety-rescan", path: "." });
     };
     const debouncedSync = (change) => {
+      if (change?.type === "deleted" && change.path !== ".") {
+        this._pendingDeletes.add(join(this._rootPath, change.path));
+      }
       if (change?.type === "safety-rescan" && this._remoteApplyInFlight) {
         this._rescanDeferred = true;
         return;
@@ -2378,11 +2406,48 @@ ${err.stack}` : String(err);
    * its own pushes, and the states it adopts from theirs.
    * @param tree - The tree that just went out, or was adopted as ours.
    */
+  /**
+   * Records a state this node is now in.
+   * @param ref - The content ref of that state.
+   */
+  _rememberState(ref) {
+    if (this._stateHistory.includes(ref)) return;
+    this._stateHistory.push(ref);
+    if (this._stateHistory.length > STATE_HISTORY_MAX) {
+      this._stateHistory.shift();
+    }
+  }
+  /**
+   * Whether a push comes from a sender this node has already moved past.
+   * @param predecessorRefs - What the push declares it descends from.
+   * @returns True when every declared parent is a state this node has left.
+   */
+  _senderIsBehind(predecessorRefs) {
+    if (predecessorRefs.length === 0) return false;
+    return predecessorRefs.every(
+      (ref) => ref !== this._currentRef && ref !== this._lastAppliedRef && this._stateHistory.includes(ref)
+    );
+  }
+  /**
+   * Marks an incoming tree's files as known to the network.
+   *
+   * A union, not a replacement: {@link _rememberAnnounced} answers "what this
+   * node has told the network", and this answers "what the network has told
+   * this node". Both make a file prunable; neither alone is the whole set, and
+   * treating the first as the whole set is what made deletions vanish.
+   * @param tree - The tree just applied.
+   */
+  _rememberReceived(tree) {
+    for (const path of this._getFileContentMap(tree).keys()) {
+      this._announcedFiles.add(join(this._rootPath, path));
+    }
+  }
   _rememberAnnounced(tree) {
     this._announcedFiles.clear();
     for (const path of this._getFileContentMap(tree).keys()) {
       this._announcedFiles.add(join(this._rootPath, path));
     }
+    this._pendingDeletes.clear();
   }
   _adoptAppliedRef(connector, treeRef) {
     if (this._lastAppliedRef && this._lastAppliedRef !== treeRef) {
@@ -2549,6 +2614,12 @@ ${err.stack}` : String(err);
             (r) => r !== void 0
           );
           const senderSawMyState = !ancestryIsCarried || !declaresAncestry || statesIAmIn.some((r) => predecessorRefs.includes(r));
+          if (ancestryIsCarried && declaresAncestry && this._senderIsBehind(predecessorRefs)) {
+            console.warn(
+              `[FsAgent] ref=${treeRef.slice(0, 8)}… descends from a state this node has already left — ignoring, the sender will catch up and re-push.`
+            );
+            return;
+          }
           const withholdPrune = restoreOptions?.cleanTarget && (ancestryExpected && !declaresAncestry || !senderSawMyState);
           const applyOptions = withholdPrune ? { ...restoreOptions, cleanTarget: false } : restoreOptions;
           if (applyOptions !== restoreOptions) {
@@ -2580,6 +2651,7 @@ ${err.stack}` : String(err);
           this._adoptAppliedRef(connector, treeRef);
           this._currentRef = postRestoreRef;
           this._persistCurrentRef(postRestoreRef);
+          this._rememberReceived(incomingTree);
           const postRestoreFiles = this._getFileContentMap(postRestoreTree);
           const incomingFiles = this._getFileContentMap(incomingTree);
           let hasNewsOfOurOwn = false;

package/package.json

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