@floomhq/floom-mcp-sync 1.0.36 → 1.0.38

package/dist/auto-sync.js

@@ -346,7 +346,7 @@ async function manifestHasMissingTrackedFile(manifest, root) {
     }
     return false;
 }
-export async function autoSync(log = (message) => process.stderr.write(`${message}\n`), signal) {
+export async function autoSync(log = (message) => process.stderr.write(`${message}\n`), signal, opts = {}) {
     const initialCfg = await readConfig();
     if (!initialCfg) {
         maybeAuthWarning(log, "[floom] not signed in; skipping sync (run `npx -y @floomhq/floom login`)");
@@ -354,7 +354,7 @@ export async function autoSync(log = (message) => process.stderr.write(`${messag
     }
     let cfg = initialCfg;
     await ensureSyncManifestDir();
-    return await withSyncLock(async () => {
+    const result = await withSyncLock(async () => {
         const manifest = await readSyncManifest();
         const root = skillsDir();
         const apiUrl = apiUrlFromConfig(cfg);
@@ -527,7 +527,11 @@ export async function autoSync(log = (message) => process.stderr.write(`${messag
             maybeHeartbeat(log, () => `[floom] heartbeat: ${total} skills tracked, all up-to-date`);
         }
         return { synced: total, unchanged, updated, conflicts };
-    });
+    }, { wait: !opts.skipIfLocked });
+    if (result)
+        return result;
+    log("[floom] sync already running; skipping background poll");
+    return { synced: 0, unchanged: 0, updated: 0, conflicts: 0 };
 }
 async function loadSyncPayload(apiUrl, token, signal) {
     const all = [];

package/dist/lib/manifest.js

@@ -225,10 +225,11 @@ export async function ensureSyncManifestDir() {
         throw err;
     }
 }
-export async function withSyncLock(fn) {
+export async function withSyncLock(fn, opts = {}) {
     await ensureSyncManifestDir();
     const lockPath = join(dirname(syncManifestPath()), "sync.lock");
     const startedAt = Date.now();
+    const wait = opts.wait !== false;
     for (;;) {
         try {
             await mkdir(lockPath, { mode: 0o700 });
@@ -249,6 +250,8 @@ export async function withSyncLock(fn) {
                     continue;
                 throw statErr;
             }
+            if (!wait)
+                return null;
             if (Date.now() - startedAt > LOCK_TIMEOUT_MS) {
                 throw new Error("Timed out waiting for Floom sync lock.");
             }
@@ -262,6 +265,9 @@ export async function withSyncLock(fn) {
         await rm(lockPath, { recursive: true, force: true }).catch(() => { });
     }
 }
+export async function clearSyncLock() {
+    await rm(join(dirname(syncManifestPath()), "sync.lock"), { recursive: true, force: true }).catch(() => { });
+}
 export function manifestKey(root, target) {
     const relativeTarget = relative(resolve(root), resolve(target));
     if (relativeTarget === ".." || relativeTarget.startsWith(`..${sep}`)) {

package/dist/server.js

@@ -2,21 +2,23 @@
 import { createInterface } from "node:readline";
 import { stdin, stdout } from "node:process";
 import { autoSync } from "./auto-sync.js";
+import { clearSyncLock } from "./lib/manifest.js";
 import { getSkill } from "./tools/get.js";
 import { searchSkills } from "./tools/search.js";
 import { syncStatus } from "./tools/status.js";
-const SERVER_VERSION = "1.0.36";
+const SERVER_VERSION = "1.0.38";
 const DEFAULT_INTERVAL_MS = 60_000;
 const MIN_INTERVAL_MS = 10_000;
 const SEARCH_TYPES = new Set(["knowledge", "instruction", "workflow", "skill"]);
 let syncInFlight = null;
 let syncAbortController = null;
-function runAutoSync() {
+let shuttingDown = false;
+function runAutoSync(opts = {}) {
     if (syncInFlight)
         return syncInFlight;
     const controller = new AbortController();
     syncAbortController = controller;
-    syncInFlight = autoSync(undefined, controller.signal).finally(() => {
+    syncInFlight = autoSync(undefined, controller.signal, opts).finally(() => {
         if (syncAbortController === controller)
             syncAbortController = null;
         syncInFlight = null;
@@ -27,6 +29,24 @@ function abortAutoSync() {
     syncAbortController?.abort();
     syncAbortController = null;
 }
+async function stopAutoSync() {
+    const inFlight = syncInFlight;
+    abortAutoSync();
+    if (!inFlight)
+        return;
+    try {
+        await Promise.race([
+            inFlight,
+            new Promise((resolve) => setTimeout(resolve, 750)),
+        ]);
+    }
+    catch {
+        // Shutdown is best-effort; autoSync already logged actionable failures.
+    }
+    finally {
+        await clearSyncLock();
+    }
+}
 function usage() {
     return `
 floom-mcp-sync v${SERVER_VERSION}
@@ -94,7 +114,7 @@ function startPolling(intervalMs, state) {
             return;
         }
         state.inFlight = true;
-        runAutoSync().catch((err) => {
+        runAutoSync({ skipIfLocked: true }).catch((err) => {
             process.stderr.write(`[floom] poll failed: ${err instanceof Error ? err.message : String(err)}\n`);
         }).finally(() => {
             state.inFlight = false;
@@ -273,17 +293,19 @@ async function main() {
     const intervalMs = resolvePollIntervalMs();
     process.stderr.write(`[floom] starting sync poller (interval ${intervalMs}ms)\n`);
     const syncState = { inFlight: true };
-    void runAutoSync().catch((err) => {
+    void runAutoSync({ skipIfLocked: true }).catch((err) => {
         process.stderr.write(`[floom] initial sync failed: ${err instanceof Error ? err.message : String(err)}\n`);
     }).finally(() => {
         syncState.inFlight = false;
     });
     const pollHandle = startPolling(intervalMs, syncState);
     const shutdown = (signal) => {
+        if (shuttingDown)
+            return;
+        shuttingDown = true;
         clearInterval(pollHandle);
-        abortAutoSync();
         process.stderr.write(`[floom] received ${signal}, stopping sync poller\n`);
-        process.exit(0);
+        void stopAutoSync().finally(() => process.exit(0));
     };
     process.once("SIGINT", () => shutdown("SIGINT"));
     process.once("SIGTERM", () => shutdown("SIGTERM"));
@@ -307,7 +329,7 @@ async function main() {
     }
     finally {
         clearInterval(pollHandle);
-        abortAutoSync();
+        await stopAutoSync();
         process.stderr.write("[floom] stdin closed, stopping sync poller\n");
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floomhq/floom-mcp-sync",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "description": "Lightweight Floom MCP server for installing, publishing, and startup-syncing skills.",
   "license": "MIT",
   "type": "module",