@myapihq/cli 1.0.84 → 1.1.0-wip.1

package/dist/commands/org.js

@@ -1,18 +1,22 @@
-import * as readline from 'readline';
 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 { confirm } from '../prompt.js';
+import { formatDate, pollJob } from '../utils.js';
+import { requireOrg, requireArg } 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)
@@ -30,13 +34,7 @@ export async function create(restArgs, flags) {
             info(`Preview domain: https://${org.preview_subdomain}.makeautonomous.com`);
         }
     }
-    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.close();
-            resolve(ans.trim().toLowerCase() !== 'n');
-        });
-    });
+    const setDefault = !!flags.yes || await confirm('› Set as default org and funnel? (Y/n) ', true);
     let funnelId;
     if (setDefault) {
         config.default_org = org.id;
@@ -59,10 +57,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 +77,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 +101,94 @@ 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) {
+    requireArg(id, 'id', '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 ");
-    const chars = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
-    let i = 0;
-    while (true) {
-        const status = await hq.getOrgImportStatus(config.api_key, importId);
-        if (status.status === 'awaiting_confirm') {
-            process.stdout.write('\r\x1b[K');
-            break;
-        }
-        if (status.status === 'failed') {
-            process.stdout.write('\r\x1b[K');
-            error("Import failed");
-        }
-        process.stdout.write(`\rImporting ${chars[i++ % chars.length]}`);
-        await sleep(3000);
-    }
+    await pollJob({
+        label: 'Importing',
+        timeoutMs: SYNC_BRAND_TIMEOUT_MS,
+        intervalMs: 3000,
+        check: () => hq.getOrgImportStatus(config.api_key, importId),
+        isDone: s => s.status === 'awaiting_confirm',
+        isFailed: s => s.status === 'failed',
+        failedMessage: 'Import failed',
+        timeoutMessage: `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.`,
+    });
     const org = await hq.confirmOrgImport(config.api_key, importId);
     success(`Import complete! Org ID: ${org.id}`);
 }
+// ── 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.`);
+    }
+}

package/dist/commands/pixel.js

@@ -43,22 +43,34 @@ export async function identity(pixelId, flags) {
     const res = await sdkPixel.getIdentity(config.api_key, orgId, pixelId);
     printJson(res);
 }
+// ── Dispatcher ───────────────────────────────────────────────────────────────
+const SUBCOMMAND_USAGE = {
+    'interactions': 'myapi pixel interactions [--website <domain>] [--campaign-id <id>] [--domain <domain>] [--from <iso8601>] [--to <iso8601>] [--limit <num>] [--offset <num>] [--org <id>] [--json]',
+    'identity': 'myapi pixel identity <pixel_id> [--org <id>]',
+};
 export async function run(subcommand, args, flags) {
     if (!subcommand || (flags.help && !subcommand)) {
-        info('Usage: myapi pixel <subcommand>\n\nSubcommands:\n  interactions   Get a unified timeline of visits and events\n  identity       Resolve the identity graph for a pixel ID\n\nNote: All pixel commands require the --org <id> flag.');
+        info(`Usage: myapi pixel <subcommand>
+
+Subcommands:
+  interactions   Get a unified timeline of visits and events
+                 (requires at least one filter: --website, --campaign-id, or --domain)
+  identity       Resolve the identity graph (emails, IPs, profiles) for a pixel ID
+
+All commands accept --org <id> (or set default: myapi config set-org <id>).`);
         return;
     }
     if (flags.help) {
-        if (subcommand === 'interactions')
-            info('Usage: myapi pixel interactions --org <id> [--website <domain>] [--campaign-id <id>] [--domain <domain>] [--from <iso8601>] [--to <iso8601>] [--limit <num>] [--offset <num>] [--json]\n\nRetrieves a merged timeline of web visits and email events. Requires at least one filter (--website, --campaign-id, or --domain).');
-        else if (subcommand === 'identity')
-            info('Usage: myapi pixel identity <pixel_id> --org <id>\n\nResolves the full identity graph (emails, IPs, profiles) for a specific pixel tracker ID.');
+        const usage = SUBCOMMAND_USAGE[subcommand];
+        if (usage)
+            info(`Usage: ${usage}`);
+        else
+            info(`Unknown subcommand: ${subcommand}. Run "myapi pixel --help" for the list.`);
         return;
     }
-    if (subcommand === 'interactions')
-        await interactions(flags);
-    else if (subcommand === 'identity')
-        await identity(args[0], flags);
-    else
-        error(`Unknown subcommand: ${subcommand}. Run "myapi pixel --help" for a list of valid subcommands.`);
+    switch (subcommand) {
+        case 'interactions': return interactions(flags);
+        case 'identity': return identity(args[0], flags);
+        default: error(`Unknown subcommand: ${subcommand}. Run "myapi pixel --help" for a list of valid subcommands.`);
+    }
 }

package/dist/commands/setup.d.ts

@@ -1,3 +1,4 @@
+import type { Flags } from '../helpers.js';
 export declare function installSkills(): Promise<void>;
-export declare function importKey(apiKey: string, flags: Record<string, string | boolean>): Promise<void>;
-export declare function setup(flags?: Record<string, string | boolean>): Promise<void>;
+export declare function importKey(apiKey: string, flags: Flags): Promise<void>;
+export declare function setup(flags?: Flags): Promise<void>;