unforgit 0.11.12 → 0.11.14

package/dist/{chunk-B3ZM62FV.js → chunk-IOHA5JJV.js}

@@ -2083,6 +2083,27 @@ var RemoteClient = class {
       syncedAt: tombstone.syncedAt ? new Date(tombstone.syncedAt) : void 0
     }));
   }
+  async pushTombstone(tombstone) {
+    const res = await this.fetchWithRetry(
+      `${this.baseUrl}/v1/sync/tombstones`,
+      {
+        method: "POST",
+        headers: this.getHeaders(),
+        body: JSON.stringify({
+          memoryId: tombstone.memoryId,
+          orgId: tombstone.orgId,
+          repoId: tombstone.repoId,
+          deletedAt: tombstone.deletedAt.toISOString(),
+          deletedBy: tombstone.deletedBy
+        })
+      },
+      "pushTombstone"
+    );
+    if (!res.ok) {
+      this.handleError(res, "pushTombstone", await res.text());
+    }
+    return res.json();
+  }
   async deprecate(id, reason) {
     const res = await this.fetchWithRetry(
       `${this.baseUrl}/v1/memory/${pathSegment(id)}/deprecate`,
@@ -3387,14 +3408,34 @@ var LocalStore = class {
     ).all(orgId, repoId);
     return rows.map(rowToTombstone);
   }
-  markTombstoneSynced(memoryId) {
+  markTombstoneSynced(memoryId, expectedTombstoneId) {
     const now = (/* @__PURE__ */ new Date()).toISOString();
-    const result = this.db.prepare("UPDATE tombstones SET synced_at = ? WHERE memory_id = ?").run(now, memoryId);
+    const result = expectedTombstoneId ? this.db.prepare(
+      "UPDATE tombstones SET synced_at = ? WHERE memory_id = ? AND id = ? AND synced_at IS NULL"
+    ).run(now, memoryId, expectedTombstoneId) : this.db.prepare("UPDATE tombstones SET synced_at = ? WHERE memory_id = ?").run(now, memoryId);
     return result.changes > 0;
   }
   applyTombstone(tombstone) {
-    const memory = this.getById(tombstone.memoryId);
-    if (!memory) {
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    const transaction = this.db.transaction(() => {
+      const existingRow = this.db.prepare("SELECT * FROM tombstones WHERE memory_id = ?").get(tombstone.memoryId);
+      const existingTombstone = existingRow ? rowToTombstone(existingRow) : void 0;
+      if (existingTombstone && !existingTombstone.syncedAt && existingTombstone.deletedAt > tombstone.deletedAt) {
+        return false;
+      }
+      const memory = this.getById(tombstone.memoryId);
+      if (memory && memory.status !== "deleted") {
+        this.db.prepare(
+          `UPDATE memories
+             SET status = 'deleted', deleted_at = ?, deleted_by = ?, version = version + 1, updated_at = ?
+             WHERE id = ?`
+        ).run(
+          tombstone.deletedAt.toISOString(),
+          tombstone.deletedBy ?? null,
+          now,
+          tombstone.memoryId
+        );
+      }
       this.db.prepare(
         `INSERT OR REPLACE INTO tombstones (id, memory_id, org_id, repo_id, deleted_at, deleted_by, synced_at, created_at)
            VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
@@ -3405,15 +3446,12 @@ var LocalStore = class {
         tombstone.repoId,
         tombstone.deletedAt.toISOString(),
         tombstone.deletedBy ?? null,
-        (/* @__PURE__ */ new Date()).toISOString(),
-        (/* @__PURE__ */ new Date()).toISOString()
+        now,
+        now
       );
       return true;
-    }
-    return this.softDelete({
-      id: tombstone.memoryId,
-      deletedBy: tombstone.deletedBy
     });
+    return transaction.immediate();
   }
   incrementVersion(id) {
     const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -4467,4 +4505,4 @@ export {
   RemoteClient,
   LocalStore
 };
-//# sourceMappingURL=chunk-B3ZM62FV.js.map
+//# sourceMappingURL=chunk-IOHA5JJV.js.map