@rljson/fs-agent 0.0.44 → 0.0.46

package/dist/fs-agent.js

@@ -2102,8 +2102,7 @@ ${err.stack}` : String(err);
     const prevRefsOf = /* @__PURE__ */ new Map();
     for (const r of rows) {
       const prev = (r.previous ?? []).map((t) => refOfTimeId.get(t)).filter((x) => x !== void 0);
-      const existing = prevRefsOf.get(r[refKey]);
-      prevRefsOf.set(r[refKey], existing ? [...existing, ...prev] : prev);
+      prevRefsOf.set(r[refKey], prev);
     }
     const ancestorsOf = (startRefs) => {
       const seen = /* @__PURE__ */ new Set();
@@ -2426,23 +2425,23 @@ ${err.stack}` : String(err);
               `[FsAgent] syncFromDb: equivalent content, skipping restore (incoming=${incomingFiles.size} entries, current=${currentFiles.size} entries, ref=${treeRef.slice(0, 8)}…)`
             );
             this._adoptAppliedRef(connector, treeRef);
+            this._currentRef = treeRef;
+            this._persistCurrentRef(treeRef);
+            this._lastSentContentKey = this._contentKeyFromTree(currentTree);
             return;
           }
-          if (this._currentRef) {
+          if (this._resolveConflicts && this._currentRef && predecessorRefs && predecessorRefs.length > 0) {
             const relation = await this._ancestryRelation(
               db,
               treeKey,
               this._currentRef,
               treeRef,
-              predecessorRefs ?? []
+              predecessorRefs
             );
             if (relation === "ahead") {
-              console.warn(
-                `[FsAgent] ref=${treeRef.slice(0, 8)}… is an ancestor of the state this agent already holds — ignoring.`
-              );
               return;
             }
-            if (relation === "diverged" && this._resolveConflicts && predecessorRefs !== void 0 && predecessorRefs.length > 0) {
+            if (relation === "diverged") {
               await this._resolveConflictInline(
                 db,
                 treeKey,
@@ -2478,10 +2477,13 @@ ${err.stack}` : String(err);
             previous
           });
           this._adoptAppliedRef(connector, treeRef);
-          this._lastSentRef = postRestoreRef;
-          this._lastSentContentKey = this._contentKeyFromTree(postRestoreTree);
           this._currentRef = postRestoreRef;
           this._persistCurrentRef(postRestoreRef);
+          const postRestoreKey = this._contentKeyFromTree(postRestoreTree);
+          if (postRestoreKey === this._contentKeyFromTree(incomingTree)) {
+            this._lastSentRef = postRestoreRef;
+            this._lastSentContentKey = postRestoreKey;
+          }
           return;
         } catch (err) {
           if (err instanceof MassDeleteRefusedError) {

package/package.json

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