@rljson/fs-agent 0.0.49 → 0.0.51

package/dist/fs-agent.d.ts

@@ -279,11 +279,21 @@ export declare class FsAgent {
     /**
      * The file set of the newest tree any peer has told this node about.
      *
-     * Kept so the SEND path can answer the one question a receiver never can:
-     * am I about to announce a state that is merely my progress through someone
-     * else's? See the check in `syncToDb`.
+     * Kept so the send path can answer the one question a receiver never can:
+     * am I about to announce my progress through someone else's state?
      */
     private _lastKnownRemoteFiles?;
+    /**
+     * Whether a LOCAL deletion has been seen since the last apply.
+     *
+     * The discriminator 0.0.49 lacked. A folder smaller than the newest tree
+     * this node knows about is either a node still catching up or a node someone
+     * deleted files from, and those need opposite treatment — the first must stay
+     * quiet, the second must be heard. The shapes are identical; the CAUSE is
+     * not, and only this node can see it: a deletion arrives as a watcher event,
+     * catching up does not.
+     */
+    private _localDeleteSinceApply;
     /**
      * Files this restore DELETED.
      *

package/dist/fs-agent.js

@@ -1155,11 +1155,21 @@ class FsAgent {
   /**
    * The file set of the newest tree any peer has told this node about.
    *
-   * Kept so the SEND path can answer the one question a receiver never can:
-   * am I about to announce a state that is merely my progress through someone
-   * else's? See the check in `syncToDb`.
+   * Kept so the send path can answer the one question a receiver never can:
+   * am I about to announce my progress through someone else's state?
    */
   _lastKnownRemoteFiles;
+  /**
+   * Whether a LOCAL deletion has been seen since the last apply.
+   *
+   * The discriminator 0.0.49 lacked. A folder smaller than the newest tree
+   * this node knows about is either a node still catching up or a node someone
+   * deleted files from, and those need opposite treatment — the first must stay
+   * quiet, the second must be heard. The shapes are identical; the CAUSE is
+   * not, and only this node can see it: a deletion arrives as a watcher event,
+   * catching up does not.
+   */
+  _localDeleteSinceApply = false;
   /**
    * Files this restore DELETED.
    *
@@ -2015,6 +2025,7 @@ ${err.stack}` : String(err);
       debouncedSync({ type: "safety-rescan" });
     };
     const debouncedSync = (change) => {
+      if (change?.type === "deleted") this._localDeleteSinceApply = true;
       if (change?.type === "safety-rescan" && this._remoteApplyInFlight) {
         this._rescanDeferred = true;
         return;
@@ -2030,7 +2041,7 @@ ${err.stack}` : String(err);
               return;
             }
             const known = this._lastKnownRemoteFiles;
-            if (known && tree.trees.size > 0) {
+            if (known && !this._localDeleteSinceApply && tree.trees.size > 0) {
               const mine = this._getFileContentMap(tree);
               if (mine.size < known.size) {
                 let hasOwn = false;
@@ -2042,7 +2053,7 @@ ${err.stack}` : String(err);
                 }
                 if (!hasOwn) {
                   console.log(
-                    `[FsAgent] not announcing ${mine.size} of ${known.size} files — this node is still catching up, and that is a gap rather than news.`
+                    `[FsAgent] not announcing ${mine.size} of ${known.size} files — nothing here was deleted locally, so this is a gap rather than news.`
                   );
                   return;
                 }
@@ -2526,6 +2537,7 @@ ${err.stack}` : String(err);
           const postRestoreFiles = this._getFileContentMap(postRestoreTree);
           const incomingFiles = this._getFileContentMap(incomingTree);
           this._lastKnownRemoteFiles = incomingFiles;
+          this._localDeleteSinceApply = false;
           let hasNewsOfOurOwn = false;
           for (const path of postRestoreFiles.keys()) {
             if (!incomingFiles.has(path)) {

package/package.json

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