@floomhq/floom 1.0.13 → 1.0.16

package/dist/cli.js

@@ -3,7 +3,7 @@ import updateNotifier from "update-notifier";
 import { login } from "./login.js";
 import { publish } from "./publish.js";
 import { whoami } from "./whoami.js";
-import { init } from "./init.js";
+import { init, INIT_TEMPLATES } from "./init.js";
 import { deleteConfig, readConfig } from "./config.js";
 import { list } from "./list.js";
 import { install } from "./install.js";
@@ -22,6 +22,7 @@ import { printError, FloomError } from "./errors.js";
 import { CLI_VERSION } from "./version.js";
 const PKG = { name: "@floomhq/floom", version: CLI_VERSION };
 const V1_NOT_AVAILABLE = "Not available in Floom Version 1.";
+const CLI_COMMAND = "npx -y @floomhq/floom";
 function usage() {
     const out = `
  ${c.blue("  ________                      ")}
@@ -30,22 +31,22 @@ function usage() {
  ${c.blue("/ __/ / / /_/ / /_/ / / / / / / ")}
  ${c.blue("/_/   /_/\\____/\\____/_/ /_/ /_/  ")}
 
- ${c.bold("Floom lets you share AI workflows with anyone.")}
+ ${c.bold("Floom syncs your AI skills across agents and machines.")}
  ${c.dim("A skill is reusable knowledge, instructions, or a workflow for your AI agent.")}
  ${c.dim("Examples: brand voice, PR review checklist, sales research workflow.")}
 
- ${c.bold("You installed Floom. Copy one recipe:")}
+ ${c.bold("Start with one command:")}
 
  ${c.bold("1. I received a Floom link")}
     ${c.dim("Replace <skill-link> with the full Floom URL someone sent you:")}
     ${c.cyan("npx -y @floomhq/floom add")} ${c.dim("<skill-link> --setup")}
     ${c.dim('Then tell Claude Code: "Use my Floom skills when they fit this task."')}
 
- ${c.bold("2. I want to make a share link")}
-    ${c.cyan("npx -y @floomhq/floom init")} ${c.dim("my-skill.md --template brand-voice")}
-    ${c.dim("Write what your agent needs to know or do in my-skill.md.")}
+ ${c.bold("2. I want my own synced skill library")}
+    ${c.cyan("npx -y @floomhq/floom init")} ${c.dim("my-skill")}
+    ${c.dim("Write what your agent needs to know or do in my-skill/SKILL.md.")}
     ${c.cyan("npx -y @floomhq/floom login")}
-    ${c.cyan("npx -y @floomhq/floom publish")} ${c.dim("my-skill.md --public")}
+    ${c.cyan("npx -y @floomhq/floom publish")} ${c.dim("my-skill --public")}
     ${c.dim("Floom scans it, prints a link, and copies the link when possible.")}
 
  ${c.bold("Good to know")}
@@ -55,8 +56,7 @@ function usage() {
 
  ${c.bold("Stuck?")}
     ${c.cyan("npx -y @floomhq/floom doctor")}        ${c.dim("Find the problem")}
-    ${c.cyan("npx -y @floomhq/floom scan my-skill.md")} ${c.dim("Check a file before publishing")}
-    ${c.cyan("npx -y @floomhq/floom init my-skill.md --template support")} ${c.dim("Start from an example")}
+    ${c.cyan("npx -y @floomhq/floom scan my-skill")} ${c.dim("Check a skill before publishing")}
     ${c.cyan("npx -y @floomhq/floom commands")}      ${c.dim("See every command")}
     ${c.dim("Step-by-step guide")}                   https://floom.dev/docs/getting-started
 `;
@@ -64,16 +64,14 @@ function usage() {
 }
 function commandUsage() {
     const out = `
- ${c.bold("Usage:")} ${c.cyan("npx -y @floomhq/floom")} ${c.dim("<command> [args]")}
- ${c.dim("Global install binary:")} ${c.cyan("floom-skills")} ${c.dim("<command> [args]")}
+ ${c.bold("Usage:")} ${c.cyan("npx -y @floomhq/floom")} ${c.dim("<command> [flags]")}
+ ${c.dim("After global install:")} ${c.cyan("floom")} ${c.dim("<command> [flags]")}
 
  ${c.bold("Commands")}
    ${c.dim("Skills")}
      ${c.cyan("add")} ${c.dim("<url>")}          Install a skill into the local agent skills folder
                        ${c.dim("Alias: install")}
-                       ${c.dim("Flags: --target claude|codex (default: claude), --setup, --force, --update, --json")}
-     ${c.cyan("update")} ${c.dim("<url>")}       Install the latest remote skill content, replacing the local copy
-                       ${c.dim("Alias: add --force")}
+                       ${c.dim("Flags: --target claude|codex (default: claude), --setup, --force")}
      ${c.cyan("search")} ${c.dim("<query>")}     Find public skills and libraries
      ${c.cyan("info")} ${c.dim("<url>")}         Show skill metadata
 
@@ -83,8 +81,7 @@ function commandUsage() {
      ${c.cyan("scan")} ${c.dim("<path>")}        Check for secrets, injection, exfiltration
      ${c.cyan("publish")} ${c.dim("<path>")}     Scan, publish, and print a share link
                        ${c.dim("Flags: --public, --private, --type knowledge|instruction|workflow|skill")}
-                       ${c.dim("       --skill-version <label>, --share <email>")}
-                       ${c.dim("       --share emails the normal link; no account is needed to add it")}
+                       ${c.dim("       --skill-version <label>")}
      ${c.cyan("share")} ${c.dim("<slug>")}       Email-share one of your skills
                        ${c.dim("Flags: --add <email>, --remove <email>, --list")}
 
@@ -99,13 +96,9 @@ function commandUsage() {
    ${c.dim("Agent setup")}
      ${c.cyan("setup")}              Configure Claude Code or Codex instructions
                        ${c.dim("Alias: connect")}
-                       ${c.dim("Flags: --target claude|codex, --yes, --dry-run, --file <path>")}
-                       ${c.dim("       From a repo, setup writes that repo's CLAUDE.md/AGENTS.md")}
-     ${c.cyan("agent-prompt")}       Print the sentence to paste into your agent
-                       ${c.dim("Alias: paste")}
-                       ${c.dim("Flags: --target claude|codex")}
+                       ${c.dim("Flags: --target claude|codex, --yes, --dry-run")}
      ${c.cyan("doctor")}             Troubleshoot auth, API, and local folders
-                       ${c.dim("Flags: --target claude|codex, --json")}
+                       ${c.dim("Flags: --target claude|codex (default: claude)")}
 
    ${c.dim("Advanced")}
      ${c.cyan("library")}            Create, browse, and subscribe to libraries
@@ -113,14 +106,12 @@ function commandUsage() {
      ${c.cyan("move")} ${c.dim("<slug> --folder <path>")}  Place a saved skill in a local folder
      ${c.cyan("mcp")}                Print optional MCP setup guidance
      ${c.cyan("sync")}               Preview pull of published, saved, and library skills
-                       ${c.dim("Flags: --target claude|codex")}
+                       ${c.dim("Flags: --target claude|codex (default: claude)")}
      ${c.cyan("watch")}              Preview polling sync loop
-                       ${c.dim("Flags: --target claude|codex, --interval <seconds>")}
 
  ${c.bold("Examples")}
    ${c.cyan("npx -y @floomhq/floom add")} ${c.dim("https://floom.dev/s/ffas93ud --setup")}
-   ${c.cyan("npx -y @floomhq/floom publish")} ${c.dim("support-tone.md --type instruction --public")}
-   ${c.cyan("npx -y @floomhq/floom publish")} ${c.dim("support-tone.md --share teammate@example.com")}
+   ${c.cyan("npx -y @floomhq/floom publish")} ${c.dim("support-tone --type instruction --public")}
    ${c.cyan("npx -y @floomhq/floom setup")} ${c.dim("--target claude --yes")}
 
  ${c.bold("Help")}
@@ -133,8 +124,6 @@ function commandUsage() {
     process.stdout.write(out);
 }
 const ASSET_TYPES = new Set(["knowledge", "instruction", "workflow", "skill"]);
-const INIT_TEMPLATES = new Set(["generic", "brand-voice", "pr-review", "sales", "support", "onboarding"]);
-const MAX_SHARE_RECIPIENTS = 25;
 const INSTALL_TARGETS = new Set([
     "claude_skill",
     "memory",
@@ -155,7 +144,7 @@ function readFlagValue(argv, index, flag) {
     return { value, nextIndex: index + 1 };
 }
 function parseFlags(argv) {
-    const out = { visibility: "unlisted", update: false, shareEmails: [], explicitVisibility: false, rest: [] };
+    const out = { visibility: "unlisted", update: false, rest: [] };
     let visibilityFlag = null;
     for (let i = 0; i < argv.length; i++) {
         const a = argv[i] ?? "";
@@ -166,15 +155,12 @@ function parseFlags(argv) {
             }
             visibilityFlag = nextVisibility;
             out.visibility = nextVisibility;
-            out.explicitVisibility = true;
         }
         else if (a === "--update") {
-            throw new FloomError("Publish updates are not available in Floom Version 1.", "Publish as a new skill for now. Use `npx -y @floomhq/floom update <link>` to refresh installed local copies.");
+            throw new FloomError(V1_NOT_AVAILABLE, `\`${CLI_COMMAND} publish --update\` is planned for a later Floom release.`);
         }
         else if (a === "--share" || a.startsWith("--share=")) {
-            const { value, nextIndex } = readFlagValue(argv, i, "--share");
-            out.shareEmails.push(...parseEmailList(value, "--share"));
-            i = nextIndex;
+            throw new FloomError(V1_NOT_AVAILABLE, `\`${CLI_COMMAND} publish --share\` is planned for a later Floom release.`);
         }
         else if (a === "--type" || a.startsWith("--type=")) {
             const { value, nextIndex } = readFlagValue(argv, i, "--type");
@@ -204,36 +190,13 @@ function parseFlags(argv) {
             throw new FloomError("`--version` prints the Floom CLI version at the top level.", "For skill version labels, use `--skill-version <label>`.");
         }
         else if (a.startsWith("--")) {
-            throw new FloomError(`Unknown flag: ${a}`, "Try `npx -y @floomhq/floom publish skill.md --type instruction --public`.");
+            throw new FloomError(`Unknown flag: ${a}`, `Try \`${CLI_COMMAND} publish my-skill --type instruction --public\`.`);
         }
         else
             out.rest.push(a);
     }
-    if (out.shareEmails.length > 0) {
-        out.shareEmails = dedupeEmails(out.shareEmails);
-        if (out.shareEmails.length > MAX_SHARE_RECIPIENTS) {
-            throw new FloomError("Too many --share recipients.", `Use ${MAX_SHARE_RECIPIENTS} email addresses or fewer.`);
-        }
-        if (out.visibility === "private") {
-            throw new FloomError("`--private --share` would email a link recipients cannot open.", "Use `--unlisted --share` for invite emails, or `npx -y @floomhq/floom share <slug> --add <email>` for email-gated access after publishing.");
-        }
-    }
     return out;
 }
-function parseEmailList(value, source) {
-    const emails = value.split(",").map((email) => email.trim().toLowerCase()).filter(Boolean);
-    if (emails.length === 0)
-        throw new FloomError(`Missing value for ${source}.`, `Try \`${source} teammate@example.com\`.`);
-    for (const email of emails) {
-        if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
-            throw new FloomError(`Invalid email for ${source}: ${email}`, "Use an address like teammate@example.com.");
-        }
-    }
-    return emails;
-}
-function dedupeEmails(emails) {
-    return [...new Set(emails)];
-}
 function parseShareFlags(argv) {
     const out = { list: false, add: [], remove: [] };
     for (let i = 0; i < argv.length; i++) {
@@ -252,48 +215,48 @@ function parseShareFlags(argv) {
             i = nextIndex;
         }
         else if (a.startsWith("--")) {
-            throw new FloomError(`Unknown flag: ${a}`, "Try `npx -y @floomhq/floom share <slug> --add person@example.com`.");
+            throw new FloomError(`Unknown flag: ${a}`, `Try \`${CLI_COMMAND} share <slug> --add person@example.com\`.`);
         }
         else if (!out.slug) {
             out.slug = a;
         }
         else {
-            throw new FloomError(`Unexpected argument: ${a}`, "Try `npx -y @floomhq/floom share <slug> --add person@example.com`.");
+            throw new FloomError(`Unexpected argument: ${a}`, `Try \`${CLI_COMMAND} share <slug> --add person@example.com\`.`);
         }
     }
     if (!out.slug)
-        throw new FloomError("Missing skill slug.", "Try `npx -y @floomhq/floom share <slug> --add person@example.com`.");
+        throw new FloomError("Missing skill slug.", `Try \`${CLI_COMMAND} share <slug> --add person@example.com\`.`);
     if (out.list && (out.add.length > 0 || out.remove.length > 0)) {
         throw new FloomError("Conflicting share flags.", "Use --list by itself, or use --add/--remove.");
     }
     if (!out.list && out.add.length === 0 && out.remove.length === 0) {
-        throw new FloomError("Missing share action.", "Try `npx -y @floomhq/floom share <slug> --add person@example.com`.");
+        throw new FloomError("Missing share action.", `Try \`${CLI_COMMAND} share <slug> --add person@example.com\`.`);
     }
     return out;
 }
 function parseInitArgs(argv) {
     let file;
-    let template = "generic";
+    let template;
     for (let i = 0; i < argv.length; i++) {
         const a = argv[i] ?? "";
         if (a === "--template" || a.startsWith("--template=")) {
             const { value, nextIndex } = readFlagValue(argv, i, "--template");
-            if (!INIT_TEMPLATES.has(value)) {
-                throw new FloomError(`Invalid --template: ${value}`, "Use one of: generic, brand-voice, pr-review, sales, support, onboarding.");
+            if (!INIT_TEMPLATES.includes(value)) {
+                throw new FloomError(`Invalid --template: ${value}`, `Use one of: ${INIT_TEMPLATES.join(", ")}.`);
             }
             template = value;
             i = nextIndex;
             continue;
         }
         if (a.startsWith("--")) {
-            throw new FloomError(`Unknown flag: ${a}`, "Try `npx -y @floomhq/floom init skill.md --template brand-voice`.");
+            throw new FloomError(`Unknown flag: ${a}`, `Try \`${CLI_COMMAND} init my-skill\`.`);
         }
         if (file) {
-            throw new FloomError(`Unexpected argument: ${a}`, "Try `npx -y @floomhq/floom init skill.md`.");
+            throw new FloomError(`Unexpected argument: ${a}`, `Try \`${CLI_COMMAND} init my-skill\`.`);
         }
         file = a;
     }
-    return file ? { file, template } : { template };
+    return { ...(file ? { file } : {}), ...(template ? { template } : {}) };
 }
 function parseListFlags(argv) {
     const out = { json: false };
@@ -301,10 +264,31 @@ function parseListFlags(argv) {
         if (a === "--json")
             out.json = true;
         else if (a.startsWith("--")) {
-            throw new FloomError(`Unknown flag: ${a}`, "Try `npx -y @floomhq/floom list --help` for usage.");
+            throw new FloomError(`Unknown flag: ${a}`, `Try \`${CLI_COMMAND} list --help\` for usage.`);
+        }
+        else {
+            throw new FloomError(`Unexpected argument: ${a}`, `Try \`${CLI_COMMAND} list --json\`.`);
+        }
+    }
+    return out;
+}
+function parseSyncFlags(argv) {
+    const out = {};
+    for (let i = 0; i < argv.length; i++) {
+        const a = argv[i] ?? "";
+        if (a === "--target" || a.startsWith("--target=")) {
+            const { value, nextIndex } = readFlagValue(argv, i, "--target");
+            if (value !== "claude" && value !== "codex") {
+                throw new FloomError("Invalid --target.", "Use claude or codex.");
+            }
+            out.target = value;
+            i = nextIndex;
+        }
+        else if (a.startsWith("--")) {
+            throw new FloomError(`Unknown flag: ${a}`, `Try \`${CLI_COMMAND} sync --target claude\`.`);
         }
         else {
-            throw new FloomError(`Unexpected argument: ${a}`, "Try `npx -y @floomhq/floom list --json`.");
+            throw new FloomError(`Unexpected argument: ${a}`, `Try \`${CLI_COMMAND} sync --target claude\`.`);
         }
     }
     return out;
@@ -315,11 +299,11 @@ function parseInfoFlags(argv) {
         if (a === "--json")
             out.json = true;
         else if (a.startsWith("--"))
-            throw new FloomError(`Unknown flag: ${a}`, "Try `npx -y @floomhq/floom info <slug> --json`.");
+            throw new FloomError(`Unknown flag: ${a}`, `Try \`${CLI_COMMAND} info <slug> --json\`.`);
         else if (!out.slug)
             out.slug = a;
         else
-            throw new FloomError(`Unexpected argument: ${a}`, "Try `npx -y @floomhq/floom info <slug> --json`.");
+            throw new FloomError(`Unexpected argument: ${a}`, `Try \`${CLI_COMMAND} info <slug> --json\`.`);
     }
     return out;
 }
@@ -328,7 +312,6 @@ function parseAddArgs(argv) {
     let target;
     let setup = false;
     let force = false;
-    let json = false;
     for (let i = 0; i < argv.length; i++) {
         const a = argv[i] ?? "";
         if (a === "--target" || a.startsWith("--target=")) {
@@ -342,73 +325,22 @@ function parseAddArgs(argv) {
         else if (a === "--setup") {
             setup = true;
         }
-        else if (a === "--json") {
-            json = true;
-        }
-        else if (a === "--force" || a === "--update") {
+        else if (a === "--force") {
             force = true;
         }
         else if (a.startsWith("--")) {
-            throw new FloomError(`Unknown flag: ${a}`, "Try `npx -y @floomhq/floom add <url-or-slug> --setup`.");
+            throw new FloomError(`Unknown flag: ${a}`, `Try \`${CLI_COMMAND} add <url-or-slug> --setup\`.`);
         }
         else if (slug) {
-            throw new FloomError(`Unexpected argument: ${a}`, "Try `npx -y @floomhq/floom add <url-or-slug> --setup`.");
+            throw new FloomError(`Unexpected argument: ${a}`, `Try \`${CLI_COMMAND} add <url-or-slug> --setup\`.`);
         }
         else
             slug = a;
     }
     if (!slug) {
-        throw new FloomError("Missing skill slug.", "Try: `npx -y @floomhq/floom add <url-or-slug> --setup`");
-    }
-    if (json && setup) {
-        throw new FloomError("Conflicting add flags.", "Use `--json` for machine output or `--setup` for interactive agent setup.");
-    }
-    return target ? { slug, target, setup, force, json } : { slug, setup, force, json };
-}
-function parseTargetFlag(value) {
-    if (value !== "claude" && value !== "codex") {
-        throw new FloomError("Invalid --target.", "Use `claude` or `codex`.");
-    }
-    return value;
-}
-function parseDoctorArgs(argv) {
-    const out = { json: false };
-    for (let i = 0; i < argv.length; i++) {
-        const a = argv[i] ?? "";
-        if (a === "--json")
-            out.json = true;
-        else if (a === "--target" || a.startsWith("--target=")) {
-            const { value, nextIndex } = readFlagValue(argv, i, "--target");
-            out.target = parseTargetFlag(value);
-            i = nextIndex;
-        }
-        else if (a.startsWith("--"))
-            throw new FloomError(`Unknown flag: ${a}`, "Try `npx -y @floomhq/floom doctor --target codex --json`.");
-        else
-            throw new FloomError(`Unexpected argument: ${a}`, "Try `npx -y @floomhq/floom doctor --target codex --json`.");
-    }
-    return out;
-}
-function parseAgentPromptArgs(argv) {
-    const out = {};
-    for (let i = 0; i < argv.length; i++) {
-        const a = argv[i] ?? "";
-        if (a === "--target" || a.startsWith("--target=")) {
-            const { value, nextIndex } = readFlagValue(argv, i, "--target");
-            if (value !== "claude" && value !== "codex") {
-                throw new FloomError("Invalid --target.", "Use `claude` or `codex`.");
-            }
-            out.target = value;
-            i = nextIndex;
-        }
-        else if (a.startsWith("--")) {
-            throw new FloomError(`Unknown flag: ${a}`, "Try `npx -y @floomhq/floom agent-prompt --target codex`.");
-        }
-        else {
-            throw new FloomError(`Unexpected argument: ${a}`, "Try `npx -y @floomhq/floom agent-prompt --target codex`.");
-        }
+        throw new FloomError("Missing skill slug.", `Try: \`${CLI_COMMAND} add <url-or-slug> --setup\``);
     }
-    return out;
+    return target ? { slug, target, setup, force } : { slug, setup, force };
 }
 function parseSearchFlags(argv) {
     const out = { json: false };
@@ -431,7 +363,7 @@ function parseSearchFlags(argv) {
             i = nextIndex;
         }
         else if (a.startsWith("--")) {
-            throw new FloomError(`Unknown flag: ${a}`, "Try `npx -y @floomhq/floom search \"support tone\" --type instruction`.");
+            throw new FloomError(`Unknown flag: ${a}`, `Try \`${CLI_COMMAND} search "support tone" --type instruction\`.`);
         }
         else {
             terms.push(a);
@@ -446,11 +378,11 @@ function parseDeleteFlags(argv) {
         if (a === "--yes" || a === "-y")
             out.yes = true;
         else if (a.startsWith("--"))
-            throw new FloomError(`Unknown flag: ${a}`, "Try `npx -y @floomhq/floom delete <slug> --yes`.");
+            throw new FloomError(`Unknown flag: ${a}`, `Try \`${CLI_COMMAND} delete <slug> --yes\`.`);
         else if (!out.slug)
             out.slug = a;
         else
-            throw new FloomError(`Unexpected argument: ${a}`, "Try `npx -y @floomhq/floom delete <slug> --yes`.");
+            throw new FloomError(`Unexpected argument: ${a}`, `Try \`${CLI_COMMAND} delete <slug> --yes\`.`);
     }
     return out;
 }
@@ -484,12 +416,33 @@ function parseSetupFlags(argv) {
             i = nextIndex;
         }
         else if (a.startsWith("--")) {
-            throw new FloomError(`Unknown flag: ${a}`, "Try `npx -y @floomhq/floom setup --target codex --dry-run`.");
+            throw new FloomError(`Unknown flag: ${a}`, `Try \`${CLI_COMMAND} setup --target codex --dry-run\`.`);
         }
         else if (!out.file)
             out.file = a;
         else
-            throw new FloomError(`Unexpected argument: ${a}`, "Try `npx -y @floomhq/floom setup --target claude --yes`.");
+            throw new FloomError(`Unexpected argument: ${a}`, `Try \`${CLI_COMMAND} setup --target claude --yes\`.`);
+    }
+    return out;
+}
+function parseDoctorFlags(argv) {
+    const out = {};
+    for (let i = 0; i < argv.length; i++) {
+        const a = argv[i] ?? "";
+        if (a === "--target" || a.startsWith("--target=")) {
+            const { value, nextIndex } = readFlagValue(argv, i, "--target");
+            if (value !== "claude" && value !== "codex") {
+                throw new FloomError("Invalid --target.", "Use `claude` or `codex`.");
+            }
+            out.target = value;
+            i = nextIndex;
+        }
+        else if (a.startsWith("--")) {
+            throw new FloomError(`Unknown flag: ${a}`, `Try \`${CLI_COMMAND} doctor --target codex\`.`);
+        }
+        else {
+            throw new FloomError(`Unexpected argument: ${a}`, `Try \`${CLI_COMMAND} doctor --target claude\`.`);
+        }
     }
     return out;
 }
@@ -548,21 +501,17 @@ function parseLibraryCreateFlags(argv) {
         else if (a === "--unlisted")
             out.visibility = "unlisted";
         else if (a.startsWith("--")) {
-            throw new FloomError(`Unknown flag: ${a}`, "Try `npx -y @floomhq/floom library create team-onboarding --name \"Team onboarding\"`.");
+            throw new FloomError(`Unknown flag: ${a}`, `Try \`${CLI_COMMAND} library create team-onboarding --name "Team onboarding"\`.`);
         }
         else if (!out.slug)
             out.slug = a;
         else
-            throw new FloomError(`Unexpected argument: ${a}`, "Try `npx -y @floomhq/floom library create <slug> --name <name>`.");
+            throw new FloomError(`Unexpected argument: ${a}`, `Try \`${CLI_COMMAND} library create <slug> --name <name>\`.`);
     }
     return out;
 }
 async function runLibrary(argv) {
     const [subcommand, ...rest] = argv;
-    if (!subcommand || subcommand === "--json") {
-        await libraryList(parseListFlags(argv));
-        return;
-    }
     switch (subcommand ?? "list") {
         case "list": {
             const flags = parseListFlags(rest);
@@ -572,9 +521,9 @@ async function runLibrary(argv) {
         case "create": {
             const flags = parseLibraryCreateFlags(rest);
             if (!flags.slug)
-                throw new FloomError("Missing library slug.", "Try `npx -y @floomhq/floom library create team-onboarding --name \"Team onboarding\"`.");
+                throw new FloomError("Missing library slug.", `Try \`${CLI_COMMAND} library create team-onboarding --name "Team onboarding"\`.`);
             if (!flags.name)
-                throw new FloomError("Missing --name.", "Try `npx -y @floomhq/floom library create team-onboarding --name \"Team onboarding\"`.");
+                throw new FloomError("Missing --name.", `Try \`${CLI_COMMAND} library create team-onboarding --name "Team onboarding"\`.`);
             await libraryCreate({
                 slug: flags.slug,
                 name: flags.name,
@@ -587,10 +536,10 @@ async function runLibrary(argv) {
             const flags = parseFolderTagFlags(rest);
             const [librarySlug, skillSlug] = flags.rest;
             if (!librarySlug || !skillSlug) {
-                throw new FloomError("Missing library or skill slug.", "Try `npx -y @floomhq/floom library add team-onboarding support-tone --folder support`.");
+                throw new FloomError("Missing library or skill slug.", `Try \`${CLI_COMMAND} library add team-onboarding support-tone --folder support\`.`);
             }
             if (flags.rest.length > 2) {
-                throw new FloomError(`Unexpected argument: ${flags.rest[2]}`, "Try `npx -y @floomhq/floom library add team-onboarding support-tone --folder support`.");
+                throw new FloomError(`Unexpected argument: ${flags.rest[2]}`, `Try \`${CLI_COMMAND} library add team-onboarding support-tone --folder support\`.`);
             }
             await libraryAddSkill({
                 librarySlug,
@@ -604,10 +553,10 @@ async function runLibrary(argv) {
         case "rm": {
             const [librarySlug, skillSlug] = rest;
             if (!librarySlug || !skillSlug) {
-                throw new FloomError("Missing library or skill slug.", "Try `npx -y @floomhq/floom library remove team-onboarding support-tone`.");
+                throw new FloomError("Missing library or skill slug.", `Try \`${CLI_COMMAND} library remove team-onboarding support-tone\`.`);
             }
             if (rest.length > 2) {
-                throw new FloomError(`Unexpected argument: ${rest[2]}`, "Try `npx -y @floomhq/floom library remove team-onboarding support-tone`.");
+                throw new FloomError(`Unexpected argument: ${rest[2]}`, `Try \`${CLI_COMMAND} library remove team-onboarding support-tone\`.`);
             }
             await libraryRemoveSkill(librarySlug, skillSlug);
             return;
@@ -615,9 +564,9 @@ async function runLibrary(argv) {
         case "subscribe": {
             const slug = rest[0];
             if (!slug)
-                throw new FloomError("Missing library slug.", "Try `npx -y @floomhq/floom library subscribe superpowers`.");
+                throw new FloomError("Missing library slug.", `Try \`${CLI_COMMAND} library subscribe superpowers\`.`);
             if (rest.length > 1) {
-                throw new FloomError(`Unexpected argument: ${rest[1]}`, "Try `npx -y @floomhq/floom library subscribe superpowers`.");
+                throw new FloomError(`Unexpected argument: ${rest[1]}`, `Try \`${CLI_COMMAND} library subscribe superpowers\`.`);
             }
             await librarySubscribe(slug);
             return;
@@ -625,9 +574,9 @@ async function runLibrary(argv) {
         case "unsubscribe": {
             const slug = rest[0];
             if (!slug)
-                throw new FloomError("Missing library slug.", "Try `npx -y @floomhq/floom library unsubscribe superpowers`.");
+                throw new FloomError("Missing library slug.", `Try \`${CLI_COMMAND} library unsubscribe superpowers\`.`);
             if (rest.length > 1) {
-                throw new FloomError(`Unexpected argument: ${rest[1]}`, "Try `npx -y @floomhq/floom library unsubscribe superpowers`.");
+                throw new FloomError(`Unexpected argument: ${rest[1]}`, `Try \`${CLI_COMMAND} library unsubscribe superpowers\`.`);
             }
             await libraryUnsubscribe(slug);
             return;
@@ -649,34 +598,11 @@ function parseWatchFlags(argv) {
             out.intervalSeconds = interval;
             i = nextIndex;
         }
-        else if (a === "--target" || a.startsWith("--target=")) {
-            const { value, nextIndex } = readFlagValue(argv, i, "--target");
-            out.target = parseTargetFlag(value);
-            i = nextIndex;
-        }
-        else if (a.startsWith("--")) {
-            throw new FloomError(`Unknown flag: ${a}`, "Try `npx -y @floomhq/floom watch --target codex --interval 60`.");
-        }
-        else {
-            throw new FloomError(`Unexpected argument: ${a}`, "Try `npx -y @floomhq/floom watch --target codex --interval 60`.");
-        }
-    }
-    return out;
-}
-function parseSyncFlags(argv) {
-    const out = {};
-    for (let i = 0; i < argv.length; i++) {
-        const a = argv[i] ?? "";
-        if (a === "--target" || a.startsWith("--target=")) {
-            const { value, nextIndex } = readFlagValue(argv, i, "--target");
-            out.target = parseTargetFlag(value);
-            i = nextIndex;
-        }
         else if (a.startsWith("--")) {
-            throw new FloomError(`Unknown flag: ${a}`, "Try `npx -y @floomhq/floom sync --target codex`.");
+            throw new FloomError(`Unknown flag: ${a}`, `Try \`${CLI_COMMAND} watch --interval 60\`.`);
         }
         else {
-            throw new FloomError(`Unexpected argument: ${a}`, "Try `npx -y @floomhq/floom sync --target codex`.");
+            throw new FloomError(`Unexpected argument: ${a}`, `Try \`${CLI_COMMAND} watch --interval 60\`.`);
         }
     }
     return out;
@@ -697,10 +623,6 @@ function parseSingleFileArg(argv, usageHint) {
         throw new FloomError("Missing file argument.", usageHint);
     return file;
 }
-function agentPrompt(target = "claude") {
-    const folder = target === "codex" ? "~/.codex/skills" : "~/.claude/skills";
-    process.stdout.write(`Before recreating behavior from scratch, search ${folder} for matching Floom skills. If none fit, search Floom with \`npx -y @floomhq/floom search <query>\`, show useful matches, and ask before installing anything.\n`);
-}
 function sleep(ms, signal) {
     if (signal.aborted)
         return Promise.resolve();
@@ -712,10 +634,10 @@ function sleep(ms, signal) {
         }, { once: true });
     });
 }
-async function watch(intervalSeconds, target = "claude") {
+async function watch(intervalSeconds) {
     const cfg = await readConfig();
     if (!cfg) {
-        throw new FloomError("Not signed in.", "Run `npx -y @floomhq/floom login` before watch, or use `npx -y @floomhq/floom add <link>` without an account.");
+        throw new FloomError("Not signed in.", `Run \`${CLI_COMMAND} login\` before \`${CLI_COMMAND} watch\`, or use \`${CLI_COMMAND} add <link>\` without an account.`);
     }
     const controller = new AbortController();
     let stopping = false;
@@ -729,9 +651,9 @@ async function watch(intervalSeconds, target = "claude") {
     };
     process.on("SIGINT", stop);
     process.on("SIGTERM", stop);
-    process.stdout.write(`${symbols.bullet}  Watching Floom ${target} sync every ${intervalSeconds}s. Press Ctrl-C to stop.\n`);
+    process.stdout.write(`${symbols.bullet}  Watching Floom sync every ${intervalSeconds}s. Press Ctrl-C to stop.\n`);
     while (!controller.signal.aborted) {
-        await sync({ spinner: false, quietUnchanged: true, target });
+        await sync({ spinner: false, quietUnchanged: true });
         await sleep(intervalSeconds * 1000, controller.signal);
     }
 }
@@ -751,10 +673,10 @@ async function main() {
             // never block on update-notifier
         }
     }
-    // Subcommand --help: any rest arg = --help/-h/help → show top-level reference.
+    // Subcommand --help: any rest arg = --help/-h/help → show top-level usage.
     // Subcommands are simple enough that one help screen is fine for Version 1.
     if (rest.includes("--help") || rest.includes("-h") || rest.includes("help")) {
-        commandUsage();
+        usage();
         return;
     }
     try {
@@ -768,7 +690,7 @@ async function main() {
                 commandUsage();
                 return;
             case "commands":
-                rejectArgs(rest, "Try `npx -y @floomhq/floom commands`.");
+                rejectArgs(rest, `Try \`${CLI_COMMAND} commands\`.`);
                 commandUsage();
                 return;
             case "--version":
@@ -776,31 +698,31 @@ async function main() {
                 process.stdout.write(`${CLI_VERSION}\n`);
                 return;
             case "login":
-                rejectArgs(rest, "Try `npx -y @floomhq/floom login`.");
+                rejectArgs(rest, `Try \`${CLI_COMMAND} login\`.`);
                 await login();
                 return;
             case "logout":
-                rejectArgs(rest, "Try `npx -y @floomhq/floom logout`.");
+                rejectArgs(rest, `Try \`${CLI_COMMAND} logout\`.`);
                 await deleteConfig();
                 process.stdout.write(`\n${symbols.ok}  Signed out\n\n`);
                 return;
             case "whoami":
-                rejectArgs(rest, "Try `npx -y @floomhq/floom whoami`.");
+                rejectArgs(rest, `Try \`${CLI_COMMAND} whoami\`.`);
                 await whoami();
                 return;
             case "init": {
                 const flags = parseInitArgs(rest);
-                await init(flags.file, flags.template);
+                await init(flags.file, flags.template ? { template: flags.template } : {});
                 return;
             }
             case "publish": {
                 const flags = parseFlags(rest);
                 const file = flags.rest[0];
                 if (!file) {
-                    throw new FloomError("Missing file argument.", "Try: `npx -y @floomhq/floom publish skill.md`");
+                    throw new FloomError("Missing file argument.", `Try: \`${CLI_COMMAND} publish my-skill\``);
                 }
                 if (flags.rest.length > 1) {
-                    throw new FloomError(`Unexpected argument: ${flags.rest[1]}`, "Try: `npx -y @floomhq/floom publish skill.md`");
+                    throw new FloomError(`Unexpected argument: ${flags.rest[1]}`, `Try: \`${CLI_COMMAND} publish my-skill\``);
                 }
                 await publish({
                     file,
@@ -809,12 +731,11 @@ async function main() {
                     ...(flags.assetType ? { assetType: flags.assetType } : {}),
                     ...(flags.installsAs ? { installsAs: flags.installsAs } : {}),
                     ...(flags.version ? { version: flags.version } : {}),
-                    ...(flags.shareEmails.length > 0 ? { sharedWithEmails: flags.shareEmails } : {}),
                 });
                 return;
             }
             case "scan": {
-                const file = parseSingleFileArg(rest, "Try `npx -y @floomhq/floom scan skill.md`.");
+                const file = parseSingleFileArg(rest, `Try \`${CLI_COMMAND} scan my-skill\`.`);
                 await scanSkill(file);
                 return;
             }
@@ -843,7 +764,7 @@ async function main() {
             case "search": {
                 const flags = parseSearchFlags(rest);
                 if (!flags.query) {
-                    throw new FloomError("Missing search query.", "Try: `npx -y @floomhq/floom search \"support tone\"`.");
+                    throw new FloomError("Missing search query.", `Try: \`${CLI_COMMAND} search "support tone"\`.`);
                 }
                 await search({
                     query: flags.query,
@@ -860,20 +781,6 @@ async function main() {
                     ...(flags.target ? { target: flags.target } : {}),
                     setup: flags.setup,
                     force: flags.force,
-                    json: flags.json,
-                });
-                if (flags.setup) {
-                    await setupAgent({ target: flags.target ?? "claude", dryRun: false, yes: true });
-                }
-                return;
-            }
-            case "update": {
-                const flags = parseAddArgs(rest);
-                await install(flags.slug, {
-                    ...(flags.target ? { target: flags.target } : {}),
-                    setup: flags.setup,
-                    force: true,
-                    json: flags.json,
                 });
                 if (flags.setup) {
                     await setupAgent({ target: flags.target ?? "claude", dryRun: false, yes: true });
@@ -881,10 +788,7 @@ async function main() {
                 return;
             }
             case "sync":
-                {
-                    const flags = parseSyncFlags(rest);
-                    await sync(flags);
-                }
+                await sync(parseSyncFlags(rest));
                 return;
             case "setup":
             case "connect": {
@@ -892,15 +796,9 @@ async function main() {
                 await setupAgent(flags);
                 return;
             }
-            case "agent-prompt":
-            case "paste": {
-                const flags = parseAgentPromptArgs(rest);
-                agentPrompt(flags.target ?? "claude");
-                return;
-            }
             case "watch": {
                 const flags = parseWatchFlags(rest);
-                await watch(flags.intervalSeconds, flags.target ?? "claude");
+                await watch(flags.intervalSeconds);
                 return;
             }
             case "delete":
@@ -917,29 +815,26 @@ async function main() {
                 const flags = parseFolderTagFlags(rest);
                 const slug = flags.rest[0];
                 if (!slug) {
-                    throw new FloomError("Missing skill slug.", "Try `npx -y @floomhq/floom move support-tone --folder support/tone`.");
+                    throw new FloomError("Missing skill slug.", `Try \`${CLI_COMMAND} move support-tone --folder support/tone\`.`);
                 }
                 if (flags.folder === undefined) {
                     throw new FloomError("Missing --folder.", "Use --folder <path> or --root. Add --tag or --tags when useful.");
                 }
                 if (flags.rest.length > 1) {
-                    throw new FloomError(`Unexpected argument: ${flags.rest[1]}`, "Try `npx -y @floomhq/floom move support-tone --folder support/tone`.");
+                    throw new FloomError(`Unexpected argument: ${flags.rest[1]}`, `Try \`${CLI_COMMAND} move support-tone --folder support/tone\`.`);
                 }
                 await moveSkill({ slug, folder: flags.folder, tags: flags.tags });
                 return;
             }
             case "mcp":
-                rejectArgs(rest, "Try `npx -y @floomhq/floom mcp`.");
+                rejectArgs(rest, `Try \`${CLI_COMMAND} mcp\`.`);
                 printMcpSetup();
                 return;
             case "doctor":
-                {
-                    const flags = parseDoctorArgs(rest);
-                    await doctor(flags);
-                }
+                await doctor(parseDoctorFlags(rest));
                 return;
             default:
-                throw new FloomError(`Unknown command: ${cmd}`, "Run `npx -y @floomhq/floom --help` to see available commands.");
+                throw new FloomError(`Unknown command: ${cmd}`, `Run \`${CLI_COMMAND} --help\` to see available commands.`);
         }
     }
     catch (e) {