@floomhq/floom 3.0.3 → 3.1.0

package/dist/index.js

@@ -3067,11 +3067,38 @@ init_src();
 import { homedir as homedir2 } from "node:os";
 import { join as join3 } from "node:path";
 import { mkdir as mkdir2, readFile as readFile3, writeFile, chmod } from "node:fs/promises";
+
+// src/lib/invocation.ts
+var NPX_HINTS = ["_npx", "npm-cache/_npx", "npm-cache\\_npx", ".npm/_npx"];
+var NPX_INVOCATION = "npx -y @floomhq/floom";
+var GLOBAL_INVOCATION = "floom";
+var cached = null;
+function detect() {
+  const override = process.env.FLOOM_INVOKED_AS;
+  if (override && (override === NPX_INVOCATION || override === GLOBAL_INVOCATION)) {
+    return override;
+  }
+  const argv1 = process.argv[1] ?? "";
+  for (const hint of NPX_HINTS) {
+    if (argv1.includes(hint)) return NPX_INVOCATION;
+  }
+  return GLOBAL_INVOCATION;
+}
+function cliInvocation() {
+  if (cached === null) cached = detect();
+  return cached;
+}
+function cliCmd(cmd) {
+  const stripped = cmd.startsWith("floom ") ? cmd.slice("floom ".length) : cmd;
+  return `${cliInvocation()} ${stripped}`;
+}
+
+// src/config.ts
 var CONFIG_DIR = join3(homedir2(), ".floom");
 var AUTH_FILE = join3(CONFIG_DIR, "auth.json");
-var DEFAULT_APP_URL = "https://floom.dev";
-var DEFAULT_API_URL = "https://floom.dev/api/v1";
-var TRUSTED_API_HOSTS = /* @__PURE__ */ new Set(["floom.dev", "try.floom.dev"]);
+var DEFAULT_APP_URL = "https://skills.floom.dev";
+var DEFAULT_API_URL = "https://skills.floom.dev/api/v1";
+var TRUSTED_API_HOSTS = /* @__PURE__ */ new Set(["floom.dev", "skills.floom.dev", "try.floom.dev"]);
 var LOOPBACK_HOSTS = /* @__PURE__ */ new Set(["localhost", "127.0.0.1"]);
 function devModeEnabled() {
   const v = process.env.FLOOM_DEV;
@@ -3097,7 +3124,9 @@ function trustedApiUrlOrDefault(apiUrl) {
   const trimmed = apiUrl.replace(/\/$/, "");
   if (!isTrustedApiUrl(trimmed)) return DEFAULT_API_URL;
   try {
-    if (TRUSTED_API_HOSTS.has(new URL(trimmed).hostname)) return DEFAULT_API_URL;
+    const hostname2 = new URL(trimmed).hostname;
+    if (hostname2 === "floom.dev" || hostname2 === "try.floom.dev") return DEFAULT_API_URL;
+    if (hostname2 === "skills.floom.dev") return `${new URL(trimmed).origin}/api/v1`;
   } catch {
     return DEFAULT_API_URL;
   }
@@ -3119,18 +3148,25 @@ async function readRawAuth() {
     if (code === "ENOENT") return null;
     if (code === "EACCES" || code === "EPERM") {
       throw new Error(
-        "Cannot read your Floom auth file (permission denied).\n  Fix: chmod 600 ~/.floom/auth.json\n  Or re-authenticate: npx -y @floomhq/floom login\n  More help: https://floom.dev/docs#troubleshooting"
+        `Cannot read your Floom auth file (permission denied).
+  Fix: chmod 600 ~/.floom/auth.json
+  Or re-authenticate: ${cliCmd("login")}
+  More help: https://floom.dev/docs#troubleshooting`
       );
     }
     throw new Error(
-      "Cannot read your Floom auth file.\n  Run: npx -y @floomhq/floom login\n  More help: https://floom.dev/docs#troubleshooting"
+      `Cannot read your Floom auth file.
+  Run: ${cliCmd("login")}
+  More help: https://floom.dev/docs#troubleshooting`
     );
   }
   try {
     return JSON.parse(raw);
   } catch {
     throw new Error(
-      "Your Floom auth file is corrupted.\n  Run: npx -y @floomhq/floom login to generate a fresh one.\n  More help: https://floom.dev/docs#troubleshooting"
+      `Your Floom auth file is corrupted.
+  Run: ${cliCmd("login")} to generate a fresh one.
+  More help: https://floom.dev/docs#troubleshooting`
     );
   }
 }
@@ -3253,7 +3289,7 @@ async function getMachineIdentity() {
 }
 
 // src/version.ts
-var VERSION = "3.0.3";
+var VERSION = "3.0.4";
 
 // src/api-client.ts
 var DEFAULT_TIMEOUT_MS = 2e4;
@@ -3304,12 +3340,12 @@ var HELP = "https://floom.dev/docs#troubleshooting";
 function friendlyApiErrorMessage(code, raw, status) {
   if (code === "AUTH_REQUIRED" || code === "TOKEN_INVALID" || status === 401) {
     return `Not signed in.
-  Run: floom login
+  Run: ${cliCmd("login")}
   More help: ${HELP}`;
   }
   if (code === "TOKEN_EXPIRED") {
     return `Your session has expired.
-  Run: floom login
+  Run: ${cliCmd("login")}
   More help: ${HELP}`;
   }
   if (code === "SKILL_ACCESS_DENIED" || status === 403) {
@@ -3318,7 +3354,7 @@ function friendlyApiErrorMessage(code, raw, status) {
   }
   if (code === "SKILL_NOT_FOUND" || status === 404) {
     return `Skill not found. It may have been deleted or the slug is wrong.
-  Run: floom list
+  Run: ${cliCmd("list")}
   More help: ${HELP}`;
   }
   if (code === "RATE_LIMITED" || status === 429) {
@@ -3346,7 +3382,9 @@ async function api(path, opts = {}) {
   if (opts.authRequired && !token) {
     throw new FloomError(
       "AUTH_REQUIRED",
-      "Not signed in.\n  Run: floom login\n  More help: https://floom.dev/docs#troubleshooting"
+      `Not signed in.
+  Run: ${cliCmd("login")}
+  More help: https://floom.dev/docs#troubleshooting`
     );
   }
   let lastError = null;
@@ -3425,7 +3463,7 @@ async function api(path, opts = {}) {
 // src/lib/agents.ts
 init_src();
 import { createHash as createHash3 } from "node:crypto";
-import { readdir as readdir2, readFile as readFile5, stat as stat3, lstat as lstat2 } from "node:fs/promises";
+import { readdir as readdir2, readFile as readFile5, readlink, stat as stat3, lstat as lstat2 } from "node:fs/promises";
 import { homedir as homedir4 } from "node:os";
 import { join as join5, posix as posix2, relative as relative3, resolve as resolve2, sep as sep3 } from "node:path";
 var AGENT_LABELS = {
@@ -3550,7 +3588,28 @@ async function collectHashFiles(root) {
       const abs = join5(dir, entry.name);
       const info = await lstat2(abs);
       if (info.isSymbolicLink()) {
-        throw new Error(`skill folders must not contain symlinks: ${abs}`);
+        let target = "(unreadable)";
+        try {
+          target = await readlink(abs);
+        } catch {
+        }
+        throw new Error(
+          `Skill folder contains a symlink (not allowed for security):
+  link:    ${abs}
+  target:  ${target}
+
+Why: a symlink could point outside the skill folder and quietly leak files
+(SSH keys, .env, cookie jars) into a public Library. Floom refuses to read
+through symlinks for that reason.
+
+Fix: replace the link with the real file contents:
+  rm "${abs}"
+  cp "${target}" "${abs}"
+
+(or move the target file under the skill folder if it lives elsewhere)
+
+More help: https://floom.dev/docs#skill-folder-rules`
+        );
       }
       if (entry.isDirectory()) {
         await walk2(abs, childRel);
@@ -3622,8 +3681,16 @@ function tildePath(path, homeDir = homedir4()) {
 }
 
 // src/commands/login.ts
+function isHeadlessLinuxSession(env = process.env, platform3 = process.platform) {
+  if (env.FLOOM_NO_OPEN === "1") return true;
+  if (platform3 !== "linux") return false;
+  const isSsh = Boolean(env.SSH_CONNECTION ?? env.SSH_CLIENT ?? env.SSH_TTY);
+  const hasDisplay = Boolean(env.DISPLAY ?? env.WAYLAND_DISPLAY);
+  return isSsh || !hasDisplay;
+}
 function tryOpenBrowser(url) {
   if (process.env.FLOOM_NO_OPEN === "1") return;
+  if (isHeadlessLinuxSession()) return;
   const platform3 = process.platform;
   let cmd;
   let args;
@@ -3666,8 +3733,17 @@ async function loginCommand() {
   });
   log.heading("Sign in to Floom");
   log.blank();
-  log.info(`  Open:  ${session.verification_uri}`);
-  log.info(`  Code:  ${chalk2.bold.cyan(session.user_code)}`);
+  const headless = isHeadlessLinuxSession();
+  if (headless) {
+    log.info("  Open this URL in any browser to approve:");
+    log.info(`    ${session.verification_uri}`);
+    log.info(`  Code:  ${chalk2.bold.cyan(session.user_code)}`);
+    log.blank();
+    log.info("  You can open it on your phone or laptop \u2014 the same URL works from anywhere.");
+  } else {
+    log.info(`  Open:  ${session.verification_uri}`);
+    log.info(`  Code:  ${chalk2.bold.cyan(session.user_code)}`);
+  }
   log.blank();
   process.stdout.write("Waiting for browser approval...");
   tryOpenBrowser(session.verification_uri);
@@ -3693,9 +3769,13 @@ async function loginCommand() {
         if (token.workspace?.name) log.info(`  Workspace: ${token.workspace.name}`);
         await printAgentsFound();
         printNext([
-          { command: "floom pull", description: "install your team's skills into these agents" },
-          { command: "floom push", description: "if you have skills here to publish first" }
+          { command: cliCmd("pull"), description: "install your team's skills into these agents" },
+          { command: cliCmd("push"), description: "if you have skills here to publish first" }
         ]);
+        if (cliCmd("login").startsWith("npx ")) {
+          log.blank();
+          log.info("  Tip: install once with  npm i -g @floomhq/floom  and just type `floom` after that.");
+        }
         return;
       }
     } catch (error) {
@@ -3714,7 +3794,7 @@ async function loginCommand() {
   process.stdout.write("\n");
   log.err("Login timed out \u2014 the browser window expired.");
   printNext([
-    { command: "floom login", description: "try again" },
+    { command: cliCmd("login"), description: "try again" },
     { command: "More help: https://floom.dev/docs#troubleshooting" }
   ]);
   process.exitCode = 1;
@@ -3752,7 +3832,7 @@ async function logoutCommand(opts = {}, deps = {}) {
   );
   log.blank();
   log.info("Your local skill files in ~/.claude/skills, ~/.codex/skills, etc. were not changed.");
-  printNext([{ command: "floom login", description: "sign in again" }]);
+  printNext([{ command: cliCmd("login"), description: "sign in again" }]);
 }
 
 // src/commands/account.ts
@@ -3807,18 +3887,18 @@ async function accountCommand(opts = {}) {
   const device = await deviceLabel();
   if (!auth) {
     if (json) {
-      emitJson({ signedIn: false, email: null, workspace: null, device: device ? { label: device } : null, next: ["floom login"] });
+      emitJson({ signedIn: false, email: null, workspace: null, device: device ? { label: device } : null, next: [cliCmd("login")] });
       return;
     }
     log.info("Not signed in to Floom.");
-    printNext([{ command: "floom login" }]);
+    printNext([{ command: cliCmd("login") }]);
     return;
   }
   if (!json) {
     const rawAuth = await readRawAuth();
     if (rawAuth && !isTrustedApiUrl(rawAuth.apiUrl)) {
       log.warn(
-        `Your saved Floom credentials point at ${rawAuth.apiUrl}, which is not a trusted Floom API. Run 'floom login' to re-authenticate.`
+        `Your saved Floom credentials point at ${rawAuth.apiUrl}, which is not a trusted Floom API. Run '${cliCmd("login")}' to re-authenticate.`
       );
     }
   }
@@ -3830,7 +3910,7 @@ async function accountCommand(opts = {}) {
         email: me.user.email ?? auth.email,
         workspace: me.workspace ? { name: me.workspace.name } : null,
         device: { label: device },
-        next: ["floom status", "floom logout"]
+        next: [cliCmd("status"), cliCmd("logout")]
       });
       return;
     }
@@ -3840,19 +3920,19 @@ async function accountCommand(opts = {}) {
     if (me.workspace) log.kv("Workspace:", me.workspace.name);
     log.kv("This machine:", device ?? "not named yet");
     printNext([
-      { command: "floom status", description: "see Library and local agent copies" },
-      { command: "floom logout", description: "sign out on this machine" }
+      { command: cliCmd("status"), description: "see Library and local agent copies" },
+      { command: cliCmd("logout"), description: "sign out on this machine" }
     ]);
   } catch (error) {
     if (json) {
-      emitJson({ signedIn: false, email: auth.email, workspace: null, device: { label: device }, next: ["floom login"] });
+      emitJson({ signedIn: false, email: auth.email, workspace: null, device: { label: device }, next: [cliCmd("login")] });
       process.exitCode = 1;
       return;
     }
     log.err(error.message);
     log.blank();
     log.info("Session expired. Sign in again to continue.");
-    printNext([{ command: "floom login" }]);
+    printNext([{ command: cliCmd("login") }]);
     process.exitCode = 1;
   }
   void isJsonMode;
@@ -4720,7 +4800,7 @@ async function pushCommand(pathArg, options = {}, deps = {}) {
           syncedCount: 0,
           plan: [],
           error: { code: "AUTH_REQUIRED", message: "Not signed in \u2014 log in first to publish." },
-          next: ["floom login"]
+          next: [cliCmd("login")]
         });
         process.exitCode = 1;
         return;
@@ -4730,7 +4810,7 @@ async function pushCommand(pathArg, options = {}, deps = {}) {
       log.blank();
       if (skills.length === 0) {
         log.info("No local skill folders found on this machine.");
-        printNext([{ command: "floom login" }]);
+        printNext([{ command: cliCmd("login") }]);
         process.exitCode = 1;
         return;
       }
@@ -4738,10 +4818,10 @@ async function pushCommand(pathArg, options = {}, deps = {}) {
       for (const skill of skills) log.info(`    ${tildePath(skill.path)}`);
       log.blank();
       log.info("To compare and publish them, sign in to Floom.");
-      printNext([{ command: "floom login" }]);
+      printNext([{ command: cliCmd("login") }]);
       log.blank();
       log.info("After login, run:");
-      log.command("floom push");
+      log.command(cliCmd("push"));
       process.exitCode = 1;
       return;
     }
@@ -4759,7 +4839,7 @@ async function pushCommand(pathArg, options = {}, deps = {}) {
           wouldMutate: false,
           syncedCount: 0,
           plan: [],
-          next: libCount > 0 ? ["floom pull"] : ["floom new"]
+          next: libCount > 0 ? [cliCmd("pull")] : [cliCmd("new")]
         });
         return;
       }
@@ -4768,11 +4848,11 @@ async function pushCommand(pathArg, options = {}, deps = {}) {
       log.blank();
       if (libCount > 0) {
         log.info(`Your Library has ${libCount} skill${libCount === 1 ? "" : "s"}. To install them here, run:`);
-        log.command("floom pull");
+        log.command(cliCmd("pull"));
       }
       printNext([
-        { command: "floom pull", description: "install your Library on this machine" },
-        { command: "floom new research-helper", description: "create a ready-to-edit skill" }
+        { command: cliCmd("pull"), description: "install your Library on this machine" },
+        { command: cliCmd("new research-helper"), description: "create a ready-to-edit skill" }
       ]);
       return;
     }
@@ -4815,7 +4895,7 @@ async function pushCommand(pathArg, options = {}, deps = {}) {
           lastSyncedLibraryVersion: r.lastSyncedLibraryVersion,
           publishVersion: r.publishVersion
         })),
-        next: ["floom push --yes", "floom push"]
+        next: [cliCmd("push --yes"), cliCmd("push")]
       });
       process.exitCode = wouldMutate && !options.exitZero ? 1 : 0;
       return;
@@ -4837,7 +4917,7 @@ async function pushCommand(pathArg, options = {}, deps = {}) {
     if (!wouldMutate && refusedRows.length === 0) {
       log.blank();
       log.info("Everything is already in sync with the Library. Nothing to publish.");
-      printNext([{ command: "floom status", description: "see every copy" }]);
+      printNext([{ command: cliCmd("status"), description: "see every copy" }]);
       return;
     }
     let toPublish = [];
@@ -4845,12 +4925,12 @@ async function pushCommand(pathArg, options = {}, deps = {}) {
       toPublish = safeRows;
     } else if (!isInteractive()) {
       log.blank();
-      log.err("floom push needs a choice but is not running in an interactive terminal.");
+      log.err(`${cliCmd("push")} needs a choice but is not running in an interactive terminal.`);
       log.blank();
       log.info("Re-run with:");
-      log.command("floom push --dry-run        preview what would happen");
-      log.command("floom push --yes            proceed with all safe changes");
-      log.command("floom push --json           get the plan as JSON");
+      log.command(cliCmd("push --dry-run") + "        preview what would happen");
+      log.command(cliCmd("push --yes") + "            proceed with all safe changes");
+      log.command(cliCmd("push --json") + "           get the plan as JSON");
       process.exitCode = 2;
       return;
     } else {
@@ -4900,9 +4980,9 @@ async function pushCommand(pathArg, options = {}, deps = {}) {
     }
     const conflictSlug = skipped.find((r) => r.action === "conflict")?.slug;
     printNext([
-      ...conflictSlug ? [{ command: `floom diff ${conflictSlug}`, description: "review the conflict before publishing" }] : [],
-      { command: "floom pull", description: "update your other agents with these new versions" },
-      { command: "floom status", description: "see every copy" }
+      ...conflictSlug ? [{ command: cliCmd(`diff ${conflictSlug}`), description: "review the conflict before publishing" }] : [],
+      { command: cliCmd("pull"), description: "update your other agents with these new versions" },
+      { command: cliCmd("status"), description: "see every copy" }
     ]);
     if (failures.length > 0 || skipped.length > 0) process.exitCode = 1;
   } finally {
@@ -4915,10 +4995,10 @@ async function pushExplicitPath(pathArg, options, pushApi, authed) {
   const info = await stat5(folder).catch(() => null);
   if (!info || !info.isDirectory()) {
     if (json) {
-      emitJson({ workspace: { name: "Library", signedIn: authed }, mode: "plan", applied: false, wouldMutate: false, syncedCount: 0, plan: [], next: ["floom push"] });
+      emitJson({ workspace: { name: "Library", signedIn: authed }, mode: "plan", applied: false, wouldMutate: false, syncedCount: 0, plan: [], next: [cliCmd("push")] });
     } else {
       log.err(`Folder not found: ${pathArg}`);
-      log.info("  Run floom push with no arguments to auto-detect your skills, or pass a valid folder path.");
+      log.info(`  Run ${cliCmd("push")} with no arguments to auto-detect your skills, or pass a valid folder path.`);
     }
     process.exitCode = 2;
     return;
@@ -4941,13 +5021,13 @@ async function pushExplicitPath(pathArg, options, pushApi, authed) {
         syncedCount: 0,
         plan: [],
         error: { code: "AUTH_REQUIRED", message: "Not signed in \u2014 log in first to publish." },
-        next: ["floom login"]
+        next: [cliCmd("login")]
       });
     } else {
       log.blank();
       log.err("Not signed in \u2014 log in first to publish.");
       log.info(`Found local skill at ${tildePath(folder)}.`);
-      printNext([{ command: "floom login" }]);
+      printNext([{ command: cliCmd("login") }]);
     }
     process.exitCode = 1;
     return;
@@ -4964,7 +5044,7 @@ async function pushExplicitPath(pathArg, options, pushApi, authed) {
           wouldMutate: false,
           syncedCount: 0,
           plan: [{ slug, scope: "global", path: folder, action: "changed", status: "refused", refusedReason: "secret_scan_failed", message: `${slug} was refused because the secret scan could not run`, localHash: "", lastSyncedHash: null, libraryVersion: null, lastSyncedLibraryVersion: null, publishVersion: null }],
-          next: ["floom push --no-secret-check"]
+          next: [cliCmd("push --no-secret-check")]
         });
         process.exitCode = 1;
         return;
@@ -4986,7 +5066,7 @@ async function pushExplicitPath(pathArg, options, pushApi, authed) {
           wouldMutate: false,
           syncedCount: 0,
           plan: [{ slug, scope: "global", path: folder, action: "changed", status: "refused", refusedReason: "secret_detected", message: `${slug} was refused because a file looks like it contains a secret`, localHash: "", lastSyncedHash: null, libraryVersion: null, lastSyncedLibraryVersion: null, publishVersion: null }],
-          next: ["floom push --no-secret-check"]
+          next: [cliCmd("push --no-secret-check")]
         });
         process.exitCode = 1;
         return;
@@ -5011,7 +5091,7 @@ async function pushExplicitPath(pathArg, options, pushApi, authed) {
         log.info("Nothing published.");
         printNext([
           { command: "Edit .floomignore to exclude secrets or generated files" },
-          { command: `floom push ${pathArg}` }
+          { command: cliCmd(`push ${pathArg}`) }
         ]);
         return;
       }
@@ -5026,7 +5106,7 @@ async function pushExplicitPath(pathArg, options, pushApi, authed) {
         wouldMutate: true,
         syncedCount: 0,
         plan: [{ slug, scope: "global", path: folder, action: "changed", status: "ok", refusedReason: null, message: `${slug} would be published`, localHash: await skillContentHash(folder) ?? "", lastSyncedHash: null, libraryVersion: null, lastSyncedLibraryVersion: null, publishVersion: null }],
-        next: ["floom push " + pathArg + " --yes"]
+        next: [cliCmd(`push ${pathArg} --yes`)]
       });
     } else {
       log.heading("Push plan");
@@ -5046,15 +5126,15 @@ async function pushExplicitPath(pathArg, options, pushApi, authed) {
         mode: "apply",
         applied: true,
         results: [{ slug: result.skill.slug, scope: "global", path: folder, action: "changed", result: "published", message: `${result.skill.slug} published as ${result.skill.latest.display}`, libraryVersion: result.skill.latest.version_seq ?? null, publishVersion: result.skill.latest.version_seq ?? null, backupPath: null }],
-        next: ["floom pull"]
+        next: [cliCmd("pull")]
       });
     } else {
       log.ok(`Published ${result.skill.slug} ${result.skill.latest.display}`);
-      printNext([{ command: "floom pull", description: `update your other agents with ${result.skill.slug}` }]);
+      printNext([{ command: cliCmd("pull"), description: `update your other agents with ${result.skill.slug}` }]);
     }
   } catch (error) {
     if (json) {
-      emitJson({ workspace: { name: "Library", signedIn: true }, mode: "apply", applied: true, results: [{ slug, scope: "global", path: folder, action: "changed", result: "failed", message: error.message, libraryVersion: null, publishVersion: null, backupPath: null }], next: ["floom push " + pathArg] });
+      emitJson({ workspace: { name: "Library", signedIn: true }, mode: "apply", applied: true, results: [{ slug, scope: "global", path: folder, action: "changed", result: "failed", message: error.message, libraryVersion: null, publishVersion: null, backupPath: null }], next: [cliCmd(`push ${pathArg}`)] });
     } else {
       log.err(error.message);
     }
@@ -5095,11 +5175,11 @@ async function deleteCommand(slug, opts = {}, deps = { api }) {
         skill: { slug: "", version: null, exists: false },
         wouldMutate: false,
         action: "missing_argument",
-        message: "floom delete needs a skill name.",
-        next: ["floom list"]
+        message: `${cliCmd("delete")} needs a skill name.`,
+        next: [cliCmd("list")]
       });
     } else {
-      log.err("floom delete needs a skill name. Run `floom list` to see skills in the Library.");
+      log.err(`${cliCmd("delete")} needs a skill name. Run \`${cliCmd("list")}\` to see skills in the Library.`);
     }
     process.exitCode = 2;
     return;
@@ -5116,10 +5196,10 @@ async function deleteCommand(slug, opts = {}, deps = { api }) {
         wouldMutate: false,
         action: "not_found",
         message: `No skill named '${slug}' in ${ws}.`,
-        next: ["floom list"]
+        next: [cliCmd("list")]
       });
     } else {
-      log.err(`No skill named '${slug}' in ${ws}. Run \`floom list\` to see what is in the Library.`);
+      log.err(`No skill named '${slug}' in ${ws}. Run \`${cliCmd("list")}\` to see what is in the Library.`);
     }
     process.exitCode = 2;
     return;
@@ -5134,7 +5214,7 @@ async function deleteCommand(slug, opts = {}, deps = { api }) {
         wouldMutate: true,
         action: "delete",
         message: `${slug} would be deleted from the Library.`,
-        next: ["floom delete " + slug + " --yes"]
+        next: [cliCmd(`delete ${slug} --yes`)]
       });
     } else {
       log.heading(`Delete plan for ${ws} Library`);
@@ -5160,17 +5240,17 @@ async function deleteCommand(slug, opts = {}, deps = { api }) {
       wouldMutate: true,
       action: "delete",
       message: `${slug} would be deleted from the Library.`,
-      next: ["floom delete " + slug + " --yes"]
+      next: [cliCmd(`delete ${slug} --yes`)]
     });
     process.exitCode = opts.exitZero ? 0 : 1;
     return;
   }
   if (!opts.yes) {
     if (!isInteractive()) {
-      log.err("floom delete needs confirmation but is not running in an interactive terminal.");
+      log.err(`${cliCmd("delete")} needs confirmation but is not running in an interactive terminal.`);
       log.blank();
       log.info("Re-run with:");
-      log.command(`floom delete ${slug} --yes`);
+      log.command(cliCmd(`delete ${slug} --yes`));
       process.exitCode = 2;
       return;
     }
@@ -5199,7 +5279,7 @@ async function deleteCommand(slug, opts = {}, deps = { api }) {
         skill: { slug, version: info.versionSeq, exists: true },
         result: "failed",
         message: error.message,
-        next: ["floom delete " + slug + " --yes"]
+        next: [cliCmd(`delete ${slug} --yes`)]
       });
     } else {
       log.err(error.message);
@@ -5215,14 +5295,14 @@ async function deleteCommand(slug, opts = {}, deps = { api }) {
       skill: { slug, version: info.versionSeq, exists: false },
       result: "deleted",
       message: `Deleted ${slug} from the Library.`,
-      next: ["floom status"]
+      next: [cliCmd("status")]
     });
     return;
   }
   log.ok(`Deleted ${slug} from the Library.`);
   log.blank();
   log.info("Local copies in your agents still have the skill. Floom will not delete them automatically.");
-  printNext([{ command: "floom status", description: "see which local copies are no longer in the Library" }]);
+  printNext([{ command: cliCmd("status"), description: "see which local copies are no longer in the Library" }]);
 }
 
 // src/commands/list.ts
@@ -5236,11 +5316,11 @@ async function listCommand(opts = {}) {
         workspace: { name: "Library", signedIn: false },
         error: { code: "AUTH_REQUIRED", message: "Not signed in." },
         skills: [],
-        next: ["floom login"]
+        next: [cliCmd("login")]
       });
     } else {
       log.err("Not signed in.");
-      printNext([{ command: "floom login" }]);
+      printNext([{ command: cliCmd("login") }]);
     }
     process.exitCode = 1;
     return;
@@ -5255,7 +5335,7 @@ async function listCommand(opts = {}) {
         workspace: { name: "Library", signedIn: true },
         error: { code: fe?.code ?? "INTERNAL_ERROR", message: e.message },
         skills: [],
-        next: ["floom login"]
+        next: [cliCmd("login")]
       });
       process.exitCode = 1;
       return;
@@ -5289,7 +5369,7 @@ async function listCommand(opts = {}) {
           }))
         };
       }),
-      next: result.total === 0 ? ["floom push"] : ["floom pull", "floom status"]
+      next: result.total === 0 ? [cliCmd("push")] : [cliCmd("pull"), cliCmd("status")]
     });
     return;
   }
@@ -5304,7 +5384,7 @@ async function listCommand(opts = {}) {
         log.info(`  ${tildePath(skill.path)}`);
       }
     }
-    printNext([{ command: "floom push", description: "publish your first skills to the Library" }]);
+    printNext([{ command: cliCmd("push"), description: "publish your first skills to the Library" }]);
     return;
   }
   log.heading(`Library \xB7 ${result.total} skill${result.total === 1 ? "" : "s"}`);
@@ -5322,8 +5402,8 @@ async function listCommand(opts = {}) {
     log.info(`  ... and ${result.total - rows.length} more`);
   }
   printNext([
-    { command: "floom pull", description: "install missing skills into local agents" },
-    { command: "floom status", description: "compare every local copy in detail" }
+    { command: cliCmd("pull"), description: "install missing skills into local agents" },
+    { command: cliCmd("status"), description: "compare every local copy in detail" }
   ]);
 }
 
@@ -5388,10 +5468,10 @@ async function pullCommand(skillArg, rawOpts = {}) {
     const planMode = isPlanMode(flags);
     if (!await readAuth()) {
       if (json) {
-        emitJson({ workspace: { name: "Library", signedIn: false }, mode: "plan", applied: false, wouldMutate: false, hasSkipped: false, agents: [], next: ["floom login"] });
+        emitJson({ workspace: { name: "Library", signedIn: false }, mode: "plan", applied: false, wouldMutate: false, hasSkipped: false, agents: [], next: [cliCmd("login")] });
       } else {
         log.info("Not signed in to Floom.");
-        printNext([{ command: "floom login" }]);
+        printNext([{ command: cliCmd("login") }]);
       }
       process.exitCode = 2;
       return;
@@ -5399,14 +5479,14 @@ async function pullCommand(skillArg, rawOpts = {}) {
     const detected = await detectAgents();
     if (detected.length === 0) {
       if (json) {
-        emitJson({ workspace: { name: "Library", signedIn: true }, mode: "plan", applied: false, wouldMutate: false, hasSkipped: false, agents: [], next: ["floom pull --agent claude"] });
+        emitJson({ workspace: { name: "Library", signedIn: true }, mode: "plan", applied: false, wouldMutate: false, hasSkipped: false, agents: [], next: [cliCmd("pull --agent claude")] });
       } else {
         log.info("No AI agents found on this machine.");
         log.blank();
         log.info("Floom looks for Claude, Codex, Cursor, Gemini, or OpenCode.");
-        log.info("Make sure one of these is installed, then run floom pull again.");
+        log.info(`Make sure one of these is installed, then run ${cliCmd("pull")} again.`);
         log.blank();
-        log.info("Or use: floom pull --agent claude");
+        log.info(`Or use: ${cliCmd("pull --agent claude")}`);
         log.blank();
         log.info("More help: https://floom.dev/docs#agents");
       }
@@ -5418,19 +5498,19 @@ async function pullCommand(skillArg, rawOpts = {}) {
     if (skillArg) {
       if (flags.allScopes) {
         if (json) {
-          emitJson({ workspace: { name: "Library", signedIn: true }, error: "floom pull <skill> targets one copy \u2014 pass --global or --project, not --all-scopes.", next: [`floom pull ${skillArg} --agent claude --global`] });
+          emitJson({ workspace: { name: "Library", signedIn: true }, error: `${cliCmd("pull")} <skill> targets one copy \u2014 pass --global or --project, not --all-scopes.`, next: [cliCmd(`pull ${skillArg} --agent claude --global`)] });
         } else {
-          log.err("floom pull <skill> targets one copy \u2014 pass --global or --project, not --all-scopes.");
+          log.err(`${cliCmd("pull")} <skill> targets one copy \u2014 pass --global or --project, not --all-scopes.`);
         }
         process.exitCode = 2;
         return;
       }
       if (flags.agents.length !== 1) {
         if (json) {
-          emitJson({ workspace: { name: "Library", signedIn: true }, error: "floom pull <skill> needs exactly one --agent", next: [`floom pull ${skillArg} --agent claude`] });
+          emitJson({ workspace: { name: "Library", signedIn: true }, error: `${cliCmd("pull")} <skill> needs exactly one --agent`, next: [cliCmd(`pull ${skillArg} --agent claude`)] });
         } else {
-          log.err(`floom pull ${skillArg} needs exactly one --agent <name>.`);
-          log.command(`floom pull ${skillArg} --agent claude`);
+          log.err(`${cliCmd("pull")} ${skillArg} needs exactly one --agent <name>.`);
+          log.command(cliCmd(`pull ${skillArg} --agent claude`));
         }
         process.exitCode = 2;
         return;
@@ -5439,7 +5519,7 @@ async function pullCommand(skillArg, rawOpts = {}) {
       const hasProjectSkillsDir = await projectSkillsDirExists(process.cwd());
       if (flags.scope === "project" && !hasProjectSkillsDir) {
         if (json) {
-          emitJson({ workspace: { name: "Library", signedIn: true }, error: "No project agent skill directory found. Pass --global or run from a project with agent skills.", next: [`floom pull ${skillArg} --agent ${agent} --global`] });
+          emitJson({ workspace: { name: "Library", signedIn: true }, error: "No project agent skill directory found. Pass --global or run from a project with agent skills.", next: [cliCmd(`pull ${skillArg} --agent ${agent} --global`)] });
         } else {
           log.err("No project agent skill directory found. Pass --global or run from a project with agent skills.");
         }
@@ -5448,7 +5528,7 @@ async function pullCommand(skillArg, rawOpts = {}) {
       }
       if (flags.scope === null && hasProjectSkillsDir && !isInteractive()) {
         if (json) {
-          emitJson({ workspace: { name: "Library", signedIn: true }, error: "This project has its own agent skill copies. Pass --global or --project.", next: [`floom pull ${skillArg} --agent ${agent} --global`, `floom pull ${skillArg} --agent ${agent} --project`] });
+          emitJson({ workspace: { name: "Library", signedIn: true }, error: "This project has its own agent skill copies. Pass --global or --project.", next: [cliCmd(`pull ${skillArg} --agent ${agent} --global`), cliCmd(`pull ${skillArg} --agent ${agent} --project`)] });
         } else {
           log.err("This project has its own agent skill copies. Pass --global or --project.");
         }
@@ -5457,7 +5537,7 @@ async function pullCommand(skillArg, rawOpts = {}) {
       }
       const resolvedScope = flags.scope === "project" ? "project" : "global";
       const dir = resolve5(resolvedScope === "project" ? projectSkillsDir(agent) : globalSkillsDir(agent));
-      const scopedPullCommand = `floom pull ${skillArg} --agent ${agent}${resolvedScope === "project" ? " --project" : ""}`;
+      const scopedPullCommand = cliCmd(`pull ${skillArg} --agent ${agent}${resolvedScope === "project" ? " --project" : ""}`);
       if (flags.dryRun || json && !flags.yes) {
         if (json) {
           emitJson({ workspace: { name: "Library", signedIn: true }, mode: "plan", applied: false, wouldMutate: true, hasSkipped: false, agents: [{ name: agent, scope: resolvedScope, skillsDir: dir, actions: [{ slug: skillArg, scope: resolvedScope, action: "update", fromVersion: null, toVersion: null, path: join9(dir, skillArg), backupPath: null }] }], next: [`${scopedPullCommand} --yes`] });
@@ -5473,10 +5553,10 @@ async function pullCommand(skillArg, rawOpts = {}) {
         cleanup.trackDir(join9(dir, ".floom", "tmp"));
         const result = await pullOneSkill(agent, skillArg, { installDir: dir });
         if (json) {
-          emitJson({ workspace: { name: "Library", signedIn: true }, mode: "apply", applied: true, hasFailures: false, agents: [{ name: agent, scope: resolvedScope, skillsDir: dir, results: [{ slug: result.slug, scope: resolvedScope, action: "update", result: "updated", fromVersion: null, toVersion: result.versionSeq, path: join9(dir, result.slug), backupPath: null, message: `updated to v${result.versionSeq}` }] }], next: [`floom status --agent ${agent}`] });
+          emitJson({ workspace: { name: "Library", signedIn: true }, mode: "apply", applied: true, hasFailures: false, agents: [{ name: agent, scope: resolvedScope, skillsDir: dir, results: [{ slug: result.slug, scope: resolvedScope, action: "update", result: "updated", fromVersion: null, toVersion: result.versionSeq, path: join9(dir, result.slug), backupPath: null, message: `updated to v${result.versionSeq}` }] }], next: [cliCmd(`status --agent ${agent}`)] });
         } else {
           log.ok(`Backed up your local copy and updated ${result.slug} to Library v${result.versionSeq}`);
-          printNext([{ command: `floom status --agent ${agent}` }]);
+          printNext([{ command: cliCmd(`status --agent ${agent}`) }]);
         }
       } catch (error) {
         if (json) {
@@ -5490,16 +5570,16 @@ async function pullCommand(skillArg, rawOpts = {}) {
     }
     if (!planMode && flags.agents.length === 0 && !wantAll && !isInteractive()) {
       if (json) {
-        emitJson({ workspace: { name: "Library", signedIn: true }, error: "floom pull needs to know which agents to update", next: ["floom pull --all-agents --yes"] });
+        emitJson({ workspace: { name: "Library", signedIn: true }, error: `${cliCmd("pull")} needs to know which agents to update`, next: [cliCmd("pull --all-agents --yes")] });
       } else {
-        log.err("floom pull needs to know which agents to update.");
+        log.err(`${cliCmd("pull")} needs to know which agents to update.`);
         log.blank();
         log.info("Pass --agent <name>, repeat --agent, or use --all-agents.");
         log.blank();
         log.info("Examples:");
-        log.command("floom pull --agent claude --yes");
-        log.command("floom pull --agent claude,codex --yes");
-        log.command("floom pull --all-agents --yes");
+        log.command(cliCmd("pull --agent claude --yes"));
+        log.command(cliCmd("pull --agent claude,codex --yes"));
+        log.command(cliCmd("pull --all-agents --yes"));
       }
       process.exitCode = 2;
       return;
@@ -5544,7 +5624,7 @@ async function pullCommand(skillArg, rawOpts = {}) {
             backupPath: null
           }))
         })),
-        next: ["floom pull --all-agents --yes"]
+        next: [cliCmd("pull --all-agents --yes")]
       });
       process.exitCode = (wouldMutate || hasSkipped) && !flags.exitZero ? 1 : 0;
       return;
@@ -5582,7 +5662,7 @@ async function pullCommand(skillArg, rawOpts = {}) {
         }
         log.blank();
         const firstConflict = conflicted[0];
-        printNext(firstConflict ? [{ command: `floom diff ${firstConflict.slug}`, description: "review the conflict" }] : [{ command: "floom status" }]);
+        printNext(firstConflict ? [{ command: cliCmd(`diff ${firstConflict.slug}`), description: "review the conflict" }] : [{ command: cliCmd("status") }]);
         process.exitCode = flags.exitZero ? 0 : 1;
         return;
       }
@@ -5591,7 +5671,7 @@ async function pullCommand(skillArg, rawOpts = {}) {
       for (const p of plans) {
         log.row([AGENT_LABELS[p.agent], "up to date"], [10]);
       }
-      printNext([{ command: "floom status" }]);
+      printNext([{ command: cliCmd("status") }]);
       return;
     }
     log.heading(`Update agent copies from ${workspaceName}`);
@@ -5608,7 +5688,7 @@ async function pullCommand(skillArg, rawOpts = {}) {
     let toUpdate = actionable;
     if (!flags.yes) {
       if (!isInteractive()) {
-        log.err("floom pull needs a choice but is not running in an interactive terminal.");
+        log.err(`${cliCmd("pull")} needs a choice but is not running in an interactive terminal.`);
         log.info("Re-run with --agent <name> --yes, or --all-agents --yes.");
         process.exitCode = 2;
         return;
@@ -5668,7 +5748,7 @@ async function pullCommand(skillArg, rawOpts = {}) {
             message: a.message
           }]
         })),
-        next: ["floom status"]
+        next: [cliCmd("status")]
       });
       if (failed || hasSkipped) process.exitCode = flags.exitZero ? 0 : 1;
       return;
@@ -5681,8 +5761,8 @@ async function pullCommand(skillArg, rawOpts = {}) {
       }
     }
     log.blank();
-    log.info("Backups of any replaced skills are in each agent's .floom/backups/ folder (run floom restore --list to see them).");
-    printNext([{ command: "floom status" }]);
+    log.info(`Backups of any replaced skills are in each agent's .floom/backups/ folder (run ${cliCmd("restore --list")} to see them).`);
+    printNext([{ command: cliCmd("status") }]);
     if (failed || hasSkipped) process.exitCode = flags.exitZero ? 0 : 1;
     void skillArg;
     void INSTALL_TARGETS;
@@ -5735,8 +5815,8 @@ function printPreview(plan) {
     log.err(`${count} ${noun} both locally and on the server: Floom won't guess which wins.`);
     for (const skill of plan.conflicts) {
       log.err(`  - ${skill.slug} (${skill.version})`);
-      log.err(`    Keep the server version:  floom pull --target ${plan.target}`);
-      log.err(`    Keep your local version:  floom push <${skill.slug}-dir>`);
+      log.err(`    Keep the server version:  ${cliCmd(`pull --target ${plan.target}`)}`);
+      log.err(`    Keep your local version:  ${cliCmd(`push <${skill.slug}-dir>`)}`);
     }
     log.err("Your local copy is always backed up to .floom/backups/ first.");
     log.err("More: https://floom.dev/docs#conflicts");
@@ -5862,7 +5942,7 @@ async function runSyncForTarget(options = {}, deps = {}) {
       log.err(`    snapshot at: ${failure.snapshotDir}`);
     }
     log.err("");
-    log.err(`Re-run \`floom sync --target ${plan.target}\` after the network recovers.`);
+    log.err(`Re-run \`${cliCmd(`sync --target ${plan.target}`)}\` after the network recovers.`);
     process.exitCode = 1;
     return { ok: false, pushFailures, hasConflicts: false };
   }
@@ -5876,6 +5956,13 @@ async function runSyncForTarget(options = {}, deps = {}) {
 init_runtime();
 init_prompt();
 import { resolve as resolve6 } from "node:path";
+async function runTestSyncDelay(cleanup) {
+  const delayMs = Number.parseInt(process.env.FLOOM_TEST_SYNC_DELAY_MS ?? "", 10);
+  if (!Number.isFinite(delayMs) || delayMs <= 0) return;
+  const trackDir = process.env.FLOOM_TEST_SYNC_TRACK_DIR;
+  if (trackDir) cleanup.trackDir(trackDir);
+  await new Promise((resolve14) => setTimeout(resolve14, delayMs));
+}
 function appliedFromResult(plan, result) {
   if (result.ok) return { plan, ok: true, message: "synced" };
   const message = result.pushFailures.length > 0 ? `push failed for ${result.pushFailures.map((f) => f.slug).join(", ")}` : result.hasConflicts ? "changed in two places" : "sync did not complete";
@@ -5897,7 +5984,7 @@ function buildApplyJson(workspaceName, applied, opts) {
         ...a.plan.conflicts.map((slug) => ({ slug, scope: a.plan.scope, direction: "pull", result: "skipped", fromVersion: null, toVersion: null, path: a.plan.skillsDir, backupPath: null, message: "changed in two places" }))
       ]
     })),
-    next: ["floom status"]
+    next: [cliCmd("status")]
   };
 }
 function formatAgentLabel(plan) {
@@ -5926,6 +6013,7 @@ async function syncCommand(rawOpts = {}, deps = {}) {
   const readAuthFn = deps.readAuth ?? readAuth;
   const cleanup = installCancellationHandler();
   try {
+    await runTestSyncDelay(cleanup);
     let flags;
     try {
       flags = parseCommonFlags(rawOpts);
@@ -5941,10 +6029,10 @@ async function syncCommand(rawOpts = {}, deps = {}) {
     const planMode = isPlanMode(flags);
     if (!await readAuthFn()) {
       if (json) {
-        emitJson({ workspace: { name: "Library", signedIn: false }, mode: "plan", applied: false, wouldMutate: false, hasSkipped: false, agents: [], next: ["floom login"] });
+        emitJson({ workspace: { name: "Library", signedIn: false }, mode: "plan", applied: false, wouldMutate: false, hasSkipped: false, agents: [], next: [cliCmd("login")] });
       } else {
         log.info("Not signed in to Floom.");
-        printNext([{ command: "floom login" }]);
+        printNext([{ command: cliCmd("login") }]);
       }
       process.exitCode = 2;
       return;
@@ -5952,7 +6040,7 @@ async function syncCommand(rawOpts = {}, deps = {}) {
     const detected = await detectAgentsFn();
     if (detected.length === 0) {
       if (json) {
-        emitJson({ workspace: { name: "Library", signedIn: true }, mode: "plan", applied: false, wouldMutate: false, hasSkipped: false, agents: [], error: "no agents detected \u2014 install Claude, Codex, Cursor, Gemini, or OpenCode", next: ["floom sync --agent claude"] });
+        emitJson({ workspace: { name: "Library", signedIn: true }, mode: "plan", applied: false, wouldMutate: false, hasSkipped: false, agents: [], error: "no agents detected \u2014 install Claude, Codex, Cursor, Gemini, or OpenCode", next: [cliCmd("sync --agent claude")] });
       } else {
         log.err("No agents detected \u2014 install Claude, Codex, Cursor, Gemini, or OpenCode, then re-run.");
         log.info("Floom syncs into one of: Claude, Codex, Cursor, Gemini, OpenCode.");
@@ -5965,14 +6053,14 @@ async function syncCommand(rawOpts = {}, deps = {}) {
     const selectedAgents = flags.agents.length > 0 ? flags.agents : detected;
     if (!planMode && !flags.yes && !isInteractive()) {
       if (json) {
-        emitJson({ workspace: { name: "Library", signedIn: true }, error: "floom sync needs --yes to apply changes in a non-interactive shell", next: ["floom sync --yes"] });
+        emitJson({ workspace: { name: "Library", signedIn: true }, error: `${cliCmd("sync")} needs --yes to apply changes in a non-interactive shell`, next: [cliCmd("sync --yes")] });
       } else {
-        log.err("floom sync needs --yes to apply changes in a non-interactive shell.");
+        log.err(`${cliCmd("sync")} needs --yes to apply changes in a non-interactive shell.`);
         log.blank();
         log.info("Examples:");
-        log.command("floom sync --yes                       # sync every detected agent");
-        log.command("floom sync --agent claude --yes");
-        log.command("floom sync --agent claude,codex --yes");
+        log.command(cliCmd("sync --yes") + "                       # sync every detected agent");
+        log.command(cliCmd("sync --agent claude --yes"));
+        log.command(cliCmd("sync --agent claude,codex --yes"));
       }
       process.exitCode = 2;
       return;
@@ -6016,12 +6104,12 @@ async function syncCommand(rawOpts = {}, deps = {}) {
             reason: "changed_in_two_places",
             libraryVersion: 0,
             localPath: p.skillsDir,
-            diffCommand: `floom diff ${slug}`,
-            pullCommand: `floom pull ${slug} --agent ${p.agent}${p.scope === "project" ? " --project" : ""}`,
-            pushCommand: `floom push`
+            diffCommand: cliCmd(`diff ${slug}`),
+            pullCommand: cliCmd(`pull ${slug} --agent ${p.agent}${p.scope === "project" ? " --project" : ""}`),
+            pushCommand: cliCmd("push")
           }))
         })),
-        next: ["floom sync --all-agents --yes"]
+        next: [cliCmd("sync --all-agents --yes")]
       });
       process.exitCode = (wouldMutate || hasSkipped) && !flags.exitZero ? 1 : 0;
       return;
@@ -6055,7 +6143,7 @@ async function syncCommand(rawOpts = {}, deps = {}) {
       log.info("Everything is in sync.");
       log.blank();
       for (const p of plans) log.row([AGENT_LABELS[p.agent], "up to date"], [10]);
-      printNext([{ command: "floom status" }]);
+      printNext([{ command: cliCmd("status") }]);
       return;
     }
     if (defaultedToAll && detected.length > 1) {
@@ -6074,7 +6162,7 @@ async function syncCommand(rawOpts = {}, deps = {}) {
     let toSync = actionable;
     if (!flags.yes) {
       if (!isInteractive()) {
-        log.err("floom sync needs a choice but is not running in an interactive terminal.");
+        log.err(`${cliCmd("sync")} needs a choice but is not running in an interactive terminal.`);
         log.info("Re-run with --agent <name> --yes, or --all-agents --yes.");
         process.exitCode = 2;
         return;
@@ -6124,7 +6212,7 @@ async function syncCommand(rawOpts = {}, deps = {}) {
         log.info(`  ${marker} ${formatAgentLabel(entry.plan)}    ${entry.message}`);
       }
       log.blank();
-      printNext([{ command: "floom status" }]);
+      printNext([{ command: cliCmd("status") }]);
       if (hasSkipped) {
         for (const p of plans) {
           for (const slug of p.conflicts) {
@@ -6148,13 +6236,13 @@ async function syncCommand(rawOpts = {}, deps = {}) {
     if (hasSkipped) {
       const conflictSlug = plans.flatMap((p) => p.conflicts)[0];
       printNext([
-        ...conflictSlug ? [{ command: `floom diff ${conflictSlug}`, description: "show what changed before choosing" }] : [],
-        { command: "floom status" }
+        ...conflictSlug ? [{ command: cliCmd(`diff ${conflictSlug}`), description: "show what changed before choosing" }] : [],
+        { command: cliCmd("status") }
       ]);
     } else {
       log.blank();
-      log.info("Backups of any replaced skills are in each agent's .floom/backups/ folder (run floom restore --list to see them).");
-      printNext([{ command: "floom status" }]);
+      log.info(`Backups of any replaced skills are in each agent's .floom/backups/ folder (run ${cliCmd("restore --list")} to see them).`);
+      printNext([{ command: cliCmd("status") }]);
     }
     if (hasSkipped) process.exitCode = 1;
   } finally {
@@ -6233,15 +6321,15 @@ async function statusCommand(rawOpts = {}) {
   const detected = await detectAgents();
   if (detected.length === 0) {
     if (json) {
-      emitJson({ workspace: { name: "Library", signedIn: false, librarySkillCount: null }, complete: true, agents: [], skillsNeedingAttention: [], next: ["floom install <link>"] });
+      emitJson({ workspace: { name: "Library", signedIn: false, librarySkillCount: null }, complete: true, agents: [], skillsNeedingAttention: [], next: [cliCmd("install <link>")] });
     } else {
       log.info("No AI agents found on this machine.");
       log.blank();
       log.info("Floom looks for Claude, Codex, Cursor, Gemini, or OpenCode.");
-      log.info("Install one of those agents, then run floom status again.");
+      log.info(`Install one of those agents, then run ${cliCmd("status")} again.`);
       log.blank();
       log.info("If someone sent you a shared skill:");
-      log.command("floom install <link>");
+      log.command(cliCmd("install <link>"));
       log.blank();
       log.info("More help: https://floom.dev/docs#agents");
     }
@@ -6257,7 +6345,7 @@ async function statusCommand(rawOpts = {}) {
         complete: false,
         agents: detected.map((agent) => ({ name: agent, detected: true, state: null, error: null, summary: emptySummary(), copies: [] })),
         skillsNeedingAttention: [],
-        next: ["floom login"]
+        next: [cliCmd("login")]
       });
       process.exitCode = 1;
       return;
@@ -6271,7 +6359,7 @@ async function statusCommand(rawOpts = {}) {
     log.blank();
     log.info("Floom Library");
     log.info("  Not signed in \u2014 can't compare with your team Library.");
-    printNext([{ command: "floom login", description: "see and sync your Library" }]);
+    printNext([{ command: cliCmd("login"), description: "see and sync your Library" }]);
     return;
   }
   const me = await fetchMe().catch(() => null);
@@ -6327,7 +6415,7 @@ async function statusCommand(rawOpts = {}) {
         };
       }),
       skillsNeedingAttention: buildAttention(checks),
-      next: ["floom sync", "floom status --verbose"]
+      next: [cliCmd("sync"), cliCmd("status --verbose")]
     });
     process.exitCode = complete ? 0 : 1;
     return;
@@ -6343,8 +6431,8 @@ async function statusCommand(rawOpts = {}) {
       }
     }
     printNext([
-      { command: "floom push", description: "publish local changes" },
-      { command: "floom pull", description: "install Library updates" }
+      { command: cliCmd("push"), description: "publish local changes" },
+      { command: cliCmd("pull"), description: "install Library updates" }
     ]);
     return;
   }
@@ -6353,7 +6441,7 @@ async function statusCommand(rawOpts = {}) {
   if (attention.length === 0 && timedOut.length === 0) {
     log.blank();
     log.info(`All ${skillCount} skill${skillCount === 1 ? "" : "s"} are up to date in ${selectedAgents.map((a) => AGENT_LABELS[a]).join(", ")}.`);
-    printNext([{ command: "floom push", description: "if you just created a new skill locally" }]);
+    printNext([{ command: cliCmd("push"), description: "if you just created a new skill locally" }]);
     return;
   }
   log.heading("Skills needing attention");
@@ -6368,7 +6456,7 @@ async function statusCommand(rawOpts = {}) {
   }
   if (attention.length > shown.length) {
     log.blank();
-    log.info(`...and ${attention.length - shown.length} more \u2014 run floom status --verbose.`);
+    log.info(`...and ${attention.length - shown.length} more \u2014 run ${cliCmd("status --verbose")}.`);
   }
   const upToDate = checks.flatMap((c) => c.skills).filter((s) => s.state === "up_to_date").length;
   if (upToDate > 0) {
@@ -6379,15 +6467,15 @@ async function statusCommand(rawOpts = {}) {
   if (timedOut.length > 0) {
     log.blank();
     log.info("Status summary");
-    log.info(`  ${timedOut.length} agent${timedOut.length === 1 ? "" : "s"} timed out \u2014 run floom status --agent ${timedOut[0].agent} to retry.`);
+    log.info(`  ${timedOut.length} agent${timedOut.length === 1 ? "" : "s"} timed out \u2014 run ${cliCmd(`status --agent ${timedOut[0].agent}`)} to retry.`);
   }
   const hasLocalUnpublished = attention.some((a) => a.locations.some((l) => l.state === "not_in_library_never_published" || l.state === "local_changes"));
   const hasUpdates = attention.some((a) => a.locations.some((l) => l.state === "update_available"));
   const next = [];
-  if (hasLocalUnpublished && hasUpdates) next.push({ command: "floom sync", description: "review local changes and Library updates together" });
-  if (hasLocalUnpublished) next.push({ command: "floom push", description: "publish local skills to the Library" });
-  if (hasUpdates) next.push({ command: "floom pull", description: "install Library updates" });
-  next.push({ command: "floom status --verbose", description: "see every skill" });
+  if (hasLocalUnpublished && hasUpdates) next.push({ command: cliCmd("sync"), description: "review local changes and Library updates together" });
+  if (hasLocalUnpublished) next.push({ command: cliCmd("push"), description: "publish local skills to the Library" });
+  if (hasUpdates) next.push({ command: cliCmd("pull"), description: "install Library updates" });
+  next.push({ command: cliCmd("status --verbose"), description: "see every skill" });
   printNext(next);
   if (timedOut.length > 0) process.exitCode = 1;
 }
@@ -6482,7 +6570,7 @@ var MACHINE_FILE3 = join11(CONFIG_DIR3, "machine.json");
 async function renameDeviceCommand(newLabel) {
   const trimmed = (newLabel ?? "").trim().slice(0, 80);
   if (!trimmed) {
-    log.err('Device name cannot be empty. Use: floom rename-device "Work Laptop"');
+    log.err(`Device name cannot be empty. Use: ${cliCmd('rename-device "Work Laptop"')}`);
     process.exitCode = 2;
     return;
   }
@@ -6503,8 +6591,8 @@ async function renameDeviceCommand(newLabel) {
     log.blank();
     log.info("Server sync will happen after your next login.");
     printNext([
-      { command: "floom login", description: "sync the device name to your workspace" },
-      { command: "floom account", description: "see account details including device name" }
+      { command: cliCmd("login"), description: "sync the device name to your workspace" },
+      { command: cliCmd("account"), description: "see account details including device name" }
     ]);
     return;
   }
@@ -6521,7 +6609,7 @@ async function renameDeviceCommand(newLabel) {
   }
   log.blank();
   log.info("This name appears in your workspace when teammates look at which machine synced last.");
-  printNext([{ command: "floom account", description: "see account details including device name" }]);
+  printNext([{ command: cliCmd("account"), description: "see account details including device name" }]);
 }
 
 // src/commands/install.ts
@@ -6698,7 +6786,7 @@ async function installCommand(input, rawOpts = {}) {
   const detected = await detectAgents();
   if (detected.length === 0) {
     if (json) {
-      emitJson({ share: shareInfo(shareData), mode: "plan", applied: false, wouldMutate: false, hasSkipped: false, agents: [], next: ["floom install <link> --agent claude"] });
+      emitJson({ share: shareInfo(shareData), mode: "plan", applied: false, wouldMutate: false, hasSkipped: false, agents: [], next: [cliCmd("install <link> --agent claude")] });
     } else {
       log.heading("Shared skill");
       log.info(`  ${shareData.skill.title} ${shareData.skill.version.display}`);
@@ -6719,16 +6807,16 @@ async function installCommand(input, rawOpts = {}) {
   if (!planMode && selectedAgents.length === 0) {
     if (!isInteractive()) {
       if (json) {
-        emitJson({ share: shareInfo(shareData), error: "floom install needs to know where to install", next: ["floom install <link> --all-agents --yes"] });
+        emitJson({ share: shareInfo(shareData), error: `${cliCmd("install")} needs to know where to install`, next: [cliCmd("install <link> --all-agents --yes")] });
       } else {
-        log.err("floom install needs to know where to install.");
+        log.err(`${cliCmd("install")} needs to know where to install.`);
         log.blank();
         log.info("Pass --agent <name>, repeat --agent, or use --all-agents.");
         log.blank();
         log.info("Examples:");
-        log.command("floom install <link> --agent claude --yes");
-        log.command("floom install <link> --agent claude,codex --yes");
-        log.command("floom install <link> --all-agents --yes");
+        log.command(cliCmd("install <link> --agent claude --yes"));
+        log.command(cliCmd("install <link> --agent claude,codex --yes"));
+        log.command(cliCmd("install <link> --all-agents --yes"));
       }
       process.exitCode = 2;
       return;
@@ -6797,7 +6885,7 @@ async function installCommand(input, rawOpts = {}) {
         wouldMutate: planAgents.length > 0,
         hasSkipped: false,
         agents: planAgents,
-        next: ["floom install <link> --all-agents --yes"]
+        next: [cliCmd("install <link> --all-agents --yes")]
       });
     } else {
       log.heading("Install plan");
@@ -6858,7 +6946,7 @@ async function installCommand(input, rawOpts = {}) {
           backupPath: null,
           message: r.message
         })),
-        next: ["floom status"]
+        next: [cliCmd("status")]
       });
     } else {
       printNext([{ command: `Open your agent and ask it to use "${shareData.skill.title}".` }]);
@@ -6999,10 +7087,10 @@ async function newCommand(name, rawOpts = {}) {
   const json = flags.json;
   if (flags.allScopes) {
     if (json) {
-      emitJson({ skill: { slug: name, name: deriveTitle(name) }, mode: "plan", applied: false, wouldMutate: false, scope: null, path: null, action: "refused", reason: "needs_agent_choice", message: "floom new creates one skill in one location; --all-scopes does not apply.", next: [`floom new ${name} --agent claude`] });
+      emitJson({ skill: { slug: name, name: deriveTitle(name) }, mode: "plan", applied: false, wouldMutate: false, scope: null, path: null, action: "refused", reason: "needs_agent_choice", message: `${cliCmd("new")} creates one skill in one location; --all-scopes does not apply.`, next: [cliCmd(`new ${name} --agent claude`)] });
     } else {
-      log.err("floom new creates one skill in one location; --all-scopes does not apply.");
-      printNext([{ command: `floom new ${name} --agent claude` }]);
+      log.err(`${cliCmd("new")} creates one skill in one location; --all-scopes does not apply.`);
+      printNext([{ command: cliCmd(`new ${name} --agent claude`) }]);
     }
     process.exitCode = 2;
     return;
@@ -7015,7 +7103,7 @@ async function newCommand(name, rawOpts = {}) {
       log.blank();
       log.info("Skill names use lowercase letters, numbers, and hyphens only.");
       log.info("Use:");
-      log.command(`floom new ${name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "")}`);
+      log.command(cliCmd(`new ${name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "")}`));
     }
     process.exitCode = 2;
     return;
@@ -7032,8 +7120,8 @@ async function newCommand(name, rawOpts = {}) {
       log.info(`Floom will not create a nested skill inside ${tildePath(cwd)}.`);
       printNext([
         { command: "cd ~/.claude/skills" },
-        { command: `floom new ${name}` },
-        { command: `floom new ${name} --agent claude` }
+        { command: cliCmd(`new ${name}`) },
+        { command: cliCmd(`new ${name} --agent claude`) }
       ]);
     }
     process.exitCode = 2;
@@ -7066,7 +7154,7 @@ async function newCommand(name, rawOpts = {}) {
         usesScannedDir = false;
       } else if (!isInteractive() || json) {
         if (json) {
-          emitJson({ skill: { slug: name, name: title }, mode: "plan", applied: false, wouldMutate: true, scope: null, path: null, action: "refused", reason: "needs_agent_choice", message: "floom new needs to know where to create the skill. Pass --agent <name>.", next: [`floom new ${name} --agent ${detected[0]}`] });
+          emitJson({ skill: { slug: name, name: title }, mode: "plan", applied: false, wouldMutate: true, scope: null, path: null, action: "refused", reason: "needs_agent_choice", message: `${cliCmd("new")} needs to know where to create the skill. Pass --agent <name>.`, next: [cliCmd(`new ${name} --agent ${detected[0]}`)] });
           process.exitCode = 2;
           return;
         }
@@ -7075,8 +7163,8 @@ async function newCommand(name, rawOpts = {}) {
           scope = "global";
           usesScannedDir = true;
         } else {
-          log.err("floom new needs to know where to create the skill.");
-          printNext([{ command: `floom new ${name} --agent ${detected[0]}` }]);
+          log.err(`${cliCmd("new")} needs to know where to create the skill.`);
+          printNext([{ command: cliCmd(`new ${name} --agent ${detected[0]}`) }]);
           process.exitCode = 2;
           return;
         }
@@ -7109,7 +7197,7 @@ async function newCommand(name, rawOpts = {}) {
   }
   if (flags.dryRun || json && !flags.yes) {
     if (json) {
-      emitJson({ skill: { slug: name, name: title }, mode: "plan", applied: false, wouldMutate: true, scope, path: skillFolder, action: "create", reason: null, message: `${name} would be created`, next: [usesScannedDir ? "floom push" : `floom push ${skillFolder}`] });
+      emitJson({ skill: { slug: name, name: title }, mode: "plan", applied: false, wouldMutate: true, scope, path: skillFolder, action: "create", reason: null, message: `${name} would be created`, next: [usesScannedDir ? cliCmd("push") : cliCmd(`push ${skillFolder}`)] });
     } else {
       log.heading("Create plan");
       log.blank();
@@ -7130,7 +7218,7 @@ async function newCommand(name, rawOpts = {}) {
   await mkdir7(skillFolder, { recursive: true });
   await writeFile6(skillMd, skillTemplate(title));
   await writeFile6(join13(skillFolder, ".floomignore"), FLOOMIGNORE);
-  const pushCmd = usesScannedDir ? "floom push" : `floom push ${tildePath(skillFolder)}`;
+  const pushCmd = usesScannedDir ? cliCmd("push") : cliCmd(`push ${tildePath(skillFolder)}`);
   if (json) {
     emitJson({ skill: { slug: name, name: title }, mode: "apply", applied: true, scope, path: skillFolder, result: "created", reason: null, message: `Created ${skillFolder}`, next: [pushCmd] });
     return;
@@ -7141,7 +7229,7 @@ async function newCommand(name, rawOpts = {}) {
   if (!usesScannedDir) {
     log.blank();
     log.info("No AI agents were detected, so Floom created the skill in this folder.");
-    log.info("Zero-arg `floom push` will not find this folder until an agent is installed.");
+    log.info(`Zero-arg \`${cliCmd("push")}\` will not find this folder until an agent is installed.`);
     next.push({ command: `Edit ${tildePath(skillMd)}` });
   } else {
     next.push({ command: `Edit ${tildePath(skillMd)}` });
@@ -7202,20 +7290,20 @@ async function doctorCommand(opts = {}) {
   const auth = await readAuth();
   let authOk = false;
   if (!auth) {
-    checks.push({ name: "auth", status: "fail", message: "not signed in", fix: "floom login" });
+    checks.push({ name: "auth", status: "fail", message: "not signed in", fix: cliCmd("login") });
   } else {
     try {
       const me = await fetchMe();
       authOk = true;
       checks.push({ name: "auth", status: "pass", message: `signed in as ${me.user.email}`, fix: null });
     } catch {
-      checks.push({ name: "auth", status: "fail", message: "session expired", fix: "floom login" });
+      checks.push({ name: "auth", status: "fail", message: "session expired", fix: cliCmd("login") });
     }
   }
   if (authOk) {
     checks.push({ name: "api", status: "pass", message: "https://floom.dev reachable", fix: null });
   } else {
-    checks.push({ name: "api", status: "warn", message: "skipped \u2014 sign in first", fix: "floom login" });
+    checks.push({ name: "api", status: "warn", message: "skipped \u2014 sign in first", fix: cliCmd("login") });
   }
   const agents = await detectAgents();
   if (agents.length === 0) {
@@ -7238,7 +7326,7 @@ async function doctorCommand(opts = {}) {
     }
   }
   if (manifestCorrupt && corruptAgent) {
-    const fix = authOk ? `floom sync --dry-run --agent ${corruptAgent}` : "floom login";
+    const fix = authOk ? cliCmd(`sync --dry-run --agent ${corruptAgent}`) : cliCmd("login");
     checks.push({
       name: "manifests",
       status: "fail",
@@ -7273,7 +7361,7 @@ async function doctorCommand(opts = {}) {
       name: "backups",
       status: "warn",
       message: `${formatBytes(backupBytes)} across detected agents`,
-      fix: "floom restore --list"
+      fix: cliCmd("restore --list")
     });
   } else {
     checks.push({ name: "backups", status: "pass", message: `${formatBytes(backupBytes)} across ${agents.length} agent${agents.length === 1 ? "" : "s"}`, fix: null });
@@ -7293,7 +7381,7 @@ async function doctorCommand(opts = {}) {
     emitJson({
       ok,
       checks,
-      next: failures.length > 0 ? failures.map((c) => c.fix).filter((f) => Boolean(f)) : ["floom status"]
+      next: failures.length > 0 ? failures.map((c) => c.fix).filter((f) => Boolean(f)) : [cliCmd("status")]
     });
     process.exitCode = ok ? 0 : 1;
     return;
@@ -7323,13 +7411,13 @@ async function doctorCommand(opts = {}) {
     if (authFail && manifestCorrupt) {
       log.blank();
       log.info("Fix in this order:");
-      log.command("floom login");
-      if (corruptAgent) log.command(`floom sync --dry-run --agent ${corruptAgent}`);
+      log.command(cliCmd("login"));
+      if (corruptAgent) log.command(cliCmd(`sync --dry-run --agent ${corruptAgent}`));
     } else {
-      printNext(failures.map((c) => ({ command: c.fix ?? "floom status" })));
+      printNext(failures.map((c) => ({ command: c.fix ?? cliCmd("status") })));
     }
   } else {
-    printNext([{ command: "floom status" }]);
+    printNext([{ command: cliCmd("status") }]);
   }
   process.exitCode = ok ? 0 : 1;
 }
@@ -7438,7 +7526,7 @@ async function diffCommand(skill, opts = {}) {
             lastSyncedHash: null,
             files: files.map((f) => ({ path: f, status: "added", binary: false }))
           }],
-          next: [`floom push ${copy.path}`]
+          next: [cliCmd(`push ${copy.path}`)]
         });
         return;
       }
@@ -7450,7 +7538,7 @@ async function diffCommand(skill, opts = {}) {
       log.blank();
       log.info("Baseline: empty");
       log.info(`Local copy: ${tildePath(copy.path)}`);
-      printNext([{ command: `floom push ${tildePath(copy.path)}`, description: `publish ${skill} as v1` }]);
+      printNext([{ command: cliCmd(`push ${tildePath(copy.path)}`), description: `publish ${skill} as v1` }]);
       return;
     }
     const localHash = await skillContentHash(copy.path) ?? "";
@@ -7469,7 +7557,7 @@ async function diffCommand(skill, opts = {}) {
           lastSyncedHash: entry.hash,
           files: []
         }],
-        next: ["floom status"]
+        next: [cliCmd("status")]
       });
       return;
     }
@@ -7479,17 +7567,17 @@ async function diffCommand(skill, opts = {}) {
     log.info(`Last synced at v${entry.version_seq}.`);
     log.info(`Local copy: ${tildePath(copy.path)}`);
     log.blank();
-    log.info("Run floom status when back online for a full file-by-file comparison.");
-    printNext([{ command: "floom status" }]);
+    log.info(`Run ${cliCmd("status")} when back online for a full file-by-file comparison.`);
+    printNext([{ command: cliCmd("status") }]);
     return;
   }
   if (copies.length === 0) {
     if (json) {
-      emitJson({ skill, agent: agentArg ?? null, source: "library", library: { available: libraryAvailable, version: libraryVersion, hash: null }, agents: [], next: libraryAvailable ? ["floom pull"] : [] });
+      emitJson({ skill, agent: agentArg ?? null, source: "library", library: { available: libraryAvailable, version: libraryVersion, hash: null }, agents: [], next: libraryAvailable ? [cliCmd("pull")] : [] });
     } else {
       log.info(`No local copy of ${skill} found on this machine.`);
       if (libraryAvailable) {
-        printNext([{ command: "floom pull", description: `install ${skill} from the Library` }]);
+        printNext([{ command: cliCmd("pull"), description: `install ${skill} from the Library` }]);
       } else {
         log.err(`${skill} is not in the Library and has no local copy.`);
       }
@@ -7545,7 +7633,7 @@ async function diffCommand(skill, opts = {}) {
       source: libraryAvailable ? "library" : "last_synced_manifest",
       library: { available: libraryAvailable, version: libraryVersion, hash: null },
       agents: agentResults,
-      next: ["floom status"]
+      next: [cliCmd("status")]
     });
     return;
   }
@@ -7574,10 +7662,10 @@ async function diffCommand(skill, opts = {}) {
   const conflict = agentResults.find((r) => r.state === "changed_in_two_places");
   const next = [];
   if (conflict) {
-    next.push({ command: `floom pull ${skill} --agent ${conflict.agent}${conflict.scope === "project" ? " --project" : ""}`, description: "use the Library version (your local copy is backed up first)" });
-    next.push({ command: `floom push ${tildePath(conflict.path)}`, description: "publish your local version" });
+    next.push({ command: cliCmd(`pull ${skill} --agent ${conflict.agent}${conflict.scope === "project" ? " --project" : ""}`), description: "use the Library version (your local copy is backed up first)" });
+    next.push({ command: cliCmd(`push ${tildePath(conflict.path)}`), description: "publish your local version" });
   } else {
-    next.push({ command: "floom status" });
+    next.push({ command: cliCmd("status") });
   }
   printNext(next);
   void sep6;
@@ -7671,7 +7759,7 @@ async function restoreCommand(skill, opts = {}) {
         wouldMutate: false,
         selectedBackup: null,
         message: `${all.length} backups available`,
-        next: skill ? [`floom restore ${skill} --agent ${detected[0] ?? "claude"}`] : []
+        next: skill ? [cliCmd(`restore ${skill} --agent ${detected[0] ?? "claude"}`)] : []
       });
       return;
     }
@@ -7693,12 +7781,12 @@ async function restoreCommand(skill, opts = {}) {
       log.info(`    ${b.skill.padEnd(16)}${b.timestamp.padEnd(24)}${tildePath(b.path)}`);
     }
     if (all[0]) {
-      printNext([{ command: `floom restore ${all[0].skill} --agent ${all[0].agent}` }]);
+      printNext([{ command: cliCmd(`restore ${all[0].skill} --agent ${all[0].agent}`) }]);
     }
     return;
   }
   if (!skill) {
-    if (!json) log.err("floom restore needs a skill name, or use floom restore --list to see backups.");
+    if (!json) log.err(`${cliCmd("restore")} needs a skill name, or use ${cliCmd("restore --list")} to see backups.`);
     process.exitCode = 2;
     return;
   }
@@ -7716,10 +7804,10 @@ async function restoreCommand(skill, opts = {}) {
   const backups = (await listBackups(searchAgents)).filter((b) => b.skill === skill);
   if (backups.length === 0) {
     if (json) {
-      emitJson({ mode: "plan", applied: false, skill: { slug: skill }, agent, scope: null, availableBackups: [], wouldMutate: false, selectedBackup: null, message: `No backups found for ${skill}.`, next: ["floom restore --list"] });
+      emitJson({ mode: "plan", applied: false, skill: { slug: skill }, agent, scope: null, availableBackups: [], wouldMutate: false, selectedBackup: null, message: `No backups found for ${skill}.`, next: [cliCmd("restore --list")] });
     } else {
       log.err(`No backups found for ${skill}.`);
-      printNext([{ command: "floom restore --list" }]);
+      printNext([{ command: cliCmd("restore --list") }]);
     }
     process.exitCode = 2;
     return;
@@ -7744,7 +7832,7 @@ async function restoreCommand(skill, opts = {}) {
     }
   }
   if (opts.yes && !opts.dryRun && !agentArg && !isInteractive()) {
-    if (!json) log.err("floom restore needs --agent <name> --backup <timestamp> --yes for non-interactive restore.");
+    if (!json) log.err(`${cliCmd("restore")} needs --agent <name> --backup <timestamp> --yes for non-interactive restore.`);
     process.exitCode = 2;
     return;
   }
@@ -7764,7 +7852,7 @@ async function restoreCommand(skill, opts = {}) {
         wouldMutate: true,
         selectedBackup: selected?.timestamp ?? null,
         message: `${skill} would be restored from ${chosen.timestamp}`,
-        next: [`floom restore ${skill} --agent ${agent} --backup ${chosen.timestamp} --yes`]
+        next: [cliCmd(`restore ${skill} --agent ${agent} --backup ${chosen.timestamp} --yes`)]
       });
     } else {
       log.heading("Restore plan");
@@ -7794,8 +7882,8 @@ async function restoreCommand(skill, opts = {}) {
       }
       selected = agentBackups[choice - 1];
     } else {
-      log.err(`floom restore needs a backup timestamp. Pass --backup <timestamp>, or run interactively.`);
-      log.info("Run floom restore --list to see available backups.");
+      log.err(`${cliCmd("restore")} needs a backup timestamp. Pass --backup <timestamp>, or run interactively.`);
+      log.info(`Run ${cliCmd("restore --list")} to see available backups.`);
       process.exitCode = 2;
       return;
     }
@@ -7839,15 +7927,15 @@ async function restoreCommand(skill, opts = {}) {
         preRestoreBackupPath: preRestoreBackup,
         result: "restored",
         message: `Restored ${skill} from ${selected.timestamp}`,
-        next: [`floom status --agent ${agent}`]
+        next: [cliCmd(`status --agent ${agent}`)]
       });
       return;
     }
     log.ok(`Restored ${skill} from ${selected.timestamp}`);
-    printNext([{ command: `floom status --agent ${agent}` }]);
+    printNext([{ command: cliCmd(`status --agent ${agent}`) }]);
   } catch (error) {
     if (json) {
-      emitJson({ mode: "apply", applied: true, skill: { slug: skill }, agent, scope: selected.scope, backup: selected.timestamp, preRestoreBackupPath: null, result: "failed", message: error.message, next: ["floom restore --list"] });
+      emitJson({ mode: "apply", applied: true, skill: { slug: skill }, agent, scope: selected.scope, backup: selected.timestamp, preRestoreBackupPath: null, result: "failed", message: error.message, next: [cliCmd("restore --list")] });
     } else {
       log.err(error.message);
     }
@@ -7873,7 +7961,7 @@ async function dashboardCommand() {
     }
     log.blank();
     log.info("Not signed in \u2014 can't compare with your team Library.");
-    printNext([{ command: "floom login", description: "sign in to see and sync your Library" }]);
+    printNext([{ command: cliCmd("login"), description: "sign in to see and sync your Library" }]);
     return;
   }
   const me = await fetchMe().catch(() => null);
@@ -7943,17 +8031,17 @@ async function dashboardCommand() {
   }
   const next = [];
   if (anyLocalChanges && anyUpdates) {
-    next.push({ command: "floom sync", description: "review local changes and Library updates together" });
-    next.push({ command: "floom push", description: "publish local skills to the Library" });
-    next.push({ command: "floom pull", description: "update agent copies from the Library" });
+    next.push({ command: cliCmd("sync"), description: "review local changes and Library updates together" });
+    next.push({ command: cliCmd("push"), description: "publish local skills to the Library" });
+    next.push({ command: cliCmd("pull"), description: "update agent copies from the Library" });
   } else if (anyUpdates) {
-    next.push({ command: "floom pull", description: "update agent copies from the Library" });
+    next.push({ command: cliCmd("pull"), description: "update agent copies from the Library" });
   } else if (anyLocalChanges) {
-    next.push({ command: "floom push", description: "publish local skills to the Library" });
+    next.push({ command: cliCmd("push"), description: "publish local skills to the Library" });
   } else if (!libResult.ok) {
-    next.push({ command: "floom status", description: "retry full comparison" });
+    next.push({ command: cliCmd("status"), description: "retry full comparison" });
   }
-  next.push({ command: "floom status", description: "see full detail" });
+  next.push({ command: cliCmd("status"), description: "see full detail" });
   printNext(next);
   void [];
 }