@myapihq/cli 1.0.84 → 1.1.0-wip.0

package/dist/commands/funnel.d.ts

@@ -1,7 +1,10 @@
-export declare function list(flags: Record<string, string | boolean>): Promise<void>;
-export declare function create(flags: Record<string, string | boolean>): Promise<void>;
-export declare function get(id: string, flags: Record<string, string | boolean>): Promise<void>;
-export declare function del(id: string, flags: Record<string, string | boolean>): Promise<void>;
-export declare function push(slug: string, flags: Record<string, string | boolean>): Promise<void>;
-export declare function verify(id: string, flags: Record<string, string | boolean>): Promise<void>;
-export declare function run(subcommand: string | undefined, args: string[], flags: Record<string, string | boolean>): Promise<void>;
+import type { FlagSchema } from '../flags.js';
+import { type Flags } from '../helpers.js';
+export declare const SCHEMA: FlagSchema;
+export declare function list(flags: Flags): Promise<void>;
+export declare function create(flags: Flags): Promise<void>;
+export declare function get(id: string, flags: Flags): Promise<void>;
+export declare function del(id: string, flags: Flags): Promise<void>;
+export declare function push(slug: string, flags: Flags): Promise<void>;
+export declare function verify(id: string, flags: Flags): Promise<void>;
+export declare function run(subcommand: string | undefined, args: string[], flags: Flags): Promise<void>;

package/dist/commands/funnel.js

@@ -1,12 +1,16 @@
 import { funnel as sdkFunnel, hq } from '@myapihq/sdk';
-import { requireConfig, saveConfig } from '../config.js';
+import { requireConfig } from '../config.js';
 import { success, error, printTable, info, printJson } from '../output.js';
 import { formatDate } from '../utils.js';
+import { requireOrg } from '../helpers.js';
+export const SCHEMA = {
+    org: 'string',
+    funnel: 'string',
+    slug: 'string',
+};
 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 orgId = requireOrg(flags, config, 'myapi funnel list [--org <id>]');
     const funnels = await sdkFunnel.listFunnels(config.api_key, orgId);
     if (flags.json) {
         printJson(funnels);
@@ -18,18 +22,14 @@ export async function list(flags) {
         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);
+    printTable(rows, {
+        flags,
+        empty: 'No funnels found. Create one with: myapi funnel create',
+    });
 }
 export async function create(flags) {
     const config = requireConfig();
-    const orgId = flags.org || config.default_org;
-    if (!orgId) {
-        error("Missing required arguments.\nUsage: myapi funnel create --org <id>\n(Or set defaults via: myapi config set-org <id>)");
-    }
+    const orgId = requireOrg(flags, config, 'myapi funnel create [--org <id>]');
     const result = await sdkFunnel.createFunnel(config.api_key, orgId);
     success(`Funnel created! ID: ${result.funnel.id}`);
     if (result.domain_url)
@@ -39,9 +39,9 @@ export async function create(flags) {
 }
 export async function get(id, flags) {
     const config = requireConfig();
-    const orgId = flags.org || config.default_org;
-    if (!orgId || !id)
-        error("Missing required arguments.\nUsage: myapi funnel get <id> --org <id>\n(Or set defaults via: myapi config set-org <id>)");
+    const orgId = requireOrg(flags, config, 'myapi funnel get <id> [--org <id>]');
+    if (!id)
+        error('Missing required arguments.\nUsage: myapi funnel get <id> [--org <id>]');
     const raw = await sdkFunnel.getFunnel(config.api_key, orgId, id);
     const funnel = raw.funnel ?? raw;
     const subdomain_url = raw.subdomain_url ?? funnel.subdomain_url;
@@ -64,27 +64,28 @@ export async function get(id, flags) {
 }
 export async function del(id, flags) {
     const config = requireConfig();
-    const orgId = flags.org || config.default_org;
-    if (!orgId || !id)
-        error("Missing required arguments.\nUsage: myapi funnel delete <id> --org <id>\n(Or set defaults via: myapi config set-org <id>)");
+    const orgId = requireOrg(flags, config, 'myapi funnel delete <id> [--org <id>]');
+    if (!id)
+        error('Missing required arguments.\nUsage: myapi funnel delete <id> [--org <id>]');
     await sdkFunnel.deleteFunnel(config.api_key, orgId, id);
     success(`Funnel ${id} deleted`);
 }
 export async function push(slug, flags) {
     const config = requireConfig();
-    const orgId = flags.org || config.default_org;
-    if (!orgId)
-        error("Missing org. Set a default with: myapi config set-org <id>");
+    const orgId = requireOrg(flags, config, 'myapi funnel push [slug] [--funnel <id>] [--org <id>]');
     const rawSlug = slug || flags.slug || '/';
     const finalSlug = rawSlug.startsWith('/') ? rawSlug : `/${rawSlug}`;
     let funnelId = flags.funnel || config.default_funnel;
+    let resolvedFromOrg = false;
     if (!funnelId) {
         const existing = await sdkFunnel.listFunnels(config.api_key, orgId);
         if (existing.length === 0)
-            error("No funnel found for this org. Try: myapi auth config set-org <id>");
+            error('No funnel found for this org. Create one with: myapi funnel create');
+        if (existing.length > 1) {
+            error(`Multiple funnels exist for this org and no default is set.\nPick one with --funnel <id>, or set a default:\n  myapi config set-funnel <id>\n\nFunnels:\n${existing.map(f => `  ${f.id}`).join('\n')}`);
+        }
         funnelId = existing[0].id;
-        config.default_funnel = funnelId;
-        saveConfig(config);
+        resolvedFromOrg = true;
     }
     if (process.stdin.isTTY) {
         error("No content provided via stdin. Use a pipe or file:\n  echo '<h1>Hello</h1>' | myapi funnel push /\n  cat page.html | myapi funnel push /about");
@@ -100,6 +101,9 @@ export async function push(slug, flags) {
         error("No content provided via stdin. Usage: echo '<h1>Hello</h1>' | myapi funnel push [slug]");
     const result = await sdkFunnel.pushFunnelPage(config.api_key, orgId, funnelId, { slug: finalSlug, html });
     success(`Pushed page to ${finalSlug}`);
+    if (resolvedFromOrg) {
+        info(`(Used the org's only funnel: ${funnelId}. Set a default with: myapi config set-funnel ${funnelId})`);
+    }
     if (result?.url) {
         info(`Preview: ${result.url}`);
     }
@@ -112,47 +116,63 @@ export async function push(slug, flags) {
 }
 export async function verify(id, flags) {
     const config = requireConfig();
-    const orgId = flags.org || config.default_org;
-    if (!orgId || !id)
-        error("Missing required arguments.\nUsage: myapi funnel verify <id> --org <id> [--slug <slug>]\n(Or set defaults via: myapi config set-org <id>)");
+    const orgId = requireOrg(flags, config, 'myapi funnel verify <id> [--slug <slug>] [--org <id>]');
+    if (!id)
+        error('Missing required arguments.\nUsage: myapi funnel verify <id> [--slug <slug>] [--org <id>]');
     const opts = {};
     if (flags.slug)
         opts.slug = flags.slug;
     const v = await sdkFunnel.verifyFunnel(config.api_key, orgId, id, opts);
     printJson(v);
 }
+// ── Dispatcher ───────────────────────────────────────────────────────────────
+const SUBCOMMAND_USAGE = {
+    'list': 'myapi funnel list [--org <id>] [--json]',
+    'create': 'myapi funnel create [--org <id>]',
+    'get': 'myapi funnel get <id> [--org <id>] [--json]',
+    'delete': 'myapi funnel delete <id> [--org <id>]',
+    'push': `myapi funnel push [slug] [--funnel <id>] [--slug <path>] [--org <id>] < page.html
+
+Reads HTML from stdin and publishes to <slug> on your funnel. Funnel is resolved
+from --funnel, the default funnel, or (only if the org has exactly one) auto-picked.
+
+Examples:
+  echo '<h1>Hello</h1>' | myapi funnel push /
+  cat about.html | myapi funnel push /about
+  myapi funnel push < index.html
+  cat p.html | myapi funnel push /pricing --funnel <uuid>`,
+    'verify': 'myapi funnel verify <id> [--slug <slug>] [--org <id>]',
+};
 export async function run(subcommand, args, flags) {
     if (!subcommand || (flags.help && !subcommand)) {
-        info('Usage: myapi funnel <subcommand>\n\nSubcommands:\n  list       List funnels\n  create     Create a funnel\n  get        Get funnel details\n  delete     Delete a funnel\n  push       Push a raw HTML page to a slug\n\nNote: Most funnel commands require the --org <id> flag (or set a default via myapi auth config set-org <id>).');
+        info(`Usage: myapi funnel <subcommand>
+
+Subcommands:
+  list       List funnels
+  create     Create a funnel
+  get <id>   Get funnel details
+  delete     Delete a funnel
+  push       Push a raw HTML page from stdin to a slug
+  verify     Verify a published page is reachable
+
+All commands accept --org <id> (or set default: myapi config set-org <id>).`);
         return;
     }
     if (flags.help) {
-        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 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 [slug] < page.html\n\nPublishes an HTML page from stdin to a path within your funnel (website).\nThe funnel is always resolved from your default or --funnel flag.\n\nFlags:\n  --org <id>      Organization ID (or set default via myapi config set-org)\n  --funnel <id>   Funnel ID (or set default via myapi config set-funnel)\n  --slug <path>   Alternative way to specify the slug\n\nExamples:\n  echo \'<h1>Hello</h1>\' | myapi funnel push /        # push to /\n  cat about.html | myapi funnel push /about           # push to /about\n  myapi funnel push < index.html                      # push to / on default funnel\n  cat p.html | myapi funnel push /pricing --funnel <uuid>');
-        else if (subcommand === 'pull')
-            info('Usage: myapi funnel pull [funnel_id] [slug]\n\nFetches the HTML content of a funnel page.');
+        const usage = SUBCOMMAND_USAGE[subcommand];
+        if (usage)
+            info(`Usage: ${usage}`);
+        else
+            info(`Unknown subcommand: ${subcommand}. Run "myapi funnel --help" for the list.`);
         return;
     }
-    if (subcommand === 'list')
-        await list(flags);
-    else if (subcommand === 'create')
-        await create(flags);
-    else if (subcommand === 'get')
-        await get(args[0], flags);
-    else if (subcommand === 'delete')
-        await del(args[0], flags);
-    else if (subcommand === 'push')
-        await push(args[0], flags);
-    else if (subcommand === 'verify')
-        await verify(args[0], flags);
-    else
-        error(`Unknown subcommand: ${subcommand}. Run "myapi funnel --help" for a list of valid subcommands.`);
+    switch (subcommand) {
+        case 'list': return list(flags);
+        case 'create': return create(flags);
+        case 'get': return get(args[0], flags);
+        case 'delete': return del(args[0], flags);
+        case 'push': return push(args[0], flags);
+        case 'verify': return verify(args[0], flags);
+        default: error(`Unknown subcommand: ${subcommand}. Run "myapi funnel --help" for a list of valid subcommands.`);
+    }
 }

package/dist/commands/image.js

@@ -61,26 +61,36 @@ export async function del(id, flags) {
     await sdkImage.deleteImage(config.api_key, orgId, id);
     success(`Image deleted! (Job ${id} history retained, URL nullified)`);
 }
+// ── Dispatcher ───────────────────────────────────────────────────────────────
+const SUBCOMMAND_USAGE = {
+    'list': 'myapi image list [--org <id>] [--json]',
+    'generate': 'myapi image generate --prompt "<text>" [--ratio <1:1|16:9>] [--style <style>] [--colors <hex_list>] [--org <id>]',
+    'delete': 'myapi image delete <job_id> [--org <id>]',
+};
 export async function run(subcommand, args, flags) {
     if (!subcommand || (flags.help && !subcommand)) {
-        info('Usage: myapi image <subcommand>\n\nSubcommands:\n  list       List all your generated images\n  generate   Generate a new AI image from a prompt\n  delete     Delete the physical image file for a job\n\nNote: All image commands require the --org <id> flag.');
+        info(`Usage: myapi image <subcommand>
+
+Subcommands:
+  list       List all your generated images
+  generate   Generate a new AI image from a prompt ($0.05 per generation)
+  delete     Delete the physical image file for a job (history retained, URL nullified)
+
+All commands accept --org <id> (or set default: myapi config set-org <id>).`);
         return;
     }
     if (flags.help) {
-        if (subcommand === 'list')
-            info('Usage: myapi image list --org <id> [--json]');
-        else if (subcommand === 'generate')
-            info('Usage: myapi image generate --prompt "<text>" [--ratio <1:1|16:9>] [--style <style>] [--colors <hex_list>] --org <id>\n\nGenerates an AI image and polls until the public URL is ready. Costs $0.05 per generation.');
-        else if (subcommand === 'delete')
-            info('Usage: myapi image delete <job_id> --org <id>\n\nDeletes the physical image file from storage. The generation job history is kept, but its URL will become null.');
+        const usage = SUBCOMMAND_USAGE[subcommand];
+        if (usage)
+            info(`Usage: ${usage}`);
+        else
+            info(`Unknown subcommand: ${subcommand}. Run "myapi image --help" for the list.`);
         return;
     }
-    if (subcommand === 'list')
-        await list(flags);
-    else if (subcommand === 'generate')
-        await generate(flags);
-    else if (subcommand === 'delete')
-        await del(args[0], flags);
-    else
-        error(`Unknown subcommand: ${subcommand}. Run "myapi image --help" for a list of valid subcommands.`);
+    switch (subcommand) {
+        case 'list': return list(flags);
+        case 'generate': return generate(flags);
+        case 'delete': return del(args[0], flags);
+        default: error(`Unknown subcommand: ${subcommand}. Run "myapi image --help" for a list of valid subcommands.`);
+    }
 }

package/dist/commands/keys.d.ts

@@ -1,3 +1,8 @@
-export declare function createNew(flags: Record<string, string | boolean>): Promise<void>;
-export declare function list(flags: Record<string, string | boolean>): Promise<void>;
-export declare function revoke(id: string, flags: Record<string, string | boolean>): Promise<void>;
+import type { FlagSchema } from '../flags.js';
+import type { Flags } from '../helpers.js';
+export declare const SCHEMA: FlagSchema;
+export declare function run(subcommand: string | undefined, args: string[], flags: Flags): Promise<void>;
+export declare function runApiKeys(subcommand: string | undefined, args: string[], flags: Flags): Promise<void>;
+export declare function createNew(flags: Flags): Promise<void>;
+export declare function list(flags: Flags): Promise<void>;
+export declare function revoke(id: string, flags: Flags): Promise<void>;

package/dist/commands/keys.js

@@ -3,11 +3,63 @@ 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) {
+export const SCHEMA = {
+    name: 'string',
+};
+const KEYS_HEADER = `Usage: myapi keys <subcommand>
+
+Manage programmatic API keys for your account.
+
+Subcommands:
+  list             List all API keys with IDs and creation dates
+  create           Create a new API key (the key value is shown once)
+  revoke <id>      Permanently revoke an API key by ID
+
+Alias for: myapi auth api-keys`;
+const API_KEYS_HEADER = `Usage: myapi auth api-keys <subcommand>
+
+Manage programmatic API keys for your account.
+
+Subcommands:
+  list             List all API keys with IDs and creation dates
+  create           Create a new API key (the key value is shown once)
+  revoke <id>      Permanently revoke an API key by ID
+
+Alias: myapi keys <subcommand>`;
+function subcommandUsage(prefix) {
+    return {
+        'list': `myapi ${prefix} list [--json]`,
+        'create': `myapi ${prefix} create [--name <name>]\n\nCreates a new API key. If --name is omitted you will be prompted.`,
+        'revoke': `myapi ${prefix} revoke <id>\n\nPermanently revokes an API key by ID. The key stops working immediately and the action cannot be undone.`,
+    };
+}
+async function dispatch(prefix, subcommand, args, flags) {
+    if (!subcommand || (flags.help && !subcommand)) {
+        info(prefix === 'keys' ? KEYS_HEADER : API_KEYS_HEADER);
+        return;
+    }
     if (flags.help) {
-        info('Usage: myapi auth api-keys create [--name <name>]\n\nCreates a new API key.\n\nFlags:\n  --name <name>   Key name (skips prompt)');
+        const usage = subcommandUsage(prefix)[subcommand];
+        if (usage)
+            info(`Usage: ${usage}`);
+        else
+            info(`Unknown subcommand: ${subcommand}. Run "myapi ${prefix} --help" for the list.`);
         return;
     }
+    switch (subcommand) {
+        case 'create': return createNew(flags);
+        case 'list': return list(flags);
+        case 'revoke': return revoke(args[0], flags);
+        default: error(`Unknown subcommand: ${subcommand}. Run "myapi ${prefix} --help" for available subcommands.`);
+    }
+}
+export async function run(subcommand, args, flags) {
+    return dispatch('keys', subcommand, args, flags);
+}
+export async function runApiKeys(subcommand, args, flags) {
+    return dispatch('auth api-keys', subcommand, args, flags);
+}
+export async function createNew(flags) {
     const config = requireConfig();
     let name = flags.name || '';
     if (!name) {
@@ -15,46 +67,33 @@ export async function createNew(flags) {
         name = await new Promise(resolve => rl.question('Enter a name for the new key: ', resolve));
         rl.close();
     }
-    if (!name.trim()) {
+    if (!name.trim())
         error('Key name cannot be empty. Use --name <name>');
-        return;
-    }
     const keyInfo = await hq.createApiKey(config.api_key, name.trim());
     success(`New API key created!\n\nName: ${keyInfo.prefix}...\nKey:  ${keyInfo.api_key}\n\nMake sure to copy your new API key now. You won't be able to see it again!`);
 }
 export async function list(flags) {
-    if (flags.help) {
-        info('Usage: myapi auth api-keys list [--json]\n\nLists all API keys associated with your account.\n\nAlias: myapi keys list\n\nFlags:\n  --json   Output raw JSON');
-        return;
-    }
     const config = requireConfig();
     const keysList = await hq.listApiKeys(config.api_key);
     if (flags.json) {
         printJson(keysList);
         return;
     }
-    const formattedKeys = keysList.map(k => {
-        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,
-            ID: k.id,
-            'Created At': createdStr,
-            'Last Used': lastUsedStr
-        };
+    const formattedKeys = keysList.map(k => ({
+        Name: k.name || 'Unnamed',
+        Prefix: k.prefix,
+        ID: k.id,
+        'Created At': formatDate(k.created_at),
+        'Last Used': k.last_used_at ? formatDate(k.last_used_at) : 'Never',
+    }));
+    printTable(formattedKeys, {
+        flags,
+        empty: 'No API keys yet. Create one with: myapi keys create',
     });
-    printTable(formattedKeys);
 }
 export async function revoke(id, flags) {
-    if (flags.help) {
-        info('Usage: myapi auth api-keys revoke <id>\n\nPermanently revokes an API key by ID. This action cannot be undone.\nThe key stops working immediately.\n\nAlias: myapi keys revoke <id>');
-        return;
-    }
-    if (!id) {
-        error("Missing key ID. Usage: myapi keys revoke <id>");
-        return;
-    }
+    if (!id)
+        error('Missing key ID. Usage: myapi keys revoke <id>');
     const config = requireConfig();
     await hq.revokeApiKey(config.api_key, id);
     success(`Key ${id} revoked successfully.`);

package/dist/commands/org.d.ts

@@ -1,5 +1,9 @@
-export declare function create(restArgs: string[], flags: Record<string, string | boolean>): Promise<void>;
-export declare function list(flags: Record<string, string | boolean>): Promise<void>;
-export declare function get(id: string, flags: Record<string, string | boolean>): Promise<void>;
-export declare function del(id: string, flags: Record<string, string | boolean>): Promise<void>;
-export declare function importOrg(args: string[], flags: Record<string, string | boolean>): Promise<void>;
+import type { FlagSchema } from '../flags.js';
+import { type Flags } from '../helpers.js';
+export declare const SCHEMA: FlagSchema;
+export declare function create(restArgs: string[], flags: Flags): Promise<void>;
+export declare function list(flags: Flags): Promise<void>;
+export declare function get(id: string, flags: Flags): Promise<void>;
+export declare function del(id: string, _flags: Flags): Promise<void>;
+export declare function importOrg(args: string[], flags: Flags): Promise<void>;
+export declare function run(subcommand: string | undefined, args: string[], flags: Flags): Promise<void>;

package/dist/commands/org.js

@@ -3,16 +3,20 @@ import { hq, funnel as sdkFunnel } from '@myapihq/sdk';
 import { requireConfig, saveConfig } from '../config.js';
 import { success, error, printTable, printJson, info } from '../output.js';
 import { sleep, formatDate } from '../utils.js';
+import { requireOrg } from '../helpers.js';
+export const SCHEMA = {
+    name: 'string',
+    tagline: 'string',
+    description: 'string',
+    'business-sector': 'string',
+    'logo-url': 'string',
+    org: 'string',
+};
+const SYNC_BRAND_TIMEOUT_MS = 5 * 60 * 1000;
 export async function create(restArgs, flags) {
-    if (flags.help) {
-        info('Usage: myapi org create <name> [options]\n       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 (alternative to positional argument)\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  --json              Output raw JSON (non-interactive, skips prompts)\n\nExamples:\n  myapi org create "Acme Inc"\n  myapi org create "Acme Inc" --yes\n  myapi org create --name "Acme Inc" --yes');
-        return;
-    }
     const name = flags.name || restArgs[0];
-    if (!name) {
-        error("Missing org name. Usage: myapi org create \"My Company\" [--yes]");
-        return;
-    }
+    if (!name)
+        error('Missing org name. Usage: myapi org create "My Company" [--yes]');
     const config = requireConfig();
     const payload = { name };
     if (flags.tagline)
@@ -32,7 +36,7 @@ export async function create(restArgs, flags) {
     }
     const setDefault = flags.yes || await new Promise(resolve => {
         const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-        rl.question(`› Set as default org and funnel? (Y/n) `, ans => {
+        rl.question('› Set as default org and funnel? (Y/n) ', ans => {
             rl.close();
             resolve(ans.trim().toLowerCase() !== 'n');
         });
@@ -59,10 +63,6 @@ export async function create(restArgs, flags) {
     }
 }
 export async function list(flags) {
-    if (flags.help) {
-        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) {
@@ -83,19 +83,16 @@ export async function list(flags) {
         name: o.id === config.default_org ? `${o.name} *` : o.name,
         created_at: o.created_at ? formatDate(o.created_at) : '',
     }));
-    printTable(rows);
+    printTable(rows, {
+        flags,
+        empty: 'No organizations found. Create one with: myapi org create "My Company"',
+    });
 }
 export async function get(id, flags) {
-    if (flags.help) {
-        info('Usage: myapi org get <id> [--json]\n\nFetches details of a specific organization.\n\nFlags:\n  --json   Output raw JSON');
-        return;
-    }
     const config = requireConfig();
     const resolvedId = id || config.default_org;
-    if (!resolvedId) {
-        error("Missing org id. Usage: myapi org get <id>\n(Or set a default: myapi config set-org <id>)");
-        return;
-    }
+    if (!resolvedId)
+        error('Missing org id. Usage: myapi org get <id>\n(Or set a default: myapi config set-org <id>)');
     const org = await hq.getOrg(config.api_key, resolvedId);
     if (flags.json) {
         printJson(org);
@@ -110,49 +107,105 @@ export async function get(id, flags) {
     if (org.preview_subdomain)
         info(`Preview: https://${org.preview_subdomain}.makeautonomous.com`);
 }
-export async function del(id, flags) {
-    if (flags.help) {
-        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) {
-        error("Missing org id. Usage: myapi org delete <id>");
-        return;
-    }
+export async function del(id, _flags) {
+    if (!id)
+        error('Missing org id. Usage: myapi org delete <id>');
     const config = requireConfig();
     await hq.deleteOrg(config.api_key, id);
     success(`Org ${id} deleted`);
 }
 export async function importOrg(args, flags) {
-    if (flags.help) {
-        info('Usage: myapi org sync-brand <domain> --org <id>\n\nFetches an existing website and extracts brand signals (name, logo, description,\nbusiness sector) to enrich your organization profile automatically.\n\nThis does NOT register or transfer the domain — it only reads from the site.\nThe org must already exist before running this command.\n\nPrerequisite:\n  myapi org create --name "My Brand" --yes\n\nExample:\n  myapi org sync-brand example.com --org <id>');
-        return;
-    }
     const config = requireConfig();
     const domain = args[0] || config.default_domain;
-    const orgId = flags.org || config.default_org;
-    if (!domain || !orgId) {
-        error("Missing required arguments.\nUsage: myapi org import <domain> --org <id>\n(Or set defaults via: myapi config set-org <id> / set-domain <domain>)");
-        return;
-    }
+    const orgId = requireOrg(flags, config, 'myapi org sync-brand <domain> [--org <id>]');
+    if (!domain)
+        error('Missing required arguments.\nUsage: myapi org sync-brand <domain> [--org <id>]\n(Or set default: myapi config set-domain <domain>)');
     const result = await hq.importOrg(config.api_key, orgId, domain);
     const importId = result.job_id;
-    process.stdout.write("Importing ");
+    process.stdout.write('Importing ');
     const chars = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
     let i = 0;
-    while (true) {
+    let elapsed = 0;
+    while (elapsed < SYNC_BRAND_TIMEOUT_MS) {
         const status = await hq.getOrgImportStatus(config.api_key, importId);
         if (status.status === 'awaiting_confirm') {
             process.stdout.write('\r\x1b[K');
-            break;
+            const org = await hq.confirmOrgImport(config.api_key, importId);
+            success(`Import complete! Org ID: ${org.id}`);
+            return;
         }
         if (status.status === 'failed') {
             process.stdout.write('\r\x1b[K');
-            error("Import failed");
+            error('Import failed');
         }
         process.stdout.write(`\rImporting ${chars[i++ % chars.length]}`);
         await sleep(3000);
+        elapsed += 3000;
+    }
+    process.stdout.write('\r\x1b[K');
+    error(`Import timed out after ${SYNC_BRAND_TIMEOUT_MS / 1000}s. The job may still complete in the background — re-run "myapi org sync-brand" to retry.`);
+}
+// ── Dispatcher ───────────────────────────────────────────────────────────────
+const SUBCOMMAND_USAGE = {
+    'list': 'myapi org list [--json]',
+    'create': `myapi org create <name> [--tagline <str>] [--description <str>] [--business-sector <str>] [--logo-url <url>] [--yes] [--json]
+       myapi org create --name <name> [...]
+
+Creates a new organization. A funnel (website) is automatically created alongside it.
+Pass --yes to skip the "set as default?" prompt (useful in CI / agent workflows).
+
+Examples:
+  myapi org create "Acme Inc"
+  myapi org create "Acme Inc" --yes
+  myapi org create --name "Acme Inc" --yes`,
+    'get': 'myapi org get <id> [--json]',
+    'delete': `myapi org delete <id>
+
+Permanently deletes an organization and its associated funnels.
+Any registered domains assigned to this org must be unassigned first.
+No confirmation prompt — the action is immediate.`,
+    'sync-brand': `myapi org sync-brand <domain> [--org <id>]
+
+Fetches an existing website and extracts brand signals (name, logo, description,
+business sector) to enrich your organization profile.
+
+Does NOT register or transfer the domain — it only reads from the site.
+The org must already exist. Polls for up to 5 minutes.
+
+Example:
+  myapi org create --name "My Brand" --yes
+  myapi org sync-brand example.com --org <id>`,
+};
+export async function run(subcommand, args, flags) {
+    if (!subcommand || (flags.help && !subcommand)) {
+        info(`Usage: myapi org <subcommand>
+
+Subcommands:
+  list        List organizations
+  create      Create an organization (e.g. myapi org create "Name" --yes)
+  get         Get details of an organization
+  delete      Delete an organization
+  sync-brand  Sync brand info (name, logo, description) from an existing website`);
+        return;
+    }
+    if (flags.help) {
+        const lookup = subcommand === 'import' ? 'sync-brand' : subcommand;
+        const usage = SUBCOMMAND_USAGE[lookup];
+        if (usage)
+            info(`Usage: ${usage}`);
+        else
+            info(`Unknown subcommand: ${subcommand}. Run "myapi org --help" for the list.`);
+        return;
+    }
+    switch (subcommand) {
+        case 'list': return list(flags);
+        case 'create': return create(args, flags);
+        case 'get': return get(args[0], flags);
+        case 'delete': return del(args[0], flags);
+        case 'sync-brand': return importOrg(args, flags);
+        case 'import':
+            process.stderr.write('› Note: "org import" is deprecated — use "org sync-brand" instead.\n');
+            return importOrg(args, flags);
+        default: error(`Unknown subcommand: ${subcommand}. Run "myapi org --help" for available subcommands.`);
     }
-    const org = await hq.confirmOrgImport(config.api_key, importId);
-    success(`Import complete! Org ID: ${org.id}`);
 }