@floomhq/floom 1.0.57 → 1.0.59

package/dist/push-watch.js

@@ -163,6 +163,9 @@ function isFloomCacheRoot(root, target) {
 function isExplicitlyPublished(entry) {
     return entry?.source === "published" || entry?.source === "updated";
 }
+function isBaselineAdopted(entry) {
+    return entry?.source === "adopted";
+}
 function slugFromPushManifest(key, pushManifest) {
     return pushManifest.files[key]?.slug ?? null;
 }
@@ -259,6 +262,17 @@ export async function pushWatchOnce(opts) {
         const pushedSlug = slugFromPushManifest(pushKey, pushManifest);
         const fallbackSlug = fallbackSlugFromPath(packagePath);
         const slug = pushedSlug ?? syncedSlug ?? fallbackSlug;
+        if (isBaselineAdopted(pushed) && !syncedSlug) {
+            pushManifest.files[pushKey] = {
+                hash,
+                slug: pushed.slug,
+                path: key,
+                pushedAt: new Date().toISOString(),
+                source: "adopted",
+            };
+            adopted += 1;
+            continue;
+        }
         if (!pushed && syncedSlug && isUnchangedSyncedPackage(root, skillPackage, syncManifest)) {
             pushManifest.files[pushKey] = {
                 hash,

package/dist/sync.js

@@ -152,6 +152,7 @@ function syncPackageFiles(target, body, files) {
 }
 async function planPackageSync(root, files, manifest) {
     let missing = 0;
+    let missingTracked = 0;
     let unchanged = 0;
     let remoteChanged = 0;
     let firstMissingTarget = null;
@@ -176,6 +177,10 @@ async function planPackageSync(root, files, manifest) {
             return { kind: "conflict", target: state.conflictTarget ?? file.target, reason: state.reason };
         if (state.kind === "missing") {
             firstMissingTarget ??= file.target;
+            if (tracked) {
+                missingTracked += 1;
+                continue;
+            }
             missing += 1;
             continue;
         }
@@ -195,15 +200,20 @@ async function planPackageSync(root, files, manifest) {
     }
     if (unchanged === files.length)
         return { kind: "unchanged" };
+    if (missing + missingTracked === files.length)
+        return { kind: "write" };
+    if (missingTracked > 0) {
+        return {
+            kind: "conflict",
+            target: firstMissingTarget ?? files[0]?.target ?? root,
+            reason: "local package is only partially installed",
+        };
+    }
     if (missing === 0 && remoteChanged > 0)
         return { kind: "update" };
     if (missing === files.length)
         return { kind: "write" };
-    return {
-        kind: "conflict",
-        target: firstMissingTarget ?? files[0]?.target ?? root,
-        reason: "local package is only partially installed",
-    };
+    return { kind: "update" };
 }
 async function overwriteTrackedFile(root, target, body, expectedHash) {
     const parent = await openSafeParentDirectory(root, target, false);
@@ -410,9 +420,20 @@ export async function sync(opts = {}) {
                             for (const file of packageFiles) {
                                 const targetKey = manifestKey(root, file.target);
                                 const tracked = manifest.files[targetKey];
-                                if (!tracked)
-                                    throw conflictError("existing file is not tracked by Floom sync", "EEXIST");
-                                await overwriteTrackedFile(root, file.target, file.bytes, tracked.hash);
+                                if (tracked) {
+                                    await overwriteTrackedFile(root, file.target, file.bytes, tracked.hash);
+                                    continue;
+                                }
+                                const state = await localState(file.target);
+                                if (state.kind === "missing") {
+                                    await writeSyncedFile(root, file.target, file.bytes);
+                                    continue;
+                                }
+                                if (state.kind === "conflict")
+                                    throw conflictError(state.reason, "EEXIST");
+                                if (state.hash === file.hash)
+                                    continue;
+                                throw conflictError("existing file is not tracked by Floom sync", "EEXIST");
                             }
                         }
                         else {

package/package.json

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