@myapihq/cli 1.0.53 → 1.0.58

package/dist/commands/auth.d.ts

@@ -1,3 +1,3 @@
-export declare function link(flags?: Record<string, string | boolean>): Promise<void>;
+export declare function link(flags?: Record<string, string | boolean>, emailArg?: string): Promise<void>;
 export declare function whoami(flags?: Record<string, string | boolean>): Promise<void>;
 export declare function switchCmd(flags?: Record<string, string | boolean>, indexArg?: string): Promise<void>;

package/dist/commands/auth.js

@@ -1,6 +1,6 @@
 import * as readline from 'readline';
 import { loadConfig, saveConfig, addAccount, switchAccount, listAccounts } from '../config.js';
-import { info, success, error } from '../output.js';
+import { info, success, error, printJson } from '../output.js';
 import { installSkills } from './setup.js';
 import { hq } from '@myapihq/sdk';
 const API_BASE = process.env.MYAPI_API_BASE ?? 'https://api.myapihq.com';
@@ -39,9 +39,9 @@ async function patch(path, body, apiKey) {
     return json.data ?? json;
 }
 // myapi auth link — upgrade anonymous session to registered account.
-export async function link(flags = {}) {
+export async function link(flags = {}, emailArg) {
     if (flags.help) {
-        info('Usage: myapi auth link\n\nLinks an email to your anonymous account, upgrading it to a registered account.\nA verification code will be sent — you must enter it interactively.\nIf the email is already in use, adds it as a second account instead.');
+        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');
         return;
     }
     const config = loadConfig();
@@ -51,7 +51,9 @@ export async function link(flags = {}) {
         error('Already registered. Use your existing account.');
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     try {
-        const email = (await ask(rl, '› Email? ')).trim();
+        const email = emailArg || (await ask(rl, '› Email? ')).trim();
+        if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email))
+            error(`Invalid email address: "${email}".`);
         let upgradeOk = true;
         try {
             await patch('/hq/account/upgrade', { email }, config.api_key);
@@ -108,25 +110,36 @@ export async function link(flags = {}) {
 // myapi auth whoami — show current session info.
 export async function whoami(flags = {}) {
     if (flags.help) {
-        info('Usage: myapi auth whoami\n\nDisplays the active account details: email, account ID, default org, default funnel, account type, and current balance.');
+        info('Usage: myapi auth whoami [--json]\n\nDisplays the active account details: email, account ID, default org, default funnel, account type, and current balance.\n\nFlags:\n  --json   Output raw JSON');
         return;
     }
     const config = loadConfig();
     if (!config?.api_key)
         error('Not configured. Run: myapi auth setup');
+    let balance = null;
+    try {
+        balance = await hq.getBalance(config.api_key);
+    }
+    catch { }
+    if (flags.json) {
+        printJson({
+            email: config.email ?? null,
+            account_id: config.account_id,
+            default_org: config.default_org ?? null,
+            default_funnel: config.default_funnel ?? null,
+            is_anonymous: config.is_anonymous ?? false,
+            balance: balance?.balance_display ?? null,
+            credits: balance?.credits_display ?? null,
+        });
+        return;
+    }
     if (config.email)
         info(`Email:    ${config.email}`);
     info(`Account:  ${config.account_id}`);
     info(`Org:      ${config.default_org ?? '(none)'}`);
     info(`Funnel:   ${config.default_funnel ?? '(none)'}`);
     info(`Type:     ${config.is_anonymous ? 'anonymous' : 'registered'}`);
-    try {
-        const bal = await hq.getBalance(config.api_key);
-        info(`Balance:  ${bal.balance_display}  |  Credits: ${bal.credits_display}`);
-    }
-    catch {
-        info(`Balance:  (unavailable)`);
-    }
+    info(`Balance:  ${balance ? `${balance.balance_display}  |  Credits: ${balance.credits_display}` : '(unavailable)'}`);
 }
 // myapi auth switch [index] — switch between saved accounts.
 export async function switchCmd(flags = {}, indexArg) {
@@ -139,6 +152,7 @@ export async function switchCmd(flags = {}, indexArg) {
         error('No accounts configured. Run: myapi auth setup');
     if (accounts.length === 1) {
         info(`Only one account configured: ${accounts[0].email ?? accounts[0].account_id}`);
+        info('To add another account, run: myapi auth setup');
         return;
     }
     info('Accounts:');

package/dist/commands/billing.js

@@ -5,11 +5,19 @@ import { success, error, printTable, info, printJson } from '../output.js';
 import { formatDate } from '../utils.js';
 export async function balance(flags) {
     if (flags.help) {
-        info('Usage: myapi billing balance\n\nShows your current account balance, credits, and payment method status.');
+        info('Usage: myapi billing balance [--json]\n\nShows your current account balance, credits, and payment method status.\n\nFlags:\n  --json   Output raw JSON');
         return;
     }
     const config = requireConfig();
     const result = await hq.getBalance(config.api_key);
+    if (flags.json) {
+        printJson({
+            balance: result.balance_display,
+            credits: result.credits_display,
+            has_payment_method: result.has_payment_method,
+        });
+        return;
+    }
     const pm = result.has_payment_method ? 'yes' : 'no';
     const accountType = config.is_anonymous ? 'anonymous' : `registered (${config.email ?? ''})`;
     info(`Account: ${accountType}`);

package/dist/commands/config.js

@@ -1,24 +1,37 @@
+import { hq, funnel as sdkFunnel } from '@myapihq/sdk';
 import { requireConfig, saveConfig } from '../config.js';
 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.");
         return;
     }
+    if (!UUID_RE.test(id))
+        error(`Invalid organization ID: "${id}". Expected a UUID (e.g. xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx).`);
     const config = requireConfig();
-    config.default_org = id;
+    info('› Validating…');
+    const org = await hq.getOrg(config.api_key, id);
+    config.default_org = org.id;
     saveConfig(config);
-    success(`Default organization set to: ${id}`);
+    success(`Default organization set to: ${org.name || org.id}`);
 }
 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.");
         return;
     }
+    if (!UUID_RE.test(id))
+        error(`Invalid funnel ID: "${id}". Expected a UUID (e.g. xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx).`);
     const config = requireConfig();
-    config.default_funnel = id;
+    const orgId = config.default_org;
+    if (!orgId)
+        error('No default organization set. Run: myapi auth config set-org <id>');
+    info('› Validating…');
+    const funnel = await sdkFunnel.getFunnel(config.api_key, orgId, id);
+    config.default_funnel = funnel.id;
     saveConfig(config);
-    success(`Default funnel set to: ${id}`);
+    success(`Default funnel set to: ${funnel.id}`);
 }
 export async function setDomain(domain, flags) {
     if (!domain || flags.help) {
@@ -41,8 +54,9 @@ export async function view(flags) {
     info(`Default Domain: ${config.default_domain || 'Not set'}`);
 }
 export async function run(subcommand, args, flags) {
+    const via = flags._via || 'auth config';
     if (!subcommand || (flags.help && !subcommand)) {
-        info('Usage: myapi config <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\nSubcommands:\n  view         View current config\n  set-org      Set default organization\n  set-funnel   Set default funnel\n  set-domain   Set default domain`);
         return;
     }
     if (subcommand === 'view')

package/dist/commands/domain.js

@@ -1,6 +1,7 @@
 import { domain as sdkDomain } from '@myapihq/sdk';
 import { requireConfig } from '../config.js';
 import { success, error, info, printTable, printJson } from '../output.js';
+import { formatDate } from '../utils.js';
 export async function check(domainArg, flags) {
     const config = requireConfig();
     const orgId = flags.org || config.default_org;
@@ -8,6 +9,10 @@ export async function check(domainArg, flags) {
     if (!orgId || !domain)
         error("Missing required arguments.\nUsage: myapi domain check <domain> --org <id>\n(Set defaults: myapi auth config set-org <id> / myapi auth config set-domain <domain>)");
     const res = await sdkDomain.checkDomain(config.api_key, orgId, domain);
+    if (flags.json) {
+        printJson(res);
+        return;
+    }
     if (res.available) {
         const price = res.price_display || `$${(res.price_cents / 100).toFixed(2)}`;
         info(`${domain} — Available ✓  ${price}/yr`);
@@ -48,6 +53,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 (domains.length === 0) {
+        info('No domains found in this organization. Register one with: myapi domain register <name>');
+        return;
+    }
     printTable(domains);
 }
 export async function assign(domainArg, flags) {
@@ -76,13 +85,14 @@ export async function status(domainArg, flags) {
     if (!orgId || !domain)
         error("Missing required arguments.\nUsage: myapi domain status <domain> --org <id>\n(Set defaults: myapi auth config set-org <id> / myapi auth config set-domain <domain>)");
     const res = await sdkDomain.getDomainStatus(config.api_key, orgId, domain);
-    const display = {
-        domain: res.domain,
-        status: res.status,
-    };
+    if (flags.json) {
+        printJson(res);
+        return;
+    }
+    info(`Domain:  ${res.domain}`);
+    info(`Status:  ${res.status}`);
     if (res.expires_at)
-        display.expires_at = res.expires_at;
-    printJson(display);
+        info(`Expires: ${formatDate(res.expires_at)}`);
 }
 export async function settings(domainArg, flags) {
     const config = requireConfig();
@@ -118,7 +128,7 @@ export async function run(subcommand, args, flags) {
         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.');
         else if (subcommand === 'check')
-            info('Usage: myapi domain check <domain> --org <id>\n\nChecks if a domain name is available for registration.');
+            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')
@@ -128,7 +138,7 @@ export async function run(subcommand, args, flags) {
         else if (subcommand === 'unassign')
             info('Usage: myapi domain unassign <domain> --org <id>\n\nUnassigns a domain from its current organization.');
         else if (subcommand === 'status')
-            info('Usage: myapi domain status <domain> --org <id>\n\nGets the registration status of a domain.');
+            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')

package/dist/commands/funnel.js

@@ -1,13 +1,19 @@
 import { funnel as sdkFunnel, hq } from '@myapihq/sdk';
 import { requireConfig } from '../config.js';
 import { success, error, printTable, info, printJson } from '../output.js';
+import { formatDate } from '../utils.js';
 export async function list(flags) {
     const config = requireConfig();
     const orgId = flags.org || 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);
-    printTable(funnels);
+    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);
 }
 export async function create(flags) {
     const config = requireConfig();
@@ -42,7 +48,11 @@ export async function push(id, slug, flags) {
     const config = requireConfig();
     const orgId = flags.org || config.default_org;
     const funnelId = id || config.default_funnel;
-    const finalSlug = slug || flags.slug || '/';
+    if (slug && flags.slug && slug !== flags.slug) {
+        info(`› Note: positional slug "${slug}" takes precedence over --slug "${flags.slug}".`);
+    }
+    const rawSlug = slug || flags.slug || '/';
+    const finalSlug = rawSlug.startsWith('/') ? rawSlug : `/${rawSlug}`;
     if (!orgId || !funnelId) {
         error("Missing required arguments.\nUsage: myapi funnel push [funnel_id] [slug] < index.html\n(Defaults to your configured funnel and slug '/' when omitted)");
     }
@@ -53,8 +63,8 @@ export async function push(id, slug, flags) {
         process.stdin.on('end', () => resolve(data));
         process.stdin.on('error', reject);
     });
-    if (!html)
-        error("No HTML provided via stdin");
+    if (!html.trim())
+        error("No content provided via stdin. Usage: echo '<h1>Hello</h1>' | myapi funnel push [id] [slug]");
     const result = await sdkFunnel.pushFunnelPage(config.api_key, orgId, funnelId, { slug: finalSlug, html });
     success(`Pushed page to ${finalSlug}`);
     if (result?.url) {

package/dist/commands/keys.js

@@ -1,6 +1,7 @@
 import { hq } from '@myapihq/sdk';
 import { requireConfig } from '../config.js';
 import { success, error, printTable, info, printJson } from '../output.js';
+import { formatDate } from '../utils.js';
 import * as readline from 'readline';
 export async function createNew(flags) {
     if (flags.help) {
@@ -33,15 +34,8 @@ export async function list(flags) {
         return;
     }
     const formattedKeys = keysList.map(k => {
-        // Format creation date
-        const createdDate = new Date(k.created_at);
-        const createdStr = isNaN(createdDate.getTime()) ? k.created_at : createdDate.toLocaleString();
-        // Format last used date
-        let lastUsedStr = 'Never';
-        if (k.last_used_at) {
-            const lastUsedDate = new Date(k.last_used_at);
-            lastUsedStr = isNaN(lastUsedDate.getTime()) ? k.last_used_at : lastUsedDate.toLocaleString();
-        }
+        const createdStr = formatDate(k.created_at);
+        const lastUsedStr = k.last_used_at ? formatDate(k.last_used_at) : 'Never';
         return {
             Name: k.name || 'Unnamed',
             Prefix: k.prefix,

package/dist/commands/org.js

@@ -43,7 +43,7 @@ export async function list(flags) {
 }
 export async function get(id, flags) {
     if (flags.help) {
-        info('Usage: myapi org get <id>\n\nFetches details of a specific organization.');
+        info('Usage: myapi org get <id> [--json]\n\nFetches details of a specific organization.\n\nFlags:\n  --json   Output raw JSON');
         return;
     }
     if (!id) {
@@ -52,10 +52,18 @@ export async function get(id, flags) {
     }
     const config = requireConfig();
     const org = await hq.getOrg(config.api_key, id);
-    printJson(org);
-    if (org.preview_subdomain) {
-        info(`Preview domain: https://${org.preview_subdomain}.makeautonomous.com`);
+    if (flags.json) {
+        printJson(org);
+        return;
     }
+    info(`ID:      ${org.id}`);
+    info(`Name:    ${org.name ?? '(none)'}`);
+    if (org.tagline)
+        info(`Tagline: ${org.tagline}`);
+    if (org.created_at)
+        info(`Created: ${formatDate(org.created_at)}`);
+    if (org.preview_subdomain)
+        info(`Preview: https://${org.preview_subdomain}.makeautonomous.com`);
 }
 export async function del(id, flags) {
     if (flags.help) {

package/dist/index.js

@@ -16,10 +16,25 @@ import * as domainCmd from './commands/domain.js';
 import * as funnelCmd from './commands/funnel.js';
 import * as authCmd from './commands/auth.js';
 import * as configCmd from './commands/config.js';
+const ERROR_MESSAGES = {
+    DOMAIN_NOT_FOUND: 'Domain not found.',
+    INVALID_DOMAIN: 'Invalid domain name.',
+    ORG_NOT_FOUND: 'Organization not found.',
+    org_not_found: 'Organization not found.',
+    FUNNEL_NOT_FOUND: 'Funnel not found.',
+    funnel_not_found: 'Funnel not found.',
+    db_error: 'Resource not found or invalid ID.',
+    NOT_FOUND: 'Resource not found.',
+    FORBIDDEN: 'You do not have permission to perform this action.',
+    RATE_LIMITED: 'Too many requests. Please wait a moment and try again.',
+};
+function friendlyError(code) {
+    return ERROR_MESSAGES[code] || code;
+}
 async function main() {
     const updatePromise = updateCmd.checkForUpdate(pkg.version).catch(() => { });
     const { args, flags } = parseArgs(process.argv.slice(2));
-    if (flags.version || flags.v) {
+    if (flags.version || flags.v || flags.V) {
         const [latest] = await Promise.all([updateCmd.latestVersion(), updatePromise]);
         const updateNote = latest && updateCmd.isNewer(latest, pkg.version)
             ? ` (update available: ${latest})`
@@ -27,6 +42,10 @@ async function main() {
         info(`myapi ${pkg.version}${updateNote}`);
         return;
     }
+    if (flags.help && args.length === 0) {
+        printHelp();
+        return;
+    }
     if (args.length === 0) {
         const config = loadConfig();
         if (!config?.api_key) {
@@ -42,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            Link an email to upgrade your anonymous account\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\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');
                     break;
                 }
                 if (subcommand === 'setup')
@@ -52,7 +71,7 @@ async function main() {
                 else if (subcommand === 'whoami')
                     await authCmd.whoami(flags);
                 else if (subcommand === 'link')
-                    await authCmd.link(flags);
+                    await authCmd.link(flags, restArgs[0]);
                 else if (subcommand === 'switch')
                     await authCmd.switchCmd(flags, restArgs[0]);
                 else if (subcommand === 'install-skills') {
@@ -131,8 +150,26 @@ async function main() {
             case 'setup':
                 await setupCmd.setup(flags);
                 break;
+            case 'whoami':
+                await authCmd.whoami(flags);
+                break;
+            case 'keys':
+                if (!subcommand) {
+                    info('Usage: myapi keys <list|create|revoke>');
+                    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);
+                break;
             case 'config':
-                await configCmd.run(subcommand, restArgs, flags);
+                await configCmd.run(subcommand, restArgs, { ...flags, _via: 'config' });
+                break;
+            case 'help':
+                printHelp();
                 break;
             default:
                 error(`Unknown command: ${command}. Run "myapi" for available commands.`);
@@ -143,15 +180,15 @@ async function main() {
             if (err.status === 401)
                 error('Invalid API key. Run: myapi auth setup');
             else if (err.status === 402) {
-                if (err.code === 'REGISTRATION_REQUIRED')
-                    error('A verified email is required. Run: myapi auth link');
-                else if (err.code === 'UPGRADE_REQUIRED')
+                if (err.code === 'REGISTRATION_REQUIRED' || err.code === 'UPGRADE_REQUIRED')
                     error('A verified email is required. Run: myapi auth link');
+                else if (err.code === 'NO_PAYMENT_METHOD')
+                    error('No payment method on file. Run: myapi billing setup');
                 else
                     error(`Insufficient balance. Run: myapi billing topup <amount>`);
             }
             else
-                error(err.code || err.message);
+                error(friendlyError(err.code) || err.message);
         }
         else {
             error(err.message || (typeof err === 'object' ? JSON.stringify(err) : String(err)));
@@ -179,6 +216,12 @@ Commands:
   domain       Manage domain configurations
   funnel       Manage headless funnels and pages
 
+Aliases:
+  whoami       → myapi auth whoami
+  keys         → myapi auth api-keys
+  setup        → myapi auth setup
+  config       → myapi auth config
+
 Run "myapi <command> --help" for subcommand help.
 
 ${quickStart}`);

package/dist/output.js

@@ -1,8 +1,9 @@
+const useColor = process.stdout.isTTY && !process.env.NO_COLOR;
 export function success(message) {
-    console.log(`\x1b[32m✓\x1b[0m ${message}`);
+    console.log(useColor ? `\x1b[32m✓\x1b[0m ${message}` : `✓ ${message}`);
 }
 export function error(message) {
-    console.error(`\x1b[31m✗\x1b[0m ${message}`);
+    console.error(useColor ? `\x1b[31m✗\x1b[0m ${message}` : `✗ ${message}`);
     process.exit(1);
 }
 export function info(message) {

package/dist/utils.js

@@ -3,7 +3,13 @@ export function parseArgs(argv) {
     const flags = {};
     for (let i = 0; i < argv.length; i++) {
         const arg = argv[i];
-        if (arg.startsWith('--')) {
+        if (arg === '-h') {
+            flags['help'] = true;
+        }
+        else if (arg === '-v') {
+            flags['version'] = true;
+        }
+        else if (arg.startsWith('--')) {
             if (arg.includes('=')) {
                 const [key, value] = arg.slice(2).split('=', 2);
                 flags[key] = value;

package/package.json

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

package/src/commands/auth.ts

@@ -1,7 +1,7 @@
 import * as readline from 'readline';
 
 import { loadConfig, saveConfig, addAccount, switchAccount, listAccounts } from '../config.js';
-import { info, success, error } from '../output.js';
+import { info, success, error, printJson } from '../output.js';
 import { installSkills } from './setup.js';
 import { hq } from '@myapihq/sdk';
 
@@ -42,9 +42,9 @@ 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> = {}) {
+export async function link(flags: Record<string, string | boolean> = {}, emailArg?: string) {
   if (flags.help) {
-    info('Usage: myapi auth link\n\nLinks an email to your anonymous account, upgrading it to a registered account.\nA verification code will be sent — you must enter it interactively.\nIf the email is already in use, adds it as a second account instead.');
+    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');
     return;
   }
   const config = loadConfig();
@@ -53,7 +53,8 @@ export async function link(flags: Record<string, string | boolean> = {}) {
 
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
   try {
-    const email = (await ask(rl, '› Email? ')).trim();
+    const email = emailArg || (await ask(rl, '› Email? ')).trim();
+    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) error(`Invalid email address: "${email}".`);
 
     let upgradeOk = true;
     try {
@@ -116,24 +117,36 @@ export async function link(flags: Record<string, string | boolean> = {}) {
 // myapi auth whoami — show current session info.
 export async function whoami(flags: Record<string, string | boolean> = {}) {
   if (flags.help) {
-    info('Usage: myapi auth whoami\n\nDisplays the active account details: email, account ID, default org, default funnel, account type, and current balance.');
+    info('Usage: myapi auth whoami [--json]\n\nDisplays the active account details: email, account ID, default org, default funnel, account type, and current balance.\n\nFlags:\n  --json   Output raw JSON');
     return;
   }
   const config = loadConfig();
   if (!config?.api_key) error('Not configured. Run: myapi auth setup');
 
+  let balance: { balance_display: string; credits_display: string } | null = null;
+  try {
+    balance = await hq.getBalance(config!.api_key);
+  } catch {}
+
+  if (flags.json) {
+    printJson({
+      email: config!.email ?? null,
+      account_id: config!.account_id,
+      default_org: config!.default_org ?? null,
+      default_funnel: config!.default_funnel ?? null,
+      is_anonymous: config!.is_anonymous ?? false,
+      balance: balance?.balance_display ?? null,
+      credits: balance?.credits_display ?? null,
+    });
+    return;
+  }
+
   if (config!.email) info(`Email:    ${config!.email}`);
   info(`Account:  ${config!.account_id}`);
   info(`Org:      ${config!.default_org ?? '(none)'}`);
   info(`Funnel:   ${config!.default_funnel ?? '(none)'}`);
   info(`Type:     ${config!.is_anonymous ? 'anonymous' : 'registered'}`);
-
-  try {
-    const bal = await hq.getBalance(config!.api_key);
-    info(`Balance:  ${bal.balance_display}  |  Credits: ${bal.credits_display}`);
-  } catch {
-    info(`Balance:  (unavailable)`);
-  }
+  info(`Balance:  ${balance ? `${balance.balance_display}  |  Credits: ${balance.credits_display}` : '(unavailable)'}`);
 }
 
 // myapi auth switch [index] — switch between saved accounts.
@@ -146,6 +159,7 @@ export async function switchCmd(flags: Record<string, string | boolean> = {}, in
   if (accounts.length === 0) error('No accounts configured. Run: myapi auth setup');
   if (accounts.length === 1) {
     info(`Only one account configured: ${accounts[0].email ?? accounts[0].account_id}`);
+    info('To add another account, run: myapi auth setup');
     return;
   }
 

package/src/commands/billing.ts

@@ -6,12 +6,21 @@ import { formatDate } from '../utils.js';
 
 export async function balance(flags: Record<string, string | boolean>) {
   if (flags.help) {
-    info('Usage: myapi billing balance\n\nShows your current account balance, credits, and payment method status.');
+    info('Usage: myapi billing balance [--json]\n\nShows your current account balance, credits, and payment method status.\n\nFlags:\n  --json   Output raw JSON');
     return;
   }
   const config = requireConfig();
   const result = await hq.getBalance(config.api_key);
 
+  if (flags.json) {
+    printJson({
+      balance: result.balance_display,
+      credits: result.credits_display,
+      has_payment_method: result.has_payment_method,
+    });
+    return;
+  }
+
   const pm = result.has_payment_method ? 'yes' : 'no';
   const accountType = config.is_anonymous ? 'anonymous' : `registered (${config.email ?? ''})`;
   info(`Account: ${accountType}`);

package/src/commands/config.ts

@@ -1,15 +1,21 @@
+import { hq, funnel as sdkFunnel } from '@myapihq/sdk';
 import { requireConfig, saveConfig } from '../config.js';
 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: 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.");
     return;
   }
+  if (!UUID_RE.test(id)) error(`Invalid organization ID: "${id}". Expected a UUID (e.g. xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx).`);
   const config = requireConfig();
-  config.default_org = id;
+  info('› Validating…');
+  const org = await hq.getOrg(config.api_key, id);
+  config.default_org = org.id;
   saveConfig(config);
-  success(`Default organization set to: ${id}`);
+  success(`Default organization set to: ${org.name || org.id}`);
 }
 
 export async function setFunnel(id: string, flags: Record<string, string | boolean>) {
@@ -17,10 +23,15 @@ export async function setFunnel(id: string, flags: Record<string, string | boole
     info("Usage: myapi config set-funnel <id>\n\nSets a default funnel ID for subsequent commands.");
     return;
   }
+  if (!UUID_RE.test(id)) error(`Invalid funnel ID: "${id}". Expected a UUID (e.g. xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx).`);
   const config = requireConfig();
-  config.default_funnel = id;
+  const orgId = config.default_org;
+  if (!orgId) error('No default organization set. Run: myapi auth config set-org <id>');
+  info('› Validating…');
+  const funnel = await sdkFunnel.getFunnel(config.api_key, orgId, id);
+  config.default_funnel = funnel.id;
   saveConfig(config);
-  success(`Default funnel set to: ${id}`);
+  success(`Default funnel set to: ${funnel.id}`);
 }
 
 export async function setDomain(domain: string, flags: Record<string, string | boolean>) {
@@ -46,8 +57,9 @@ 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 config <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\nSubcommands:\n  view         View current config\n  set-org      Set default organization\n  set-funnel   Set default funnel\n  set-domain   Set default domain`);
     return;
   }
   

package/src/commands/domain.ts

@@ -1,6 +1,7 @@
 import { domain as sdkDomain } from '@myapihq/sdk';
 import { requireConfig } from '../config.js';
 import { success, error, info, printTable, printJson } from '../output.js';
+import { formatDate } from '../utils.js';
 
 export async function check(domainArg: string, flags: Record<string, string | boolean>) {
   const config = requireConfig();
@@ -8,6 +9,10 @@ export async function check(domainArg: string, flags: Record<string, string | bo
   const domain = domainArg || (config.default_domain as string);
   if (!orgId || !domain) error("Missing required arguments.\nUsage: myapi domain check <domain> --org <id>\n(Set defaults: myapi auth config set-org <id> / myapi auth config set-domain <domain>)");
   const res = await sdkDomain.checkDomain(config.api_key, orgId, domain) as { available: boolean; price_cents: number; price_display?: string; message?: unknown };
+  if (flags.json) {
+    printJson(res);
+    return;
+  }
   if (res.available) {
     const price = res.price_display || `$${(res.price_cents / 100).toFixed(2)}`;
     info(`${domain} — Available ✓  ${price}/yr`);
@@ -45,6 +50,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 ((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>[]);
 }
 
@@ -73,12 +79,13 @@ export async function status(domainArg: string, flags: Record<string, string | b
   const domain = domainArg || (config.default_domain as string);
   if (!orgId || !domain) error("Missing required arguments.\nUsage: myapi domain status <domain> --org <id>\n(Set defaults: myapi auth config set-org <id> / myapi auth config set-domain <domain>)");
   const res = await sdkDomain.getDomainStatus(config.api_key, orgId, domain);
-  const display: Record<string, unknown> = {
-    domain: res.domain,
-    status: res.status,
-  };
-  if (res.expires_at) display.expires_at = res.expires_at;
-  printJson(display);
+  if (flags.json) {
+    printJson(res);
+    return;
+  }
+  info(`Domain:  ${res.domain}`);
+  info(`Status:  ${res.status}`);
+  if ((res as any).expires_at) info(`Expires: ${formatDate((res as any).expires_at)}`);
 }
 
 export async function settings(domainArg: string, flags: Record<string, string | boolean>) {
@@ -112,12 +119,12 @@ export async function run(subcommand: string | undefined, args: string[], flags:
 
   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.');
-    else if (subcommand === 'check') info('Usage: myapi domain check <domain> --org <id>\n\nChecks if a domain name is available for registration.');
+    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> --target <target_org_id>\n\nAssigns a domain to a different organization.');
     else if (subcommand === 'unassign') info('Usage: myapi domain unassign <domain> --org <id>\n\nUnassigns a domain from its current organization.');
-    else if (subcommand === 'status') info('Usage: myapi domain status <domain> --org <id>\n\nGets the registration status of a domain.');
+    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.');
     return;

package/src/commands/funnel.ts

@@ -1,6 +1,7 @@
 import { funnel as sdkFunnel, hq } from '@myapihq/sdk';
 import { requireConfig } from '../config.js';
 import { success, error, printTable, info, printJson } from '../output.js';
+import { formatDate } from '../utils.js';
 import * as fs from 'fs';
 
 export async function list(flags: Record<string, string | boolean>) {
@@ -8,7 +9,9 @@ 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);
-  printTable(funnels as unknown as Record<string, unknown>[]);
+  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>[]);
 }
 
 export async function create(flags: Record<string, string | boolean>) {
@@ -45,7 +48,11 @@ export async function push(id: string, slug: string, flags: Record<string, strin
   const config = requireConfig();
   const orgId = (flags.org as string) || config.default_org;
   const funnelId = id || config.default_funnel;
-  const finalSlug = slug || (flags.slug as string) || '/';
+  if (slug && flags.slug && slug !== flags.slug) {
+    info(`› Note: positional slug "${slug}" takes precedence over --slug "${flags.slug}".`);
+  }
+  const rawSlug = slug || (flags.slug as string) || '/';
+  const finalSlug = rawSlug.startsWith('/') ? rawSlug : `/${rawSlug}`;
 
   if (!orgId || !funnelId) {
     error("Missing required arguments.\nUsage: myapi funnel push [funnel_id] [slug] < index.html\n(Defaults to your configured funnel and slug '/' when omitted)");
@@ -59,7 +66,7 @@ export async function push(id: string, slug: string, flags: Record<string, strin
     process.stdin.on('error', reject);
   });
 
-  if (!html) error("No HTML provided via stdin");
+  if (!html.trim()) error("No content provided via stdin. Usage: echo '<h1>Hello</h1>' | myapi funnel push [id] [slug]");
 
   const result = await sdkFunnel.pushFunnelPage(config.api_key, orgId, funnelId, { slug: finalSlug, html });
   success(`Pushed page to ${finalSlug}`);

package/src/commands/keys.ts

@@ -1,6 +1,7 @@
 import { hq } from '@myapihq/sdk';
 import { requireConfig } from '../config.js';
 import { success, error, printTable, info, printJson } from '../output.js';
+import { formatDate } from '../utils.js';
 import * as readline from 'readline';
 
 export async function createNew(flags: Record<string, string | boolean>) {
@@ -37,16 +38,8 @@ export async function list(flags: Record<string, string | boolean>) {
   }
   
   const formattedKeys = keysList.map(k => {
-    // Format creation date
-    const createdDate = new Date(k.created_at);
-    const createdStr = isNaN(createdDate.getTime()) ? k.created_at : createdDate.toLocaleString();
-    
-    // Format last used date
-    let lastUsedStr = 'Never';
-    if (k.last_used_at) {
-      const lastUsedDate = new Date(k.last_used_at);
-      lastUsedStr = isNaN(lastUsedDate.getTime()) ? k.last_used_at : lastUsedDate.toLocaleString();
-    }
+    const createdStr = formatDate(k.created_at);
+    const lastUsedStr = k.last_used_at ? formatDate(k.last_used_at) : 'Never';
     
     return {
       Name: k.name || 'Unnamed',

package/src/commands/org.ts

@@ -43,7 +43,7 @@ export async function list(flags: Record<string, string | boolean>) {
 
 export async function get(id: string, flags: Record<string, string | boolean>) {
   if (flags.help) {
-    info('Usage: myapi org get <id>\n\nFetches details of a specific organization.');
+    info('Usage: myapi org get <id> [--json]\n\nFetches details of a specific organization.\n\nFlags:\n  --json   Output raw JSON');
     return;
   }
   if (!id) {
@@ -52,10 +52,15 @@ export async function get(id: string, flags: Record<string, string | boolean>) {
   }
   const config = requireConfig();
   const org = await hq.getOrg(config.api_key, id);
-  printJson(org);
-  if (org.preview_subdomain) {
-    info(`Preview domain: https://${org.preview_subdomain}.makeautonomous.com`);
+  if (flags.json) {
+    printJson(org);
+    return;
   }
+  info(`ID:      ${org.id}`);
+  info(`Name:    ${org.name ?? '(none)'}`);
+  if ((org as any).tagline) info(`Tagline: ${(org as any).tagline}`);
+  if ((org as any).created_at) info(`Created: ${formatDate((org as any).created_at)}`);
+  if (org.preview_subdomain) info(`Preview: https://${org.preview_subdomain}.makeautonomous.com`);
 }
 
 export async function del(id: string, flags: Record<string, string | boolean>) {

package/src/index.ts

@@ -18,12 +18,29 @@ import * as funnelCmd from './commands/funnel.js';
 import * as authCmd from './commands/auth.js';
 import * as configCmd from './commands/config.js';
 
+const ERROR_MESSAGES: Record<string, string> = {
+  DOMAIN_NOT_FOUND: 'Domain not found.',
+  INVALID_DOMAIN: 'Invalid domain name.',
+  ORG_NOT_FOUND: 'Organization not found.',
+  org_not_found: 'Organization not found.',
+  FUNNEL_NOT_FOUND: 'Funnel not found.',
+  funnel_not_found: 'Funnel not found.',
+  db_error: 'Resource not found or invalid ID.',
+  NOT_FOUND: 'Resource not found.',
+  FORBIDDEN: 'You do not have permission to perform this action.',
+  RATE_LIMITED: 'Too many requests. Please wait a moment and try again.',
+};
+
+function friendlyError(code: string): string {
+  return ERROR_MESSAGES[code] || code;
+}
+
 async function main() {
   const updatePromise = updateCmd.checkForUpdate(pkg.version).catch(() => {});
 
   const { args, flags } = parseArgs(process.argv.slice(2));
 
-  if (flags.version || flags.v) {
+  if (flags.version || flags.v || flags.V) {
     const [latest] = await Promise.all([updateCmd.latestVersion(), updatePromise]);
     const updateNote = latest && updateCmd.isNewer(latest, pkg.version)
       ? ` (update available: ${latest})`
@@ -32,6 +49,11 @@ async function main() {
     return;
   }
 
+  if (flags.help && args.length === 0) {
+    printHelp();
+    return;
+  }
+
   if (args.length === 0) {
     const config = loadConfig();
     if (!config?.api_key) {
@@ -48,13 +70,13 @@ 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            Link an email to upgrade your anonymous account\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\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');
           break;
         }
         if (subcommand === 'setup') await setupCmd.setup(flags);
         else if (subcommand === 'import-key') await setupCmd.importKey(restArgs[0], flags);
         else if (subcommand === 'whoami') await authCmd.whoami(flags);
-            else if (subcommand === 'link') await authCmd.link(flags);
+            else if (subcommand === 'link') await authCmd.link(flags, restArgs[0]);
         else if (subcommand === 'switch') await authCmd.switchCmd(flags, restArgs[0]);
         else if (subcommand === 'install-skills') {
           if (flags.help) {
@@ -111,8 +133,20 @@ async function main() {
       case 'setup':
         await setupCmd.setup(flags);
         break;
+      case 'whoami':
+        await authCmd.whoami(flags);
+        break;
+      case 'keys':
+        if (!subcommand) { info('Usage: myapi keys <list|create|revoke>'); 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);
+        break;
       case 'config':
-        await configCmd.run(subcommand, restArgs, flags);
+        await configCmd.run(subcommand, restArgs, { ...flags, _via: 'config' });
+        break;
+      case 'help':
+        printHelp();
         break;
       default:
         error(`Unknown command: ${command}. Run "myapi" for available commands.`);
@@ -121,11 +155,11 @@ async function main() {
     if (err instanceof MyApiError) {
       if (err.status === 401) error('Invalid API key. Run: myapi auth setup');
       else if (err.status === 402) {
-        if (err.code === 'REGISTRATION_REQUIRED') error('A verified email is required. Run: myapi auth link');
-        else if (err.code === 'UPGRADE_REQUIRED') error('A verified email is required. Run: myapi auth link');
+        if (err.code === 'REGISTRATION_REQUIRED' || err.code === 'UPGRADE_REQUIRED') error('A verified email is required. Run: myapi auth link');
+        else if (err.code === 'NO_PAYMENT_METHOD') error('No payment method on file. Run: myapi billing setup');
         else error(`Insufficient balance. Run: myapi billing topup <amount>`);
       }
-      else error(err.code || err.message);
+      else error(friendlyError(err.code) || err.message);
     } else {
       error(err.message || (typeof err === 'object' ? JSON.stringify(err) : String(err)));
     }
@@ -153,6 +187,12 @@ Commands:
   domain       Manage domain configurations
   funnel       Manage headless funnels and pages
 
+Aliases:
+  whoami       → myapi auth whoami
+  keys         → myapi auth api-keys
+  setup        → myapi auth setup
+  config       → myapi auth config
+
 Run "myapi <command> --help" for subcommand help.
 
 ${quickStart}`);

package/src/output.ts

@@ -1,9 +1,11 @@
+const useColor = process.stdout.isTTY && !process.env.NO_COLOR;
+
 export function success(message: string): void {
-  console.log(`\x1b[32m✓\x1b[0m ${message}`);
+  console.log(useColor ? `\x1b[32m✓\x1b[0m ${message}` : `✓ ${message}`);
 }
 
 export function error(message: string): never {
-  console.error(`\x1b[31m✗\x1b[0m ${message}`);
+  console.error(useColor ? `\x1b[31m✗\x1b[0m ${message}` : `✗ ${message}`);
   process.exit(1);
 }
 

package/src/utils.ts

@@ -4,7 +4,11 @@ export function parseArgs(argv: string[]) {
 
   for (let i = 0; i < argv.length; i++) {
     const arg = argv[i];
-    if (arg.startsWith('--')) {
+    if (arg === '-h') {
+      flags['help'] = true;
+    } else if (arg === '-v') {
+      flags['version'] = true;
+    } else if (arg.startsWith('--')) {
       if (arg.includes('=')) {
         const [key, value] = arg.slice(2).split('=', 2);
         flags[key] = value;