@myapihq/cli 1.0.27 → 1.0.28

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 // AUTO-GENERATED by scripts/generate-indexes.js — do not edit manually
 import { parseArgs } from './utils.js';
-import { error, info } from './output.js';
+import { error, info, success } from './output.js';
 import { loadConfig } from './config.js';
 import { MyApiError } from '@myapihq/sdk';
 import * as fs from 'fs';
@@ -11,11 +11,11 @@ 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';
-import * as configCmd from './commands/config.js';
-import * as authCmd from './commands/auth.js';
 import * as updateCmd from './commands/update.js';
 import * as domainCmd from './commands/domain.js';
 import * as funnelCmd from './commands/funnel.js';
+import * as authCmd from './commands/auth.js';
+import * as configCmd from './commands/config.js';
 async function main() {
     // Fire-and-forget auto-update check — never blocks the command.
     updateCmd.checkForUpdate(pkg.version).catch(() => { });
@@ -31,8 +31,8 @@ async function main() {
     if (args.length === 0) {
         const config = loadConfig();
         if (!config?.api_key) {
-            info('No account found. Run: myapi setup');
-            process.exit(0);
+            info('No account found. Run: myapi auth setup');
+            info('');
         }
         printHelp();
         process.exit(0);
@@ -40,16 +40,39 @@ async function main() {
     const [command, subcommand, ...restArgs] = args;
     try {
         switch (command) {
-            case 'setup':
-                await setupCmd.setup();
-                break;
             case 'auth':
-                if (subcommand === 'signup')
-                    await authCmd.signup();
+                if (!subcommand || flags.help) {
+                    info('Usage: myapi auth <subcommand>\n\nSubcommands:\n  setup           Configure your account\n  whoami          Show current account\n  signup          Upgrade anonymous account to registered\n  switch          Switch between accounts\n  config          Manage CLI defaults (org_id, domain…)\n  install-skills  Install the MyAPI skills pack\n  api-keys        Manage API keys');
+                    break;
+                }
+                if (subcommand === 'setup')
+                    await setupCmd.setup();
                 else if (subcommand === 'whoami')
                     await authCmd.whoami();
+                else if (subcommand === 'signup')
+                    await authCmd.signup();
+                else if (subcommand === 'switch')
+                    await authCmd.switchCmd();
+                else if (subcommand === 'install-skills') {
+                    await setupCmd.installSkills();
+                    success('› Skills installed.');
+                }
+                else if (subcommand === 'config')
+                    await configCmd.run(restArgs[0], restArgs.slice(1), flags);
+                else if (subcommand === 'api-keys') {
+                    if (!restArgs[0]) {
+                        info('Usage: myapi auth api-keys <list|create|revoke>');
+                        break;
+                    }
+                    if (restArgs[0] === 'create')
+                        await keysCmd.createNew(flags);
+                    else if (restArgs[0] === 'list')
+                        await keysCmd.list(flags);
+                    else if (restArgs[0] === 'revoke')
+                        await keysCmd.revoke(restArgs[1], flags);
+                }
                 else
-                    info('Usage: myapi auth <signup|whoami>');
+                    info('Unknown subcommand. Run: myapi auth --help');
                 break;
             case 'update':
                 await updateCmd.update();
@@ -102,9 +125,6 @@ async function main() {
                 else
                     printHelp();
                 break;
-            case 'config':
-                await configCmd.run(subcommand, restArgs, flags);
-                break;
             case 'domain':
                 await domainCmd.run(subcommand, restArgs, flags);
                 break;
@@ -127,6 +147,13 @@ async function main() {
     }
 }
 function printHelp() {
+    const config = loadConfig();
+    const quickStart = config?.api_key
+        ? `Quick start:
+  myapi funnel create
+  echo '<h1>Hello!</h1>' | myapi funnel push <funnel_id> /`
+        : `Quick start:
+  myapi setup`;
     info(`myapi - MyAPI command-line interface
 
 Usage: myapi <command> [subcommand] [args]
@@ -136,18 +163,13 @@ Commands:
   keys         Manage API keys
   billing      Check balance and manage billing
   org          Manage organizations
-  setup        Configure credentials and install skills
-  config       Manage CLI defaults like org_id and domain
-  auth         Manage authentication (signup, whoami)
+  setup        Configure account · whoami · signup · config · install-skills
   update       Update CLI and skills to the latest version
   domain       Manage domain configurations
   funnel       Manage headless funnels and pages
 
 Run "myapi <command> --help" for subcommand help.
 
-Quick start:
-  myapi setup
-  myapi funnel create
-  echo '<h1>Hello!</h1>' | myapi funnel push <funnel_id> /`);
+${quickStart}`);
 }
 main().catch(err => { error(err.message || (typeof err === 'object' ? JSON.stringify(err) : String(err))); });

package/dist/skills/my-api-hq.md

@@ -0,0 +1,116 @@
+---
+name: my-api-hq
+description: >
+  Core Identity and Billing hub. Manage auth, organizations (get org_id), and billing (checkout/topup).
+---
+
+# MyApiHQ Skill
+Root entry point for the ecosystem. All other skills require an `api_key` and often an `org_id` from here.
+
+## Platform Conventions
+
+### Response Envelope
+Every response across all services is wrapped in:
+```json
+{
+  "success": true,
+  "data": { ... },
+  "error": null,
+  "meta": { "request_id": "...", "latency_ms": 12, "service": "...", "version": "v1" }
+}
+```
+On error, `success` is `false`, `data` is `null`, and `error` contains a string error code or object. Always check `success` before reading `data`.
+
+### Pagination
+List endpoints accept `?limit=` and `?offset=` and return `total`, `limit`, `offset` in the body.
+
+## Authentication & Key Management
+
+You need to go to myapihq.com and register an account. Generate an api key and export it to pass it to the agent (as env).
+
+### Account Login
+```
+POST /hq/account/login
+{ "email": "...", "password": "..." }
+→ { "data": { "token": "<JWT>" } }
+```
+Errors: `401` wrong password.
+
+**Refresh Token:**
+```
+POST /hq/account/refresh
+```
+
+**Google OAuth:**
+- `GET /hq/auth/google/redirect` — Initiates Google OAuth flow.
+- `GET /hq/auth/google/callback` — OAuth callback.
+
+### API Key Management
+**Generate Persistent Key:**
+```
+POST /hq/account/create/key
+Authorization: Bearer <JWT from login>
+{ "name": "MyKey" }
+→ { "data": { "api_key": "hq_live_...", "id": "...", "prefix": "..." } }
+```
+Errors: `401` no auth.
+
+Use `Authorization: Bearer <api_key>` for all subsequent requests across the entire ecosystem.
+
+**List Keys:** `GET /hq/account/keys`
+
+**Revoke Key:** `DELETE /hq/account/delete/key/{id}`
+
+### Cross-Session Storage
+**Always persist credentials immediately.** Write a `.env` file:
+```
+MYAPI_API_KEY=hq_live_...
+MYAPI_ACCOUNT_ID=...
+```
+Also save to agent memory if your runtime supports it (e.g., Claude Code memory). On every new session, check for credentials before creating a new account.
+
+## Organization Management
+**You MUST create an org to get an `org_id` for other APIs.**
+
+### Create Org (sync)
+```
+POST /hq/orgs
+{ "name": "Acme Inc" (required), "tagline", "description", "business_sector",
+  "logo_url", "favicon_url", "og_image_url",
+  "color_palette": { "primary": "#hex", ... },
+  "font_family", "imagery_style", "headline", "subheadline", "cta_text",
+  "value_propositions": ["..."],
+  "social_links": { "twitter": "url", ... },
+  "canonical_url", "privacy_policy_url", "cookie_policy_url", "terms_url",
+  "gdpr_enabled": false, "default_language": "en", "tracking": {} }
+→ { "data": { "id": "<org_id>", ... } }
+```
+Errors: `400` invalid_json · `422` name_required, invalid_field:color_palette, invalid_field:value_propositions, invalid_field:social_links, invalid_field:tracking · `402` insufficient balance (org creation has a cost on paid plan).
+
+### Async Brand Import
+```
+POST /hq/org-imports
+{ "org_id": "<id>" (required), "domain": "example.com" (required), "auto_accept": false }
+→ { "data": { "job_id": "...", "status": "pending" } }
+
+GET /hq/org-imports/{job_id}
+→ Poll until status = "awaiting_confirm". Returns brand_preview.
+
+POST /hq/org-imports/{job_id}/confirm
+{ ...optional overrides matching POST /hq/orgs payload... }
+→ { "data": { "id": "<org_id>", ... } }
+```
+
+### Manage Orgs
+- `GET /hq/orgs` — list all orgs.
+- `GET /hq/orgs/{id}` — get org details. Errors: `404` org_not_found.
+- `PATCH /hq/orgs/{id}` — partial update, same fields as create. Errors: `400` invalid_json · `404` org_not_found · `422` invalid_field:*.
+- `DELETE /hq/orgs/{id}` — delete org and cascade. Errors: `404` org_not_found.
+
+## Billing
+- **Setup Payment Method:** You need to do this from the myapihq dashboard directly.
+- **Check Balance:** `GET /hq/billing/balance` → `{ "data": { "balance_cents": 1000, "balance_display": "$10.00", "credits_cents": 500, "credits_display": "$5.00", "has_payment_method": true } }`.
+- **Billing History:** `GET /hq/billing/history`
+- **Top Up:** `POST /hq/billing/topup` — `{ "amount_cents": 1000 }` → `{ "data": { "new_balance_cents": 2000, "new_balance_display": "$20.00" } }`.
+
+**On 402 from any service:** check balance and top up here before retrying.

package/dist/skills/my-domain-api.md

@@ -0,0 +1,83 @@
+---
+name: my-domain-api
+description: >
+  Register new domains, check availability and pricing, import existing domains, and manage edge settings. Use this before creating mailboxes or funnels — both require an owned domain.
+---
+
+# MyDomainAPI Skill
+
+## Quick Start
+1. `GET /domain/orgs/{org_id}/list?filter=all` — lists domains owned by your account. `filter` can be `all`, `unassigned`, or `org` (default).
+2. `GET /domain/orgs/{org_id}/check/available/{domain}` — confirm availability and price.
+3. `POST /domain/orgs/{org_id}/register` with `domain` and optional `years`.
+4. Proceed to `my-email-api` for mailboxes or `my-funnel-api` for a website.
+
+DNS is fully managed by the platform — enabling seamless email deliverability, tracking pixel, and edge delivery integration. Manual DNS record management is not exposed.
+
+## Dependencies & Backlinks
+- **Auth & Billing:** 401/402 → fall back to `my-api-hq`.
+- **Next Steps:** After registration → `my-email-api` for mailboxes or `my-funnel-api` for a website.
+
+## Authentication
+`Authorization: Bearer <api_key>` (from `my-api-hq`).
+
+## Endpoints
+
+### Check Availability
+```
+GET /domain/orgs/{org_id}/check/available/{domain}
+→ { "available": true, "price_cents": 1200 }
+```
+Errors: `400` INVALID_DOMAIN, TLD_NOT_SUPPORTED.
+
+### Register Domain
+```
+POST /domain/orgs/{org_id}/register
+{ "domain": "example.com", "years": 1 }
+→ { "domain": "...", "status": "provisioning", "domain_id": "..." }
+```
+Errors: `400` invalid request, INVALID_DOMAIN, TLD_NOT_SUPPORTED · `409` DOMAIN_ALREADY_OWNED, DOMAIN_UNAVAILABLE · `402` INSUFFICIENT_BALANCE (includes `required_cents`) or UPGRADE_REQUIRED (free account) · `403` `already_owned` flag is not permitted.
+
+### Import Existing Domain
+```
+POST /domain/orgs/{org_id}/import
+{ "domain": "example.com", "namecheap_api_user": "optional", "namecheap_api_key": "optional" }
+```
+Sets up DNS and email infrastructure automatically. Optionally updates Namecheap NS if credentials are provided.
+Errors: `402` insufficient balance.
+
+To use Namecheap automation: go to **Profile > Tools > Namecheap API Access**, generate an API Key, and whitelist the MyAPI-HQ server IP — otherwise the API calls will be rejected.
+
+### List & Status
+```
+GET /domain/orgs/{org_id}/list
+GET /domain/orgs/{org_id}/{domain}/status
+```
+Errors (status): `404` DOMAIN_NOT_FOUND.
+
+### Assign / Unassign Domain
+```
+POST /domain/orgs/{org_id}/{domain}/assign
+{ "org_id": "<target_org_id>" } // Pass null to unassign
+```
+Associates a domain already in the account with a specific organization, or removes it from its current organization if `org_id` is null.
+Errors: `404` DOMAIN_NOT_FOUND · `422` ORG_NOT_FOUND.
+
+### Edge Settings
+
+**Update:**
+```
+POST /domain/orgs/{org_id}/{domain}/settings
+{
+  "security_level": "essentially_off",  // essentially_off | medium | high | under_attack
+  "browser_check": "off",               // on | off
+  "purge_cache": true
+}
+```
+*To allow AI training bots and crawlers: set `security_level: "essentially_off"` and `browser_check: "off"`.*
+
+**Get:**
+```
+GET /domain/orgs/{org_id}/{domain}/settings
+→ { "domain": "...", "security_level": "...", "browser_check": "...", "ai_bots_protection": "disabled", "is_robots_txt_managed": false }
+```

package/dist/skills/my-funnel-api.md

@@ -0,0 +1,35 @@
+---
+name: my-funnel-api:funnel
+description: >
+  A lean CRUD and CDN Publishing API. Manage funnel configurations, push raw HTML pages, and deploy static assets to the edge KV.
+---
+
+# MyFunnelAPI Skill
+
+## 1. Funnel Management (Authenticated)
+These endpoints manage the database records and structural configuration of funnels.
+
+- `GET /funnel/orgs/{org_id}/funnels`
+  Lists all funnels for the specified organization.
+- `POST /funnel/orgs/{org_id}/funnels`
+  Creates a new funnel entry. Expects basic configuration metadata (name, domain, etc.). Body: `{ "domain": "example.com" }`
+- `GET /funnel/orgs/{org_id}/funnels/{id}`
+  Retrieves the metadata and configuration details of a specific funnel.
+- `DELETE /funnel/orgs/{org_id}/funnels/{id}`
+  Deletes a funnel from the database and automatically purges all of its preview and published pages from the edge KV cache.
+
+## 2. Publishing & Edge Deployment (Authenticated)
+These endpoints interact with the edge KV cache to push HTML/JS content to the edge domains. As soon as you push a page, it is live.
+
+- `POST /funnel/orgs/{org_id}/funnels/{id}/push-page`
+  Deploys raw HTML to a specific slug on the live funnel (e.g., pushing custom HTML to /contact). Body: `{"slug": "/route", "html": "..."}`.
+- `POST /funnel/orgs/{org_id}/funnels/{id}/verify`
+  Pre-publish verification. Validates syntax and structure of raw HTML or an existing page slug.
+
+## 3. Public Proxies (Unauthenticated)
+These endpoints are called directly by the end-users' browsers (via the deployed static HTML). They do not require API keys. They are stateless and act as routing proxies to the Webhook API.
+
+- `POST /funnel/funnels/{id}/submit/{slug...}`
+  The endpoint for HTML form submissions. Validates the JSON payload, returns a 200 OK to the browser, and asynchronously POSTs the data to the organization's matching webhook (or fallback webhook).
+- `POST /funnel/funnels/{id}/event`
+  The endpoint for analytics and tracking scripts. Proxies click events, pageviews, and pixel tracking data to the configured webhook endpoints. Includes built-in rate limiting (max 60 req/min per funnel).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myapihq/cli",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "description": "MyAPI command-line interface",
   "type": "module",
   "main": "dist/index.js",
@@ -9,7 +9,7 @@
   },
   "scripts": {
     "prebuild": "node scripts/copy-skills.js",
-    "build": "tsc",
+    "build": "tsc && rm -rf dist/skills && cp -r src/skills dist/skills",
     "dev": "tsc --watch"
   },
   "dependencies": {

package/scripts/copy-skills.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 // Copies skills/*/SKILL.md from the repo root into src/skills/ so they get
 // bundled in the npm package. Runs as prebuild.
-import { readdirSync, mkdirSync, copyFileSync, existsSync, readFileSync } from 'fs';
+import { readdirSync, mkdirSync, copyFileSync, existsSync, readFileSync, rmSync } from 'fs';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 
@@ -15,6 +15,8 @@ if (!existsSync(skillsRoot)) {
   process.exit(0);
 }
 
+// Always start clean so unpublished skills don't linger.
+if (existsSync(dest)) rmSync(dest, { recursive: true, force: true });
 mkdirSync(dest, { recursive: true });
 
 let copied = 0;

package/src/commands/auth.ts

@@ -1,6 +1,6 @@
 import * as readline from 'readline';
 
-import { loadConfig, saveConfig } from '../config.js';
+import { loadConfig, saveConfig, addAccount, switchAccount, listAccounts } from '../config.js';
 import { info, success, error } from '../output.js';
 
 const API_BASE = process.env.MYAPI_API_BASE ?? 'https://api.myapihq.com';
@@ -9,6 +9,12 @@ function ask(rl: readline.Interface, q: string): Promise<string> {
   return new Promise(resolve => rl.question(q, resolve));
 }
 
+function yn(answer: string, defaultYes = true): boolean {
+  const t = answer.trim().toLowerCase();
+  if (t === '') return defaultYes;
+  return t === 'y' || t === 'yes';
+}
+
 async function post(path: string, body: unknown, apiKey?: string): Promise<unknown> {
   const headers: Record<string, string> = { 'Content-Type': 'application/json' };
   if (apiKey) headers['Authorization'] = `Bearer ${apiKey}`;
@@ -36,14 +42,26 @@ async function patch(path: string, body: unknown, apiKey: string): Promise<unkno
 // myapi auth signup — upgrade anonymous session to registered account.
 export async function signup() {
   const config = loadConfig();
-  if (!config?.api_key) error('Not configured. Run: myapi setup');
+  if (!config?.api_key) error('Not configured. Run: myapi auth setup');
   if (!config!.is_anonymous) error('Already registered. Use your existing account.');
 
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
   try {
     const email = (await ask(rl, '› Email? ')).trim();
 
-    await patch('/hq/account/upgrade', { email }, config!.api_key);
+    let upgradeOk = true;
+    try {
+      await patch('/hq/account/upgrade', { email }, config!.api_key);
+    } catch (err: any) {
+      if (err.message !== 'EMAIL_TAKEN') throw err;
+      upgradeOk = false;
+      info(`› That email already has an account — accounts cannot be merged.`);
+      info(`› Your anonymous account will be kept and you can switch back to it anytime.`);
+      const ans = (await ask(rl, '› Sign in and add it as a second account? (Y/n) ')).trim();
+      if (!yn(ans)) return;
+      await post('/hq/account/send-code', { email });
+    }
+
     info(`› Sent a code to ${email} · paste it below`);
 
     const code = (await ask(rl, '› Code? ')).trim();
@@ -54,16 +72,32 @@ export async function signup() {
       default_funnel: string;
     };
 
-    saveConfig({
-      ...config!,
-      api_key: data.api_key,
-      account_id: data.account_id,
-      default_org: data.default_org || config!.default_org,
-      default_funnel: data.default_funnel || config!.default_funnel,
-      is_anonymous: false,
-    });
-
-    success(`› Welcome! Account upgraded · ${email}`);
+    if (upgradeOk) {
+      // Upgrade: update current account in place.
+      saveConfig({
+        ...config!,
+        api_key: data.api_key,
+        account_id: data.account_id,
+        email,
+        default_org: data.default_org || config!.default_org,
+        default_funnel: data.default_funnel || config!.default_funnel,
+        is_anonymous: false,
+      });
+      success(`› Welcome! Account upgraded · ${email}`);
+    } else {
+      // Add as new account and switch to it.
+      const idx = addAccount({
+        api_key: data.api_key,
+        account_id: data.account_id,
+        email,
+        pin: '',
+        default_org: data.default_org,
+        default_funnel: data.default_funnel,
+        is_anonymous: false,
+      });
+      success(`› Signed in · ${email} (account #${idx + 1})`);
+      info(`› Use "myapi auth switch" to toggle between accounts.`);
+    }
   } finally {
     rl.close();
   }
@@ -72,10 +106,43 @@ export async function signup() {
 // myapi auth whoami — show current session info.
 export async function whoami() {
   const config = loadConfig();
-  if (!config?.api_key) error('Not configured. Run: myapi setup');
+  if (!config?.api_key) error('Not configured. Run: myapi auth setup');
 
+  if (config!.email) info(`Email:    ${config!.email}`);
   info(`Account:  ${config!.account_id}`);
   info(`Org:      ${config!.default_org ?? '(none)'}`);
   info(`Funnel:   ${config!.default_funnel ?? '(none)'}`);
   info(`Type:     ${config!.is_anonymous ? 'anonymous' : 'registered'}`);
 }
+
+// myapi auth switch — switch between saved accounts.
+export async function switchCmd() {
+  const accounts = listAccounts();
+  if (accounts.length === 0) error('No accounts configured. Run: myapi auth setup');
+  if (accounts.length === 1) {
+    info(`Only one account configured: ${accounts[0].email ?? accounts[0].account_id}`);
+    return;
+  }
+
+  info('Accounts:');
+  for (const a of accounts) {
+    const label = a.email ?? (a.is_anonymous ? `anonymous · ${a.account_id.slice(0, 8)}` : a.account_id.slice(0, 8));
+    const marker = a.active ? ' ◀ active' : '';
+    info(`  ${a.index + 1}. ${label}${marker}`);
+  }
+
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  try {
+    const ans = (await ask(rl, `› Switch to account (1-${accounts.length})? `)).trim();
+    const idx = parseInt(ans, 10) - 1;
+    if (isNaN(idx) || idx < 0 || idx >= accounts.length) {
+      error('Invalid selection.');
+    }
+    if (switchAccount(idx)) {
+      const a = accounts[idx];
+      success(`› Switched to ${a.email ?? a.account_id}`);
+    }
+  } finally {
+    rl.close();
+  }
+}

package/src/commands/config.ts

@@ -12,6 +12,17 @@ export async function setOrg(id: string, flags: Record<string, string | boolean>
   success(`Default organization set to: ${id}`);
 }
 
+export async function setFunnel(id: string, flags: Record<string, string | boolean>) {
+  if (!id || flags.help) {
+    info("Usage: myapi config set-funnel <id>\n\nSets a default funnel ID for subsequent commands.");
+    return;
+  }
+  const config = requireConfig();
+  config.default_funnel = id;
+  saveConfig(config);
+  success(`Default funnel set to: ${id}`);
+}
+
 export async function setDomain(domain: string, flags: Record<string, string | boolean>) {
   if (!domain || flags.help) {
     info("Usage: myapi config set-domain <domain>\n\nSets a default domain for subsequent commands.");
@@ -29,18 +40,20 @@ export async function view(flags: Record<string, string | boolean>) {
      return;
   }
   const config = requireConfig();
-  info(`Default Org: ${config.default_org || 'Not set'}`);
+  info(`Default Org:    ${config.default_org || 'Not set'}`);
+  info(`Default Funnel: ${config.default_funnel || 'Not set'}`);
   info(`Default Domain: ${config.default_domain || 'Not set'}`);
 }
 
 export async function run(subcommand: string | undefined, args: string[], flags: Record<string, string | boolean>) {
   if (!subcommand || (flags.help && !subcommand)) {
-    info('Usage: myapi config <subcommand>\n\nSubcommands:\n  view         View current config\n  set-org      Set default organization\n  set-domain   Set default domain');
+    info('Usage: myapi config <subcommand>\n\nSubcommands:\n  view         View current config\n  set-org      Set default organization\n  set-funnel   Set default funnel\n  set-domain   Set default domain');
     return;
   }
   
   if (subcommand === 'view') await view(flags);
   else if (subcommand === 'set-org') await setOrg(args[0], flags);
+  else if (subcommand === 'set-funnel') await setFunnel(args[0], flags);
   else if (subcommand === 'set-domain') await setDomain(args[0], flags);
   else error(`Unknown subcommand: ${subcommand}. Run "myapi config --help" for a list of valid subcommands.`);
 }

package/src/commands/funnel.ts

@@ -44,9 +44,11 @@ export async function del(id: string, flags: Record<string, string | boolean>) {
 export async function push(id: string, slug: string, flags: Record<string, string | boolean>) {
   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 funnelId = id || config.default_funnel;
+  const finalSlug = slug || (flags.slug as string) || '/';
+
+  if (!orgId || !funnelId) {
+    error("Missing required arguments.\nUsage: myapi funnel push [funnel_id] [slug] < index.html\n(Defaults to your configured funnel and slug '/' when omitted)");
   }
   
   const html = await new Promise<string>((resolve, reject) => {
@@ -59,14 +61,14 @@ export async function push(id: string, slug: string, flags: Record<string, strin
 
   if (!html) error("No HTML provided via stdin");
 
-  const result = await sdkFunnel.pushFunnelPage(config.api_key, orgId, id, { slug, html });
-  success(`Pushed page to ${slug}`);
+  const result = await sdkFunnel.pushFunnelPage(config.api_key, orgId, funnelId, { slug: finalSlug, html });
+  success(`Pushed page to ${finalSlug}`);
   if (result?.url) {
     info(`Preview: ${result.url}`);
   } else {
     const org = await hq.getOrg(config.api_key, orgId);
     if (org.preview_subdomain) {
-      info(`Preview: https://${org.preview_subdomain}.makeautonomous.com/${slug}`);
+      info(`Preview: https://${org.preview_subdomain}.makeautonomous.com${finalSlug}`);
     }
   }
 }
@@ -92,7 +94,7 @@ export async function run(subcommand: string | undefined, args: string[], flags:
     else if (subcommand === 'create') info('Usage: myapi funnel create --org <id>');
     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 === 'push') info('Usage: myapi funnel push [funnel_id] [slug] < index.html\n\nPushes HTML from stdin. Uses your default funnel and slug "/" when omitted.');
     else if (subcommand === 'verify') info('Usage: myapi funnel verify <id> --org <id> [--slug <slug>]\n\nVerifies syntax and structure before pushing.');
     return;
   }