@floomhq/floom 1.0.52 → 1.0.53

package/dist/sync.js

@@ -1,5 +1,5 @@
 import { constants } from "node:fs";
-import { lstat, mkdir, open } from "node:fs/promises";
+import { lstat, mkdir, open, rm, rmdir } from "node:fs/promises";
 import { createHash } from "node:crypto";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import ora from "ora";
@@ -224,6 +224,40 @@ async function overwriteTrackedFile(root, target, body, expectedHash) {
         await parent.close();
     }
 }
+async function deleteSyncedFile(root, target, expectedHash) {
+    const state = await localState(target);
+    if (state.kind === "missing")
+        return;
+    if (state.kind === "conflict")
+        throw conflictError(state.reason, "EEXIST");
+    if (state.hash !== expectedHash)
+        throw conflictError("local file changed since the last Floom sync", "EEXIST");
+    await rm(target);
+    await pruneEmptyParents(root, dirname(target));
+}
+async function pruneEmptyParents(root, startDir) {
+    const resolvedRoot = resolve(root);
+    let current = resolve(startDir);
+    for (;;) {
+        const relativeCurrent = relative(resolvedRoot, current);
+        if (!relativeCurrent || relativeCurrent === ".." || relativeCurrent.startsWith(`..${sep}`) || isAbsolute(relativeCurrent))
+            return;
+        try {
+            await rmdir(current);
+        }
+        catch (err) {
+            const code = err.code;
+            if (code === "ENOENT") {
+                current = dirname(current);
+                continue;
+            }
+            if (code === "ENOTEMPTY" || code === "EEXIST" || code === "ENOTDIR")
+                return;
+            throw err;
+        }
+        current = dirname(current);
+    }
+}
 async function ensureSafeParentDirectory(root, target) {
     const resolvedRoot = resolve(root);
     const resolvedParent = resolve(dirname(target));
@@ -446,6 +480,26 @@ export async function sync(opts = {}) {
                             noteConflict(target, "local file changed since the last Floom sync");
                             continue;
                         }
+                        try {
+                            await deleteSyncedFile(root, target, entry.hash);
+                        }
+                        catch (err) {
+                            const code = err.code;
+                            if (code === "ENOENT") {
+                                unmarkSynced(manifest, key);
+                                manifestChanged = true;
+                                continue;
+                            }
+                            if (code === "ELOOP") {
+                                noteManifestConflict(key, "path contains a symbolic link");
+                                continue;
+                            }
+                            if (code === "ENOTDIR" || code === "EISDIR" || code === "EEXIST") {
+                                noteManifestConflict(key, err instanceof Error ? err.message : "local file changed since the last Floom sync");
+                                continue;
+                            }
+                            throw err;
+                        }
                         unmarkSynced(manifest, key);
                         manifestChanged = true;
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floomhq/floom",
-  "version": "1.0.52",
+  "version": "1.0.53",
   "description": "Sync AI skills across agents and machines.",
   "license": "MIT",
   "type": "module",