@myapihq/cli 1.0.14 → 1.0.16

package/dist/commands/billing.js

@@ -68,7 +68,7 @@ async function topup(amountStr, flags) {
 }
 async function setup(flags) {
     if (flags.help) {
-        (0, output_js_1.info)('Usage: myapi billing setup\n\nGenerates a secure Stripe Checkout link to add or update your payment method.');
+        (0, output_js_1.info)('Usage: myapi billing setup\n\nGenerates a secure checkout link to add or update your payment method.');
         return;
     }
     const config = (0, config_js_1.requireConfig)();

package/dist/commands/email.d.ts

@@ -1,7 +1,9 @@
 export declare function createMailbox(flags: Record<string, string | boolean>): Promise<void>;
 export declare function listMailboxes(flags: Record<string, string | boolean>): Promise<void>;
+export declare function sent(flags: Record<string, string | boolean>): Promise<void>;
 export declare function send(flags: Record<string, string | boolean>): Promise<void>;
 export declare function inbox(address: string, flags: Record<string, string | boolean>): Promise<void>;
+export declare function outbox(address: string, flags: Record<string, string | boolean>): Promise<void>;
 export declare function listTemplates(flags: Record<string, string | boolean>): Promise<void>;
 export declare function generateTemplate(flags: Record<string, string | boolean>): Promise<void>;
 export declare function listCampaigns(flags: Record<string, string | boolean>): Promise<void>;

package/dist/commands/email.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMailbox = createMailbox;
 exports.listMailboxes = listMailboxes;
+exports.sent = sent;
 exports.send = send;
 exports.inbox = inbox;
+exports.outbox = outbox;
 exports.listTemplates = listTemplates;
 exports.generateTemplate = generateTemplate;
 exports.listCampaigns = listCampaigns;
@@ -27,21 +29,51 @@ async function listMailboxes(flags) {
     const config = (0, config_js_1.requireConfig)();
     const orgId = flags.org || config.default_org;
     if (!orgId)
-        (0, output_js_1.error)("Missing required arguments.\nUsage: myapi email list-mailboxes --org <id>\n(Or set a default org via: myapi config set-org <id>)");
-    const mailboxes = await sdk_1.email.listMailboxes(config.api_key, orgId);
+        (0, output_js_1.error)("Missing required arguments.\nUsage: myapi email list-mailboxes --org <id> [--domain <domain> | --filter unassigned]\n(Or set a default org via: myapi config set-org <id>)");
+    if (!flags.domain && flags.filter !== 'unassigned')
+        (0, output_js_1.error)("Must provide either --domain <domain> or --filter unassigned");
+    const mailboxes = await sdk_1.email.listMailboxes(config.api_key, orgId, {
+        domain: flags.domain,
+        filter: flags.filter === 'unassigned' ? 'unassigned' : undefined
+    });
     (0, output_js_1.printTable)(mailboxes);
 }
+async function sent(flags) {
+    const config = (0, config_js_1.requireConfig)();
+    const orgId = flags.org || config.default_org;
+    if (!orgId)
+        (0, output_js_1.error)("Missing required arguments.\nUsage: myapi email sent --org <id> [--limit <num>] [--offset <num>]\n(Or set defaults via: myapi config set-org <id>)");
+    const limit = parseInt(flags.limit) || 50;
+    const offset = parseInt(flags.offset) || 0;
+    const emails = await sdk_1.email.getSentEmails(config.api_key, orgId, limit, offset);
+    (0, output_js_1.printTable)(emails);
+}
 async function send(flags) {
     const config = (0, config_js_1.requireConfig)();
     const orgId = flags.org || config.default_org;
-    if (!orgId || !flags.from || !flags.to || !flags.subject || !flags.body) {
-        (0, output_js_1.error)("Missing required arguments.\nUsage: myapi email send --org <id> --from <email> --to <email> --subject <str> --body <str>");
+    if (!orgId || !flags.from || !flags.to || !flags.subject) {
+        (0, output_js_1.error)("Missing required arguments.\nUsage: myapi email send --org <id> --from <email> --to <email> --subject <str> [--body <str> | --template-id <id> [--template-vars <json_str>]]");
+    }
+    if (!flags.body && !flags['template-id'])
+        (0, output_js_1.error)("Must provide either --body or --template-id");
+    if (flags.body && flags['template-id'])
+        (0, output_js_1.error)("Cannot provide both --body and --template-id");
+    let templateVars;
+    if (flags['template-vars']) {
+        try {
+            templateVars = JSON.parse(flags['template-vars']);
+        }
+        catch (e) {
+            (0, output_js_1.error)("--template-vars must be a valid JSON string");
+        }
     }
     const res = await sdk_1.email.sendEmail(config.api_key, orgId, {
         from: flags.from,
         to: [flags.to],
         subject: flags.subject,
-        text: flags.body
+        text: flags.body,
+        template_id: flags['template-id'],
+        template_vars: templateVars
     });
     (0, output_js_1.success)(`Email sent! Message ID: ${res.message_id}`);
 }
@@ -53,6 +85,14 @@ async function inbox(address, flags) {
     const messages = await sdk_1.email.getInbox(config.api_key, orgId, address);
     (0, output_js_1.printTable)(messages);
 }
+async function outbox(address, flags) {
+    const config = (0, config_js_1.requireConfig)();
+    const orgId = flags.org || config.default_org;
+    if (!orgId || !address)
+        (0, output_js_1.error)("Missing required arguments.\nUsage: myapi email outbox <address> --org <id>");
+    const messages = await sdk_1.email.getOutbox(config.api_key, orgId, address);
+    (0, output_js_1.printTable)(messages);
+}
 async function listTemplates(flags) {
     const config = (0, config_js_1.requireConfig)();
     const orgId = flags.org || config.default_org;
@@ -111,18 +151,22 @@ async function campaignStats(id, flags) {
 }
 async function run(subcommand, args, flags) {
     if (!subcommand || (flags.help && !subcommand)) {
-        (0, output_js_1.info)('Usage: myapi email <subcommand>\n\nSubcommands:\n  create-mailbox      Create a new mailbox\n  list-mailboxes      List mailboxes\n  send                Send an email\n  inbox               Read received emails\n  list-templates      List email templates\n  generate-template   Generate AI template\n  list-campaigns      List campaigns\n  campaign-stats      Get campaign stats\n\nNote: All email commands require the --org <id> flag.');
+        (0, output_js_1.info)('Usage: myapi email <subcommand>\n\nSubcommands:\n  create-mailbox      Create a new mailbox\n  list-mailboxes      List mailboxes\n  send                Send an email\n  sent                List sent emails\n  inbox               Read received emails\n  outbox              Read sent emails for address\n  list-templates      List email templates\n  generate-template   Generate AI template\n  list-campaigns      List campaigns\n  campaign-stats      Get campaign stats\n\nNote: All email commands require the --org <id> flag.');
         return;
     }
     if (flags.help) {
         if (subcommand === 'create-mailbox')
             (0, output_js_1.info)('Usage: myapi email create-mailbox --org <id> --domain <domain> --username <user>');
         else if (subcommand === 'list-mailboxes')
-            (0, output_js_1.info)('Usage: myapi email list-mailboxes --org <id>');
+            (0, output_js_1.info)('Usage: myapi email list-mailboxes --org <id> [--domain <domain> | --filter unassigned]');
         else if (subcommand === 'send')
-            (0, output_js_1.info)('Usage: myapi email send --org <id> --from <email> --to <email> --subject <str> --body <str>');
+            (0, output_js_1.info)('Usage: myapi email send --org <id> --from <email> --to <email> --subject <str> [--body <str> | --template-id <id> [--template-vars <json_str>]]');
+        else if (subcommand === 'sent')
+            (0, output_js_1.info)('Usage: myapi email sent --org <id> [--limit <num>] [--offset <num>]');
         else if (subcommand === 'inbox')
             (0, output_js_1.info)('Usage: myapi email inbox <address> --org <id>');
+        else if (subcommand === 'outbox')
+            (0, output_js_1.info)('Usage: myapi email outbox <address> --org <id>');
         else if (subcommand === 'list-templates')
             (0, output_js_1.info)('Usage: myapi email list-templates --org <id>');
         else if (subcommand === 'generate-template')
@@ -139,8 +183,12 @@ async function run(subcommand, args, flags) {
         await listMailboxes(flags);
     else if (subcommand === 'send')
         await send(flags);
+    else if (subcommand === 'sent')
+        await sent(flags);
     else if (subcommand === 'inbox')
         await inbox(args[0], flags);
+    else if (subcommand === 'outbox')
+        await outbox(args[0], flags);
     else if (subcommand === 'list-templates')
         await listTemplates(flags);
     else if (subcommand === 'generate-template')

package/dist/commands/funnel.d.ts

@@ -1,3 +1,7 @@
 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(id: string, 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>;

package/dist/commands/funnel.js

@@ -2,27 +2,54 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.list = list;
 exports.create = create;
+exports.get = get;
+exports.del = del;
 exports.push = push;
+exports.verify = verify;
+exports.run = run;
 const sdk_1 = require("@myapihq/sdk");
 const config_js_1 = require("../config.js");
 const output_js_1 = require("../output.js");
 async function list(flags) {
     const config = (0, config_js_1.requireConfig)();
-    const funnels = await sdk_1.funnel.listFunnels(config.api_key);
+    const orgId = flags.org || config.default_org;
+    if (!orgId)
+        (0, output_js_1.error)("Missing required arguments.\nUsage: myapi funnel list --org <id>\n(Or set defaults via: myapi config set-org <id>)");
+    const funnels = await sdk_1.funnel.listFunnels(config.api_key, orgId);
     (0, output_js_1.printTable)(funnels);
 }
 async function create(flags) {
-    if (!flags['org-id'] || !flags.domain) {
-        (0, output_js_1.error)("Missing --org-id or --domain flags");
-    }
     const config = (0, config_js_1.requireConfig)();
-    const funnel = await sdk_1.funnel.createFunnel(config.api_key, flags['org-id'], flags.domain);
+    const orgId = flags.org || config.default_org;
+    const domain = flags.domain || config.default_domain;
+    if (!orgId || !domain) {
+        (0, output_js_1.error)("Missing required arguments.\nUsage: myapi funnel create --org <id> --domain <domain>\n(Or set defaults via: myapi config set-org <id> / set-domain <domain>)");
+    }
+    const funnel = await sdk_1.funnel.createFunnel(config.api_key, orgId, domain);
     (0, output_js_1.success)(`Funnel created! ID: ${funnel.id}`);
 }
+async function get(id, flags) {
+    const config = (0, config_js_1.requireConfig)();
+    const orgId = flags.org || config.default_org;
+    if (!orgId || !id)
+        (0, output_js_1.error)("Missing required arguments.\nUsage: myapi funnel get <id> --org <id>\n(Or set defaults via: myapi config set-org <id>)");
+    const funnel = await sdk_1.funnel.getFunnel(config.api_key, orgId, id);
+    (0, output_js_1.printJson)(funnel);
+}
+async function del(id, flags) {
+    const config = (0, config_js_1.requireConfig)();
+    const orgId = flags.org || config.default_org;
+    if (!orgId || !id)
+        (0, output_js_1.error)("Missing required arguments.\nUsage: myapi funnel delete <id> --org <id>\n(Or set defaults via: myapi config set-org <id>)");
+    await sdk_1.funnel.deleteFunnel(config.api_key, orgId, id);
+    (0, output_js_1.success)(`Funnel ${id} deleted`);
+}
 async function push(id, slug, flags) {
-    if (!id || !slug)
-        (0, output_js_1.error)("Missing id or slug");
     const config = (0, config_js_1.requireConfig)();
+    const orgId = flags.org || config.default_org;
+    if (!orgId || !id || !slug) {
+        (0, output_js_1.error)("Missing required arguments.\nUsage: myapi funnel push <funnel_id> <slug> --org <id> < index.html\n(Or set defaults via: myapi config set-org <id>)");
+    }
     const html = await new Promise((resolve, reject) => {
         let data = '';
         process.stdin.setEncoding('utf-8');
@@ -32,6 +59,52 @@ async function push(id, slug, flags) {
     });
     if (!html)
         (0, output_js_1.error)("No HTML provided via stdin");
-    await sdk_1.funnel.pushPage(config.api_key, id, slug, html);
+    await sdk_1.funnel.pushFunnelPage(config.api_key, orgId, id, { slug, html });
     (0, output_js_1.success)(`Pushed page to ${slug}`);
 }
+async function verify(id, flags) {
+    const config = (0, config_js_1.requireConfig)();
+    const orgId = flags.org || config.default_org;
+    if (!orgId || !id)
+        (0, output_js_1.error)("Missing required arguments.\nUsage: myapi funnel verify <id> --org <id> [--slug <slug>]\n(Or set defaults via: myapi config set-org <id>)");
+    const opts = {};
+    if (flags.slug)
+        opts.slug = flags.slug;
+    const v = await sdk_1.funnel.verifyFunnel(config.api_key, orgId, id, opts);
+    (0, output_js_1.printJson)(v);
+}
+async function run(subcommand, args, flags) {
+    if (!subcommand || (flags.help && !subcommand)) {
+        (0, output_js_1.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  verify     Verify links and webhooks\n\nNote: All funnel commands require the --org <id> flag.');
+        return;
+    }
+    if (flags.help) {
+        if (subcommand === 'list')
+            (0, output_js_1.info)('Usage: myapi funnel list --org <id>');
+        else if (subcommand === 'create')
+            (0, output_js_1.info)('Usage: myapi funnel create --org <id> --domain <domain>');
+        else if (subcommand === 'get')
+            (0, output_js_1.info)('Usage: myapi funnel get <id> --org <id>');
+        else if (subcommand === 'delete')
+            (0, output_js_1.info)('Usage: myapi funnel delete <id> --org <id>');
+        else if (subcommand === 'push')
+            (0, output_js_1.info)('Usage: myapi funnel push <funnel_id> <slug> --org <id> < index.html\n\nPushes HTML content from stdin to the specified funnel.');
+        else if (subcommand === 'verify')
+            (0, output_js_1.info)('Usage: myapi funnel verify <id> --org <id> [--slug <slug>]\n\nVerifies syntax and structure before pushing.');
+        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], args[1], flags);
+    else if (subcommand === 'verify')
+        await verify(args[0], flags);
+    else
+        (0, output_js_1.error)(`Unknown subcommand: ${subcommand}. Run "myapi funnel --help" for a list of valid subcommands.`);
+}

package/dist/index.js

@@ -44,7 +44,7 @@ const orgCmd = __importStar(require("./commands/org.js"));
 const setupCmd = __importStar(require("./commands/setup.js"));
 const configCmd = __importStar(require("./commands/config.js"));
 const domainCmd = __importStar(require("./commands/domain.js"));
-const emailCmd = __importStar(require("./commands/email.js"));
+const funnelCmd = __importStar(require("./commands/funnel.js"));
 async function main() {
     const { args, flags } = (0, utils_js_1.parseArgs)(process.argv.slice(2));
     if (args.length === 0) {
@@ -115,8 +115,8 @@ async function main() {
             case 'domain':
                 await domainCmd.run(subcommand, restArgs, flags);
                 break;
-            case 'email':
-                await emailCmd.run(subcommand, restArgs, flags);
+            case 'funnel':
+                await funnelCmd.run(subcommand, restArgs, flags);
                 break;
             default:
                 printHelp();
@@ -145,7 +145,7 @@ Commands:
   setup        Setup CLI credentials and view integration instructions
   config       Manage CLI defaults like org_id and domain
   domain       Manage domain configurations
-  email        Send emails and manage templates
+  funnel       Manage headless funnels and pages
 
 Run "myapi <command> --help" for subcommand help.`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myapihq/cli",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "MyAPI command-line interface",
   "main": "dist/index.js",
   "bin": {

package/src/commands/billing.ts

@@ -74,7 +74,7 @@ export async function topup(amountStr: string, flags: Record<string, string | bo
 
 export async function setup(flags: Record<string, string | boolean>) {
   if (flags.help) {
-    info('Usage: myapi billing setup\n\nGenerates a secure Stripe Checkout link to add or update your payment method.');
+    info('Usage: myapi billing setup\n\nGenerates a secure checkout link to add or update your payment method.');
     return;
   }
   const config = requireConfig();

package/src/commands/email.ts

@@ -17,22 +17,50 @@ export async function createMailbox(flags: Record<string, string | boolean>) {
 export async function listMailboxes(flags: Record<string, string | boolean>) {
   const config = requireConfig();
   const orgId = (flags.org as string) || config.default_org;
-  if (!orgId) error("Missing required arguments.\nUsage: myapi email list-mailboxes --org <id>\n(Or set a default org via: myapi config set-org <id>)");
-  const mailboxes = await sdkEmail.listMailboxes(config.api_key, orgId);
+  if (!orgId) error("Missing required arguments.\nUsage: myapi email list-mailboxes --org <id> [--domain <domain> | --filter unassigned]\n(Or set a default org via: myapi config set-org <id>)");
+  if (!flags.domain && flags.filter !== 'unassigned') error("Must provide either --domain <domain> or --filter unassigned");
+  const mailboxes = await sdkEmail.listMailboxes(config.api_key, orgId, {
+    domain: flags.domain as string | undefined,
+    filter: flags.filter === 'unassigned' ? 'unassigned' : undefined
+  });
   printTable(mailboxes as unknown as Record<string, unknown>[]);
 }
 
+export async function sent(flags: Record<string, string | boolean>) {
+  const config = requireConfig();
+  const orgId = (flags.org as string) || config.default_org;
+  if (!orgId) error("Missing required arguments.\nUsage: myapi email sent --org <id> [--limit <num>] [--offset <num>]\n(Or set defaults via: myapi config set-org <id>)");
+  const limit = parseInt(flags.limit as string) || 50;
+  const offset = parseInt(flags.offset as string) || 0;
+  const emails = await sdkEmail.getSentEmails(config.api_key, orgId, limit, offset);
+  printTable(emails as unknown as Record<string, unknown>[]);
+}
+
 export async function send(flags: Record<string, string | boolean>) {
   const config = requireConfig();
   const orgId = (flags.org as string) || config.default_org;
-  if (!orgId || !flags.from || !flags.to || !flags.subject || !flags.body) {
-    error("Missing required arguments.\nUsage: myapi email send --org <id> --from <email> --to <email> --subject <str> --body <str>");
+  if (!orgId || !flags.from || !flags.to || !flags.subject) {
+    error("Missing required arguments.\nUsage: myapi email send --org <id> --from <email> --to <email> --subject <str> [--body <str> | --template-id <id> [--template-vars <json_str>]]");
+  }
+  if (!flags.body && !flags['template-id']) error("Must provide either --body or --template-id");
+  if (flags.body && flags['template-id']) error("Cannot provide both --body and --template-id");
+  
+  let templateVars: Record<string, string> | undefined;
+  if (flags['template-vars']) {
+    try {
+      templateVars = JSON.parse(flags['template-vars'] as string);
+    } catch (e) {
+      error("--template-vars must be a valid JSON string");
+    }
   }
+
   const res = await sdkEmail.sendEmail(config.api_key, orgId, {
     from: flags.from as string,
     to: [flags.to as string],
     subject: flags.subject as string,
-    text: flags.body as string
+    text: flags.body as string | undefined,
+    template_id: flags['template-id'] as string | undefined,
+    template_vars: templateVars
   });
   success(`Email sent! Message ID: ${res.message_id}`);
 }
@@ -45,6 +73,14 @@ export async function inbox(address: string, flags: Record<string, string | bool
   printTable(messages as unknown as Record<string, unknown>[]);
 }
 
+export async function outbox(address: string, flags: Record<string, string | boolean>) {
+  const config = requireConfig();
+  const orgId = (flags.org as string) || config.default_org;
+  if (!orgId || !address) error("Missing required arguments.\nUsage: myapi email outbox <address> --org <id>");
+  const messages = await sdkEmail.getOutbox(config.api_key, orgId, address);
+  printTable(messages as unknown as Record<string, unknown>[]);
+}
+
 export async function listTemplates(flags: Record<string, string | boolean>) {
   const config = requireConfig();
   const orgId = (flags.org as string) || config.default_org;
@@ -107,15 +143,17 @@ export async function campaignStats(id: string, flags: Record<string, string | b
 
 export async function run(subcommand: string | undefined, args: string[], flags: Record<string, string | boolean>) {
   if (!subcommand || (flags.help && !subcommand)) {
-    info('Usage: myapi email <subcommand>\n\nSubcommands:\n  create-mailbox      Create a new mailbox\n  list-mailboxes      List mailboxes\n  send                Send an email\n  inbox               Read received emails\n  list-templates      List email templates\n  generate-template   Generate AI template\n  list-campaigns      List campaigns\n  campaign-stats      Get campaign stats\n\nNote: All email commands require the --org <id> flag.');
+    info('Usage: myapi email <subcommand>\n\nSubcommands:\n  create-mailbox      Create a new mailbox\n  list-mailboxes      List mailboxes\n  send                Send an email\n  sent                List sent emails\n  inbox               Read received emails\n  outbox              Read sent emails for address\n  list-templates      List email templates\n  generate-template   Generate AI template\n  list-campaigns      List campaigns\n  campaign-stats      Get campaign stats\n\nNote: All email commands require the --org <id> flag.');
     return;
   }
   
   if (flags.help) {
     if (subcommand === 'create-mailbox') info('Usage: myapi email create-mailbox --org <id> --domain <domain> --username <user>');
-    else if (subcommand === 'list-mailboxes') info('Usage: myapi email list-mailboxes --org <id>');
-    else if (subcommand === 'send') info('Usage: myapi email send --org <id> --from <email> --to <email> --subject <str> --body <str>');
+    else if (subcommand === 'list-mailboxes') info('Usage: myapi email list-mailboxes --org <id> [--domain <domain> | --filter unassigned]');
+    else if (subcommand === 'send') info('Usage: myapi email send --org <id> --from <email> --to <email> --subject <str> [--body <str> | --template-id <id> [--template-vars <json_str>]]');
+    else if (subcommand === 'sent') info('Usage: myapi email sent --org <id> [--limit <num>] [--offset <num>]');
     else if (subcommand === 'inbox') info('Usage: myapi email inbox <address> --org <id>');
+    else if (subcommand === 'outbox') info('Usage: myapi email outbox <address> --org <id>');
     else if (subcommand === 'list-templates') info('Usage: myapi email list-templates --org <id>');
     else if (subcommand === 'generate-template') info('Usage: myapi email generate-template --org <id> --prompt <str> --name <str>');
     else if (subcommand === 'list-campaigns') info('Usage: myapi email list-campaigns --org <id>');
@@ -126,7 +164,9 @@ export async function run(subcommand: string | undefined, args: string[], flags:
   if (subcommand === 'create-mailbox') await createMailbox(flags);
   else if (subcommand === 'list-mailboxes') await listMailboxes(flags);
   else if (subcommand === 'send') await send(flags);
+  else if (subcommand === 'sent') await sent(flags);
   else if (subcommand === 'inbox') await inbox(args[0], flags);
+  else if (subcommand === 'outbox') await outbox(args[0], flags);
   else if (subcommand === 'list-templates') await listTemplates(flags);
   else if (subcommand === 'generate-template') await generateTemplate(flags);
   else if (subcommand === 'list-campaigns') await listCampaigns(flags);

package/src/commands/funnel.ts

@@ -1,26 +1,52 @@
 import { funnel as sdkFunnel } from '@myapihq/sdk';
 import { requireConfig } from '../config.js';
-import { success, error, printTable } from '../output.js';
+import { success, error, printTable, info, printJson } from '../output.js';
 import * as fs from 'fs';
 
 export async function list(flags: Record<string, string | boolean>) {
   const config = requireConfig();
-  const funnels = await sdkFunnel.listFunnels(config.api_key);
+  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>[]);
 }
 
 export async function create(flags: Record<string, string | boolean>) {
-  if (!flags['org-id'] || !flags.domain) {
-    error("Missing --org-id or --domain flags");
-  }
   const config = requireConfig();
-  const funnel = await sdkFunnel.createFunnel(config.api_key, flags['org-id'] as string, flags.domain as string);
+  const orgId = (flags.org as string) || config.default_org;
+  const domain = (flags.domain as string) || config.default_domain;
+  
+  if (!orgId || !domain) {
+    error("Missing required arguments.\nUsage: myapi funnel create --org <id> --domain <domain>\n(Or set defaults via: myapi config set-org <id> / set-domain <domain>)");
+  }
+  
+  const funnel = await sdkFunnel.createFunnel(config.api_key, orgId, domain);
   success(`Funnel created! ID: ${funnel.id}`);
 }
 
+export async function get(id: string, flags: Record<string, string | boolean>) {
+  const config = requireConfig();
+  const orgId = (flags.org as string) || 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 funnel = await sdkFunnel.getFunnel(config.api_key, orgId, id);
+  printJson(funnel);
+}
+
+export async function del(id: string, flags: Record<string, string | boolean>) {
+  const config = requireConfig();
+  const orgId = (flags.org as string) || 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>)");
+  await sdkFunnel.deleteFunnel(config.api_key, orgId, id);
+  success(`Funnel ${id} deleted`);
+}
+
 export async function push(id: string, slug: string, flags: Record<string, string | boolean>) {
-  if (!id || !slug) error("Missing id or slug");
   const config = requireConfig();
+  const orgId = (flags.org as string) || config.default_org;
+  
+  if (!orgId || !id || !slug) {
+    error("Missing required arguments.\nUsage: myapi funnel push <funnel_id> <slug> --org <id> < index.html\n(Or set defaults via: myapi config set-org <id>)");
+  }
   
   const html = await new Promise<string>((resolve, reject) => {
     let data = '';
@@ -32,6 +58,41 @@ export async function push(id: string, slug: string, flags: Record<string, strin
 
   if (!html) error("No HTML provided via stdin");
 
-  await sdkFunnel.pushPage(config.api_key, id, slug, html);
+  await sdkFunnel.pushFunnelPage(config.api_key, orgId, id, { slug, html });
   success(`Pushed page to ${slug}`);
 }
+
+export async function verify(id: string, flags: Record<string, string | boolean>) {
+  const config = requireConfig();
+  const orgId = (flags.org as string) || 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 opts: any = {};
+  if (flags.slug) opts.slug = flags.slug as string;
+  const v = await sdkFunnel.verifyFunnel(config.api_key, orgId, id, opts);
+  printJson(v);
+}
+
+export async function run(subcommand: string | undefined, args: string[], flags: Record<string, string | boolean>) {
+  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  verify     Verify links and webhooks\n\nNote: All funnel commands require the --org <id> flag.');
+    return;
+  }
+  
+  if (flags.help) {
+    if (subcommand === 'list') info('Usage: myapi funnel list --org <id>');
+    else if (subcommand === 'create') info('Usage: myapi funnel create --org <id> --domain <domain>');
+    else if (subcommand === 'get') info('Usage: myapi funnel get <id> --org <id>');
+    else if (subcommand === 'delete') info('Usage: myapi funnel delete <id> --org <id>');
+    else if (subcommand === 'push') info('Usage: myapi funnel push <funnel_id> <slug> --org <id> < index.html\n\nPushes HTML content from stdin to the specified funnel.');
+    else if (subcommand === 'verify') info('Usage: myapi funnel verify <id> --org <id> [--slug <slug>]\n\nVerifies syntax and structure before pushing.');
+    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], args[1], 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.`);
+}

package/src/index.ts

@@ -9,7 +9,7 @@ import * as orgCmd from './commands/org.js';
 import * as setupCmd from './commands/setup.js';
 import * as configCmd from './commands/config.js';
 import * as domainCmd from './commands/domain.js';
-import * as emailCmd from './commands/email.js';
+import * as funnelCmd from './commands/funnel.js';
 
 async function main() {
   const { args, flags } = parseArgs(process.argv.slice(2));
@@ -63,8 +63,8 @@ async function main() {
       case 'domain':
         await domainCmd.run(subcommand, restArgs, flags);
         break;
-      case 'email':
-        await emailCmd.run(subcommand, restArgs, flags);
+      case 'funnel':
+        await funnelCmd.run(subcommand, restArgs, flags);
         break;
       default:
         printHelp();
@@ -91,7 +91,7 @@ Commands:
   setup        Setup CLI credentials and view integration instructions
   config       Manage CLI defaults like org_id and domain
   domain       Manage domain configurations
-  email        Send emails and manage templates
+  funnel       Manage headless funnels and pages
 
 Run "myapi <command> --help" for subcommand help.`);
 }