@myapihq/cli 1.0.61 → 1.0.63

package/dist/commands/auth.js

@@ -41,7 +41,7 @@ async function patch(path, body, apiKey) {
 // myapi auth link — upgrade anonymous session to registered account.
 export async function link(flags = {}, emailArg) {
     if (flags.help) {
-        info('Usage: myapi auth link [email]\n\nAttaches a verified email to your current anonymous account, converting it into\na registered account. A one-time code will be sent to the email to confirm.\n\nIf that email already belongs to an existing MyAPI account, you will be signed\ninto that account instead — it is added as a second active session alongside\nyour current one.\n\nTo create a brand-new account from scratch, use: myapi auth setup');
+        info('Usage: myapi auth link [email]\n\nUpgrades your anonymous account by attaching a verified email address.\nA one-time code will be sent to your inbox — paste it at the prompt to confirm.\nThis is an interactive command; it will ask for the code before completing.\n\nIf that email already belongs to an existing MyAPI account, your anonymous\naccount is NOT merged. Instead, the existing account is added as a second\nactive session and you can switch between them with: myapi auth switch\n\nTo create a completely new account from scratch, use: myapi auth setup');
         return;
     }
     const config = loadConfig();
@@ -144,7 +144,7 @@ export async function whoami(flags = {}) {
 // myapi auth switch [index] — switch between saved accounts.
 export async function switchCmd(flags = {}, indexArg) {
     if (flags.help) {
-        info('Usage: myapi auth switch [index]\n\nSwitches the active account. Pass an account index to skip the prompt.\n\nExample:\n  myapi auth switch 2');
+        info('Usage: myapi auth switch [index]\n\nSwitches the active account. Run without arguments to see a numbered list\nof accounts and choose interactively.\n\nPass an index number to switch non-interactively:\n  myapi auth switch 2\n\nNote: index numbers may change as accounts are added. For scripting,\ncheck the list first with: myapi auth switch (no args)');
         return;
     }
     const accounts = listAccounts();

package/dist/commands/config.js

@@ -4,7 +4,7 @@ import { success, error, info } from '../output.js';
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 export async function setOrg(id, flags) {
     if (!id || flags.help) {
-        info("Usage: myapi config set-org <id>\n\nSets a default organization ID for subsequent commands.");
+        info("Usage: myapi config set-org <id>\n\nSets the default organization for all commands that require --org.\nThe ID is validated against the API before saving.\n\nExample:\n  myapi auth config set-org xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
         return;
     }
     if (!UUID_RE.test(id))
@@ -18,7 +18,7 @@ export async function setOrg(id, flags) {
 }
 export async function setFunnel(id, flags) {
     if (!id || flags.help) {
-        info("Usage: myapi config set-funnel <id>\n\nSets a default funnel ID for subsequent commands.");
+        info("Usage: myapi config set-funnel <id>\n\nSets the default funnel. The funnel must belong to your current default org.\nThe ID is validated against the API before saving.\n\nExample:\n  myapi auth config set-funnel xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
         return;
     }
     if (!UUID_RE.test(id))
@@ -35,7 +35,7 @@ export async function setFunnel(id, flags) {
 }
 export async function setDomain(domain, flags) {
     if (!domain || flags.help) {
-        info("Usage: myapi config set-domain <domain>\n\nSets a default domain for subsequent commands.");
+        info("Usage: myapi config set-domain <domain>\n\nSets the default domain used by domain commands when --domain is omitted.\n\nExample:\n  myapi auth config set-domain example.com");
         return;
     }
     const config = requireConfig();
@@ -45,7 +45,7 @@ export async function setDomain(domain, flags) {
 }
 export async function view(flags) {
     if (flags.help) {
-        info("Usage: myapi config view\n\nViews current config settings.");
+        info("Usage: myapi config view\n\nShows the currently configured defaults: default org, funnel, and domain.");
         return;
     }
     const config = requireConfig();
@@ -56,7 +56,7 @@ export async function view(flags) {
 export async function run(subcommand, args, flags) {
     const via = flags._via || 'auth config';
     if (!subcommand || (flags.help && !subcommand)) {
-        info(`Usage: myapi ${via} <subcommand>\n\nSubcommands:\n  view         View current config\n  set-org      Set default organization\n  set-funnel   Set default funnel\n  set-domain   Set default domain`);
+        info(`Usage: myapi ${via} <subcommand>\n\nManages CLI defaults (org, funnel, domain) so you don't have to pass --org / --domain on every command.\n\nSubcommands:\n  view         Show current defaults\n  set-org      Set default organization (validates access)\n  set-funnel   Set default funnel (must be owned by default org)\n  set-domain   Set default domain\n\nExamples:\n  myapi auth config set-org <id>\n  myapi auth config set-funnel <id>\n  myapi auth config view`);
         return;
     }
     if (subcommand === 'view')

package/dist/commands/domain.d.ts

@@ -1,6 +1,5 @@
 export declare function check(domainArg: string, flags: Record<string, string | boolean>): Promise<void>;
 export declare function register(domainArg: string, flags: Record<string, string | boolean>): Promise<void>;
-export declare function importDomain(domainArg: string, flags: Record<string, string | boolean>): Promise<void>;
 export declare function list(flags: Record<string, string | boolean>): Promise<void>;
 export declare function assign(domainArg: string, flags: Record<string, string | boolean>): Promise<void>;
 export declare function unassign(domainArg: string, flags: Record<string, string | boolean>): Promise<void>;

package/dist/commands/domain.js

@@ -35,20 +35,6 @@ export async function register(domainArg, flags) {
     info(`DNS propagation can take a few minutes — track it with: myapi domain status ${domain}`);
     info(`Your funnel will be live on https://${domain} once propagation completes.`);
 }
-export async function importDomain(domainArg, flags) {
-    const config = requireConfig();
-    const orgId = flags.org || config.default_org;
-    const domain = domainArg || config.default_domain;
-    if (!orgId || !domain)
-        error("Missing required arguments.\nUsage: myapi domain import <domain> --org <id> [--namecheap-user <user> --namecheap-key <key>]\n(Set defaults: myapi auth config set-org <id> / myapi auth config set-domain <domain>)");
-    const payload = { domain };
-    if (flags['namecheap-user'])
-        payload.namecheap_api_user = flags['namecheap-user'];
-    if (flags['namecheap-key'])
-        payload.namecheap_api_key = flags['namecheap-key'];
-    await sdkDomain.importDomain(config.api_key, orgId, payload);
-    success(`Imported ${domain}`);
-}
 export async function list(flags) {
     const config = requireConfig();
     const orgId = flags.org || config.default_org;
@@ -56,6 +42,10 @@ export async function list(flags) {
         error("Missing required arguments.\nUsage: myapi domain list --org <id> [--filter=all|unassigned|org]\n(Set default: myapi auth config set-org <id>)");
     const filter = flags.filter;
     const domains = await sdkDomain.listDomains(config.api_key, orgId, filter);
+    if (flags.json) {
+        printJson(domains);
+        return;
+    }
     if (domains.length === 0) {
         info('No domains found in this organization. Register one with: myapi domain register <name>');
         return;
@@ -125,28 +115,26 @@ export async function updateSettings(domainArg, flags) {
 }
 export async function run(subcommand, args, flags) {
     if (!subcommand || (flags.help && !subcommand)) {
-        info('Usage: myapi domain <subcommand>\n\nSubcommands:\n  list             List domains\n  check            Check domain availability\n  register         Register a domain\n  import           Import an existing domain\n  assign           Assign domain to an org\n  unassign         Unassign domain from its current org\n  status           Get domain status\n  settings         Get domain settings\n  update-settings  Update domain settings\n\nTip: Set defaults with "myapi auth config set-org <id>" to skip --org on every command.');
+        info('Usage: myapi domain <subcommand>\n\nSubcommands:\n  list             List domains\n  check            Check domain availability\n  register         Register a domain\n  assign           Assign domain to an org\n  unassign         Unassign domain from its current org\n  status           Get domain status\n  settings         Get domain settings\n  update-settings  Update edge/CDN settings\n\nTip: Set defaults with "myapi auth config set-org <id>" to skip --org on every command.');
         return;
     }
     if (flags.help) {
         if (subcommand === 'list')
-            info('Usage: myapi domain list --org <id> [--filter=all|unassigned|org]\n\nLists all registered domains in your account.\n  --filter=all        Lists all domains owned by the account.\n  --filter=unassigned Lists domains not assigned to an org.\n  --filter=org        (Default) Lists domains assigned to the current org.');
+            info('Usage: myapi domain list --org <id> [--filter=all|unassigned|org] [--json]\n\nLists all registered domains in your account.\n  --filter=all        Lists all domains owned by the account.\n  --filter=unassigned Lists domains not assigned to an org.\n  --filter=org        (Default) Lists domains assigned to the current org.\n  --json              Output raw JSON');
         else if (subcommand === 'check')
             info('Usage: myapi domain check <domain> --org <id> [--json]\n\nChecks if a domain name is available for registration.\n\nFlags:\n  --json   Output raw JSON');
         else if (subcommand === 'register')
-            info('Usage: myapi domain register <domain> --org <id> [--years <num>]\n\nRegisters a new domain name.');
-        else if (subcommand === 'import')
-            info('Usage: myapi domain import <domain> --org <id> --namecheap-user <user> --namecheap-key <key>\n\nImports an existing domain from Namecheap.');
+            info('Usage: myapi domain register <domain> --org <id> [--years <num>]\n\nRegisters a new domain name under your account.\n\nFlags:\n  --years <num>   Number of years to register for (default: 1)\n\nPrerequisites:\n  - You must have sufficient balance (myapi billing balance)\n  - The domain must be available (myapi domain check <domain>)\n\nAfter registering, assign the domain to your org:\n  myapi domain assign <domain> --org <id>\n\nDNS propagation takes a few minutes. Track it with:\n  myapi domain status <domain>');
         else if (subcommand === 'assign')
-            info('Usage: myapi domain assign <domain> --org <id>\n\nAssigns a domain to the specified organization.');
+            info('Usage: myapi domain assign <domain> --org <id>\n\nAssigns a registered domain to an organization. The domain must already be\nregistered under your account. Once assigned, your funnel will be served at\nhttps://<domain> after DNS propagation completes.\n\nTo transfer a domain to a different org: unassign it first, then assign to the new org.');
         else if (subcommand === 'unassign')
-            info('Usage: myapi domain unassign <domain> --org <id>\n\nUnassigns a domain from its current organization.');
+            info('Usage: myapi domain unassign <domain> --org <id>\n\nUnassigns a domain from its current organization. The domain remains registered\nunder your account and can be reassigned to a different org at any time.');
         else if (subcommand === 'status')
             info('Usage: myapi domain status <domain> --org <id> [--json]\n\nGets the registration status of a domain.\n\nFlags:\n  --json   Output raw JSON');
         else if (subcommand === 'settings')
             info('Usage: myapi domain settings <domain> --org <id>\n\nGets the DNS settings and configuration for a domain.');
         else if (subcommand === 'update-settings')
-            info('Usage: myapi domain update-settings <domain> --org <id> [--security=essentially_off|medium|high|under_attack] [--browser-check=on|off] [--purge-cache]\n\nUpdates edge settings for a domain.');
+            info('Usage: myapi domain update-settings <domain> --org <id> [flags]\n\nUpdates edge/CDN settings for a domain.\n\nFlags:\n  --security=<level>       CDN security level. Controls bot/threat filtering.\n                           Values: essentially_off | low | medium | high | under_attack\n                           Default (if unset): medium\n  --browser-check=<on|off> Enable or disable browser integrity challenge for suspicious traffic.\n                           Default: on\n  --purge-cache            Immediately clears the CDN cache for this domain.\n                           Use after deploying changes that are not yet visible.\n\nExample:\n  myapi domain update-settings example.com --org <id> --security=high --purge-cache');
         return;
     }
     if (subcommand === 'list')
@@ -155,8 +143,6 @@ export async function run(subcommand, args, flags) {
         await check(args[0], flags);
     else if (subcommand === 'register')
         await register(args[0], flags);
-    else if (subcommand === 'import')
-        await importDomain(args[0], flags);
     else if (subcommand === 'assign')
         await assign(args[0], flags);
     else if (subcommand === 'unassign')

package/dist/commands/funnel.js

@@ -8,6 +8,10 @@ export async function list(flags) {
     if (!orgId)
         error("Missing required arguments.\nUsage: myapi funnel list --org <id>\n(Or set defaults via: myapi config set-org <id>)");
     const funnels = await sdkFunnel.listFunnels(config.api_key, orgId);
+    if (flags.json) {
+        printJson(funnels);
+        return;
+    }
     const rows = funnels.map(f => ({ id: f.id, created_at: formatDate(f.created_at), updated_at: formatDate(f.updated_at) }));
     if (rows.length === 0) {
         info('No funnels found. Create one with: myapi funnel create');
@@ -102,15 +106,15 @@ export async function run(subcommand, args, flags) {
     }
     if (flags.help) {
         if (subcommand === 'list')
-            info('Usage: myapi funnel list --org <id>\n\nLists all funnels in the organization.\n\nFlags:\n  --org <id>   Organization ID (or set default via myapi auth config set-org)');
+            info('Usage: myapi funnel list --org <id> [--json]\n\nLists all funnels (websites) in the organization.\n\nFlags:\n  --org <id>   Organization ID (or set default via myapi auth config set-org)\n  --json       Output raw JSON');
         else if (subcommand === 'create')
             info('Usage: myapi funnel create --org <id>\n\nCreates a new funnel in the organization.\n\nFlags:\n  --org <id>   Organization ID (or set default via myapi auth config set-org)');
         else if (subcommand === 'get')
-            info('Usage: myapi funnel get <id> --org <id>\n\nFetches details of a specific funnel.\n\nFlags:\n  --org <id>   Organization ID (or set default via myapi auth config set-org)');
+            info('Usage: myapi funnel get <id> --org <id>\n\nFetches details of a specific funnel including its pages and settings.\n\nFlags:\n  --org <id>   Organization ID (or set default via myapi auth config set-org)');
         else if (subcommand === 'delete')
             info('Usage: myapi funnel delete <id> --org <id>\n\nDeletes a funnel permanently.\n\nFlags:\n  --org <id>   Organization ID (or set default via myapi auth config set-org)');
         else if (subcommand === 'push')
-            info('Usage: myapi funnel push [funnel_id] [slug] < index.html\n\nPushes an HTML page from stdin to a slug path within a funnel.\nUses your configured default funnel and slug "/" when arguments are omitted.\n\nFlags:\n  --org <id>     Organization ID\n  --slug <path>  Target slug path (default: /)');
+            info('Usage: myapi funnel push [funnel_id] [slug] < page.html\n   or: echo \'<h1>Hi</h1>\' | myapi funnel push [slug]\n\nPublishes an HTML page from stdin to a path within your funnel (website).\nBoth arguments are optional — omitting them uses your configured defaults.\n\nArguments:\n  funnel_id   UUID of the target funnel (default: your configured default funnel)\n  slug        URL path to publish to, e.g. /about (default: /)\n\nFlags:\n  --org <id>     Organization ID (or set default via myapi auth config set-org)\n  --slug <path>  Alternative way to specify the slug\n\nExamples:\n  echo \'<h1>Hello</h1>\' | myapi funnel push /\n  cat index.html | myapi funnel push /about\n  myapi funnel push < index.html');
         else if (subcommand === 'pull')
             info('Usage: myapi funnel pull [funnel_id] [slug]\n\nFetches the HTML content of a funnel page.');
         return;

package/dist/commands/org.js

@@ -5,7 +5,7 @@ import { success, error, printTable, printJson, info } from '../output.js';
 import { sleep, formatDate } from '../utils.js';
 export async function create(flags) {
     if (flags.help) {
-        info('Usage: myapi org create --name="My Org" [options]\n\nOptions:\n  --name              Organization name (required)\n  --tagline           Short tagline\n  --description       Detailed description\n  --business-sector   Sector (e.g. Technology)\n  --logo-url          URL to logo image');
+        info('Usage: myapi org create --name <name> [options]\n\nCreates a new organization. A funnel (website) is automatically created alongside it.\n\nOptions:\n  --name              Organization name (required). Use quotes for names with spaces.\n  --tagline           Short tagline\n  --description       Detailed description\n  --business-sector   Sector (e.g. Technology)\n  --logo-url          URL to logo image\n  --yes               Skip the "set as default?" prompt (useful in CI / agent workflows)\n\nExamples:\n  myapi org create --name "Acme Inc"\n  myapi org create --name "Acme Inc" --yes');
         return;
     }
     if (!flags.name) {
@@ -45,11 +45,15 @@ export async function create(flags) {
 }
 export async function list(flags) {
     if (flags.help) {
-        info('Usage: myapi org list\n\nLists all organizations in your account.');
+        info('Usage: myapi org list [--json]\n\nLists all organizations in your account.\n\nFlags:\n  --json   Output raw JSON');
         return;
     }
     const config = requireConfig();
     const orgs = await hq.listOrgs(config.api_key);
+    if (flags.json) {
+        printJson(orgs);
+        return;
+    }
     const rows = orgs.map((o) => ({
         id: o.id,
         name: o.name,
@@ -83,7 +87,7 @@ export async function get(id, flags) {
 }
 export async function del(id, flags) {
     if (flags.help) {
-        info('Usage: myapi org delete <id>\n\nDeletes an organization.');
+        info('Usage: myapi org delete <id>\n\nPermanently deletes an organization and its associated funnels.\nNote: any registered domains assigned to this org must be unassigned first.\n\nNo confirmation prompt is shown — this action is immediate.');
         return;
     }
     if (!id) {
@@ -96,7 +100,7 @@ export async function del(id, flags) {
 }
 export async function importOrg(args, flags) {
     if (flags.help) {
-        info('Usage: myapi org import <domain> --org <id>\n\nAutomatically extracts brand info from an existing website and updates the organization.\n\nNote: You must create a placeholder organization first using `myapi org create` to get an org_id.');
+        info('Usage: myapi org import <domain> --org <id>\n\nSyncs brand information from an existing website into an organization.\nMyAPI fetches the site, extracts name, logo, description, and other brand signals,\nthen updates the org profile automatically.\n\nThis is a profile-enrichment tool, not a domain transfer. The domain does not\nneed to be registered with MyAPI.\n\nPrerequisite: an org must already exist. Create one with: myapi org create --name "..."');
         return;
     }
     const config = requireConfig();

package/dist/commands/update.js

@@ -41,7 +41,7 @@ export async function checkForUpdate(currentVersion) {
 // myapi update — explicit update, same logic as auto-update.
 export async function update(flags = {}) {
     if (flags.help) {
-        info('Usage: myapi update\n\nUpdates the MyAPI CLI to the latest published version.\nEquivalent to: npm install -g @myapihq/cli@latest');
+        info('Usage: myapi update\n\nUpdates the MyAPI CLI and installed skills to the latest published version.\nEquivalent to: npm install -g @myapihq/cli@latest\n\nNote: version pinning and rollback are not supported — always installs the latest.\nThe CLI also auto-updates silently on each command when a newer version is detected.');
         return;
     }
     info('› Checking for updates…');

package/dist/index.js

@@ -61,7 +61,7 @@ async function main() {
         switch (command) {
             case 'auth':
                 if (!subcommand || (flags.help && !subcommand)) {
-                    info('Usage: myapi auth <subcommand>\n\nSubcommands:\n  setup           Configure your account\n  import-key      Import an existing API key non-interactively\n  whoami          Show current account\n  link [email]    Attach an email to your anonymous account (upgrades it to registered)\n                  If the email already has an account, signs you into it as a second session\n  switch [index]  Switch between accounts\n  config          Manage CLI defaults (org_id, domain…)\n  install-skills  Install the MyAPI skills pack\n  api-keys        Manage API keys');
+                    info('Usage: myapi auth <subcommand>\n\nSubcommands:\n  setup           Configure your account\n  import-key      Import an existing API key non-interactively\n  whoami          Show current account · supports --json\n  link [email]    Upgrade anonymous account to registered (or add a second session)\n                  Use myapi auth setup to create a completely new account\n  switch [index]  Switch active account by index or email\n  config          Manage CLI defaults (org, funnel, domain) · supports set-org / set-funnel / set-domain\n  install-skills  Install or update the MyAPI skills pack for AI agents\n  api-keys        Manage API keys · list / create / revoke\n  keys            Alias for api-keys');
                     break;
                 }
                 if (subcommand === 'setup')
@@ -76,7 +76,7 @@ async function main() {
                     await authCmd.switchCmd(flags, restArgs[0]);
                 else if (subcommand === 'install-skills') {
                     if (flags.help) {
-                        info('Usage: myapi auth install-skills\n\nInstalls the MyAPI skills pack for Claude, Gemini, and Cursor agents.');
+                        info('Usage: myapi auth install-skills\n\nInstalls the MyAPI skills pack for AI coding agents (Claude, Gemini, Cursor).\n\nThis command writes skill definition files to:\n  ~/.agents/skills/myapi/\n\nAnd creates symlinks in the appropriate agent config directories:\n  ~/.claude/  (Claude)\n  ~/.gemini/  (Gemini)\n  ~/.cursor/  (Cursor, if detected)\n\nThese files teach agents how to use the MyAPI CLI and API directly.\nRun this command again to update existing skills to the latest version.');
                         break;
                     }
                     await setupCmd.installSkills();
@@ -86,11 +86,11 @@ async function main() {
                     await configCmd.run(restArgs[0], restArgs.slice(1), flags);
                 else if (subcommand === 'api-keys') {
                     if (flags.help && !restArgs[0]) {
-                        info('Usage: myapi auth api-keys <subcommand>\n\nSubcommands:\n  list             List all API keys\n  create           Create a new API key\n  revoke <id>      Revoke an API key by ID');
+                        info('Usage: myapi auth api-keys <subcommand>\n\nManage programmatic API keys for your account. API keys are used to authenticate\nrequests to the MyAPI SDK and REST API.\n\nSubcommands:\n  list             List all API keys with their IDs and creation dates\n  create           Create a new API key (the key value is shown once)\n  revoke <id>      Permanently revoke an API key by ID\n\nExamples:\n  myapi auth api-keys list\n  myapi auth api-keys create\n  myapi auth api-keys revoke xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx');
                         break;
                     }
                     if (!restArgs[0]) {
-                        info('Usage: myapi auth api-keys <list|create|revoke>');
+                        info('Run: myapi auth api-keys --help');
                         break;
                     }
                     if (restArgs[0] === 'create')
@@ -154,8 +154,8 @@ async function main() {
                 await authCmd.whoami(flags);
                 break;
             case 'keys':
-                if (!subcommand) {
-                    info('Usage: myapi keys <list|create|revoke>');
+                if (!subcommand || flags.help) {
+                    info('Usage: myapi keys <subcommand>\n\nManage programmatic API keys for your account. API keys are used to authenticate\nrequests to the MyAPI SDK and REST API.\n\nSubcommands:\n  list             List all API keys with their IDs and creation dates\n  create           Create a new API key (the key value is shown once)\n  revoke <id>      Permanently revoke an API key by ID\n\nExamples:\n  myapi keys list\n  myapi keys create\n  myapi keys revoke xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx\n\nAlias for: myapi auth api-keys');
                     break;
                 }
                 if (subcommand === 'create')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myapihq/cli",
-  "version": "1.0.61",
+  "version": "1.0.63",
   "description": "MyAPI command-line interface",
   "type": "module",
   "main": "dist/index.js",

package/src/commands/auth.ts

@@ -44,7 +44,7 @@ async function patch(path: string, body: unknown, apiKey: string): Promise<unkno
 // myapi auth link — upgrade anonymous session to registered account.
 export async function link(flags: Record<string, string | boolean> = {}, emailArg?: string) {
   if (flags.help) {
-    info('Usage: myapi auth link [email]\n\nAttaches a verified email to your current anonymous account, converting it into\na registered account. A one-time code will be sent to the email to confirm.\n\nIf that email already belongs to an existing MyAPI account, you will be signed\ninto that account instead — it is added as a second active session alongside\nyour current one.\n\nTo create a brand-new account from scratch, use: myapi auth setup');
+    info('Usage: myapi auth link [email]\n\nUpgrades your anonymous account by attaching a verified email address.\nA one-time code will be sent to your inbox — paste it at the prompt to confirm.\nThis is an interactive command; it will ask for the code before completing.\n\nIf that email already belongs to an existing MyAPI account, your anonymous\naccount is NOT merged. Instead, the existing account is added as a second\nactive session and you can switch between them with: myapi auth switch\n\nTo create a completely new account from scratch, use: myapi auth setup');
     return;
   }
   const config = loadConfig();
@@ -152,7 +152,7 @@ export async function whoami(flags: Record<string, string | boolean> = {}) {
 // myapi auth switch [index] — switch between saved accounts.
 export async function switchCmd(flags: Record<string, string | boolean> = {}, indexArg?: string) {
   if (flags.help) {
-    info('Usage: myapi auth switch [index]\n\nSwitches the active account. Pass an account index to skip the prompt.\n\nExample:\n  myapi auth switch 2');
+    info('Usage: myapi auth switch [index]\n\nSwitches the active account. Run without arguments to see a numbered list\nof accounts and choose interactively.\n\nPass an index number to switch non-interactively:\n  myapi auth switch 2\n\nNote: index numbers may change as accounts are added. For scripting,\ncheck the list first with: myapi auth switch (no args)');
     return;
   }
   const accounts = listAccounts();

package/src/commands/config.ts

@@ -6,7 +6,7 @@ const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/
 
 export async function setOrg(id: string, flags: Record<string, string | boolean>) {
   if (!id || flags.help) {
-    info("Usage: myapi config set-org <id>\n\nSets a default organization ID for subsequent commands.");
+    info("Usage: myapi config set-org <id>\n\nSets the default organization for all commands that require --org.\nThe ID is validated against the API before saving.\n\nExample:\n  myapi auth config set-org xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
     return;
   }
   if (!UUID_RE.test(id)) error(`Invalid organization ID: "${id}". Expected a UUID (e.g. xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx).`);
@@ -20,7 +20,7 @@ export async function setOrg(id: string, flags: Record<string, string | boolean>
 
 export async function setFunnel(id: string, flags: Record<string, string | boolean>) {
   if (!id || flags.help) {
-    info("Usage: myapi config set-funnel <id>\n\nSets a default funnel ID for subsequent commands.");
+    info("Usage: myapi config set-funnel <id>\n\nSets the default funnel. The funnel must belong to your current default org.\nThe ID is validated against the API before saving.\n\nExample:\n  myapi auth config set-funnel xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
     return;
   }
   if (!UUID_RE.test(id)) error(`Invalid funnel ID: "${id}". Expected a UUID (e.g. xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx).`);
@@ -36,7 +36,7 @@ export async function setFunnel(id: string, flags: Record<string, string | boole
 
 export async function setDomain(domain: string, flags: Record<string, string | boolean>) {
   if (!domain || flags.help) {
-    info("Usage: myapi config set-domain <domain>\n\nSets a default domain for subsequent commands.");
+    info("Usage: myapi config set-domain <domain>\n\nSets the default domain used by domain commands when --domain is omitted.\n\nExample:\n  myapi auth config set-domain example.com");
     return;
   }
   const config = requireConfig();
@@ -47,7 +47,7 @@ export async function setDomain(domain: string, flags: Record<string, string | b
 
 export async function view(flags: Record<string, string | boolean>) {
   if (flags.help) {
-     info("Usage: myapi config view\n\nViews current config settings.");
+     info("Usage: myapi config view\n\nShows the currently configured defaults: default org, funnel, and domain.");
      return;
   }
   const config = requireConfig();
@@ -59,10 +59,10 @@ export async function view(flags: Record<string, string | boolean>) {
 export async function run(subcommand: string | undefined, args: string[], flags: Record<string, string | boolean>) {
   const via = (flags._via as string) || 'auth config';
   if (!subcommand || (flags.help && !subcommand)) {
-    info(`Usage: myapi ${via} <subcommand>\n\nSubcommands:\n  view         View current config\n  set-org      Set default organization\n  set-funnel   Set default funnel\n  set-domain   Set default domain`);
+    info(`Usage: myapi ${via} <subcommand>\n\nManages CLI defaults (org, funnel, domain) so you don't have to pass --org / --domain on every command.\n\nSubcommands:\n  view         Show current defaults\n  set-org      Set default organization (validates access)\n  set-funnel   Set default funnel (must be owned by default org)\n  set-domain   Set default domain\n\nExamples:\n  myapi auth config set-org <id>\n  myapi auth config set-funnel <id>\n  myapi auth config view`);
     return;
   }
-  
+
   if (subcommand === 'view') await view(flags);
   else if (subcommand === 'set-org') await setOrg(args[0], flags);
   else if (subcommand === 'set-funnel') await setFunnel(args[0], flags);

package/src/commands/domain.ts

@@ -35,17 +35,6 @@ export async function register(domainArg: string, flags: Record<string, string |
   info(`Your funnel will be live on https://${domain} once propagation completes.`);
 }
 
-export async function importDomain(domainArg: string, flags: Record<string, string | boolean>) {
-  const config = requireConfig();
-  const orgId = (flags.org as string) || config.default_org;
-  const domain = domainArg || (config.default_domain as string);
-  if (!orgId || !domain) error("Missing required arguments.\nUsage: myapi domain import <domain> --org <id> [--namecheap-user <user> --namecheap-key <key>]\n(Set defaults: myapi auth config set-org <id> / myapi auth config set-domain <domain>)");
-  const payload: { domain: string; namecheap_api_user?: string; namecheap_api_key?: string } = { domain };
-  if (flags['namecheap-user']) payload.namecheap_api_user = flags['namecheap-user'] as string;
-  if (flags['namecheap-key']) payload.namecheap_api_key = flags['namecheap-key'] as string;
-  await sdkDomain.importDomain(config.api_key, orgId, payload);
-  success(`Imported ${domain}`);
-}
 
 export async function list(flags: Record<string, string | boolean>) {
   const config = requireConfig();
@@ -53,6 +42,7 @@ export async function list(flags: Record<string, string | boolean>) {
   if (!orgId) error("Missing required arguments.\nUsage: myapi domain list --org <id> [--filter=all|unassigned|org]\n(Set default: myapi auth config set-org <id>)");
   const filter = flags.filter as 'all' | 'unassigned' | 'org' | undefined;
   const domains = await sdkDomain.listDomains(config.api_key, orgId, filter);
+  if (flags.json) { printJson(domains); return; }
   if ((domains as unknown[]).length === 0) { info('No domains found in this organization. Register one with: myapi domain register <name>'); return; }
   printTable(domains as unknown as Record<string, unknown>[]);
 }
@@ -116,27 +106,25 @@ export async function updateSettings(domainArg: string, flags: Record<string, st
 
 export async function run(subcommand: string | undefined, args: string[], flags: Record<string, string | boolean>) {
   if (!subcommand || (flags.help && !subcommand)) {
-    info('Usage: myapi domain <subcommand>\n\nSubcommands:\n  list             List domains\n  check            Check domain availability\n  register         Register a domain\n  import           Import an existing domain\n  assign           Assign domain to an org\n  unassign         Unassign domain from its current org\n  status           Get domain status\n  settings         Get domain settings\n  update-settings  Update domain settings\n\nTip: Set defaults with "myapi auth config set-org <id>" to skip --org on every command.');
+    info('Usage: myapi domain <subcommand>\n\nSubcommands:\n  list             List domains\n  check            Check domain availability\n  register         Register a domain\n  assign           Assign domain to an org\n  unassign         Unassign domain from its current org\n  status           Get domain status\n  settings         Get domain settings\n  update-settings  Update edge/CDN settings\n\nTip: Set defaults with "myapi auth config set-org <id>" to skip --org on every command.');
     return;
   }
 
   if (flags.help) {
-    if (subcommand === 'list') info('Usage: myapi domain list --org <id> [--filter=all|unassigned|org]\n\nLists all registered domains in your account.\n  --filter=all        Lists all domains owned by the account.\n  --filter=unassigned Lists domains not assigned to an org.\n  --filter=org        (Default) Lists domains assigned to the current org.');
+    if (subcommand === 'list') info('Usage: myapi domain list --org <id> [--filter=all|unassigned|org] [--json]\n\nLists all registered domains in your account.\n  --filter=all        Lists all domains owned by the account.\n  --filter=unassigned Lists domains not assigned to an org.\n  --filter=org        (Default) Lists domains assigned to the current org.\n  --json              Output raw JSON');
     else if (subcommand === 'check') info('Usage: myapi domain check <domain> --org <id> [--json]\n\nChecks if a domain name is available for registration.\n\nFlags:\n  --json   Output raw JSON');
-    else if (subcommand === 'register') info('Usage: myapi domain register <domain> --org <id> [--years <num>]\n\nRegisters a new domain name.');
-    else if (subcommand === 'import') info('Usage: myapi domain import <domain> --org <id> --namecheap-user <user> --namecheap-key <key>\n\nImports an existing domain from Namecheap.');
-    else if (subcommand === 'assign') info('Usage: myapi domain assign <domain> --org <id>\n\nAssigns a domain to the specified organization.');
-    else if (subcommand === 'unassign') info('Usage: myapi domain unassign <domain> --org <id>\n\nUnassigns a domain from its current organization.');
+    else if (subcommand === 'register') info('Usage: myapi domain register <domain> --org <id> [--years <num>]\n\nRegisters a new domain name under your account.\n\nFlags:\n  --years <num>   Number of years to register for (default: 1)\n\nPrerequisites:\n  - You must have sufficient balance (myapi billing balance)\n  - The domain must be available (myapi domain check <domain>)\n\nAfter registering, assign the domain to your org:\n  myapi domain assign <domain> --org <id>\n\nDNS propagation takes a few minutes. Track it with:\n  myapi domain status <domain>');
+    else if (subcommand === 'assign') info('Usage: myapi domain assign <domain> --org <id>\n\nAssigns a registered domain to an organization. The domain must already be\nregistered under your account. Once assigned, your funnel will be served at\nhttps://<domain> after DNS propagation completes.\n\nTo transfer a domain to a different org: unassign it first, then assign to the new org.');
+    else if (subcommand === 'unassign') info('Usage: myapi domain unassign <domain> --org <id>\n\nUnassigns a domain from its current organization. The domain remains registered\nunder your account and can be reassigned to a different org at any time.');
     else if (subcommand === 'status') info('Usage: myapi domain status <domain> --org <id> [--json]\n\nGets the registration status of a domain.\n\nFlags:\n  --json   Output raw JSON');
     else if (subcommand === 'settings') info('Usage: myapi domain settings <domain> --org <id>\n\nGets the DNS settings and configuration for a domain.');
-    else if (subcommand === 'update-settings') info('Usage: myapi domain update-settings <domain> --org <id> [--security=essentially_off|medium|high|under_attack] [--browser-check=on|off] [--purge-cache]\n\nUpdates edge settings for a domain.');
+    else if (subcommand === 'update-settings') info('Usage: myapi domain update-settings <domain> --org <id> [flags]\n\nUpdates edge/CDN settings for a domain.\n\nFlags:\n  --security=<level>       CDN security level. Controls bot/threat filtering.\n                           Values: essentially_off | low | medium | high | under_attack\n                           Default (if unset): medium\n  --browser-check=<on|off> Enable or disable browser integrity challenge for suspicious traffic.\n                           Default: on\n  --purge-cache            Immediately clears the CDN cache for this domain.\n                           Use after deploying changes that are not yet visible.\n\nExample:\n  myapi domain update-settings example.com --org <id> --security=high --purge-cache');
     return;
   }
 
   if (subcommand === 'list') await list(flags);
   else if (subcommand === 'check') await check(args[0], flags);
   else if (subcommand === 'register') await register(args[0], flags);
-  else if (subcommand === 'import') await importDomain(args[0], flags);
   else if (subcommand === 'assign') await assign(args[0], flags);
   else if (subcommand === 'unassign') await unassign(args[0], flags);
   else if (subcommand === 'status') await status(args[0], flags);

package/src/commands/funnel.ts

@@ -9,6 +9,7 @@ export async function list(flags: Record<string, string | boolean>) {
   const orgId = (flags.org as string) || config.default_org;
   if (!orgId) error("Missing required arguments.\nUsage: myapi funnel list --org <id>\n(Or set defaults via: myapi config set-org <id>)");
   const funnels = await sdkFunnel.listFunnels(config.api_key, orgId);
+  if (flags.json) { printJson(funnels); return; }
   const rows = funnels.map(f => ({ id: f.id, created_at: formatDate(f.created_at), updated_at: formatDate(f.updated_at) }));
   if (rows.length === 0) { info('No funnels found. Create one with: myapi funnel create'); return; }
   printTable(rows as unknown as Record<string, unknown>[]);
@@ -103,11 +104,11 @@ export async function run(subcommand: string | undefined, args: string[], flags:
   }
 
   if (flags.help) {
-    if (subcommand === 'list') info('Usage: myapi funnel list --org <id>\n\nLists all funnels in the organization.\n\nFlags:\n  --org <id>   Organization ID (or set default via myapi auth config set-org)');
+    if (subcommand === 'list') info('Usage: myapi funnel list --org <id> [--json]\n\nLists all funnels (websites) in the organization.\n\nFlags:\n  --org <id>   Organization ID (or set default via myapi auth config set-org)\n  --json       Output raw JSON');
     else if (subcommand === 'create') info('Usage: myapi funnel create --org <id>\n\nCreates a new funnel in the organization.\n\nFlags:\n  --org <id>   Organization ID (or set default via myapi auth config set-org)');
-    else if (subcommand === 'get') info('Usage: myapi funnel get <id> --org <id>\n\nFetches details of a specific funnel.\n\nFlags:\n  --org <id>   Organization ID (or set default via myapi auth config set-org)');
+    else if (subcommand === 'get') info('Usage: myapi funnel get <id> --org <id>\n\nFetches details of a specific funnel including its pages and settings.\n\nFlags:\n  --org <id>   Organization ID (or set default via myapi auth config set-org)');
     else if (subcommand === 'delete') info('Usage: myapi funnel delete <id> --org <id>\n\nDeletes a funnel permanently.\n\nFlags:\n  --org <id>   Organization ID (or set default via myapi auth config set-org)');
-    else if (subcommand === 'push') info('Usage: myapi funnel push [funnel_id] [slug] < index.html\n\nPushes an HTML page from stdin to a slug path within a funnel.\nUses your configured default funnel and slug "/" when arguments are omitted.\n\nFlags:\n  --org <id>     Organization ID\n  --slug <path>  Target slug path (default: /)');
+    else if (subcommand === 'push') info('Usage: myapi funnel push [funnel_id] [slug] < page.html\n   or: echo \'<h1>Hi</h1>\' | myapi funnel push [slug]\n\nPublishes an HTML page from stdin to a path within your funnel (website).\nBoth arguments are optional — omitting them uses your configured defaults.\n\nArguments:\n  funnel_id   UUID of the target funnel (default: your configured default funnel)\n  slug        URL path to publish to, e.g. /about (default: /)\n\nFlags:\n  --org <id>     Organization ID (or set default via myapi auth config set-org)\n  --slug <path>  Alternative way to specify the slug\n\nExamples:\n  echo \'<h1>Hello</h1>\' | myapi funnel push /\n  cat index.html | myapi funnel push /about\n  myapi funnel push < index.html');
     else if (subcommand === 'pull') info('Usage: myapi funnel pull [funnel_id] [slug]\n\nFetches the HTML content of a funnel page.');
     return;
   }

package/src/commands/org.ts

@@ -6,7 +6,7 @@ import { sleep, formatDate } from '../utils.js';
 
 export async function create(flags: Record<string, string | boolean>) {
   if (flags.help) {
-    info('Usage: myapi org create --name="My Org" [options]\n\nOptions:\n  --name              Organization name (required)\n  --tagline           Short tagline\n  --description       Detailed description\n  --business-sector   Sector (e.g. Technology)\n  --logo-url          URL to logo image');
+    info('Usage: myapi org create --name <name> [options]\n\nCreates a new organization. A funnel (website) is automatically created alongside it.\n\nOptions:\n  --name              Organization name (required). Use quotes for names with spaces.\n  --tagline           Short tagline\n  --description       Detailed description\n  --business-sector   Sector (e.g. Technology)\n  --logo-url          URL to logo image\n  --yes               Skip the "set as default?" prompt (useful in CI / agent workflows)\n\nExamples:\n  myapi org create --name "Acme Inc"\n  myapi org create --name "Acme Inc" --yes');
     return;
   }
   if (!flags.name) {
@@ -45,11 +45,12 @@ export async function create(flags: Record<string, string | boolean>) {
 
 export async function list(flags: Record<string, string | boolean>) {
   if (flags.help) {
-    info('Usage: myapi org list\n\nLists all organizations in your account.');
+    info('Usage: myapi org list [--json]\n\nLists all organizations in your account.\n\nFlags:\n  --json   Output raw JSON');
     return;
   }
   const config = requireConfig();
   const orgs = await hq.listOrgs(config.api_key);
+  if (flags.json) { printJson(orgs); return; }
   const rows = orgs.map((o: any) => ({
     id: o.id,
     name: o.name,
@@ -82,7 +83,7 @@ export async function get(id: string, flags: Record<string, string | boolean>) {
 
 export async function del(id: string, flags: Record<string, string | boolean>) {
   if (flags.help) {
-    info('Usage: myapi org delete <id>\n\nDeletes an organization.');
+    info('Usage: myapi org delete <id>\n\nPermanently deletes an organization and its associated funnels.\nNote: any registered domains assigned to this org must be unassigned first.\n\nNo confirmation prompt is shown — this action is immediate.');
     return;
   }
   if (!id) {
@@ -96,7 +97,7 @@ export async function del(id: string, flags: Record<string, string | boolean>) {
 
 export async function importOrg(args: string[], flags: Record<string, string | boolean>) {
   if (flags.help) {
-    info('Usage: myapi org import <domain> --org <id>\n\nAutomatically extracts brand info from an existing website and updates the organization.\n\nNote: You must create a placeholder organization first using `myapi org create` to get an org_id.');
+    info('Usage: myapi org import <domain> --org <id>\n\nSyncs brand information from an existing website into an organization.\nMyAPI fetches the site, extracts name, logo, description, and other brand signals,\nthen updates the org profile automatically.\n\nThis is a profile-enrichment tool, not a domain transfer. The domain does not\nneed to be registered with MyAPI.\n\nPrerequisite: an org must already exist. Create one with: myapi org create --name "..."');
     return;
   }
   const config = requireConfig();

package/src/commands/update.ts

@@ -43,7 +43,7 @@ export async function checkForUpdate(currentVersion: string): Promise<void> {
 // myapi update — explicit update, same logic as auto-update.
 export async function update(flags: Record<string, string | boolean> = {}): Promise<void> {
   if (flags.help) {
-    info('Usage: myapi update\n\nUpdates the MyAPI CLI to the latest published version.\nEquivalent to: npm install -g @myapihq/cli@latest');
+    info('Usage: myapi update\n\nUpdates the MyAPI CLI and installed skills to the latest published version.\nEquivalent to: npm install -g @myapihq/cli@latest\n\nNote: version pinning and rollback are not supported — always installs the latest.\nThe CLI also auto-updates silently on each command when a newer version is detected.');
     return;
   }
   info('› Checking for updates…');

package/src/index.ts

@@ -70,7 +70,7 @@ async function main() {
     switch (command) {
       case 'auth':
         if (!subcommand || (flags.help && !subcommand)) {
-          info('Usage: myapi auth <subcommand>\n\nSubcommands:\n  setup           Configure your account\n  import-key      Import an existing API key non-interactively\n  whoami          Show current account\n  link [email]    Attach an email to your anonymous account (upgrades it to registered)\n                  If the email already has an account, signs you into it as a second session\n  switch [index]  Switch between accounts\n  config          Manage CLI defaults (org_id, domain…)\n  install-skills  Install the MyAPI skills pack\n  api-keys        Manage API keys');
+          info('Usage: myapi auth <subcommand>\n\nSubcommands:\n  setup           Configure your account\n  import-key      Import an existing API key non-interactively\n  whoami          Show current account · supports --json\n  link [email]    Upgrade anonymous account to registered (or add a second session)\n                  Use myapi auth setup to create a completely new account\n  switch [index]  Switch active account by index or email\n  config          Manage CLI defaults (org, funnel, domain) · supports set-org / set-funnel / set-domain\n  install-skills  Install or update the MyAPI skills pack for AI agents\n  api-keys        Manage API keys · list / create / revoke\n  keys            Alias for api-keys');
           break;
         }
         if (subcommand === 'setup') await setupCmd.setup(flags);
@@ -80,7 +80,7 @@ async function main() {
         else if (subcommand === 'switch') await authCmd.switchCmd(flags, restArgs[0]);
         else if (subcommand === 'install-skills') {
           if (flags.help) {
-            info('Usage: myapi auth install-skills\n\nInstalls the MyAPI skills pack for Claude, Gemini, and Cursor agents.');
+            info('Usage: myapi auth install-skills\n\nInstalls the MyAPI skills pack for AI coding agents (Claude, Gemini, Cursor).\n\nThis command writes skill definition files to:\n  ~/.agents/skills/myapi/\n\nAnd creates symlinks in the appropriate agent config directories:\n  ~/.claude/  (Claude)\n  ~/.gemini/  (Gemini)\n  ~/.cursor/  (Cursor, if detected)\n\nThese files teach agents how to use the MyAPI CLI and API directly.\nRun this command again to update existing skills to the latest version.');
             break;
           }
           await setupCmd.installSkills();
@@ -88,10 +88,10 @@ async function main() {
         } else if (subcommand === 'config') await configCmd.run(restArgs[0], restArgs.slice(1), flags);
         else if (subcommand === 'api-keys') {
           if (flags.help && !restArgs[0]) {
-            info('Usage: myapi auth api-keys <subcommand>\n\nSubcommands:\n  list             List all API keys\n  create           Create a new API key\n  revoke <id>      Revoke an API key by ID');
+            info('Usage: myapi auth api-keys <subcommand>\n\nManage programmatic API keys for your account. API keys are used to authenticate\nrequests to the MyAPI SDK and REST API.\n\nSubcommands:\n  list             List all API keys with their IDs and creation dates\n  create           Create a new API key (the key value is shown once)\n  revoke <id>      Permanently revoke an API key by ID\n\nExamples:\n  myapi auth api-keys list\n  myapi auth api-keys create\n  myapi auth api-keys revoke xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx');
             break;
           }
-          if (!restArgs[0]) { info('Usage: myapi auth api-keys <list|create|revoke>'); break; }
+          if (!restArgs[0]) { info('Run: myapi auth api-keys --help'); break; }
           if (restArgs[0] === 'create') await keysCmd.createNew(flags);
           else if (restArgs[0] === 'list') await keysCmd.list(flags);
           else if (restArgs[0] === 'revoke') await keysCmd.revoke(restArgs[1], flags);
@@ -137,7 +137,10 @@ async function main() {
         await authCmd.whoami(flags);
         break;
       case 'keys':
-        if (!subcommand) { info('Usage: myapi keys <list|create|revoke>'); break; }
+        if (!subcommand || flags.help) {
+          info('Usage: myapi keys <subcommand>\n\nManage programmatic API keys for your account. API keys are used to authenticate\nrequests to the MyAPI SDK and REST API.\n\nSubcommands:\n  list             List all API keys with their IDs and creation dates\n  create           Create a new API key (the key value is shown once)\n  revoke <id>      Permanently revoke an API key by ID\n\nExamples:\n  myapi keys list\n  myapi keys create\n  myapi keys revoke xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx\n\nAlias for: myapi auth api-keys');
+          break;
+        }
         if (subcommand === 'create') await keysCmd.createNew(flags);
         else if (subcommand === 'list') await keysCmd.list(flags);
         else if (subcommand === 'revoke') await keysCmd.revoke(restArgs[0], flags);