@tonbo/cli 0.19.0 → 0.21.0

package/dist/bin/tonbo.js

@@ -364,6 +364,20 @@ var managementOperations = {
     "idempotencyKey": false,
     "cli": "tonbo usage series"
   },
+  "getVolumeMetrics": {
+    "method": "GET",
+    "path": "/metrics/volumes",
+    "pathParams": [],
+    "query": [
+      "series",
+      "window",
+      "granularity",
+      "from",
+      "to"
+    ],
+    "idempotencyKey": false,
+    "cli": "tonbo metrics volumes"
+  },
   "getUsageToday": {
     "method": "GET",
     "path": "/usage/today",
@@ -414,6 +428,7 @@ var managementOperations = {
     "pathParams": [],
     "query": [
       "device_id",
+      "project",
       "cursor",
       "limit"
     ],
@@ -695,6 +710,36 @@ var managementOperations = {
     "idempotencyKey": false,
     "cli": "tonbo machine activations"
   },
+  "getMachineMetrics": {
+    "method": "GET",
+    "path": "/machines/{name}/metrics",
+    "pathParams": [
+      "name"
+    ],
+    "query": [
+      "series",
+      "window",
+      "granularity",
+      "from",
+      "to"
+    ],
+    "idempotencyKey": false,
+    "cli": "tonbo machine metrics"
+  },
+  "getAccountMachineMetrics": {
+    "method": "GET",
+    "path": "/metrics/machines",
+    "pathParams": [],
+    "query": [
+      "series",
+      "window",
+      "granularity",
+      "from",
+      "to"
+    ],
+    "idempotencyKey": false,
+    "cli": "tonbo metrics machines"
+  },
   "listMachineShapes": {
     "method": "GET",
     "path": "/machine-shapes",
@@ -2316,6 +2361,10 @@ var ManagementApi = class {
   getUsageSeries(key, query = {}) {
     return this.call("getUsageSeries", key, { query });
   }
+  /** The account's Volume metrics over a window, such as what they stored each day. */
+  getVolumeMetrics(key, query = {}) {
+    return this.call("getVolumeMetrics", key, { query });
+  }
   /** The account's writes of yesterday and today, hourly, per lane. */
   getUsageToday(key) {
     return this.call("getUsageToday", key);
@@ -2480,6 +2529,14 @@ var ManagementApi = class {
       query: { limit, cursor }
     });
   }
+  /** A managed Machine's metrics per UTC hour or day. */
+  getMachineMetrics(key, name, query = {}) {
+    return this.call("getMachineMetrics", key, { params: { name }, query });
+  }
+  /** The account's Machines' metrics per UTC hour or day, each and summed. */
+  getAccountMachineMetrics(key, query = {}) {
+    return this.call("getAccountMachineMetrics", key, { query });
+  }
   /** The whole answer: the shapes and the default one. */
   listMachineShapes(key) {
     return this.request("listMachineShapes", key, {});
@@ -2819,7 +2876,8 @@ function accountLogins(login) {
     ...entry,
     account_id,
     kind: entry.kind ?? null,
-    name: entry.name ?? null
+    name: entry.name ?? null,
+    role: entry.role ?? null
   }));
   if (!entries.some((entry) => entry.account_id === login.account_id))
     entries.unshift({
@@ -2828,12 +2886,18 @@ function accountLogins(login) {
       key: login.key,
       expires_at: login.expires_at,
       kind: null,
-      name: null
+      name: null,
+      role: null
     });
   return entries;
 }
 function personalLogin(login) {
-  return accountLogins(login).find((entry) => entry.kind === "user") ?? null;
+  const logins = accountLogins(login);
+  const personal = login.session?.personalAccountId;
+  return (personal ? logins.find((entry) => entry.account_id === personal) : void 0) ?? logins.find((entry) => entry.kind === "user" && !isGuestLogin(entry)) ?? null;
+}
+function isGuestLogin(login) {
+  return login.role === "collaborator";
 }
 async function preparePrivateDirectory(directory) {
   const stat3 = await lstat(directory);
@@ -3387,7 +3451,8 @@ var LoginStore = class {
       key: client.bearer(id),
       expires_at: current.session.expires_at,
       kind: current.accounts?.[id]?.kind ?? (id === current.personal_account_id ? "user" : null),
-      name: current.accounts?.[id]?.name ?? null
+      name: current.accounts?.[id]?.name ?? null,
+      role: current.accounts?.[id]?.role ?? null
     });
     accounts[current.personal_account_id] = entry(current.personal_account_id);
     for (const id of Object.keys(current.accounts ?? {}))
@@ -5272,6 +5337,109 @@ async function usageSeriesCommand(deps, options = {}) {
     );
   print(deps, options.json, series, lines.join("\n"));
 }
+async function metricsVolumesCommand(deps, options = {}) {
+  const metrics = await deps.api.getVolumeMetrics(await deps.auth.apiKey(), {
+    series: "stored_bytes",
+    window: options.window,
+    granularity: options.from || options.to ? "day" : void 0,
+    from: options.from,
+    to: options.to
+  });
+  const points = metrics.total.points;
+  const lines = [
+    `What the Volumes stored from ${metrics.from.slice(0, 10)} to ${metrics.to.slice(0, 10)} (UTC, average per day)`,
+    table(
+      ["DAY", "STORED", ""],
+      points.map((point) => [
+        point.start.slice(0, 10),
+        bytes(point.stored_bytes),
+        point.partial ? "so far" : ""
+      ])
+    )
+  ];
+  const complete = points.filter((point) => !point.partial);
+  if (complete.length > 1) {
+    const change = complete[complete.length - 1].stored_bytes - complete[0].stored_bytes;
+    lines.push(
+      `Change over its complete days: ${change < 0 ? "-" : "+"}${bytes(Math.abs(change))}`
+    );
+  }
+  if (metrics.unavailable_regions.length > 0)
+    lines.push(`Not read: ${metrics.unavailable_regions.join(", ")}`);
+  print(deps, options.json, metrics, lines.join("\n"));
+}
+function metricsQuery(options) {
+  return {
+    series: options.series,
+    window: options.window,
+    granularity: options.granularity,
+    from: options.from,
+    to: options.to
+  };
+}
+var MACHINE_COLUMNS = {
+  awake_seconds: ["AWAKE", (value) => `${Math.round(value / 60)} min`],
+  wakes: ["WAKES", String],
+  refused_wakes: ["REFUSED", String],
+  wake_ms_p50: ["WAKE P50", (value) => `${(value / 1e3).toFixed(1)} s`],
+  wake_ms_max: ["WAKE MAX", (value) => `${(value / 1e3).toFixed(1)} s`],
+  cpu_cores_avg: ["CPU", (value) => `${value} cores`],
+  memory_mib_avg: ["MEMORY", (value) => bytes(value * 1024 * 1024)],
+  network_rx_bytes: ["NET IN", (value) => bytes(value)],
+  network_tx_bytes: ["NET OUT", (value) => bytes(value)],
+  internet_rx_bytes: ["INTERNET IN", (value) => bytes(value)],
+  internet_tx_bytes: ["INTERNET OUT", (value) => bytes(value)]
+};
+function machineMetricsTable(granularity, points) {
+  const series = Object.keys(MACHINE_COLUMNS).filter(
+    (name) => points.some((point) => name in point)
+  );
+  return table(
+    [
+      granularity === "hour" ? "HOUR (UTC)" : "DAY (UTC)",
+      ...series.map((name) => MACHINE_COLUMNS[name][0])
+    ],
+    points.map((point) => [
+      granularity === "hour" ? point.start.slice(0, 16).replace("T", " ") : point.start.slice(0, 10),
+      ...series.map((name) => {
+        const value = point[name];
+        if (value === null || value === void 0)
+          return Date.parse(point.start) > Date.now() ? "" : "-";
+        return MACHINE_COLUMNS[name][1](value);
+      })
+    ])
+  );
+}
+async function metricsMachinesCommand(deps, options = {}) {
+  const metrics = await deps.api.getAccountMachineMetrics(
+    await deps.auth.apiKey(),
+    metricsQuery(options)
+  );
+  const lines = [
+    `The account's Machines from ${metrics.from} to ${metrics.to} (UTC)`,
+    machineMetricsTable(metrics.granularity, metrics.total.points)
+  ];
+  if (metrics.resources.length > 0) {
+    const sum = (points, name) => points.reduce((total, point) => total + (point[name] ?? 0), 0);
+    const series = Object.keys(MACHINE_COLUMNS).filter(
+      (name) => metrics.total.points.some((point) => name in point)
+    );
+    lines.push(
+      "",
+      table(
+        ["MACHINE", "REGION", ...series.map((name) => MACHINE_COLUMNS[name][0])],
+        metrics.resources.map((resource) => [
+          resource.name,
+          resource.region,
+          ...series.map((name) => MACHINE_COLUMNS[name][1](sum(resource.points, name)))
+        ])
+      )
+    );
+  }
+  if (metrics.unavailable_regions.length > 0)
+    lines.push(`Not read: ${metrics.unavailable_regions.join(", ")}`);
+  print(deps, options.json, metrics, lines.join("\n"));
+}
 async function streamActivityCommand(deps, name, options = {}) {
   const activity = await deps.api.getStreamActivity(
     await deps.auth.apiKey(),
@@ -6332,6 +6500,24 @@ async function machineActivationsCommand(deps, name, options = {}) {
     );
   });
 }
+async function machineMetricsCommand(deps, name, options = {}) {
+  await machineCommand(async () => {
+    const metrics = await deps.api.getMachineMetrics(
+      await deps.auth.apiKey(),
+      name,
+      metricsQuery(options)
+    );
+    print(
+      deps,
+      options.json,
+      metrics,
+      [
+        `Machine ${metrics.name} in ${metrics.region} from ${metrics.from} to ${metrics.to} (UTC)`,
+        machineMetricsTable(metrics.granularity, metrics.points)
+      ].join("\n")
+    );
+  });
+}
 function appliesText(name, change) {
   const lines = [];
   if (change.ports !== void 0 || change.sleep_after_seconds !== void 0)
@@ -7189,6 +7375,18 @@ var COMMAND_HELP = {
     arguments: NAME("Machine"),
     defaults: { "--limit": LIMIT_DEFAULT }
   },
+  "tonbo machine metrics": {
+    about: [
+      "Prints the Machine's metrics, one row per UTC hour or day: how long it was awake, its wakes and refused wakes and how long they took (the median and the longest), its average CPU (in cores) and memory while awake, the bytes on its network interface, Tonbo's traffic included, and the bytes it exchanged with the internet. A dash is a step it was never awake in; the current step is still growing.",
+      "Give `--window`, or `--from` and `--to` with `--granularity` (at most 32 days hourly, 92 days daily). `--series` prints only the series it names. It carries no money: `tonbo usage show` says what it cost."
+    ],
+    examples: [
+      "tonbo machine metrics web --window 7d",
+      "tonbo machine metrics web --series cpu_cores_avg,memory_mib_avg"
+    ],
+    arguments: NAME("Machine"),
+    defaults: { "--window": "24h" }
+  },
   "tonbo machine shapes": {
     about: [
       "Lists the shapes a Machine may have, each with its vCPUs, memory, scratch disk, whether it is offered and can suspend, and its list price for an hour at full use, and marks the default."
@@ -7282,6 +7480,22 @@ var COMMAND_HELP = {
     examples: ["tonbo usage series --days 7 --compare"],
     defaults: { "--days": "30" }
   },
+  "tonbo metrics machines": {
+    about: [
+      "Prints the account's Machines per UTC hour or day, summed over every region: how long they were awake, their wakes and refused wakes, and the bytes they exchanged with the internet. Then each Machine's totals over the window, most first by the first series printed. `tonbo machine metrics` prints one Machine's CPU, memory and network too.",
+      "Give `--window`, or `--from` and `--to` with `--granularity` (at most 32 days hourly, 92 days daily)."
+    ],
+    examples: ["tonbo metrics machines --window 30d"],
+    defaults: { "--window": "7d" }
+  },
+  "tonbo metrics volumes": {
+    about: [
+      "Prints what the account's Volumes stored, one line per UTC day of the window: the average bytes their files held that day, compressed, summed over every region, which is what they are billed for. Today, and a day not fully rated yet, is marked `so far`. Then the change between the window's first and last complete days.",
+      "Give `--window`, or `--from` and `--to` (at most 92 days); the last 30 days when neither is given."
+    ],
+    examples: ["tonbo metrics volumes --window 7d"],
+    defaults: { "--window": "30d" }
+  },
   "tonbo usage today": {
     about: [
       "Prints the account's write units per UTC hour of yesterday and today, in three columns: databases, streams and other."
@@ -9187,6 +9401,15 @@ function createProgram(makeDependencies = createDependencies) {
   ).action(
     async (name, options) => machineActivationsCommand(dependencies(), name, options)
   );
+  operationOptions(
+    machine.command("metrics <name>").description("show a Machine's awake time, wakes, CPU, memory and network over time").option("--window <window>", "24h or 7d hourly, 30d or 90d daily; 24h when omitted").option(
+      "--series <series>",
+      "the series to print, comma-separated; every series when omitted"
+    ).option("--granularity <step>", "with --from and --to, hour or day").option("--from <time>", "with --to, the window's start, on a UTC hour or day").option("--to <time>", "with --from, the window's end, exclusive"),
+    "getMachineMetrics"
+  ).action(
+    async (name, options) => machineMetricsCommand(dependencies(), name, options)
+  );
   operationOptions(
     machine.command("shapes").description("list the shapes a Machine may have"),
     "listMachineShapes"
@@ -9247,6 +9470,20 @@ function createProgram(makeDependencies = createDependencies) {
     ),
     "getUsageToday"
   ).action(async (options) => usageTodayCommand(dependencies(), options));
+  const metrics = program.command("metrics").description("show how the account's resources are used over time");
+  operationOptions(
+    metrics.command("volumes").description("show what the account's Volumes stored, day by day").option("--window <window>", "the last 7d, 30d or 90d, today included").option("--from <day>", "with --to, the first UTC day, as YYYY-MM-DD").option("--to <day>", "with --from, the UTC day the window ends before, as YYYY-MM-DD"),
+    "getVolumeMetrics"
+  ).action(
+    async (options) => metricsVolumesCommand(dependencies(), options)
+  );
+  operationOptions(
+    metrics.command("machines").description("show the account's Machines' awake time, wakes and internet bytes over time").option("--window <window>", "24h or 7d hourly, 30d or 90d daily; 7d when omitted").option(
+      "--series <series>",
+      "the series to print, comma-separated; every series when omitted"
+    ).option("--granularity <step>", "with --from and --to, hour or day").option("--from <time>", "with --to, the window's start, on a UTC hour or day").option("--to <time>", "with --from, the window's end, exclusive"),
+    "getAccountMachineMetrics"
+  ).action(async (options) => metricsMachinesCommand(dependencies(), options));
   const ssh = program.command("ssh").description("open a terminal on a Machine, or run a command there, over SSH").argument("<machine>", "the Machine's name").argument("[command...]", "a command to run instead of a shell, after --").action(async (name, command) => sshCommand(dependencies(), name, command));
   ssh.command("config").description(
     "print the ssh_config block that lets ssh, scp, sftp and Remote-SSH reach every Machine"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonbo/cli",
-  "version": "0.19.0",
+  "version": "0.21.0",
   "description": "The Tonbo CLI. Compute, disks, databases and streams for AI agents: your agent picks what it needs, sets it up, and knows what it costs, from the command line.",
   "homepage": "https://tonbo.dev",
   "bugs": {