unforgit 0.11.8 → 0.11.10

package/dist/{chunk-23T3TBYJ.js → chunk-J74YKGDT.js}

@@ -2046,6 +2046,43 @@ var RemoteClient = class {
     }
     return res.json();
   }
+  async syncPull(orgId, repoId, since) {
+    const params = new URLSearchParams({ orgId, repoId });
+    if (since) params.set("since", since.toISOString());
+    const res = await this.fetchWithRetry(
+      `${this.baseUrl}/v1/sync/pull?${params.toString()}`,
+      { method: "GET", headers: this.getHeaders() },
+      "syncPull"
+    );
+    if (!res.ok) {
+      this.handleError(res, "syncPull", await res.text());
+    }
+    const memories = await res.json();
+    return memories.map((memory) => ({
+      ...memory,
+      createdAt: new Date(memory.createdAt),
+      updatedAt: new Date(memory.updatedAt),
+      deletedAt: memory.deletedAt ? new Date(memory.deletedAt) : void 0
+    }));
+  }
+  async syncTombstones(orgId, repoId, since) {
+    const params = new URLSearchParams({ orgId, repoId });
+    if (since) params.set("since", since.toISOString());
+    const res = await this.fetchWithRetry(
+      `${this.baseUrl}/v1/sync/tombstones?${params.toString()}`,
+      { method: "GET", headers: this.getHeaders() },
+      "syncTombstones"
+    );
+    if (!res.ok) {
+      this.handleError(res, "syncTombstones", await res.text());
+    }
+    const tombstones = await res.json();
+    return tombstones.map((tombstone) => ({
+      ...tombstone,
+      deletedAt: new Date(tombstone.deletedAt),
+      syncedAt: tombstone.syncedAt ? new Date(tombstone.syncedAt) : void 0
+    }));
+  }
   async deprecate(id, reason) {
     const res = await this.fetchWithRetry(
       `${this.baseUrl}/v1/memory/${pathSegment(id)}/deprecate`,
@@ -3392,9 +3429,8 @@ var LocalStore = class {
     ).all(orgId, repoId, since.toISOString());
     return rows.map(rowToMemory);
   }
-  upsertFromRemote(memory) {
+  upsertFromRemote(memory, conflictResolution = "last_write_wins") {
     const existing = this.getById(memory.id);
-    const now = (/* @__PURE__ */ new Date()).toISOString();
     const normalizedOrgId = memory.orgId.toLowerCase();
     const normalizedRepoId = memory.repoId.toLowerCase();
     if (!existing) {
@@ -3425,7 +3461,7 @@ var LocalStore = class {
         memory.deletedAt?.toISOString() ?? null,
         memory.deletedBy ?? null,
         memory.createdAt.toISOString(),
-        now
+        memory.updatedAt.toISOString()
       );
       return { action: "created", conflict: false };
     }
@@ -3437,6 +3473,10 @@ var LocalStore = class {
       }
     }
     const hasConflict = localVersion !== remoteVersion && existing.updatedAt > memory.updatedAt;
+    const preserveLocal = hasConflict && (conflictResolution === "manual" || conflictResolution === "local_wins" || conflictResolution === "last_write_wins" && existing.updatedAt >= memory.updatedAt);
+    if (preserveLocal) {
+      return { action: "skipped", conflict: true };
+    }
     this.db.prepare(
       `UPDATE memories SET
           memory_type = ?, visibility = ?, status = ?, text = ?, summary = ?, tags = ?,
@@ -3459,10 +3499,10 @@ var LocalStore = class {
       memory.consolidationVersion ?? null,
       memory.authorId ?? null,
       memory.authorName ?? null,
-      Math.max(remoteVersion, localVersion) + 1,
+      remoteVersion,
       memory.deletedAt?.toISOString() ?? null,
       memory.deletedBy ?? null,
-      now,
+      memory.updatedAt.toISOString(),
       memory.id
     );
     return { action: "updated", conflict: hasConflict };
@@ -3567,13 +3607,16 @@ var LocalStore = class {
     });
     return transaction.immediate();
   }
-  markAsPulled(memoryId, localVersion) {
+  markAsPulled(memoryId, remoteVersion) {
     const now = (/* @__PURE__ */ new Date()).toISOString();
     this.db.prepare(`
-        UPDATE sync_state 
-        SET sync_status = 'synced', local_version = ?, last_pulled_at = ?
+        UPDATE sync_state
+        SET sync_status = 'synced',
+            local_version = ?,
+            remote_version = ?,
+            last_pulled_at = ?
         WHERE memory_id = ?
-      `).run(localVersion, now, memoryId);
+      `).run(remoteVersion, remoteVersion, now, memoryId);
   }
   markAsConflict(memoryId, remoteVersion) {
     this.db.prepare(`
@@ -4424,4 +4467,4 @@ export {
   RemoteClient,
   LocalStore
 };
-//# sourceMappingURL=chunk-23T3TBYJ.js.map
+//# sourceMappingURL=chunk-J74YKGDT.js.map