@myapihq/cli 1.0.84 → 1.1.0-wip.1

package/dist/commands/setup.js

@@ -1,30 +1,10 @@
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-import * as readline from 'readline';
 import { loadConfig, saveConfig, addAccount, loadFullConfig } from '../config.js';
 import { info, success } from '../output.js';
-const API_BASE = process.env.MYAPI_API_BASE ?? 'https://api.myapihq.com';
-function ask(rl, q) {
-    return new Promise(resolve => rl.question(q, resolve));
-}
-function yn(answer, defaultYes = true) {
-    const t = answer.trim().toLowerCase();
-    if (t === '')
-        return defaultYes;
-    return t === 'y' || t === 'yes';
-}
-async function post(path, body) {
-    const res = await fetch(`${API_BASE}${path}`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(body),
-    });
-    const json = await res.json();
-    if (!res.ok)
-        throw new Error(json.error ?? `HTTP ${res.status}`);
-    return json.data ?? json;
-}
+import { ask, confirm } from '../prompt.js';
+import { hq, funnel as sdkFunnel } from '@myapihq/sdk';
 // ---------------------------------------------------------------------------
 // Skills installation
 // ---------------------------------------------------------------------------
@@ -55,96 +35,153 @@ export async function installSkills() {
         fs.mkdirSync(skillDir, { recursive: true });
         fs.copyFileSync(path.join(BUNDLED_SKILLS_DIR, skill, 'SKILL.md'), path.join(skillDir, 'SKILL.md'));
     }
-    // Symlink each skill into agent config directories
+    // Symlink each skill into agent config directories. Surface failures so
+    // users can fix permission issues — skills that didn't install will not
+    // be available to the agent and "skills installed" would otherwise lie.
     for (const [agent, dir] of Object.entries(AGENT_DIRS)) {
         try {
             fs.mkdirSync(dir, { recursive: true });
             for (const skill of skills) {
                 const link = path.join(dir, skill);
                 const target = path.join(SKILLS_CANONICAL, skill);
+                // Only remove if it's already a symlink we own. Avoids clobbering a
+                // user-authored skill that happens to share the same `my-X-api/`
+                // name. ENOENT here just means "nothing to clean up".
                 try {
-                    fs.rmSync(link, { recursive: true, force: true });
+                    const stat = fs.lstatSync(link);
+                    if (stat.isSymbolicLink())
+                        fs.rmSync(link, { force: true });
                 }
-                catch { /* ignore */ }
+                catch { /* ENOENT: nothing there */ }
                 fs.symlinkSync(target, link);
             }
             info(`  ✓ ${agent}`);
         }
-        catch {
-            // Silently skip agents whose directory can't be created.
+        catch (err) {
+            // Skip agents not installed on this machine (ENOENT on parent dir is OK).
+            // Surface anything else so the user knows skills aren't fully installed.
+            const code = err?.code;
+            if (code === 'ENOENT' || code === 'ENOTDIR') {
+                // Agent likely not installed — quietly skip.
+                continue;
+            }
+            info(`  ✗ ${agent}: ${err.message || code} (${dir})`);
         }
     }
 }
 // ---------------------------------------------------------------------------
+// Shared helpers
+// ---------------------------------------------------------------------------
+// Resolve the user's "install skills?" preference: explicit flag wins, else
+// prompt (defaulting to yes). `--yes` short-circuits to true.
+async function resolveSkillsPreference(flags) {
+    if (flags['install-skills'])
+        return true;
+    if (flags['no-skills'])
+        return false;
+    if (flags.yes)
+        return true;
+    return confirm('› Install the MyAPI skills pack? (Y/n) ', true);
+}
+// Resolve default org and funnel for a key by inspecting the account's orgs.
+// Used by both `setup` and `import-key`. Picks the most recently-created
+// org/funnel as the default; preserves the caller's hint if it still exists.
+async function resolveDefaults(apiKey, hint = {}) {
+    let org = hint.org ?? '';
+    let funnel = hint.funnel ?? '';
+    try {
+        const orgs = await hq.listOrgs(apiKey);
+        if (orgs.length > 0) {
+            if (!org || !orgs.find(o => o.id === org)) {
+                org = orgs[orgs.length - 1].id;
+            }
+            const funnels = await sdkFunnel.listFunnels(apiKey, org);
+            if (funnels.length > 0 && (!funnel || !funnels.find((f) => f.id === funnel))) {
+                funnel = funnels[funnels.length - 1].id;
+            }
+        }
+    }
+    catch { /* non-fatal */ }
+    return { org, funnel };
+}
+// ---------------------------------------------------------------------------
 // Registered flow
 // ---------------------------------------------------------------------------
-async function registeredFlow(rl) {
-    const email = (await ask(rl, '› Email? ')).trim();
-    await post('/hq/account/send-code', { email });
+async function registeredFlow() {
+    const email = await ask('› Email? ');
+    await hq.sendCode(email);
     info(`› Sent a code to ${email} · paste it below`);
-    const code = (await ask(rl, '› Code? ')).trim();
-    const data = await post('/hq/account/verify-code', { email, code });
+    const code = await ask('› Code? ');
+    const data = await hq.verifyCode(email, code);
     return { ...data, email };
 }
-// ---------------------------------------------------------------------------
-// Anonymous flow
-// ---------------------------------------------------------------------------
 async function anonymousFlow() {
-    const data = await post('/hq/account/anonymous', {});
-    return data;
+    return hq.createAnonymousAccount();
 }
 // ---------------------------------------------------------------------------
 // Main setup command
 // ---------------------------------------------------------------------------
+const IMPORT_KEY_HELP = `Usage: myapi auth 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.
+
+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.
+
+Flags:
+  --install-skills   Also install the MyAPI skills pack for AI agents after importing
+  --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]
+
+Configures your account and stores your default org and funnel so you don't
+need to pass --org or --funnel on every command.
+
+Flags:
+  --anonymous       Skip registration, create anonymous account
+  --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.
 export async function importKey(apiKey, flags) {
     if (flags.help || !apiKey) {
-        info('Usage: myapi auth import-key <api_key> [--install-skills] [--no-skills]\n\nImports an existing API key non-interactively. Use this in CI, Docker, or any\nenvironment where the interactive "myapi auth setup" flow is not practical.\n\nThe key is validated against the API before being saved. Your default org and\nfunnel are auto-detected from the account and written to the local config.\n\nFlags:\n  --install-skills   Also install the MyAPI skills pack for AI agents after importing\n  --no-skills        Skip skills installation even if previously installed\n\nExamples:\n  myapi auth import-key hq_live_xxxxxxxxxxxxxxxxxxxx\n  myapi auth import-key hq_live_xxxxxxxxxxxxxxxxxxxx --install-skills');
+        info(IMPORT_KEY_HELP);
         return;
     }
-    const auth = { Authorization: `Bearer ${apiKey}` };
     let accountId = '';
     let email;
-    let defaultOrg = '';
-    let defaultFunnel = '';
     try {
-        const meRes = await fetch(`${API_BASE}/hq/account/me`, { headers: auth });
-        const meJson = await meRes.json();
-        if (!meRes.ok)
-            throw new Error(meJson.error ?? `HTTP ${meRes.status}`);
-        const me = meJson.data ?? meJson;
+        const me = await hq.getAccount(apiKey);
         accountId = me.account_id ?? '';
         email = me.email || undefined;
     }
     catch (e) {
         throw new Error(`Could not verify API key: ${e.message}`);
     }
-    // Fetch org/funnel defaults.
-    try {
-        const orgRes = await fetch(`${API_BASE}/hq/orgs`, { headers: auth });
-        if (orgRes.ok) {
-            const orgs = ((await orgRes.json())?.data ?? []);
-            if (orgs.length > 0) {
-                defaultOrg = orgs[orgs.length - 1].id;
-                const fRes = await fetch(`${API_BASE}/funnel/orgs/${defaultOrg}/funnels`, { headers: auth });
-                if (fRes.ok) {
-                    const funnels = ((await fRes.json())?.data ?? []);
-                    if (funnels.length > 0)
-                        defaultFunnel = funnels[funnels.length - 1].id;
-                }
-            }
-        }
-    }
-    catch { /* non-fatal */ }
-    const wantsSkills = flags['install-skills'] ? true : flags['no-skills'] ? false : true;
-    addAccount({ api_key: apiKey, account_id: accountId, email, default_org: defaultOrg, default_funnel: defaultFunnel, skills_installed: wantsSkills });
+    const { org: defaultOrg, funnel: defaultFunnel } = await resolveDefaults(apiKey);
+    const wantsSkills = flags['no-skills'] ? false : true;
+    addAccount({
+        api_key: apiKey, account_id: accountId, email,
+        default_org: defaultOrg, default_funnel: defaultFunnel,
+        skills_installed: wantsSkills,
+    });
     success(`› ✓ Key imported${email ? ` · ${email}` : ''}`);
     if (wantsSkills)
         await installSkills();
 }
+// Persist a new account + (optionally) install skills.
+async function installAndPersistSkills(account, wantsSkills) {
+    addAccount({ ...account, skills_installed: wantsSkills });
+    if (wantsSkills)
+        await installSkills();
+}
 export async function setup(flags = {}) {
     if (flags.help) {
-        info('Usage: myapi auth setup [--anonymous] [--yes] [--install-skills|--no-skills]\n\nConfigures your account and stores your default org and funnel so you don\'t need to pass --org or --funnel on every command.\n\nFlags:\n  --anonymous       Skip registration, create anonymous account\n  --yes             Skip confirmation prompts\n  --install-skills  Auto-install skills pack\n  --no-skills       Skip skills installation');
+        info(SETUP_HELP);
         return;
     }
     info('› Configuring MyAPI…');
@@ -157,27 +194,20 @@ export async function setup(flags = {}) {
         const activeType = existing.is_anonymous ? 'anonymous' : 'registered';
         const othersNote = total > 1 ? ` · ${total - 1} more saved` : '';
         info(`› Connected: ${activeLabel} (${activeType})${othersNote}`);
-        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-        const add = await ask(rl, '› Connect a new account? (y/N) ');
-        if (!yn(add, false)) {
+        const add = await confirm('› Connect a new account? (y/N) ', false);
+        if (!add) {
             if (!existing.skills_installed) {
-                const ans = await ask(rl, '› Install the MyAPI skills pack? (Y/n) ');
-                rl.close();
-                if (yn(ans)) {
+                const wants = await resolveSkillsPreference(flags);
+                if (wants) {
                     await installSkills();
                     success('› Skills installed.');
                     saveConfig({ ...existing, skills_installed: true });
                 }
             }
-            else {
-                rl.close();
-            }
             return;
         }
-        rl.close();
         // Fall through to setup flow — new account will be added to the list.
     }
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     let apiKey = '';
     let accountId = '';
     let defaultOrg = '';
@@ -185,97 +215,62 @@ export async function setup(flags = {}) {
     let subdomainUrl = '';
     let isAnonymous = false;
     let email = '';
-    // Determine skills preference from flags before any prompts.
-    const skillsFromFlag = flags['install-skills'] ? true : flags['no-skills'] ? false : null;
+    const useAnon = flags.anonymous || flags.anon;
+    const wantsRegister = useAnon ? false : await confirm('› Register with email? (Y/n, or N to continue anonymously) ', true);
+    if (wantsRegister) {
+        const data = await registeredFlow();
+        apiKey = data.api_key;
+        accountId = data.account_id;
+        defaultOrg = data.default_org;
+        defaultFunnel = data.default_funnel;
+        email = data.email;
+    }
+    else {
+        info('› Continuing as anonymous — sites ship to *.makeautonomous.com');
+        const data = await anonymousFlow();
+        apiKey = data.api_key;
+        accountId = data.account_id;
+        defaultOrg = data.default_org;
+        defaultFunnel = data.default_funnel;
+        subdomainUrl = data.subdomain_url;
+        isAnonymous = true;
+    }
+    const wantsSkills = await resolveSkillsPreference(flags);
+    await installAndPersistSkills({
+        api_key: apiKey,
+        account_id: accountId,
+        email: email || undefined,
+        default_org: defaultOrg,
+        default_funnel: defaultFunnel,
+        is_anonymous: isAnonymous,
+    }, wantsSkills);
+    success(`› ✓ saved to ~/.myapi/config.json`);
+    // Validate key and ensure org/funnel defaults are still correct.
+    // (resolveDefaults is non-fatal if the API call fails.)
     try {
-        const useAnon = flags.anonymous || flags.anon;
-        const createAns = useAnon ? 'n' : await ask(rl, '› Register with email? (Y/n, or N to continue anonymously) ');
-        if (yn(createAns)) {
-            const data = await registeredFlow(rl);
-            apiKey = data.api_key;
-            accountId = data.account_id;
-            defaultOrg = data.default_org;
-            defaultFunnel = data.default_funnel;
-            email = data.email;
-        }
-        else {
-            info('› Continuing as anonymous — sites ship to *.makeautonomous.com');
-            const data = await anonymousFlow();
-            apiKey = data.api_key;
-            accountId = data.account_id;
-            defaultOrg = data.default_org;
-            defaultFunnel = data.default_funnel;
-            subdomainUrl = data.subdomain_url;
-            isAnonymous = true;
-        }
-        const wantsSkills = skillsFromFlag !== null ? skillsFromFlag : flags.yes ? true : yn(await ask(rl, '› Install the MyAPI skills pack? (Y/n) '));
-        addAccount({
-            api_key: apiKey,
-            account_id: accountId,
-            email: email || undefined,
-            default_org: defaultOrg,
-            default_funnel: defaultFunnel,
-            is_anonymous: isAnonymous,
-            skills_installed: wantsSkills,
-        });
-        success(`› ✓ saved to ~/.myapi/config.json`);
-        if (wantsSkills) {
-            await installSkills();
-        }
-        // Validate key and ensure org/funnel defaults are correct.
-        try {
-            const auth = { Authorization: `Bearer ${apiKey}` };
-            const meRes = await fetch(`${API_BASE}/hq/account/me`, { headers: auth });
-            if (!meRes.ok) {
-                info('› Warning: could not verify API key — check your connection.');
-            }
-            else {
-                // Verify default org exists; if not, fetch the most recent one.
-                let resolvedOrg = defaultOrg;
-                let resolvedFunnel = defaultFunnel;
-                const orgRes = await fetch(`${API_BASE}/hq/orgs`, { headers: auth });
-                if (orgRes.ok) {
-                    const orgs = (await orgRes.json())?.data ?? [];
-                    if (orgs.length > 0) {
-                        const latest = orgs[orgs.length - 1];
-                        if (!resolvedOrg || !orgs.find((o) => o.id === resolvedOrg)) {
-                            resolvedOrg = latest.id;
-                            info(`› Auto-selected org: ${latest.name} (${resolvedOrg})`);
-                        }
-                        // Verify default funnel exists within the org.
-                        const fRes = await fetch(`${API_BASE}/funnel/orgs/${resolvedOrg}/funnels`, { headers: auth });
-                        if (fRes.ok) {
-                            const funnels = (await fRes.json())?.data ?? [];
-                            if (funnels.length > 0 && (!resolvedFunnel || !funnels.find((f) => f.id === resolvedFunnel))) {
-                                resolvedFunnel = funnels[funnels.length - 1].id;
-                                info(`› Auto-selected funnel: ${resolvedFunnel}`);
-                            }
-                        }
-                        if (resolvedOrg !== defaultOrg || resolvedFunnel !== defaultFunnel) {
-                            const full = loadFullConfig();
-                            const idx = full.active;
-                            full.accounts[idx].default_org = resolvedOrg;
-                            full.accounts[idx].default_funnel = resolvedFunnel;
-                            fs.writeFileSync(path.join(os.homedir(), '.myapi', 'config.json'), JSON.stringify(full, null, 2), { mode: 0o600 });
-                            defaultOrg = resolvedOrg;
-                            defaultFunnel = resolvedFunnel;
-                        }
-                    }
-                }
+        await hq.getAccount(apiKey);
+        const resolved = await resolveDefaults(apiKey, { org: defaultOrg, funnel: defaultFunnel });
+        if (resolved.org !== defaultOrg || resolved.funnel !== defaultFunnel) {
+            const current = loadConfig();
+            if (current) {
+                saveConfig({ ...current, default_org: resolved.org, default_funnel: resolved.funnel });
+                if (resolved.org !== defaultOrg)
+                    info(`› Auto-selected org: ${resolved.org}`);
+                if (resolved.funnel !== defaultFunnel)
+                    info(`› Auto-selected funnel: ${resolved.funnel}`);
+                defaultOrg = resolved.org;
+                defaultFunnel = resolved.funnel;
             }
         }
-        catch { /* non-fatal */ }
-        if (isAnonymous) {
-            success('› Setup complete. No card, no email, ready to ship.');
-            if (subdomainUrl)
-                info(`› Your funnel: ${subdomainUrl}`);
-            info('› Upgrade anytime — myapi auth link');
-        }
-        else {
-            success(`› Setup complete. Org ${defaultOrg} ready · $5.00 free credits added.`);
-        }
     }
-    finally {
-        rl.close();
+    catch { /* non-fatal */ }
+    if (isAnonymous) {
+        success('› Setup complete. No card, no email, ready to ship.');
+        if (subdomainUrl)
+            info(`› Your funnel: ${subdomainUrl}`);
+        info('› Upgrade anytime — myapi auth link');
+    }
+    else {
+        success(`› Setup complete. Org ${defaultOrg} ready · $5.00 free credits added.`);
     }
 }

package/dist/commands/storage.js

@@ -30,26 +30,36 @@ export async function del(id, flags) {
     await sdkStorage.deleteAsset(config.api_key, orgId, id);
     success(`Asset ${id} deleted`);
 }
+// ── Dispatcher ───────────────────────────────────────────────────────────────
+const SUBCOMMAND_USAGE = {
+    'list': 'myapi storage list [--org <id>] [--json]',
+    'ingest': 'myapi storage ingest <url> [--name <name>] [--org <id>]',
+    'delete': 'myapi storage delete <asset_id> [--org <id>]',
+};
 export async function run(subcommand, args, flags) {
     if (!subcommand || (flags.help && !subcommand)) {
-        info('Usage: myapi storage <subcommand>\n\nSubcommands:\n  list       List all your uploaded assets\n  ingest     Ingest a public image URL into your edge storage\n  delete     Delete a stored asset\n\nNote: All storage commands require the --org <id> flag.');
+        info(`Usage: myapi storage <subcommand>
+
+Subcommands:
+  list       List all your uploaded assets
+  ingest     Ingest a public image URL into your edge storage
+  delete     Delete a stored asset
+
+All commands accept --org <id> (or set default: myapi config set-org <id>).`);
         return;
     }
     if (flags.help) {
-        if (subcommand === 'list')
-            info('Usage: myapi storage list --org <id> [--json]');
-        else if (subcommand === 'ingest')
-            info('Usage: myapi storage ingest <url> [--name <name>] --org <id>\n\nDownloads a public image (JPEG/PNG) and permanently hosts it on your MyAPI storage. Returns the new URL.');
-        else if (subcommand === 'delete')
-            info('Usage: myapi storage delete <asset_id> --org <id>');
+        const usage = SUBCOMMAND_USAGE[subcommand];
+        if (usage)
+            info(`Usage: ${usage}`);
+        else
+            info(`Unknown subcommand: ${subcommand}. Run "myapi storage --help" for the list.`);
         return;
     }
-    if (subcommand === 'list')
-        await list(flags);
-    else if (subcommand === 'ingest')
-        await ingest(args[0], flags);
-    else if (subcommand === 'delete')
-        await del(args[0], flags);
-    else
-        error(`Unknown subcommand: ${subcommand}. Run "myapi storage --help" for a list of valid subcommands.`);
+    switch (subcommand) {
+        case 'list': return list(flags);
+        case 'ingest': return ingest(args[0], flags);
+        case 'delete': return del(args[0], flags);
+        default: error(`Unknown subcommand: ${subcommand}. Run "myapi storage --help" for a list of valid subcommands.`);
+    }
 }

package/dist/commands/update.d.ts

@@ -1,4 +1,5 @@
+import type { Flags } from '../helpers.js';
 export declare function checkForUpdate(currentVersion: string): Promise<void>;
-export declare function update(flags?: Record<string, string | boolean>): Promise<void>;
+export declare function update(flags?: Flags): Promise<void>;
 export declare function latestVersion(): Promise<string | null>;
 export declare function isNewer(latest: string, current: string): boolean;

package/dist/commands/update.js

@@ -126,6 +126,11 @@ export async function latestVersion() {
         return null;
     }
 }
+// Stable-only semver comparison (1.2.3). Prerelease versions (1.2.3-wip.0)
+// produce NaN in the patch slot, and `n > NaN` is always false — which is
+// what we want: a prerelease user should not be auto-rolled back to stable.
+// Auto-update is opt-in via the `latest` dist-tag (always stable); see
+// checkForUpdate() above.
 export function isNewer(latest, current) {
     const toNum = (v) => v.split('.').map(Number);
     const [lMaj, lMin, lPat] = toNum(latest);

package/dist/commands/url.js

@@ -12,18 +12,30 @@ export async function shorten(targetUrl, flags) {
     else
         success(`Shortened URL: ${res.short_url}\nCode: ${res.short_code}`);
 }
+// ── Dispatcher ───────────────────────────────────────────────────────────────
+const SUBCOMMAND_USAGE = {
+    'shorten': 'myapi url shorten <url> [--org <id>] [--json]',
+};
 export async function run(subcommand, args, flags) {
     if (!subcommand || (flags.help && !subcommand)) {
-        info('Usage: myapi url <subcommand>\n\nSubcommands:\n  shorten    Shorten a long URL\n\nNote: All url commands require the --org <id> flag.');
+        info(`Usage: myapi url <subcommand>
+
+Subcommands:
+  shorten    Shorten a long URL (returns a myurlto.com link)
+
+All commands accept --org <id> (or set default: myapi config set-org <id>).`);
         return;
     }
     if (flags.help) {
-        if (subcommand === 'shorten')
-            info('Usage: myapi url shorten <url> --org <id> [--json]\n\nShortens a long URL and returns the compact myurlto.com link.');
+        const usage = SUBCOMMAND_USAGE[subcommand];
+        if (usage)
+            info(`Usage: ${usage}`);
+        else
+            info(`Unknown subcommand: ${subcommand}. Run "myapi url --help" for the list.`);
         return;
     }
-    if (subcommand === 'shorten')
-        await shorten(args[0], flags);
-    else
-        error(`Unknown subcommand: ${subcommand}. Run "myapi url --help" for a list of valid subcommands.`);
+    switch (subcommand) {
+        case 'shorten': return shorten(args[0], flags);
+        default: error(`Unknown subcommand: ${subcommand}. Run "myapi url --help" for a list of valid subcommands.`);
+    }
 }

package/dist/commands/webhook.d.ts

@@ -1,5 +1,8 @@
-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 del(id: string, flags: Record<string, string | boolean>): Promise<void>;
-export declare function delivery(id: string, flags: Record<string, string | boolean>): Promise<void>;
-export declare function run(subcommand: string | undefined, args: string[], flags: Record<string, string | boolean>): Promise<void>;
+import type { FlagSchema } from '../flags.js';
+import { type Flags } from '../helpers.js';
+export declare const SCHEMA: FlagSchema;
+export declare function list(flags: Flags): Promise<void>;
+export declare function create(nameArg: string | undefined, flags: Flags): Promise<void>;
+export declare function del(id: string, flags: Flags): Promise<void>;
+export declare function delivery(id: string, flags: Flags): Promise<void>;
+export declare function run(subcommand: string | undefined, args: string[], flags: Flags): Promise<void>;