@floomhq/floom 2.0.6 → 2.0.7

package/dist/index.js

@@ -1916,7 +1916,7 @@ import { promisify } from "node:util";
 var scrypt = promisify(scryptCb);
 
 // ../shared/src/install-targets.ts
-import { homedir } from "node:os";
+import { homedir, platform } from "node:os";
 import { stat } from "node:fs/promises";
 import { isAbsolute, join, relative, resolve, sep } from "node:path";
 var INSTALL_TARGETS = [
@@ -1956,6 +1956,27 @@ var TARGET_PARENT_DIRS = {
   opencode: ".opencode"
 };
 var SYSTEM_ROOTS = /* @__PURE__ */ new Set(["/", "/etc", "/usr", "/bin", "/sbin", "/var", "/sys", "/proc"]);
+function xdgConfigHome(homeDir) {
+  const xdg = process.env.XDG_CONFIG_HOME?.trim();
+  if (xdg) return resolve(xdg);
+  if (platform() === "win32") {
+    const appdata = process.env.APPDATA?.trim();
+    if (appdata) return resolve(appdata);
+  }
+  return join(homeDir ?? homedir(), ".config");
+}
+var TARGET_SENTINELS = {
+  claude: [],
+  // ~/.claude/ is claude-code-specific; directory alone is fine
+  codex: [],
+  // ~/.codex/ is codex-specific; directory alone is fine
+  cursor: ["mcp.json", "cli-config.json"],
+  // require a Cursor-written file
+  gemini: [],
+  // ~/.gemini/ is gemini-cli-specific; directory alone is fine
+  opencode: []
+  // ~/.config/opencode/ checked below; directory alone is fine
+};
 function isInsideDir(path, parent) {
   const rel = relative(parent, path);
   return rel === "" || rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute(rel);
@@ -1979,7 +2000,8 @@ function envDirForTarget(target, homeDir) {
 }
 function presetDir(target, opts) {
   const cwd = opts.cwd ?? process.cwd();
-  const root = opts.global ? opts.homeDir ?? homedir() : cwd;
+  const homeDir = opts.homeDir ?? homedir();
+  const root = opts.global ? homeDir : cwd;
   switch (target) {
     case "claude":
       return join(root, ".claude", "skills");
@@ -1990,7 +2012,7 @@ function presetDir(target, opts) {
     case "cursor":
       return join(root, ".cursor", "skills");
     case "opencode":
-      return join(root, ".opencode", "skills");
+      return opts.global ? join(xdgConfigHome(homeDir), "opencode", "skills") : join(cwd, ".opencode", "skills");
   }
 }
 function resolveInstallDir(args) {
@@ -2020,14 +2042,33 @@ function resolveInstallDir(args) {
     compatibleAgents: COMPATIBLE_AGENTS[target]
   };
 }
+function agentConfigRoot(target, homeDir) {
+  if (target === "opencode") return join(xdgConfigHome(homeDir), "opencode");
+  return join(homeDir, TARGET_PARENT_DIRS[target]);
+}
 async function detectInstalledTargets(opts = {}) {
   const homeDir = opts.homeDir ?? homedir();
   const detected = [];
   for (const target of INSTALL_TARGETS) {
-    const parentDir = join(homeDir, TARGET_PARENT_DIRS[target]);
+    const configRoot = agentConfigRoot(target, homeDir);
     try {
-      const parentStat = await stat(parentDir);
-      if (parentStat.isDirectory()) detected.push(target);
+      const dirStat = await stat(configRoot);
+      if (!dirStat.isDirectory()) continue;
+      const sentinels = TARGET_SENTINELS[target];
+      if (sentinels.length === 0) {
+        detected.push(target);
+        continue;
+      }
+      let found = false;
+      for (const sentinel of sentinels) {
+        try {
+          await stat(join(configRoot, sentinel));
+          found = true;
+          break;
+        } catch {
+        }
+      }
+      if (found) detected.push(target);
     } catch {
     }
   }
@@ -2675,7 +2716,7 @@ function normalizeApiUrl(apiUrl) {
 }
 
 // src/lib/machine.ts
-import { hostname, platform, type, release } from "node:os";
+import { hostname, platform as platform2, type, release } from "node:os";
 import { join as join4 } from "node:path";
 import { mkdir as mkdir3, readFile as readFile4, writeFile as writeFile2 } from "node:fs/promises";
 import { homedir as homedir3 } from "node:os";
@@ -2709,7 +2750,7 @@ async function tryCommand(cmd, args) {
   });
 }
 async function nativeDeviceName() {
-  const p = platform();
+  const p = platform2();
   if (p === "darwin") {
     return tryCommand("scutil", ["--get", "ComputerName"]);
   }
@@ -2722,7 +2763,7 @@ async function defaultLabel() {
   const native = await nativeDeviceName();
   const host = (hostname() || "").trim();
   const base = native || host || `${type()}`.slice(0, 40);
-  const p = platform();
+  const p = platform2();
   const os = p === "darwin" ? "macOS" : p === "linux" ? "Linux" : p === "win32" ? "Windows" : type();
   const label = base.toLowerCase().includes(os.toLowerCase()) ? base : `${base} \xB7 ${os}`;
   return label.slice(0, 80);
@@ -2931,13 +2972,13 @@ import { spawn as spawn2 } from "node:child_process";
 import chalk2 from "chalk";
 function tryOpenBrowser(url) {
   if (process.env.FLOOM_NO_OPEN === "1") return;
-  const platform2 = process.platform;
+  const platform3 = process.platform;
   let cmd;
   let args;
-  if (platform2 === "darwin") {
+  if (platform3 === "darwin") {
     cmd = "open";
     args = [url];
-  } else if (platform2 === "win32") {
+  } else if (platform3 === "win32") {
     cmd = "cmd";
     args = ["/c", "start", "", url];
   } else {
@@ -3016,6 +3057,7 @@ import { z as z3 } from "zod";
 import { createHash as createHash3, randomUUID as randomUUID2 } from "node:crypto";
 import { cp, lstat as lstat2, mkdir as mkdir4, readdir as readdir2, readFile as readFile5, rename, rm, stat as stat3, writeFile as writeFile3 } from "node:fs/promises";
 import { dirname, join as join5, resolve as resolve2, sep as sep3 } from "node:path";
+import { homedir as osHomedir } from "node:os";
 import { createInterface } from "node:readline/promises";
 import { ZodError } from "zod";
 import chalk3 from "chalk";
@@ -3149,9 +3191,72 @@ async function dirExists(path) {
     return false;
   }
 }
-async function resolvePullDirs(target, _cwd = process.cwd(), homeDir) {
+async function findGitRoot(startDir, stopAt) {
+  const stop = stopAt ?? osHomedir();
+  let current = resolve2(startDir);
+  while (true) {
+    try {
+      const gitDir = join5(current, ".git");
+      const s = await stat3(gitDir);
+      if (s.isDirectory() || s.isFile()) return current;
+    } catch {
+    }
+    const parent = dirname(current);
+    if (parent === current || current === stop) break;
+    current = parent;
+  }
+  return null;
+}
+function targetParentDirName(target) {
+  switch (target) {
+    case "claude":
+      return ".claude";
+    case "codex":
+      return ".codex";
+    case "cursor":
+      return ".cursor";
+    case "gemini":
+      return ".gemini";
+    case "opencode":
+      return ".opencode";
+  }
+}
+async function findProjectLocalSkillsDir(target, cwd) {
+  const parentName = targetParentDirName(target);
+  if (!parentName) return null;
+  const home = resolve2(osHomedir());
+  const gitRoot = await findGitRoot(cwd);
+  const stopAt = gitRoot ?? home;
+  let current = resolve2(cwd);
+  while (true) {
+    if (current !== home) {
+      const agentDir = join5(current, parentName);
+      if (await dirExists(agentDir)) {
+        return join5(agentDir, "skills");
+      }
+    }
+    const parent = dirname(current);
+    if (parent === current || current === stopAt) break;
+    current = parent;
+  }
+  if (stopAt !== home) {
+    const agentDir = join5(stopAt, parentName);
+    if (await dirExists(agentDir)) {
+      return join5(agentDir, "skills");
+    }
+  }
+  return null;
+}
+async function resolvePullDirs(target, cwd = process.cwd(), homeDir, globalOnly = false) {
   const primary = resolveInstallDir({ target, global: true, homeDir }).dir;
-  return uniqueResolvedDirs([primary]);
+  if (globalOnly) {
+    return uniqueResolvedDirs([primary]);
+  }
+  const projectLocalSkillsDir = await findProjectLocalSkillsDir(target, cwd);
+  if (!projectLocalSkillsDir) {
+    return uniqueResolvedDirs([primary]);
+  }
+  return uniqueResolvedDirs([primary, projectLocalSkillsDir]);
 }
 async function hasStatusVisibleProjectLocalDir(dir) {
   if (await fileExists(manifestPath(dir))) return true;
@@ -3543,7 +3648,7 @@ async function pullCommand(options, deps = {}) {
       }
       const dirsByTarget = /* @__PURE__ */ new Map();
       for (const target2 of targets) {
-        const dirs2 = await resolvePullDirs(target2);
+        const dirs2 = await resolvePullDirs(target2, process.cwd(), void 0, options.globalOnly);
         dirsByTarget.set(target2, dirs2);
         for (const dir of dirs2) cleanup.trackDir(join5(dir, ".floom", "tmp"));
       }
@@ -3563,21 +3668,26 @@ async function pullCommand(options, deps = {}) {
       }
       log.heading("Pull summary:");
       for (const result of results) {
-        if (result.ok) log.ok(`${result.target}  ${result.skillCount} skills  ${result.dirs.join(", ")}`);
-        else log.err(`${result.target}  ${result.error.message}`);
+        if (result.ok) {
+          log.ok(`${result.target}  ${result.skillCount} skills`);
+          for (const dir of result.dirs) log.info(`  \u2192 ${dir}`);
+        } else {
+          log.err(`${result.target}  ${result.error.message}`);
+        }
       }
       if (results.some((result) => !result.ok)) process.exitCode = 1;
       return;
     }
     const target = assertInstallTarget(options.target);
-    const dirs = await resolvePullDirs(target);
+    const dirs = await resolvePullDirs(target, process.cwd(), void 0, options.globalOnly);
     for (const dir of dirs) cleanup.trackDir(join5(dir, ".floom", "tmp"));
     let skillCount = 0;
     for (const dir of dirs) {
       const result = await pullLibrary(target, { ...deps, installDir: dir });
       skillCount = result.skillCount;
     }
-    log.ok(`Pulled ${skillCount} skills into ${target} (${dirs.join(", ")}).`);
+    log.ok(`Pulled ${skillCount} skills into ${target}.`);
+    for (const dir of dirs) log.info(`  \u2192 ${dir}`);
     log.info(`This syncs ${target} only. For another agent: npx -y @floomhq/floom pull --target <claude|codex|cursor|gemini|opencode>`);
   } finally {
     cleanup.dispose();
@@ -4490,7 +4600,7 @@ program.command("logout").description("Sign out and clear local auth.").action(l
 program.command("whoami").description("Show who you are signed in as.").action(whoamiCommand);
 program.command("push [dir]").description("Publish a skill folder to your workspace.").option("--concurrency <n>", "Bulk push concurrency, 1-16", "6").action(pushCommand);
 program.command("delete <slug>").description("Delete a skill from your workspace.").option("--yes", "Skip confirmation").action((slug, opts) => deleteCommand(slug, opts));
-program.command("pull").description("Pull the workspace library into your AI agents.").option("--target <target>", "claude | codex | cursor | gemini | opencode").action(pullCommand);
+program.command("pull").description("Pull the workspace library into your AI agents.").option("--target <target>", "claude | codex | cursor | gemini | opencode").option("--global-only", "Write only to the global agent dir; skip project-local .claude/skills/ etc.").action((opts) => pullCommand({ target: opts.target, globalOnly: opts.globalOnly }));
 program.command("sync").description("Pull remote changes, then push any local edits.").option("--target <target>", "claude | codex | cursor | gemini | opencode").option("--yes", "Skip confirmation").action(syncCommand);
 program.command("list").description("List workspace skills.").action(listCommand);
 program.command("status").description("Show local workspace sync status.").option("--target <target>", "claude | codex | cursor | gemini | opencode").action(statusCommand);

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.6";
+export const VERSION = "2.0.7";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floomhq/floom",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "Floom CLI \u2014 one shared skill library, pulled into the AI agent you choose (Claude, Codex, Cursor, Gemini, OpenCode).",
   "license": "MIT",
   "homepage": "https://floom.dev",