@floomhq/floom-mcp-sync 1.0.35 → 1.0.37

package/dist/lib/config.js

@@ -3,7 +3,7 @@ import { dirname } from "node:path";
 import { configPath } from "./paths.js";
 export const DEFAULT_API_URL = "https://floom.dev";
 export function apiUrlFromConfig(cfg) {
-    return (cfg.apiUrl ?? process.env.FLOOM_API_URL ?? DEFAULT_API_URL).replace(/\/$/, "");
+    return (process.env.FLOOM_API_URL ?? cfg.apiUrl ?? DEFAULT_API_URL).replace(/\/$/, "");
 }
 export async function readConfig() {
     try {

package/dist/lib/manifest.js

@@ -1,8 +1,7 @@
 import { constants } from "node:fs";
 import { lstat, mkdir, open, rename, rm, stat } from "node:fs/promises";
-import { homedir } from "node:os";
 import { basename, dirname, join, relative, resolve, sep } from "node:path";
-import { configPath } from "./paths.js";
+import { configPath, hasStaleNativeCodexEnv, homeDir, skillsDir } from "./paths.js";
 const MANIFEST_VERSION = 1;
 const SLUG_RE = /^[A-Za-z0-9_-]{1,128}$/;
 const FD_PATH_ROOT = "/proc/self/fd";
@@ -96,13 +95,15 @@ const ROOT_SUPPORT_FILES = new Set([
 export function syncManifestPath() {
     if (process.env.FLOOM_SYNC_MANIFEST_PATH)
         return expandHome(process.env.FLOOM_SYNC_MANIFEST_PATH);
+    if (hasStaleNativeCodexEnv())
+        return join(skillsDir(), ".floom-sync-manifest.json");
     return join(dirname(configPath()), "sync-manifest.json");
 }
 function expandHome(path) {
     if (path === "~")
-        return homedir();
+        return homeDir();
     if (path.startsWith("~/"))
-        return join(homedir(), path.slice(2));
+        return join(homeDir(), path.slice(2));
     return path;
 }
 function emptyManifest() {
@@ -261,6 +262,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/lib/paths.js

@@ -2,14 +2,20 @@ import { homedir } from "node:os";
 import { isAbsolute, join, relative, resolve, sep } from "node:path";
 import { assertValidSlug } from "./slug.js";
 export function configPath() {
-    return process.env.FLOOM_CONFIG_PATH ?? join(homedir(), ".floom", "config.json");
+    return process.env.FLOOM_CONFIG_PATH ?? join(homeDir(), ".floom", "config.json");
 }
-export function skillsDir() {
-    if (!process.env.FLOOM_SKILLS_DIR &&
+export function homeDir() {
+    return process.env.HOME ? resolve(process.env.HOME) : homedir();
+}
+export function hasStaleNativeCodexEnv() {
+    return Boolean(!process.env.FLOOM_SKILLS_DIR &&
         !process.env.FLOOM_ALLOW_NATIVE_CODEX_SYNC &&
         process.env.CODEX_SKILLS_DIR &&
-        resolve(expandHome(process.env.CODEX_SKILLS_DIR)) === resolve(join(homedir(), ".codex", "skills"))) {
-        return join(homedir(), ".floom", "skill-cache", "codex");
+        resolve(expandHome(process.env.CODEX_SKILLS_DIR)) === resolve(join(homeDir(), ".codex", "skills")));
+}
+export function skillsDir() {
+    if (hasStaleNativeCodexEnv()) {
+        return join(homeDir(), ".floom", "skill-cache", "codex");
     }
     return expandHome(process.env.FLOOM_SKILLS_DIR
         ?? process.env.CLAUDE_SKILLS_DIR
@@ -21,9 +27,9 @@ export function skillsDir() {
 }
 function expandHome(path) {
     if (path === "~")
-        return homedir();
+        return homeDir();
     if (path.startsWith("~/"))
-        return join(homedir(), path.slice(2));
+        return join(homeDir(), path.slice(2));
     return path;
 }
 export function skillPath(slug) {

package/dist/server.js

@@ -2,15 +2,17 @@
 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.35";
+const SERVER_VERSION = "1.0.37";
 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;
+let shuttingDown = false;
 function runAutoSync() {
     if (syncInFlight)
         return syncInFlight;
@@ -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}
@@ -280,10 +300,12 @@ async function main() {
     });
     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.35",
+  "version": "1.0.37",
   "description": "Lightweight Floom MCP server for installing, publishing, and startup-syncing skills.",
   "license": "MIT",
   "type": "module",