@myapihq/cli 1.0.6 → 1.0.8

package/dist/commands/billing.js

@@ -8,26 +8,69 @@ const sdk_1 = require("@myapihq/sdk");
 const config_js_1 = require("../config.js");
 const output_js_1 = require("../output.js");
 async function balance(flags) {
+    if (flags.help) {
+        (0, output_js_1.info)('Usage: myapi billing balance\n\nShows your current account balance, credits, and payment method status.');
+        return;
+    }
     const config = (0, config_js_1.requireConfig)();
     const result = await sdk_1.hq.getBalance(config.api_key);
-    (0, output_js_1.info)(`Balance: $${(result.balance_cents / 100).toFixed(2)}  |  Payment method: ${result.has_payment_method ? 'yes' : 'no'}`);
+    const bal = result.balance_display || `$${(result.balance_cents / 100).toFixed(2)}`;
+    const cred = result.credits_display || `$${((result.credits_cents || 0) / 100).toFixed(2)}`;
+    const pm = result.has_payment_method ? 'yes' : 'no';
+    (0, output_js_1.info)(`Balance: ${bal}  |  Credits: ${cred}  |  Payment method: ${pm}`);
 }
 async function history(flags) {
+    if (flags.help) {
+        (0, output_js_1.info)('Usage: myapi billing history [--json]\n\nShows your recent billing transactions and top-ups.');
+        return;
+    }
     const config = (0, config_js_1.requireConfig)();
     const items = await sdk_1.hq.getBillingHistory(config.api_key);
-    (0, output_js_1.printTable)(items);
+    if (flags.json) {
+        (0, output_js_1.printJson)(items);
+        return;
+    }
+    const formattedItems = items.map(item => {
+        // Attempt to parse the date cleanly (handling Go's "+0000 UTC" suffix)
+        const cleanDate = item.created_at.replace(' +0000 UTC', 'Z');
+        const date = new Date(cleanDate);
+        const dateStr = isNaN(date.getTime()) ? item.created_at : date.toLocaleString();
+        // Format amount
+        const isNegative = item.amount_cents < 0;
+        const absAmount = Math.abs(item.amount_cents) / 100;
+        const amountStr = `${isNegative ? '-' : ''}$${absAmount.toFixed(2)}`;
+        return {
+            Type: item.type || 'unknown',
+            Amount: amountStr,
+            Status: item.status ? item.status.charAt(0).toUpperCase() + item.status.slice(1) : '',
+            Date: dateStr
+        };
+    });
+    (0, output_js_1.printTable)(formattedItems);
 }
 async function topup(amountStr, flags) {
-    if (!amountStr)
-        (0, output_js_1.error)("Missing amount");
+    if (flags.help) {
+        (0, output_js_1.info)('Usage: myapi billing topup <amount_in_dollars>\n\nAdds funds to your account balance using your saved payment method.\nExample: myapi billing topup 10.00');
+        return;
+    }
+    if (!amountStr) {
+        (0, output_js_1.error)("Missing amount. Usage: myapi billing topup <amount_in_dollars>");
+        return;
+    }
     const amount = parseFloat(amountStr);
-    if (isNaN(amount))
-        (0, output_js_1.error)("Invalid amount");
+    if (isNaN(amount)) {
+        (0, output_js_1.error)("Invalid amount. Must be a number in dollars (e.g., 10.00)");
+        return;
+    }
     const config = (0, config_js_1.requireConfig)();
     const result = await sdk_1.hq.topUp(config.api_key, Math.round(amount * 100));
     (0, output_js_1.success)(`Top up successful! New balance: $${(result.new_balance_cents / 100).toFixed(2)}`);
 }
 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.');
+        return;
+    }
     const config = (0, config_js_1.requireConfig)();
     const result = await sdk_1.hq.setupPayment(config.api_key);
     (0, output_js_1.success)(`Open this URL in your browser to set up payment:\n${result.url}`);

package/dist/commands/keys.d.ts

@@ -0,0 +1,3 @@
+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>;

package/dist/commands/keys.js

@@ -0,0 +1,98 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNew = createNew;
+exports.list = list;
+exports.revoke = revoke;
+const sdk_1 = require("@myapihq/sdk");
+const config_js_1 = require("../config.js");
+const output_js_1 = require("../output.js");
+const readline = __importStar(require("readline"));
+async function createNew(flags) {
+    if (flags.help) {
+        (0, output_js_1.info)('Usage: myapi keys create\n\nCreates a new API key. You will be prompted to enter a name for the key.');
+        return;
+    }
+    const config = (0, config_js_1.requireConfig)();
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const name = await new Promise(resolve => rl.question('Enter a name for the new key: ', resolve));
+    rl.close();
+    if (!name.trim()) {
+        (0, output_js_1.error)('Key name cannot be empty.');
+        return;
+    }
+    const keyInfo = await sdk_1.hq.createApiKey(config.api_key, name.trim());
+    (0, output_js_1.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!`);
+}
+async function list(flags) {
+    if (flags.help) {
+        (0, output_js_1.info)('Usage: myapi keys list\n\nLists all API keys associated with your account.');
+        return;
+    }
+    const config = (0, config_js_1.requireConfig)();
+    const keysList = await sdk_1.hq.listApiKeys(config.api_key);
+    const formattedKeys = keysList.map(k => {
+        // Format creation date
+        const createdDate = new Date(k.created_at);
+        const createdStr = isNaN(createdDate.getTime()) ? k.created_at : createdDate.toLocaleString();
+        // Format last used date
+        let lastUsedStr = 'Never';
+        if (k.last_used_at) {
+            const lastUsedDate = new Date(k.last_used_at);
+            lastUsedStr = isNaN(lastUsedDate.getTime()) ? k.last_used_at : lastUsedDate.toLocaleString();
+        }
+        return {
+            Name: k.name || 'Unnamed',
+            Prefix: k.prefix,
+            ID: k.id,
+            'Created At': createdStr,
+            'Last Used': lastUsedStr
+        };
+    });
+    (0, output_js_1.printTable)(formattedKeys);
+}
+async function revoke(id, flags) {
+    if (flags.help) {
+        (0, output_js_1.info)('Usage: myapi keys revoke <id>\n\nRevokes an API key permanently.');
+        return;
+    }
+    if (!id) {
+        (0, output_js_1.error)("Missing key ID. Usage: myapi keys revoke <id>");
+        return;
+    }
+    const config = (0, config_js_1.requireConfig)();
+    await sdk_1.hq.revokeApiKey(config.api_key, id);
+    (0, output_js_1.success)(`Key ${id} revoked successfully.`);
+}

package/dist/commands/org.d.ts

@@ -2,4 +2,4 @@ export declare function create(flags: Record<string, string | boolean>): Promise
 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(domain: string, flags: Record<string, string | boolean>): Promise<void>;
+export declare function importOrg(args: string[], flags: Record<string, string | boolean>): Promise<void>;

package/dist/commands/org.js

@@ -10,41 +10,75 @@ const config_js_1 = require("../config.js");
 const output_js_1 = require("../output.js");
 const utils_js_1 = require("../utils.js");
 async function create(flags) {
-    if (!flags.name)
-        (0, output_js_1.error)("Missing --name flag");
+    if (flags.help) {
+        (0, output_js_1.info)('Usage: myapi org create --name="My Org" [options]\n\nOptions:\n  --name              Organization name (required)\n  --tagline           Short tagline\n  --description       Detailed description\n  --business-sector   Sector (e.g. Technology)\n  --logo-url          URL to logo image');
+        return;
+    }
+    if (!flags.name) {
+        (0, output_js_1.error)("Missing --name flag. Run 'myapi org create --help' for details.");
+        return;
+    }
     const config = (0, config_js_1.requireConfig)();
     const payload = { name: flags.name };
     if (flags.tagline)
         payload.tagline = flags.tagline;
     if (flags.description)
         payload.description = flags.description;
+    if (flags['business-sector'])
+        payload.business_sector = flags['business-sector'];
+    if (flags['logo-url'])
+        payload.logo_url = flags['logo-url'];
     const org = await sdk_1.hq.createOrg(config.api_key, payload);
     (0, output_js_1.success)(`Org created! ID: ${org.id}, Name: ${org.name}`);
 }
 async function list(flags) {
+    if (flags.help) {
+        (0, output_js_1.info)('Usage: myapi org list\n\nLists all organizations in your account as JSON.');
+        return;
+    }
     const config = (0, config_js_1.requireConfig)();
     const orgs = await sdk_1.hq.listOrgs(config.api_key);
-    (0, output_js_1.printTable)(orgs);
+    (0, output_js_1.printJson)(orgs);
 }
 async function get(id, flags) {
-    if (!id)
-        (0, output_js_1.error)("Missing org id");
+    if (flags.help) {
+        (0, output_js_1.info)('Usage: myapi org get <id>\n\nFetches details of a specific organization.');
+        return;
+    }
+    if (!id) {
+        (0, output_js_1.error)("Missing org id. Usage: myapi org get <id>");
+        return;
+    }
     const config = (0, config_js_1.requireConfig)();
     const org = await sdk_1.hq.getOrg(config.api_key, id);
     (0, output_js_1.printJson)(org);
 }
 async function del(id, flags) {
-    if (!id)
-        (0, output_js_1.error)("Missing org id");
+    if (flags.help) {
+        (0, output_js_1.info)('Usage: myapi org delete <id>\n\nDeletes an organization.');
+        return;
+    }
+    if (!id) {
+        (0, output_js_1.error)("Missing org id. Usage: myapi org delete <id>");
+        return;
+    }
     const config = (0, config_js_1.requireConfig)();
     await sdk_1.hq.deleteOrg(config.api_key, id);
     (0, output_js_1.success)(`Org ${id} deleted`);
 }
-async function importOrg(domain, flags) {
-    if (!domain)
-        (0, output_js_1.error)("Missing domain");
+async function importOrg(args, flags) {
+    if (flags.help) {
+        (0, output_js_1.info)('Usage: myapi org import <org_id> <domain>\n\nAutomatically extracts brand info from an existing website and updates the organization.\n\nNote: You must create a placeholder organization first using `myapi org create` to get an org_id.');
+        return;
+    }
+    const orgId = args[0];
+    const domain = args[1];
+    if (!orgId || !domain) {
+        (0, output_js_1.error)("Missing arguments. Usage: myapi org import <org_id> <domain>");
+        return;
+    }
     const config = (0, config_js_1.requireConfig)();
-    const result = await sdk_1.hq.importOrg(config.api_key, domain);
+    const result = await sdk_1.hq.importOrg(config.api_key, orgId, domain);
     const importId = result.job_id;
     process.stdout.write("Importing ");
     const chars = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];

package/dist/index.js

@@ -38,7 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_js_1 = require("./utils.js");
 const output_js_1 = require("./output.js");
 const sdk_1 = require("@myapihq/sdk");
-const accountCmd = __importStar(require("./commands/account.js"));
+const keysCmd = __importStar(require("./commands/keys.js"));
 const billingCmd = __importStar(require("./commands/billing.js"));
 const orgCmd = __importStar(require("./commands/org.js"));
 const setupCmd = __importStar(require("./commands/setup.js"));
@@ -58,36 +58,40 @@ async function main() {
                 }
                 await setupCmd.setup();
                 break;
-            case 'account':
-                if (flags.help || !subcommand) {
-                    (0, output_js_1.info)('Usage: myapi account <subcommand>\n\nSubcommands:\n  token      Recover your agent token\n  keys       List API keys\n  revoke     Revoke an API key');
+            case 'keys':
+                if (!subcommand || (flags.help && !subcommand)) {
+                    (0, output_js_1.info)('Usage: myapi keys <subcommand>\n\nSubcommands:\n  list       List your API keys\n  create     Create a new API key\n  revoke     Revoke an API key (e.g. myapi keys revoke <id>)');
                     break;
                 }
                 if (subcommand === 'create')
-                    await accountCmd.create();
-                else if (subcommand === 'token')
-                    await accountCmd.token(flags);
-                else if (subcommand === 'keys')
-                    await accountCmd.listKeys(flags);
+                    await keysCmd.createNew(flags);
+                else if (subcommand === 'list')
+                    await keysCmd.list(flags);
                 else if (subcommand === 'revoke')
-                    await accountCmd.revokeKey(restArgs[0], flags);
+                    await keysCmd.revoke(restArgs[0], flags);
                 else
                     printHelp();
                 break;
             case 'org':
-                if (flags.help || !subcommand) {
-                    (0, output_js_1.info)('Usage: myapi org <subcommand>\n\nSubcommands:\n  list       List organizations\n  create     Create an organization');
+                if (!subcommand || (flags.help && !subcommand)) {
+                    (0, output_js_1.info)('Usage: myapi org <subcommand>\n\nSubcommands:\n  list       List organizations\n  create     Create an organization\n  get        Get details of an organization\n  delete     Delete an organization\n  import     Extract org from domain');
                     break;
                 }
                 if (subcommand === 'list')
                     await orgCmd.list(flags);
                 else if (subcommand === 'create')
                     await orgCmd.create(flags);
+                else if (subcommand === 'get')
+                    await orgCmd.get(restArgs[0], flags);
+                else if (subcommand === 'delete')
+                    await orgCmd.del(restArgs[0], flags);
+                else if (subcommand === 'import')
+                    await orgCmd.importOrg(restArgs, flags);
                 else
                     printHelp();
                 break;
             case 'billing':
-                if (flags.help || !subcommand) {
+                if (!subcommand || (flags.help && !subcommand)) {
                     (0, output_js_1.info)('Usage: myapi billing <subcommand>\n\nSubcommands:\n  balance    Check balance\n  history    View billing history\n  topup      Top up your balance\n  setup      Setup a payment method');
                     break;
                 }
@@ -123,7 +127,7 @@ function printHelp() {
 Usage: myapi <command> [subcommand] [args]
 
 Commands:
-  account      Manage API keys and account settings
+  keys         Manage API keys
   billing      Check balance and manage billing
   org          Manage organizations
   setup        Setup CLI credentials and view integration instructions

package/package.json

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

package/src/commands/billing.ts

@@ -1,23 +1,71 @@
 import { hq } from '@myapihq/sdk';
 import { requireConfig } from '../config.js';
-import { success, error, printTable, info } from '../output.js';
+import { success, error, printTable, info, printJson } from '../output.js';
 
 export async function balance(flags: Record<string, string | boolean>) {
+  if (flags.help) {
+    info('Usage: myapi billing balance\n\nShows your current account balance, credits, and payment method status.');
+    return;
+  }
   const config = requireConfig();
   const result = await hq.getBalance(config.api_key);
-  info(`Balance: $${(result.balance_cents / 100).toFixed(2)}  |  Payment method: ${result.has_payment_method ? 'yes' : 'no'}`);
+  
+  const bal = result.balance_display || `$${(result.balance_cents / 100).toFixed(2)}`;
+  const cred = result.credits_display || `$${((result.credits_cents || 0) / 100).toFixed(2)}`;
+  const pm = result.has_payment_method ? 'yes' : 'no';
+  
+  info(`Balance: ${bal}  |  Credits: ${cred}  |  Payment method: ${pm}`);
 }
 
 export async function history(flags: Record<string, string | boolean>) {
+  if (flags.help) {
+    info('Usage: myapi billing history [--json]\n\nShows your recent billing transactions and top-ups.');
+    return;
+  }
   const config = requireConfig();
   const items = await hq.getBillingHistory(config.api_key);
-  printTable(items as unknown as Record<string, unknown>[]);
+  
+  if (flags.json) {
+    printJson(items);
+    return;
+  }
+  
+  const formattedItems = items.map(item => {
+    // Attempt to parse the date cleanly (handling Go's "+0000 UTC" suffix)
+    const cleanDate = item.created_at.replace(' +0000 UTC', 'Z');
+    const date = new Date(cleanDate);
+    const dateStr = isNaN(date.getTime()) ? item.created_at : date.toLocaleString();
+    
+    // Format amount
+    const isNegative = item.amount_cents < 0;
+    const absAmount = Math.abs(item.amount_cents) / 100;
+    const amountStr = `${isNegative ? '-' : ''}$${absAmount.toFixed(2)}`;
+    
+    return {
+      Type: item.type || 'unknown',
+      Amount: amountStr,
+      Status: item.status ? item.status.charAt(0).toUpperCase() + item.status.slice(1) : '',
+      Date: dateStr
+    };
+  });
+  
+  printTable(formattedItems as unknown as Record<string, unknown>[]);
 }
 
 export async function topup(amountStr: string, flags: Record<string, string | boolean>) {
-  if (!amountStr) error("Missing amount");
+  if (flags.help) {
+    info('Usage: myapi billing topup <amount_in_dollars>\n\nAdds funds to your account balance using your saved payment method.\nExample: myapi billing topup 10.00');
+    return;
+  }
+  if (!amountStr) {
+    error("Missing amount. Usage: myapi billing topup <amount_in_dollars>");
+    return;
+  }
   const amount = parseFloat(amountStr);
-  if (isNaN(amount)) error("Invalid amount");
+  if (isNaN(amount)) {
+    error("Invalid amount. Must be a number in dollars (e.g., 10.00)");
+    return;
+  }
   
   const config = requireConfig();
   const result = await hq.topUp(config.api_key, Math.round(amount * 100));
@@ -25,6 +73,10 @@ 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.');
+    return;
+  }
   const config = requireConfig();
   const result = await hq.setupPayment(config.api_key);
   success(`Open this URL in your browser to set up payment:\n${result.url}`);

package/src/commands/keys.ts

@@ -0,0 +1,69 @@
+import { hq } from '@myapihq/sdk';
+import { requireConfig } from '../config.js';
+import { success, error, printTable, info } from '../output.js';
+import * as readline from 'readline';
+
+export async function createNew(flags: Record<string, string | boolean>) {
+  if (flags.help) {
+    info('Usage: myapi keys create\n\nCreates a new API key. You will be prompted to enter a name for the key.');
+    return;
+  }
+  const config = requireConfig();
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  const name = await new Promise<string>(resolve => rl.question('Enter a name for the new key: ', resolve));
+  rl.close();
+  
+  if (!name.trim()) {
+    error('Key name cannot be empty.');
+    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: Record<string, string | boolean>) {
+  if (flags.help) {
+    info('Usage: myapi keys list\n\nLists all API keys associated with your account.');
+    return;
+  }
+  const config = requireConfig();
+  const keysList = await hq.listApiKeys(config.api_key);
+  
+  const formattedKeys = keysList.map(k => {
+    // Format creation date
+    const createdDate = new Date(k.created_at);
+    const createdStr = isNaN(createdDate.getTime()) ? k.created_at : createdDate.toLocaleString();
+    
+    // Format last used date
+    let lastUsedStr = 'Never';
+    if (k.last_used_at) {
+      const lastUsedDate = new Date(k.last_used_at);
+      lastUsedStr = isNaN(lastUsedDate.getTime()) ? k.last_used_at : lastUsedDate.toLocaleString();
+    }
+    
+    return {
+      Name: k.name || 'Unnamed',
+      Prefix: k.prefix,
+      ID: k.id,
+      'Created At': createdStr,
+      'Last Used': lastUsedStr
+    };
+  });
+  
+  printTable(formattedKeys as unknown as Record<string, unknown>[]);
+}
+
+export async function revoke(id: string, flags: Record<string, string | boolean>) {
+  if (flags.help) {
+    info('Usage: myapi keys revoke <id>\n\nRevokes an API key permanently.');
+    return;
+  }
+  if (!id) {
+    error("Missing key ID. Usage: myapi keys revoke <id>");
+    return;
+  }
+  const config = requireConfig();
+  await hq.revokeApiKey(config.api_key, id);
+  success(`Key ${id} revoked successfully.`);
+}

package/src/commands/org.ts

@@ -1,44 +1,81 @@
 import { hq } from '@myapihq/sdk';
 import { requireConfig } from '../config.js';
-import { success, error, printTable, printJson } from '../output.js';
+import { success, error, printTable, printJson, info } from '../output.js';
 import { sleep } from '../utils.js';
 
 export async function create(flags: Record<string, string | boolean>) {
-  if (!flags.name) error("Missing --name flag");
+  if (flags.help) {
+    info('Usage: myapi org create --name="My Org" [options]\n\nOptions:\n  --name              Organization name (required)\n  --tagline           Short tagline\n  --description       Detailed description\n  --business-sector   Sector (e.g. Technology)\n  --logo-url          URL to logo image');
+    return;
+  }
+  if (!flags.name) {
+    error("Missing --name flag. Run 'myapi org create --help' for details.");
+    return;
+  }
   const config = requireConfig();
   const payload: any = { name: flags.name as string };
   if (flags.tagline) payload.tagline = flags.tagline as string;
   if (flags.description) payload.description = flags.description as string;
+  if (flags['business-sector']) payload.business_sector = flags['business-sector'] as string;
+  if (flags['logo-url']) payload.logo_url = flags['logo-url'] as string;
   
   const org = await hq.createOrg(config.api_key, payload);
   success(`Org created! ID: ${org.id}, Name: ${org.name}`);
 }
 
 export async function list(flags: Record<string, string | boolean>) {
+  if (flags.help) {
+    info('Usage: myapi org list\n\nLists all organizations in your account as JSON.');
+    return;
+  }
   const config = requireConfig();
   const orgs = await hq.listOrgs(config.api_key);
-  printTable(orgs as unknown as Record<string, unknown>[]);
+  printJson(orgs);
 }
 
 export async function get(id: string, flags: Record<string, string | boolean>) {
-  if (!id) error("Missing org id");
+  if (flags.help) {
+    info('Usage: myapi org get <id>\n\nFetches details of a specific organization.');
+    return;
+  }
+  if (!id) {
+    error("Missing org id. Usage: myapi org get <id>");
+    return;
+  }
   const config = requireConfig();
   const org = await hq.getOrg(config.api_key, id);
   printJson(org);
 }
 
 export async function del(id: string, flags: Record<string, string | boolean>) {
-  if (!id) error("Missing org id");
+  if (flags.help) {
+    info('Usage: myapi org delete <id>\n\nDeletes an organization.');
+    return;
+  }
+  if (!id) {
+    error("Missing org id. Usage: myapi org delete <id>");
+    return;
+  }
   const config = requireConfig();
   await hq.deleteOrg(config.api_key, id);
   success(`Org ${id} deleted`);
 }
 
-export async function importOrg(domain: string, flags: Record<string, string | boolean>) {
-  if (!domain) error("Missing domain");
+export async function importOrg(args: string[], flags: Record<string, string | boolean>) {
+  if (flags.help) {
+    info('Usage: myapi org import <org_id> <domain>\n\nAutomatically extracts brand info from an existing website and updates the organization.\n\nNote: You must create a placeholder organization first using `myapi org create` to get an org_id.');
+    return;
+  }
+  const orgId = args[0];
+  const domain = args[1];
+  
+  if (!orgId || !domain) {
+    error("Missing arguments. Usage: myapi org import <org_id> <domain>");
+    return;
+  }
   const config = requireConfig();
   
-  const result = await hq.importOrg(config.api_key, domain);
+  const result = await hq.importOrg(config.api_key, orgId, domain);
   const importId = result.job_id;
   
   process.stdout.write("Importing ");

package/src/index.ts

@@ -3,7 +3,7 @@
 import { parseArgs } from './utils.js';
 import { error, info } from './output.js';
 import { MyApiError } from '@myapihq/sdk';
-import * as accountCmd from './commands/account.js';
+import * as keysCmd from './commands/keys.js';
 import * as billingCmd from './commands/billing.js';
 import * as orgCmd from './commands/org.js';
 import * as setupCmd from './commands/setup.js';
@@ -21,28 +21,30 @@ async function main() {
         }
         await setupCmd.setup();
         break;
-      case 'account':
-        if (flags.help || !subcommand) {
-          info('Usage: myapi account <subcommand>\n\nSubcommands:\n  token      Recover your agent token\n  keys       List API keys\n  revoke     Revoke an API key');
+      case 'keys':
+        if (!subcommand || (flags.help && !subcommand)) {
+          info('Usage: myapi keys <subcommand>\n\nSubcommands:\n  list       List your API keys\n  create     Create a new API key\n  revoke     Revoke an API key (e.g. myapi keys revoke <id>)');
           break;
         }
-        if (subcommand === 'create') await accountCmd.create();
-        else if (subcommand === 'token') await accountCmd.token(flags);
-        else if (subcommand === 'keys') await accountCmd.listKeys(flags);
-        else if (subcommand === 'revoke') await accountCmd.revokeKey(restArgs[0], flags);
+        if (subcommand === 'create') await keysCmd.createNew(flags);
+        else if (subcommand === 'list') await keysCmd.list(flags);
+        else if (subcommand === 'revoke') await keysCmd.revoke(restArgs[0], flags);
         else printHelp();
         break;
       case 'org':
-        if (flags.help || !subcommand) {
-          info('Usage: myapi org <subcommand>\n\nSubcommands:\n  list       List organizations\n  create     Create an organization');
+        if (!subcommand || (flags.help && !subcommand)) {
+          info('Usage: myapi org <subcommand>\n\nSubcommands:\n  list       List organizations\n  create     Create an organization\n  get        Get details of an organization\n  delete     Delete an organization\n  import     Extract org from domain');
           break;
         }
         if (subcommand === 'list') await orgCmd.list(flags);
         else if (subcommand === 'create') await orgCmd.create(flags);
+        else if (subcommand === 'get') await orgCmd.get(restArgs[0], flags);
+        else if (subcommand === 'delete') await orgCmd.del(restArgs[0], flags);
+        else if (subcommand === 'import') await orgCmd.importOrg(restArgs, flags);
         else printHelp();
         break;
       case 'billing':
-        if (flags.help || !subcommand) {
+        if (!subcommand || (flags.help && !subcommand)) {
           info('Usage: myapi billing <subcommand>\n\nSubcommands:\n  balance    Check balance\n  history    View billing history\n  topup      Top up your balance\n  setup      Setup a payment method');
           break;
         }
@@ -71,7 +73,7 @@ function printHelp() {
 Usage: myapi <command> [subcommand] [args]
 
 Commands:
-  account      Manage API keys and account settings
+  keys         Manage API keys
   billing      Check balance and manage billing
   org          Manage organizations
   setup        Setup CLI credentials and view integration instructions

package/src/commands/account.ts

@@ -1,49 +0,0 @@
-import { hq } from '@myapihq/sdk';
-import { saveConfig, requireConfig } from '../config.js';
-import { success, error, printTable } from '../output.js';
-import * as readline from 'readline';
-
-export async function create() {
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  const key = await new Promise<string>(resolve => rl.question('Paste your API key (get it from https://myapihq.com): ', resolve));
-  rl.close();
-  
-  if (!key.trim()) {
-    error('API key cannot be empty.');
-    return;
-  }
-
-  saveConfig({ api_key: key.trim(), account_id: '', pin: '' });
-  success(`API key saved to ~/.myapi/config.json`);
-}
-
-export async function token(flags: Record<string, string | boolean>) {
-  let pin = flags.pin as string;
-  if (!pin) {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    pin = await new Promise<string>(resolve => rl.question('Enter PIN: ', resolve));
-    rl.close();
-  }
-
-  const result = await hq.recoverAgentToken(pin);
-  const keyInfo = await hq.createApiKey(result.token, 'recovered');
-  
-  const config = requireConfig();
-  config.api_key = keyInfo.api_key;
-  saveConfig(config);
-  
-  success(`Token recovered! New API Key: ${keyInfo.api_key}`);
-}
-
-export async function listKeys(flags: Record<string, string | boolean>) {
-  const config = requireConfig();
-  const keys = await hq.listApiKeys(config.api_key);
-  printTable(keys as unknown as Record<string, unknown>[]);
-}
-
-export async function revokeKey(id: string, flags: Record<string, string | boolean>) {
-  if (!id) error("Missing key id");
-  const config = requireConfig();
-  await hq.revokeApiKey(config.api_key, id);
-  success(`Key ${id} revoked`);
-}