@myapihq/cli 1.3.13 → 2.1.0

package/dist/commands/keys.js

@@ -162,7 +162,7 @@ export async function revokeAll(flags) {
     const res = await hq.revokeAllKeys(config.api_key, kind);
     success(`Revoked ${res.revoked} key(s).`);
     if (!kind) {
-        info('Your current key was revoked too — re-authenticate with: myapi auth setup');
+        info('Your current key was revoked too — re-authenticate with: myapi account setup');
     }
 }
 // ── Dispatcher ───────────────────────────────────────────────────────────────
@@ -186,7 +186,7 @@ create flags:
   --org <org_id>       Lock the key to one org. Omit for account-wide.
   --spend-cap <usd>    Per-key spend ceiling in dollars, e.g. --spend-cap 50
 
-${prefix === 'keys' ? 'Alias for: myapi auth api-keys' : 'Alias: myapi keys <subcommand>'}`;
+${prefix === 'keys' ? 'Alias for: myapi account api-keys' : 'Alias: myapi keys <subcommand>'}`;
 }
 function subcommandUsage(prefix) {
     return {
@@ -203,7 +203,7 @@ Omitting --grant mints an unrestricted key. --grant slots: ${[...hq.GRANTABLE_SL
         'revoke-all': `myapi ${prefix} revoke-all [--kind function|manual|account] [--yes]
 
 Kill switch. With no --kind, revokes EVERY active key in the account — including
-the key this CLI is authenticated with (recovery: myapi auth setup). --kind
+the key this CLI is authenticated with (recovery: myapi account setup). --kind
 narrows it to one provenance class. Destructive — confirms unless --yes.`,
     };
 }

package/dist/commands/queue.d.ts

@@ -11,4 +11,5 @@ export declare function get(name: string, flags: Flags): Promise<void>;
 export declare function enqueue(name: string, flags: Flags): Promise<void>;
 export declare function jobs(name: string, flags: Flags): Promise<void>;
 export declare function job(jobId: string, flags: Flags): Promise<void>;
+export declare function del(name: string, flags: Flags): Promise<void>;
 export declare function run(subcommand: string | undefined, args: string[], flags: Flags): Promise<void>;

package/dist/commands/queue.js

@@ -165,11 +165,19 @@ export async function job(jobId, flags) {
     if (j.last_error)
         info(`Error:    ${j.last_error}`);
 }
+export async function del(name, flags) {
+    const config = requireConfig();
+    const orgId = requireOrg(flags, config, 'myapi queue delete <name> [--org <id>]');
+    requireArg(name, 'name', 'myapi queue delete <name>');
+    await sdkQueue.deleteQueue(config.api_key, orgId, name);
+    success(`Deleted queue: ${name}`);
+}
 // ── Dispatcher ───────────────────────────────────────────────────────────────
 const SUBCOMMAND_USAGE = {
     'create': 'myapi queue create <name> --consumer-url <url> [--max-attempts <n>] [--max-concurrency <n>] [--org <id>]',
     'list': 'myapi queue list [--org <id>] [--json]',
     'get': 'myapi queue get <name> [--org <id>] [--json]',
+    'delete': 'myapi queue delete <name> [--org <id>]',
     'enqueue': 'myapi queue enqueue <name> --payload <json> [--dedup-key <k>] [--delay <seconds>] [--depends-on <id,id>] [--org <id>]',
     'jobs': 'myapi queue jobs <name> [--status <s>] [--limit <n>] [--org <id>] [--json]',
     'job': 'myapi queue job <job_id> [--org <id>] [--json]',
@@ -185,6 +193,7 @@ Queues:
   create <name>     Create a queue (--consumer-url, --max-attempts, --max-concurrency)
   list              List queues
   get <name>        Show a queue's policy
+  delete <name>     Delete a queue (and its jobs)
 
 Jobs:
   enqueue <name>    Enqueue a job (--payload, --dedup-key, --delay, --depends-on)
@@ -208,6 +217,7 @@ All commands accept --org <id> (or set default: myapi config set-org <id>).`);
         case 'create': return create(args[0], flags);
         case 'list': return list(flags);
         case 'get': return get(args[0], flags);
+        case 'delete': return del(args[0], flags);
         case 'enqueue': return enqueue(args[0], flags);
         case 'jobs': return jobs(args[0], flags);
         case 'job': return job(args[0], flags);

package/dist/commands/setup.js

@@ -172,10 +172,10 @@ async function anonymousFlow() {
 // ---------------------------------------------------------------------------
 // Main setup command
 // ---------------------------------------------------------------------------
-const IMPORT_KEY_HELP = `Usage: myapi auth import-key <api_key> [--install-skills] [--no-skills]
+const IMPORT_KEY_HELP = `Usage: myapi account import-key <api_key> [--install-skills] [--no-skills]
 
 Imports an existing API key non-interactively. Use this in CI, Docker, or any
-environment where the interactive "myapi auth setup" flow is not practical.
+environment where the interactive "myapi account setup" flow is not practical.
 
 The key is validated against the API before being saved. Your default org and
 funnel are auto-detected from the account and written to the local config.
@@ -185,9 +185,9 @@ Flags:
   --no-skills        Skip skills installation even if previously installed
 
 Examples:
-  myapi auth import-key hq_live_xxxxxxxxxxxxxxxxxxxx
-  myapi auth import-key hq_live_xxxxxxxxxxxxxxxxxxxx --install-skills`;
-const SETUP_HELP = `Usage: myapi auth setup [--anonymous] [--yes] [--install-skills|--no-skills]
+  myapi account import-key hq_live_xxxxxxxxxxxxxxxxxxxx
+  myapi account import-key hq_live_xxxxxxxxxxxxxxxxxxxx --install-skills`;
+const SETUP_HELP = `Usage: myapi account setup [--anonymous] [--yes] [--install-skills|--no-skills]
 
 Configures your account and stores your default org and funnel so you don't
 need to pass --org or --funnel on every command.
@@ -197,7 +197,7 @@ Flags:
   --yes             Skip confirmation prompts
   --install-skills  Auto-install skills pack
   --no-skills       Skip skills installation`;
-// myapi auth import-key <key> — non-interactively import a raw API key.
+// myapi account import-key <key> — non-interactively import a raw API key.
 export async function importKey(apiKey, flags) {
     if (flags.help || !apiKey) {
         info(IMPORT_KEY_HELP);
@@ -278,7 +278,7 @@ export async function setup(flags = {}) {
     }
     else {
         info('› Continuing as anonymous — sites ship to *.makeautonomous.com');
-        info('  (Anonymous accounts have $0 credit. Link an email anytime to unlock $5 free credit and paid actions: myapi auth link <email>)');
+        info('  (Anonymous accounts have $0 credit. Link an email anytime to unlock $5 free credit and paid actions: myapi account link <email>)');
         const data = await anonymousFlow();
         apiKey = data.api_key;
         accountId = data.account_id;
@@ -320,7 +320,7 @@ export async function setup(flags = {}) {
         success('› Setup complete. No card, no email, ready to ship.');
         if (subdomainUrl)
             info(`› Your funnel: ${subdomainUrl}`);
-        info('› Upgrade anytime — myapi auth link');
+        info('› Upgrade anytime — myapi account link');
     }
     else {
         success(`› Setup complete. Org ${defaultOrg} ready · $5.00 free credits added.`);

package/dist/commands/status.d.ts

@@ -3,5 +3,5 @@ import { type Flags } from '../helpers.js';
 import type { Exposes } from '../exposes.js';
 export declare const EXPOSES: Exposes;
 export declare const SCHEMA: FlagSchema;
-export declare const STATUS_HELP = "Usage: myapi status [--org <id>] [--json]\n\nSingle-screen view of your account and what's running in the default org:\nidentity, balance, free-tier usage, plus resource counts across domains,\nfunnels, campaigns, webhooks, and workflows. Useful before a\nco-build session or when checking \"what's mid-flight\" without running six\nlist commands.\n\nEach section is best-effort \u2014 a failing service is shown as \"\u2014\", not an\nerror, so the rest of the snapshot still prints.\n";
+export declare const STATUS_HELP = "Usage: myapi status [--org <id>] [--json]\n\nSingle-screen view of your account and what's running in the default org:\nidentity, balance, free-tier usage, plus resource counts across domains,\nfunnels, webhooks, and workflows. Useful before a\nco-build session or when checking \"what's mid-flight\" without running six\nlist commands.\n\nEach section is best-effort \u2014 a failing service is shown as \"\u2014\", not an\nerror, so the rest of the snapshot still prints.\n";
 export declare function run(_subcommand: string | undefined, _args: string[], flags?: Flags): Promise<void>;

package/dist/commands/status.js

@@ -1,15 +1,16 @@
-import { hq, domain, funnel, email, webhook, workflow, MyApiError } from '@myapihq/sdk';
+import { hq, domain, funnel, webhook, workflow, MyApiError } from '@myapihq/sdk';
 // listMailboxes is omitted from this view: the backend requires a domain or
 // filter, so there is no global "all mailboxes in this org" call. Use
 // `myapi email mailbox list --domain <d>` for per-domain detail.
 import { loadConfig } from '../config.js';
+import { autoRechargeSummary } from './billing.js';
 import { info, error, printJson } from '../output.js';
 export const EXPOSES = [
     'GET /hq/billing/balance',
+    'GET /hq/billing/auto-recharge',
     'GET /hq/account/free-tier',
-    'GET /domain/orgs/{org_id}/domains',
+    'GET /domain/orgs/{org_id}/list',
     'GET /funnel/orgs/{org_id}/funnels',
-    'GET /email/orgs/{org_id}/campaigns',
     'GET /webhook/orgs/{org_id}/endpoints',
     'GET /workflow/orgs/{org_id}/workflows',
 ];
@@ -20,7 +21,7 @@ export const STATUS_HELP = `Usage: myapi status [--org <id>] [--json]
 
 Single-screen view of your account and what's running in the default org:
 identity, balance, free-tier usage, plus resource counts across domains,
-funnels, campaigns, webhooks, and workflows. Useful before a
+funnels, webhooks, and workflows. Useful before a
 co-build session or when checking "what's mid-flight" without running six
 list commands.
 
@@ -37,7 +38,7 @@ export async function run(_subcommand, _args, flags = {}) {
     }
     const config = loadConfig();
     if (!config?.api_key)
-        error('Not configured. Run: myapi auth setup');
+        error('Not configured. Run: myapi account setup');
     const orgId = flags.org ?? config.default_org;
     // Account-level info works without an org; org-scoped resources are skipped if none set.
     const orgKnown = Boolean(orgId);
@@ -45,8 +46,10 @@ export async function run(_subcommand, _args, flags = {}) {
     const accountResults = await Promise.allSettled([
         hq.getBalance(config.api_key),
         hq.getFreeTier(config.api_key),
+        hq.getAutoRecharge(config.api_key),
     ]);
     const balance = unwrap(accountResults[0]);
+    const autoR = unwrap(accountResults[2]);
     // The backend currently returns an array of { service, used, allowance }
     // per-service entries. The SDK type lies about this (claims scalar) — same
     // bug surfaces in `whoami`. Treat as unknown here and narrow at render time.
@@ -55,20 +58,18 @@ export async function run(_subcommand, _args, flags = {}) {
     // the snapshot as untrustworthy rather than silently printing local config.
     const keyRejected = accountResults.some(r => r.status === 'rejected' && r.reason instanceof MyApiError && r.reason.status === 401);
     // Org-scoped (skipped if no default org set).
-    let domains = null, funnels = null, campaigns = null, webhooks = null, workflows = null;
+    let domains = null, funnels = null, webhooks = null, workflows = null;
     if (orgKnown) {
         const orgResults = await Promise.allSettled([
             domain.listDomains(config.api_key, orgId),
             funnel.listFunnels(config.api_key, orgId),
-            email.listCampaigns(config.api_key, orgId),
             webhook.listEndpoints(config.api_key, orgId),
             workflow.listWorkflows(config.api_key, orgId),
         ]);
         domains = unwrap(orgResults[0]);
         funnels = unwrap(orgResults[1]);
-        campaigns = unwrap(orgResults[2]);
-        webhooks = unwrap(orgResults[3]);
-        workflows = unwrap(orgResults[4]);
+        webhooks = unwrap(orgResults[2]);
+        workflows = unwrap(orgResults[3]);
     }
     if (flags.json) {
         printJson({
@@ -81,15 +82,16 @@ export async function run(_subcommand, _args, flags = {}) {
                 key_rejected: keyRejected,
             },
             balance,
+            auto_recharge: autoR,
             free_tier: freeTier,
             org_resources: orgKnown ? {
-                domains, funnels, campaigns, webhooks, workflows,
+                domains, funnels, webhooks, workflows,
             } : null,
         });
         return;
     }
     if (keyRejected) {
-        info('⚠ The backend rejected your API key. Values may be stale — run: myapi auth setup');
+        info('⚠ The backend rejected your API key. Values may be stale — run: myapi account setup');
         info('');
     }
     // ── Identity ──────────────────────────────────────────────────────────────
@@ -101,7 +103,14 @@ export async function run(_subcommand, _args, flags = {}) {
     info(`Type:     ${config.is_anonymous ? 'anonymous' : 'registered'}`);
     info(`Balance:  ${balance ? `${balance.balance_display}  |  Credits: ${balance.credits_display}` : '—'}`);
     if (config.is_anonymous) {
-        info('          → Link an email to unlock $5 free credit + paid actions: myapi auth link <email>');
+        info('          → Link an email to unlock $5 free credit + paid actions: myapi account link <email>');
+    }
+    // Auto-recharge: only worth a line when it's on (or off but a refill recently
+    // failed/capped and needs attention).
+    if (autoR) {
+        const summary = autoRechargeSummary(autoR);
+        if (summary)
+            info(`Recharge: ${summary}`);
     }
     if (Array.isArray(freeTier) && freeTier.length > 0) {
         const parts = freeTier
@@ -114,7 +123,7 @@ export async function run(_subcommand, _args, flags = {}) {
     info('');
     info('Resources:');
     if (!orgKnown) {
-        info('  (set a default org to see domains/funnels/campaigns/webhooks/workflows)');
+        info('  (set a default org to see domains/funnels/webhooks/workflows)');
         return;
     }
     if (domains) {
@@ -126,19 +135,6 @@ export async function run(_subcommand, _args, flags = {}) {
     else
         info('  Domains:   —');
     info(`  Funnels:   ${funnels ? funnels.length : '—'}`);
-    if (campaigns) {
-        // Campaigns: backend statuses include 'draft', 'active', 'paused', 'completed'.
-        // Surface counts for the two states that matter mid-flight.
-        const active = campaigns.filter(c => /active|running/i.test(c.status)).length;
-        const paused = campaigns.filter(c => /paused/i.test(c.status)).length;
-        const extras = [
-            active > 0 ? `${active} active` : null,
-            paused > 0 ? `${paused} paused` : null,
-        ].filter(Boolean).join(', ');
-        info(`  Campaigns: ${campaigns.length}${extras ? ` (${extras})` : ''}`);
-    }
-    else
-        info('  Campaigns: —');
     info(`  Webhooks:  ${webhooks ? webhooks.length : '—'}`);
     if (workflows) {
         const enabled = workflows.filter(w => w.enabled).length;

package/dist/commands/storage.js

@@ -26,6 +26,8 @@ const EXT_TO_CT = {
     '.jpeg': 'image/jpeg',
     '.gif': 'image/gif',
     '.webp': 'image/webp',
+    '.svg': 'image/svg+xml',
+    '.pdf': 'application/pdf',
     '.mp4': 'video/mp4',
     '.webm': 'video/webm',
 };
@@ -64,7 +66,7 @@ async function upload(filePath, flags) {
     const ext = extname(filePath).toLowerCase();
     const contentType = EXT_TO_CT[ext];
     if (!contentType) {
-        error(`Unsupported file extension "${ext}". Supported: ${Object.keys(EXT_TO_CT).join(', ')}.\n(SVG and PDF still go through "myapi storage ingest <url>" today.)`);
+        error(`Unsupported file extension "${ext}". Supported: ${Object.keys(EXT_TO_CT).join(', ')}.\nFor other types, host the file and use "myapi storage ingest <url>".`);
     }
     let data;
     try {

package/dist/commands/workflow.js

@@ -19,6 +19,8 @@ export const SCHEMA = {
     'endpoint-id': 'string',
     steps: 'string',
     'no-enable': 'boolean',
+    limit: 'number',
+    cursor: 'string',
 };
 // Mirrors the backend's SupportedStepTypes list. Both alias and underscore
 // forms are accepted by the workflow runner. Keep this in sync if the
@@ -279,18 +281,27 @@ export async function del(id, flags) {
 }
 export async function runs(id, flags) {
     const config = requireConfig();
-    const orgId = requireOrg(flags, config, 'myapi workflow runs <id> [--org <id>]');
+    const orgId = requireOrg(flags, config, 'myapi workflow runs <id> [--limit <n>] [--cursor <id>] [--org <id>]');
     if (!id)
-        error('Missing required arguments.\nUsage: myapi workflow runs <workflow_id> [--org <id>]');
-    const wRuns = await sdkWorkflow.listWorkflowRuns(config.api_key, orgId, id);
+        error('Missing required arguments.\nUsage: myapi workflow runs <workflow_id> [--limit <n>] [--cursor <id>] [--org <id>]');
+    const opts = {};
+    if (typeof flags.limit === 'number')
+        opts.limit = flags.limit;
+    if (typeof flags.cursor === 'string')
+        opts.cursor = flags.cursor;
+    const page = await sdkWorkflow.listWorkflowRuns(config.api_key, orgId, id, opts);
     if (flags.json) {
-        printJson(wRuns);
+        printJson(page);
         return;
     }
-    printTable(wRuns.map(summarizeRun), {
+    printTable(page.runs.map(summarizeRun), {
         flags,
         empty: 'No runs yet for this workflow.',
     });
+    if (page.next_cursor) {
+        info('');
+        info(`More runs available. Next page: myapi workflow runs ${id} --cursor ${page.next_cursor}`);
+    }
 }
 export async function getRun(runId, flags) {
     const config = requireConfig();
@@ -360,7 +371,11 @@ See the my-workflow-api skill for the full form-to-email recipe.`,
     'enable': 'myapi workflow enable <id> [--org <id>]',
     'disable': 'myapi workflow disable <id> [--org <id>]',
     'delete': 'myapi workflow delete <id> [--org <id>]',
-    'runs': 'myapi workflow runs <workflow_id> [--org <id>] [--json]',
+    'runs': `myapi workflow runs <workflow_id> [--limit <n>] [--cursor <id>] [--org <id>] [--json]
+
+Lists recent runs, newest first (keyset-paginated). --limit is 1-500
+(default 100). When more pages exist, the next cursor is printed; pass it
+back with --cursor to fetch the following page.`,
     'get-run': 'myapi workflow get-run <run_id> [--org <id>]',
 };
 export async function run(subcommand, args, flags) {

package/dist/completion.js

@@ -35,15 +35,16 @@ export const COMMANDS = [
 // command → subcommands, for `myapi <command> <TAB>`. Mirrors each
 // command's dispatcher; commands absent here take no subcommand.
 export const SUBCOMMANDS = {
-    account: ['mailing-address'],
-    auth: ['setup', 'import-key', 'whoami', 'link', 'switch', 'install-skills', 'config', 'registrant', 'api-keys'],
+    account: ['setup', 'import-key', 'whoami', 'link', 'switch', 'install-skills', 'config', 'registrant', 'api-keys', 'keys', 'mailing-address'],
+    // The end-user auth product. Operator/account commands live under `account`.
+    auth: ['tenant', 'client', 'usage', 'domain'],
     org: ['create', 'delete', 'get', 'import', 'list', 'sync-brand', 'update'],
     billing: ['balance', 'history', 'usage', 'setup', 'topup', 'spend-cap'],
     domain: ['assign', 'check', 'email-setup', 'import', 'list', 'mail-server-resync', 'records', 'register', 'renew', 'retry-provisioning', 'settings', 'status'],
     funnel: ['create', 'delete', 'get', 'list', 'pages', 'publish', 'push', 'verify'],
     webhook: ['create', 'delete', 'delivery', 'list', 'update'],
     workflow: ['create', 'delete', 'disable', 'enable', 'get', 'get-run', 'list', 'runs', 'update'],
-    email: ['mailbox', 'message', 'warmup', 'template', 'campaign', 'verify'],
+    email: ['mailbox', 'message', 'warmup', 'template', 'verify'],
     image: ['delete', 'generate', 'get', 'get-url', 'list', 'models'],
     storage: ['delete', 'get', 'get-url', 'ingest', 'list', 'upload'],
     pixel: ['audience', 'events', 'identity', 'interactions', 'visits'],
@@ -60,7 +61,7 @@ export const SUBCOMMANDS = {
     payments: ['connect', 'status', 'charge', 'list', 'get', 'refund'],
     container: ['create', 'deploy', 'list', 'get', 'logs', 'domain', 'delete'],
     git: ['create', 'list', 'get', 'delete', 'refs', 'log', 'show', 'tree', 'blob', 'diff', 'commit', 'create-branch', 'delete-branch', 'tag', 'merge', 'repack'],
-    queue: ['create', 'list', 'get', 'enqueue', 'jobs', 'job'],
+    queue: ['create', 'list', 'get', 'delete', 'enqueue', 'jobs', 'job'],
     task: ['create', 'list', 'get', 'claim', 'extend', 'resolve', 'fail', 'cancel'],
     completion: ['install', 'uninstall'],
 };

package/dist/config.js

@@ -98,7 +98,7 @@ export function listAccounts() {
 export function requireConfig() {
     const config = loadConfig();
     if (!config || !config.api_key) {
-        console.error("No API key found. Provide MYAPI_KEY env var or run: myapi auth setup");
+        console.error("No API key found. Provide MYAPI_KEY env var or run: myapi account setup");
         process.exit(1);
     }
     return config;

package/dist/exposes.test.js

@@ -7,7 +7,7 @@ import * as url from 'url';
 // surface.
 const COMMAND_MODULES = [
     './commands/account.js',
-    './commands/auth.js',
+    './commands/authproduct.js',
     './commands/billing.js',
     './commands/config.js',
     './commands/crm/index.js',
@@ -19,7 +19,6 @@ const COMMAND_MODULES = [
     './commands/email/mailbox.js',
     './commands/email/message.js',
     './commands/email/template.js',
-    './commands/email/campaign.js',
     './commands/email/warmup.js',
     './commands/email/verify.js',
     './commands/funnel.js',

package/dist/index.js

@@ -21,7 +21,7 @@ import * as imageCmd from './commands/image.js';
 import * as storageCmd from './commands/storage.js';
 import * as pixelCmd from './commands/pixel.js';
 import * as urlCmd from './commands/url.js';
-import * as authCmd from './commands/auth.js';
+import * as authProductCmd from './commands/authproduct.js';
 import * as configCmd from './commands/config.js';
 import * as statusCmd from './commands/status.js';
 import * as peopleCmd from './commands/people.js';
@@ -42,7 +42,7 @@ import * as doctorCmd from './commands/doctor.js';
 // one command means editing one file (its SCHEMA), not a global allowlist.
 const COMBINED_SCHEMA = {
     ...accountCmd.SCHEMA,
-    ...authCmd.SCHEMA,
+    ...authProductCmd.SCHEMA,
     ...billingCmd.SCHEMA,
     ...configCmd.SCHEMA,
     ...domainCmd.SCHEMA,
@@ -153,7 +153,7 @@ async function main() {
     if (args.length === 0) {
         const config = loadConfig();
         if (!config?.api_key) {
-            info('No account found. Run: myapi auth setup');
+            info('No account found. Run: myapi account setup');
             info('');
         }
         printHelp();
@@ -164,7 +164,9 @@ async function main() {
     try {
         switch (command) {
             case 'auth':
-                await dispatchAuth(subcommand, restArgs, flags);
+                // `auth` is the end-user auth product (my-auth-api). Operator/account
+                // commands live under `myapi account`.
+                await authProductCmd.run(subcommand, restArgs, flags);
                 break;
             case 'update':
                 await updateCmd.update(flags);
@@ -173,7 +175,7 @@ async function main() {
                 await orgCmd.run(subcommand, restArgs, flags);
                 break;
             case 'account':
-                await accountCmd.run(subcommand, restArgs, flags);
+                await dispatchAccount(subcommand, restArgs, flags);
                 break;
             case 'billing':
                 await billingCmd.run(subcommand, restArgs, flags);
@@ -249,7 +251,7 @@ async function main() {
                 await setupCmd.setup(flags);
                 break;
             case 'whoami':
-                await authCmd.whoami(flags);
+                await accountCmd.whoami(flags);
                 break;
             case 'status':
                 await statusCmd.run(subcommand, restArgs, flags);
@@ -262,7 +264,7 @@ async function main() {
                 break;
             case 'install-skills':
                 if (flags.help) {
-                    info(authCmd.INSTALL_SKILLS_HELP);
+                    info(accountCmd.INSTALL_SKILLS_HELP);
                     break;
                 }
                 await setupCmd.installSkills();
@@ -292,21 +294,42 @@ async function main() {
     catch (err) {
         if (err instanceof MyApiError) {
             if (err.status === 401)
-                error('Invalid API key. Run: myapi auth setup');
+                error('Invalid API key. Run: myapi account setup');
             else if (err.status === 402) {
+                const body = (err.body ?? {});
                 if (err.code === 'REGISTRATION_REQUIRED' || err.code === 'UPGRADE_REQUIRED')
-                    error('A verified email is required. Run: myapi auth link');
+                    error('A verified email is required. Run: myapi account link');
                 else if (err.code === 'NO_PAYMENT_METHOD')
                     error('No payment method on file. Run: myapi billing setup');
+                else if (err.code === 'SPEND_CAP_EXCEEDED') {
+                    // A self-imposed ceiling, NOT an empty wallet — topping up won't
+                    // help. Point at the cap, not the balance.
+                    const cap = typeof body.cap_cents === 'number' ? `$${(body.cap_cents / 100).toFixed(2)}` : 'your cap';
+                    const spent = typeof body.spent_cents === 'number' ? `$${(body.spent_cents / 100).toFixed(2)} of ` : '';
+                    const period = typeof body.period === 'string' ? body.period : 'period';
+                    error(`Spend cap reached (${spent}${cap} this ${period}). This is a ceiling you set, not an empty wallet — raise or clear it: myapi billing spend-cap`);
+                }
                 else {
-                    // Anonymous accounts can't top up (no payment surface). The
-                    // natural unblock is to link an email — the upgrade grants the
-                    // free credit and opens the paid surface.
+                    // INSUFFICIENT_FUNDS (or legacy INSUFFICIENT_BALANCE): empty wallet.
+                    // Tailor the unblock to the auto-recharge state the backend reports
+                    // so an agent knows whether to wait, fix a card, or top up.
+                    const state = body.auto_recharge;
                     const cfg = loadConfig();
-                    if (cfg?.is_anonymous) {
-                        error('Insufficient balance. Anonymous accounts have no free credit — link an email to unlock $5: myapi auth link <email>');
+                    if (state === 'in_flight') {
+                        const secs = typeof body.retry_after_seconds === 'number' ? body.retry_after_seconds : 5;
+                        error(`Wallet empty — auto-recharge is in flight; retry in ~${secs}s.`);
                     }
-                    error('Insufficient balance. Run: myapi billing topup <amount>');
+                    else if (state === 'capped')
+                        error('Wallet empty and auto-recharge hit your monthly cap. Raise it: myapi billing auto-recharge set --monthly-cap <amount>, or top up: myapi billing topup <amount>');
+                    else if (state === 'failed')
+                        error('Wallet empty and the last auto-recharge was declined. Fix your card: myapi billing setup, or top up: myapi billing topup <amount>');
+                    else if (state === 'no_pm')
+                        error('Wallet empty and auto-recharge has no payment method. Add one: myapi billing setup, or top up: myapi billing topup <amount>');
+                    // Anonymous accounts can't top up (no payment surface) — link to unlock.
+                    else if (cfg?.is_anonymous)
+                        error('Insufficient balance. Anonymous accounts have no free credit — link an email to unlock $5: myapi account link <email>');
+                    else
+                        error('Insufficient balance. Top up: myapi billing topup <amount> — or keep it funded automatically: myapi billing auto-recharge set');
                 }
             }
             else
@@ -320,33 +343,34 @@ async function main() {
         }
     }
 }
-async function dispatchAuth(subcommand, restArgs, flags) {
+async function dispatchAccount(subcommand, restArgs, flags) {
     if (!subcommand || (flags.help && !subcommand)) {
-        info(authCmd.HELP);
+        info(accountCmd.HELP);
         return;
     }
     switch (subcommand) {
+        case 'mailing-address': return accountCmd.run('mailing-address', restArgs, flags);
         case 'setup': return setupCmd.setup(flags);
         case 'import-key': return setupCmd.importKey(restArgs[0], flags);
-        case 'whoami': return authCmd.whoami(flags);
-        case 'link': return authCmd.link(flags, restArgs[0]);
-        case 'switch': return authCmd.switchCmd(flags, restArgs[0]);
+        case 'whoami': return accountCmd.whoami(flags);
+        case 'link': return accountCmd.link(flags, restArgs[0]);
+        case 'switch': return accountCmd.switchCmd(flags, restArgs[0]);
         case 'install-skills':
             // DEPRECATED: install-skills is now a top-level command. The auth subcommand
             // form is kept for one minor version with a warning, then will be removed.
-            banner('› Note: `myapi auth install-skills` is deprecated. Use `myapi install-skills` instead.');
+            banner('› Note: `myapi account install-skills` is deprecated. Use `myapi install-skills` instead.');
             if (flags.help) {
-                info(authCmd.INSTALL_SKILLS_HELP);
+                info(accountCmd.INSTALL_SKILLS_HELP);
                 return;
             }
             await setupCmd.installSkills();
             success('› Skills installed.');
             return;
         case 'config': return configCmd.run(restArgs[0], restArgs.slice(1), flags);
-        case 'registrant': return authCmd.registrant(restArgs[0], flags);
+        case 'registrant': return accountCmd.registrant(restArgs[0], flags);
         case 'api-keys':
         case 'keys': return keysCmd.runApiKeys(restArgs[0], restArgs.slice(1), flags);
-        default: info('Unknown subcommand. Run: myapi auth --help');
+        default: info('Unknown subcommand. Run: myapi account --help');
     }
 }
 const HELP_TARGETS = {
@@ -372,7 +396,7 @@ const HELP_TARGETS = {
     task: f => taskCmd.run(undefined, [], f),
     doctor: f => doctorCmd.run(undefined, [], f),
     org: f => orgCmd.run(undefined, [], f),
-    account: f => accountCmd.run(undefined, [], f),
+    account: f => dispatchAccount(undefined, [], f),
     billing: f => billingCmd.run(undefined, [], f),
     keys: f => keysCmd.run(undefined, [], f),
     config: f => configCmd.run(undefined, [], f),
@@ -383,7 +407,7 @@ async function dispatchHelp(target) {
         return;
     }
     if (target === 'auth') {
-        info(authCmd.HELP);
+        info(authProductCmd.HELP);
         return;
     }
     const handler = HELP_TARGETS[target];
@@ -398,16 +422,16 @@ function printHelp() {
         ? `Quick start:
   echo '<h1>Hello!</h1>' | myapi funnel push /`
         : `Quick start:
-  myapi auth setup --help`;
+  myapi account setup --help`;
     info(`myapi - MyAPI command-line interface
 
 Usage: myapi <command> [subcommand] [args]
        myapi --version
 
 Commands:
-  account         Account-scoped settings (mailing address)
+  account         Your MyAPI account · setup · whoami · link · keys · config · mailing-address
   audience        Save filter snapshots as named audiences (people or companies)
-  auth            Manage account · setup · whoami · link
+  auth            Auth for your app's end users — OIDC tenant, clients, usage, custom domain
   billing         Check balance and manage billing
   company         Search the company database (filter by industry, size, country, ...)
   container       Run containers — services, workers, and scheduled jobs
@@ -436,10 +460,10 @@ Commands:
   workflow        Run actions (send email, post to Slack) when a webhook fires
 
 Aliases:
-  config          → myapi auth config
-  keys            → myapi auth api-keys
-  setup           → myapi auth setup
-  whoami          → myapi auth whoami
+  config          → myapi account config
+  keys            → myapi account api-keys
+  setup           → myapi account setup
+  whoami          → myapi account whoami
 
 Run "myapi <command> --help" for subcommand help.