@rljson/fs-agent 0.0.40 → 0.0.42

package/dist/fs-agent.d.ts

@@ -263,6 +263,16 @@ export declare class FsAgent {
      * view — and undo a deletion the peer just made.
      */
     private _remoteApplyInFlight;
+    /**
+     * Whether a safety rescan was suppressed while a remote apply was running.
+     *
+     * The rescan is what covers a watcher that drops or coalesces events, so a
+     * suppressed one has to be re-run rather than forgotten — see the deferral in
+     * `syncToDb`'s change handler.
+     */
+    private _rescanDeferred;
+    /** Re-runs a deferred rescan once the apply that blocked it has finished. */
+    private _flushDeferredRescan;
     /** Files written vs left alone by the current {@link restore}. */
     private _restoreWritten;
     private _restoreSkipped;

package/dist/fs-agent.js

@@ -1090,6 +1090,16 @@ class FsAgent {
    * view — and undo a deletion the peer just made.
    */
   _remoteApplyInFlight = false;
+  /**
+   * Whether a safety rescan was suppressed while a remote apply was running.
+   *
+   * The rescan is what covers a watcher that drops or coalesces events, so a
+   * suppressed one has to be re-run rather than forgotten — see the deferral in
+   * `syncToDb`'s change handler.
+   */
+  _rescanDeferred = false;
+  /** Re-runs a deferred rescan once the apply that blocked it has finished. */
+  _flushDeferredRescan;
   /** Files written vs left alone by the current {@link restore}. */
   _restoreWritten = 0;
   _restoreSkipped = 0;
@@ -1344,9 +1354,7 @@ ${err.stack}` : String(err);
    */
   async _sendRef(connector, ref, predecessorRefs) {
     connector.invalidateSent?.(ref);
-    if (this._resolveConflicts) {
-      connector.setPredecessors(predecessorRefs ?? []);
-    }
+    connector.setPredecessors(predecessorRefs ?? []);
     await FsAgent._withRetry(
       async () => {
         if (connector.syncConfig?.requireAck) {
@@ -1932,8 +1940,14 @@ ${err.stack}` : String(err);
       );
     }
     let debounceTimer = null;
+    this._flushDeferredRescan = () => {
+      if (!this._rescanDeferred) return;
+      this._rescanDeferred = false;
+      debouncedSync({ type: "safety-rescan" });
+    };
     const debouncedSync = (change) => {
       if (change?.type === "safety-rescan" && this._remoteApplyInFlight) {
+        this._rescanDeferred = true;
         return;
       }
       if (debounceTimer) clearTimeout(debounceTimer);
@@ -2459,6 +2473,7 @@ ${err.stack}` : String(err);
         } finally {
           this._remoteApplyInFlight = false;
           this._scanner.resumeWatch();
+          this._flushDeferredRescan?.();
         }
         await new Promise(
           (r) => setTimeout(r, attempt * this._timeouts.processRefRetryDelayMs)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rljson/fs-agent",
-  "version": "0.0.40",
+  "version": "0.0.42",
   "description": "Rljson fs-agent description",
   "homepage": "https://github.com/rljson/fs-agent",
   "bugs": "https://github.com/rljson/fs-agent/issues",
@@ -19,6 +19,14 @@
     "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",
@@ -51,11 +59,13 @@
     "socket.io": "^4.8.3",
     "socket.io-client": "^4.8.3"
   },
-  "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"
-  }
-}
+  "pnpm": {
+    "onlyBuiltDependencies": [
+      "esbuild"
+    ],
+    "overrides": {
+      "@rljson/rljson": "^0.0.78"
+    }
+  },
+  "packageManager": "pnpm@10.11.0"
+}