@easybits.cloud/cli 0.7.0 → 0.8.0

package/README.md

@@ -36,7 +36,7 @@ another server (default `https://www.easybits.cloud`; `baseUrl` in `~/.easybitsr
 # Sandboxes (alias: sb)
 easybits sandboxes ls
 easybits sandboxes create --template node --name scratch --dotenv .env
-easybits sandboxes create --size m --timeout 1800 --no-wait   # size s|m|l|xl (plan-gated)
+easybits sandboxes create --size m --ttl 1800 --no-wait   # size s|m|l|xl (plan-gated)
 easybits sandboxes get sb_abc123
 easybits sandboxes exec sb_abc123 -- npm test
 easybits sandboxes logs sb_abc123 --unit myapp --lines 100 --since "10 min ago" --grep ERROR
@@ -50,7 +50,7 @@ easybits sandboxes destroy sb_abc123 --yes
 
 # Hosting: permanent machines (alias: deploy)
 easybits machines ls
-easybits machines deploy sb_abc123 -m "v1.2"
+easybits deploy sb_abc123 -m "v1.2"   # = machines deploy
 easybits machines releases sb_abc123 --limit 5
 easybits machines logs sb_abc123 --lines 100 --grep ERROR
 easybits machines rollback sb_abc123 rel_789
@@ -83,14 +83,15 @@ easybits agents destroy helper --yes
 # Files, websites, account
 easybits files ls
 easybits files upload ./report.pdf
-easybits files delete FILE_ID --yes
+easybits files rm FILE_ID --yes
 easybits websites ls
 easybits providers                   # storage provider (Tigris by default)
 easybits usage
 
 # MCP, SSH, docs
-easybits config        # MCP config (streamable HTTP)
-easybits mcp           # MCP config (stdio)
+easybits whoami        # account and where the credential comes from
+easybits mcp config    # MCP config (streamable HTTP)
+easybits mcp config --stdio   # MCP config (stdio)
 easybits ssh-key       # public key for sandbox SSH
 easybits docs cli      # a docs section as markdown (--en for English)
 easybits docs --open   # open the docs in your browser
@@ -104,7 +105,7 @@ Every command has help with examples: `easybits <command> <subcommand> --help`
 (or `easybits help <command> <subcommand>`). A typo gets a "Did you mean" suggestion.
 
 **Destructive commands** (`db rm`, `agents destroy`, `sandboxes destroy`, `domains rm`,
-`files delete`) ask before acting in a terminal: `[y/N]`, or typing the name/id for
+`files rm`) ask before acting in a terminal: `[y/N]`, or typing the name/id for
 irreversible ones (a database, an agent, a permanent sandbox). Without a terminal they
 never prompt — and neither do they with `--json`: pass `--yes` / `-y`, or they exit `2`.
 
@@ -134,6 +135,21 @@ Host *.ghosty
 
 Full reference: https://www.easybits.cloud/docs#cli · https://www.easybits.cloud/en/docs/cli.md
 
+## Changes in 0.8.0
+
+- One naming rule (like `gh`): `easybits <noun> <verb>`. Old spellings still work and print the new
+  one on stderr (never with `--json`):
+  `easybits config` → `easybits mcp config`; `easybits mcp` → `easybits mcp config --stdio`;
+  `easybits deploy <machine>` is now the verb (= `machines deploy`), so `deploy ls` → `machines ls`;
+  `machines release` → `machines deploy` (it clashed with `releases`);
+  `sandboxes create --timeout` → `--ttl` (`--timeout` stays in `exec`, where it caps the command).
+- `files rm` is the name (`delete` still works), like `db rm` and `domains rm`.
+- New `easybits whoami`: account email and where the credential comes from.
+
+## Changes in 0.7.0
+
+- Agents, sandboxes/machines and databases by **name** anywhere an id goes; `easybits agents get`.
+
 ## Changes in 0.6.1
 
 - Help: `--yes` is no longer listed as a global flag; it lives on each destructive command

package/dist/index.js

@@ -495,7 +495,8 @@ var providers = {
   synopsis: "providers",
   leaf: {
     summary: "Show storage providers",
-    usage: "easybits providers [list]",
+    usage: "easybits providers",
+    examples: ["easybits providers", "easybits providers --json"],
     async run(ctx) {
       const data = {
         defaultProvider: "tigris",
@@ -508,60 +509,57 @@ var providers = {
     }
   }
 };
-var config = {
-  name: "config",
+var mcp = {
+  name: "mcp",
   group: "MCP",
-  summary: "Print MCP config JSON (streamable HTTP)",
-  synopsis: "config",
-  leaf: {
-    summary: "Print MCP config JSON (streamable HTTP) with your key",
-    usage: "easybits config",
-    examples: ["easybits config > .mcp.json"],
-    async run(ctx) {
-      const apiKey = resolveApiKey(ctx);
-      const baseUrl = await resolveBaseUrl3();
-      console.log(
-        JSON.stringify(
-          {
+  summary: "Print the MCP config JSON for your agent or editor",
+  synopsis: "mcp",
+  subs: {
+    config: {
+      summary: "Print MCP config JSON: streamable HTTP with your key, or stdio (npx @easybits.cloud/mcp)",
+      usage: "easybits mcp config [--stdio]",
+      options: { stdio: { type: "boolean", description: "stdio config (npx @easybits.cloud/mcp) instead of streamable HTTP" } },
+      examples: ["easybits mcp config > .mcp.json", "easybits mcp config --stdio"],
+      async run(ctx) {
+        if (bool(ctx, "stdio")) {
+          const config2 = {
             mcpServers: {
-              easybits: {
-                type: "streamable-http",
-                url: `${baseUrl}/api/mcp`,
-                headers: { Authorization: `Bearer ${apiKey || "eb_sk_live_YOUR_KEY"}` }
-              }
+              easybits: { command: "npx", args: ["-y", "@easybits.cloud/mcp"], env: { EASYBITS_API_KEY: "eb_sk_live_YOUR_KEY" } }
             }
-          },
-          null,
-          2
-        )
-      );
+          };
+          console.log(JSON.stringify(config2, null, 2));
+          return;
+        }
+        const apiKey = resolveApiKey(ctx);
+        const baseUrl = await resolveBaseUrl3();
+        const config = {
+          mcpServers: {
+            easybits: {
+              type: "streamable-http",
+              url: `${baseUrl}/api/mcp`,
+              headers: { Authorization: `Bearer ${apiKey || "eb_sk_live_YOUR_KEY"}` }
+            }
+          }
+        };
+        console.log(JSON.stringify(config, null, 2));
+      }
     }
   }
 };
-var mcp = {
-  name: "mcp",
-  group: "MCP",
-  summary: "Print MCP stdio config JSON",
-  synopsis: "mcp",
+var whoami = {
+  name: "whoami",
+  group: "Account",
+  summary: "Show which account and credential the CLI is using",
+  synopsis: "whoami",
   leaf: {
-    summary: "Print MCP stdio config JSON (npx @easybits.cloud/mcp)",
-    usage: "easybits mcp",
-    async run() {
-      console.log(
-        JSON.stringify(
-          {
-            mcpServers: {
-              easybits: {
-                command: "npx",
-                args: ["-y", "@easybits.cloud/mcp"],
-                env: { EASYBITS_API_KEY: "eb_sk_live_YOUR_KEY" }
-              }
-            }
-          },
-          null,
-          2
-        )
-      );
+    summary: "Show the account email and where the credential comes from",
+    usage: "easybits whoami",
+    examples: ["easybits whoami", "easybits whoami --json"],
+    async run(ctx) {
+      const source = process.env.EASYBITS_API_KEY ? "env EASYBITS_API_KEY" : ctx.token ? "--token" : readRc().oauth?.accessToken ? "browser session (~/.easybitsrc)" : readRc().apiKey ? "API key (~/.easybitsrc)" : void 0;
+      if (!source) throw notLoggedIn();
+      const email = await fetchEmail(await resolveCredential(ctx));
+      emit(ctx, { email, source, baseUrl: await resolveBaseUrl3() }, () => console.log(`${email ?? "(unknown email)"}  via ${source}`));
     }
   }
 };
@@ -674,12 +672,12 @@ var files = {
         emit(ctx, data.file, () => console.log(`Uploaded: ${data.file.id}`));
       }
     },
-    delete: {
-      aliases: ["rm"],
+    rm: {
+      aliases: ["delete", "remove"],
       summary: "Delete a file (soft delete, 7-day trash)",
-      usage: "easybits files delete <file-id> [--yes]",
+      usage: "easybits files rm <file-id> [--yes]",
       options: { ...YES_OPTION },
-      examples: ["easybits files delete 6650f0c2a1b2c3d4e5f60718", "easybits files rm 6650f0c2a1b2c3d4e5f60718 --yes"],
+      examples: ["easybits files rm 6650f0c2a1b2c3d4e5f60718", "easybits files rm 6650f0c2a1b2c3d4e5f60718 --yes"],
       async run(ctx) {
         const id = need(ctx, 0, "file-id", this.usage);
         requireYesIfHeadless(ctx);
@@ -1026,11 +1024,11 @@ var sandboxes = {
     create: {
       aliases: ["new"],
       summary: "Create a sandbox and wait until it is running",
-      usage: "easybits sandboxes create [--template ubuntu] [--name <name>] [--timeout <s>] [--size s|m|l|xl] [--dotenv <path>] [--env K=V]...",
+      usage: "easybits sandboxes create [--template ubuntu] [--name <name>] [--ttl <s>] [--size s|m|l|xl] [--dotenv <path>] [--env K=V]...",
       options: {
         template: { type: "string", value: "name", description: "Base template (default ubuntu): ubuntu, python, node, code-interpreter\u2026" },
         name: { type: "string", value: "name", description: "Human label (lets you `ssh <name>.ghosty`)" },
-        timeout: { type: "string", value: "seconds", description: "Time to live before auto-destroy" },
+        ttl: { type: "string", value: "seconds", description: "Time to live before auto-destroy (was --timeout)" },
         size: { type: "string", value: "s|m|l|xl", description: "VM size class (gated by plan)" },
         env: { type: "string", multiple: true, value: "K=V", description: "Environment variable, non-secret (repeatable)" },
         ...ENV_FILE_OPTION,
@@ -1049,7 +1047,7 @@ var sandboxes = {
         const sb = await eb.sandboxes.create({
           template: str(ctx, "template") ?? "ubuntu",
           name: str(ctx, "name"),
-          timeoutSeconds: int(ctx, "timeout", this.usage),
+          timeoutSeconds: int(ctx, "ttl", this.usage),
           size,
           env: Object.keys(env).length ? env : void 0,
           waitForReady: !bool(ctx, "no-wait")
@@ -1243,16 +1241,16 @@ var sandboxes = {
 var SECRETS_USAGE = "easybits machines secrets <ls|set|unset> <machine> [--dotenv <path> | NAME]";
 var machines = {
   name: "machines",
-  aliases: ["deploy", "machine"],
+  aliases: ["machine"],
   group: "Hosting",
-  summary: "Permanent machines and their releases (alias: deploy)",
+  summary: "Permanent machines and their releases (easybits deploy <machine> publishes)",
   synopsis: "machines",
   subs: {
     ls: {
       aliases: ["list"],
       summary: "List your permanent machines",
       usage: "easybits machines ls",
-      examples: ["easybits machines ls", "easybits deploy ls --json"],
+      examples: ["easybits machines ls", "easybits machines ls --json"],
       async run(ctx) {
         const eb = await getClient(ctx);
         const rows = (await eb.machines.list()).map(sandboxRecord);
@@ -1268,11 +1266,10 @@ var machines = {
       }
     },
     deploy: {
-      aliases: ["release"],
       summary: "Publish the machine's current app code as a new release",
       usage: "easybits machines deploy <machine> [--message <text>]",
       options: { message: { type: "string", short: "m", value: "text", description: "Release note" } },
-      examples: ['easybits machines deploy sb_abc123 -m "v1.2: fix checkout"'],
+      examples: ['easybits machines deploy shop -m "v1.2: fix checkout"', 'easybits deploy shop -m "v1.2"          # same thing, shorter'],
       async run(ctx) {
         const id = need(ctx, 0, "machine", this.usage);
         const eb = await getClient(ctx);
@@ -1535,7 +1532,7 @@ async function findDb(ctx, id) {
 }
 var db = {
   name: "db",
-  aliases: ["databases"],
+  aliases: ["databases", "database"],
   group: "Data",
   summary: "SQL databases (libSQL)",
   synopsis: "db",
@@ -1827,6 +1824,7 @@ var docs = {
 var COMMANDS = [
   login,
   logout,
+  whoami,
   usage,
   sandboxes,
   agents,
@@ -1837,7 +1835,6 @@ var COMMANDS = [
   files,
   websites,
   providers,
-  config,
   mcp,
   sshKey,
   sshProxy,
@@ -1879,10 +1876,13 @@ var GLOBAL_FLAGS = `Global flags:
   -h, --help       Help (also: easybits <command> --help)
   -v, --version    Print the CLI version
 
+Naming (like gh): noun then verb \u2014 easybits <noun> <verb>. Old spellings still work
+and print the new one on stderr (never with --json).
+
 Names or ids: agents, sandboxes/machines and databases take either
 (exact, case-insensitive; two with the same name \u2192 exit 2 with the ids).
 
-Deletes (sandboxes destroy, agents destroy, db rm, domains rm, files delete) ask first;
+Deletes (sandboxes destroy, agents destroy, db rm, domains rm, files rm) ask first;
 without a terminal or with --json pass -y/--yes, or they exit 2.
 
 Env: EASYBITS_API_KEY (API key), EASYBITS_URL (API server, default https://www.easybits.cloud)
@@ -1942,7 +1942,71 @@ var BANNER = "            \x1B[38;2;244;245;251m\u2860\u2812\u2812\u28E4\x1B[38;
 
 // src/index.ts
 import { EasybitsError as EasybitsError2 } from "@easybits.cloud/sdk";
-var VERSION = true ? "0.7.0" : "dev";
+
+// src/aliases.ts
+function positionals(argv2) {
+  const out = [];
+  for (let i = 0; i < argv2.length; i++) {
+    const a = argv2[i];
+    if (a === "--") break;
+    if (a === "--token") {
+      i++;
+      continue;
+    }
+    if (a.startsWith("-") && a !== "-") continue;
+    out.push(i);
+  }
+  return out;
+}
+var MACHINE_SUBS = ["ls", "list", "deploy", "release", "releases", "logs", "rollback", "secrets"];
+var SANDBOX_NAMES = ["sandboxes", "sandbox", "sb"];
+function normalizeArgs(input) {
+  const argv2 = [...input];
+  const notes = [];
+  const end = argv2.indexOf("--");
+  const head = end === -1 ? argv2 : argv2.slice(0, end);
+  const help = head.includes("--help") || head.includes("-h");
+  let pos = positionals(argv2);
+  const at = (n) => pos[n] != null ? argv2[pos[n]] : void 0;
+  if (at(0) === "config") {
+    argv2.splice(pos[0], 1, "mcp", "config");
+    notes.push("`easybits config` is now `easybits mcp config`.");
+  } else if (at(0) === "mcp" && at(1) == null && !help) {
+    argv2.splice(pos[0] + 1, 0, "config");
+    argv2.push("--stdio");
+    notes.push("`easybits mcp` is now `easybits mcp config --stdio`.");
+  }
+  if (at(0) === "deploy") {
+    const sub = at(1);
+    if (sub && MACHINE_SUBS.includes(sub) && sub !== "deploy") {
+      argv2[pos[0]] = "machines";
+      notes.push(`\`easybits deploy ${sub}\` is now \`easybits machines ${sub}\`.`);
+    } else if (sub === "deploy") {
+      argv2[pos[0]] = "machines";
+      notes.push("`easybits deploy deploy` is now `easybits deploy <machine>`.");
+    } else {
+      argv2.splice(pos[0], 1, "machines", "deploy");
+    }
+    pos = positionals(argv2);
+  }
+  if ((at(0) === "machines" || at(0) === "machine") && at(1) === "release") {
+    argv2[pos[1]] = "deploy";
+    notes.push("`machines release` is now `machines deploy`.");
+  }
+  if (SANDBOX_NAMES.includes(at(0) ?? "") && (at(1) === "create" || at(1) === "new")) {
+    const stop = argv2.indexOf("--");
+    for (let i = 0; i < (stop === -1 ? argv2.length : stop); i++) {
+      if (argv2[i] === "--timeout" || argv2[i].startsWith("--timeout=")) {
+        argv2[i] = argv2[i].replace("--timeout", "--ttl");
+        notes.push("`sandboxes create --timeout` is now `--ttl` (`--timeout` stays for `exec`).");
+      }
+    }
+  }
+  return { argv: argv2, notes };
+}
+
+// src/index.ts
+var VERSION = true ? "0.8.0" : "dev";
 var GLOBAL_OPTIONS = {
   json: { type: "boolean" },
   token: { type: "string" },
@@ -1974,13 +2038,13 @@ function positionalIndexes(argv2) {
 function parse(argv2, skip, leaf) {
   const rest = argv2.filter((_, i) => !skip.includes(i));
   try {
-    const { values, positionals } = parseArgs({
+    const { values, positionals: positionals2 } = parseArgs({
       args: rest,
       options: { ...GLOBAL_OPTIONS, ...leaf?.options ?? {} },
       allowPositionals: true,
       strict: true
     });
-    return { values, positionals };
+    return { values, positionals: positionals2 };
   } catch (e) {
     throw usageError(e.message.split("\n")[0].split(". To specify")[0].replace(/\.?$/, "."), leaf?.usage);
   }
@@ -2004,7 +2068,15 @@ function unknownSub(cmd, name) {
 ${e.hint}`;
   return e;
 }
-async function main(argv2) {
+function aliasNote(note) {
+  const dim = process.stderr.isTTY && !process.env.NO_COLOR;
+  process.stderr.write(dim ? `\x1B[2m${note}\x1B[0m
+` : `${note}
+`);
+}
+async function main(input) {
+  const { argv: argv2, notes } = normalizeArgs(input);
+  if (!wantsJson(argv2)) notes.forEach(aliasNote);
   const pos = positionalIndexes(argv2);
   const cmdName = pos.length ? argv2[pos[0]] : void 0;
   if (!cmdName || cmdName === "help") {
@@ -2052,7 +2124,7 @@ async function main(argv2) {
       throw usageError(`Missing subcommand for "${cmd.name}".`, `easybits ${cmd.name} <${Object.keys(cmd.subs).join("|")}>`);
     }
   }
-  const { values, positionals } = parse(argv2, skip, leaf);
+  const { values, positionals: positionals2 } = parse(argv2, skip, leaf);
   if (values.version) {
     console.log(VERSION);
     return;
@@ -2064,7 +2136,7 @@ async function main(argv2) {
   const ctx = {
     json: values.json === true,
     token: typeof values.token === "string" ? values.token : void 0,
-    args: positionals,
+    args: positionals2,
     opts: values
   };
   const refKey = `${cmd.name} ${subKey ?? ""}`.trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easybits.cloud/cli",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Official CLI for EasyBits, the cloud for AI agents — sandboxes, hosting, domains, databases, agents and files from your terminal",
   "type": "module",
   "bin": {