@ornncompute/cli 0.1.2 → 0.1.3

package/README.md

@@ -1,8 +1,10 @@
 # Ornn CLI
 
-Command-line access for Ornn bare-metal compute workflows: find
-available capacity, buy or bid, manage reservations, activate SSH access,
-resell capacity, and open billing.
+Command-line access for Ornn compute workflows: browse Listings, buy capacity,
+bid in Exchange, manage GPU reservations, launch VM or Bare Metal machines,
+create Kubernetes or Slurm clusters, manage private networks and storage
+volumes, attach SSH keys, SSH into launched machines, watch machine health
+metrics, and view billing readouts.
 
 For the end-user install, browser-login, command, and troubleshooting guide, see
 the [`docs/cli.md`](../../docs/cli.md) guide.
@@ -28,38 +30,87 @@ ornn help [command]
 ornn login [--auth-base <url>] [--no-browser] [--timeout <seconds>]
 ornn whoami [--json]
 ornn status [--json]
-ornn availability list [--gpu-type <type>] [--facility <name>] [--operator <name>] [--json]
-ornn availability show <listing-id> [--open] [--json]
+ornn listings list [--gpu-type <type>] [--facility <name>] [--operator <name>] [--json]
+ornn listings show <listing-id> [--open] [--json]
 ornn buy <listing-id> [--no-open] [--json]
-ornn bid create <listing-id> --gpu-count <n> --min-gpu-count <n> --start-date <yyyy-mm-dd> --end-date <yyyy-mm-dd> --price <usd> [--no-open] [--json]
-ornn bid list [--json]
-ornn bid show <bid-id> [--open] [--json]
-ornn bid update <bid-id> --gpu-count <n> --min-gpu-count <n> --start-date <yyyy-mm-dd> --end-date <yyyy-mm-dd> --price <usd>
-ornn bid withdraw <bid-id>
-ornn reservations list [--status <status>] [--json]
-ornn reservations show <reservation-id> [--open] [--json]
-ornn reservations checkout <reservation-id> [--no-open] [--json]
+ornn exchange create <listing-id> --gpu-count <n> --min-gpu-count <n> --start-date <yyyy-mm-dd> --end-date <yyyy-mm-dd> --price <usd> [--no-open] [--json]
+ornn exchange list [--json]
+ornn exchange show <bid-id> [--open] [--json]
+ornn exchange update <bid-id> --gpu-count <n> --min-gpu-count <n> --start-date <yyyy-mm-dd> --end-date <yyyy-mm-dd> --price <usd>
+ornn exchange withdraw <bid-id>
+ornn gpus list [--status <status>] [--json]
+ornn gpus show <reservation-id> [--open] [--json]
+ornn gpus checkout <reservation-id> [--no-open] [--json]
+ornn nodes list [--json]
+ornn nodes show <node-id> [--json]
+ornn nodes launch <reservation-id> --key <path|id|label> [--mode bare-metal|vm] [--username <name>] [--network public|private] [--storage-load-drive-id <id>] [--storage-save-drive-id <id>] [--wait] [--json]
+ornn nodes wait <node-or-reservation-id> [--timeout <seconds>] [--json]
+ornn nodes start <node-id> [--json]
+ornn nodes stop <node-id> [--json]
+ornn nodes teardown <node-id> [--json]
+ornn nodes revoke <node-id> [--json]
+ornn nodes ssh-command <node-or-reservation-id> [--json]
+ornn nodes keys attach <node-id> --key <path|id|label> [--json]
+ornn nodes keys list <node-id> [--json]
+ornn ssh <node-or-reservation-id> [--print] [--identity-file <path>] [--user <name>] [--json]
+ornn metrics nodes [--json]
+ornn metrics node <node-id> [--json]
+ornn metrics history <node-id> [--start <iso>] [--end <iso>] [--max-points <n>] [--json]
+ornn metrics watch <node-id> [--interval <seconds>] [--count <n>] [--timeout <seconds>] [--json]
+ornn clusters list [--json]
+ornn clusters reservations [--json]
+ornn clusters eligible-nodes <reservation-id> [--type kubernetes|slurm] [--network public|private] [--json]
+ornn clusters create <reservation-id> --type kubernetes|slurm [--network public|private] [--node <node-id>] [--node-count <n>] [--wait] [--json]
+ornn clusters show <reservation-id> [--type kubernetes|slurm] [--json]
+ornn clusters wait <reservation-id> [--type kubernetes|slurm] [--timeout <seconds>] [--json]
+ornn clusters credentials <reservation-id> [--type kubernetes|slurm] [--json]
+ornn clusters kubeconfig <reservation-id> [--output <path>] [--json]
+ornn clusters ssh-command <reservation-id> [--identity-file <path>] [--user <name>] [--json]
+ornn clusters ssh <reservation-id> [--print] [--identity-file <path>] [--user <name>] [--json]
+ornn clusters add-node <reservation-id> --node <node-id> [--json]
+ornn clusters remove-node <reservation-id> --node <node-id> [--json]
+ornn clusters teardown <reservation-id> [--type kubernetes|slurm] [--json]
+ornn networks list [--json]
+ornn networks show <network-id> [--json]
+ornn networks create --name <name> [--cidr <cidr>] [--description <text>] [--json]
+ornn networks update <network-id> [--name <name>] [--description <text>] [--clear-description] [--json]
+ornn networks delete <network-id> [--json]
+ornn networks reservation <reservation-id> [--json]
+ornn networks attach <reservation-id> --network <network-id> [--json]
+ornn networks detach <reservation-id> [--json]
+ornn storage volumes list [--json]
+ornn storage volumes show <drive-id> [--json]
+ornn storage volumes create --name <name> [--source <drive-id>] [--json]
+ornn storage volumes refresh <drive-id> [--json]
+ornn storage volumes clear <drive-id> [--json]
+ornn storage volumes delete <drive-id> [--json]
+ornn keys list [--json]
+ornn keys add [<public-key-file>] [--public-key <key>] [--label <label>] [--json]
+ornn keys delete <key-id> [--json]
 ornn access show <reservation-id> [--json]
-ornn access activate <reservation-id> --ssh-key-id <id> [--username <name>] [--no-open] [--json]
+ornn access activate <reservation-id> --key <path|id|label> [--mode bare-metal|vm] [--username <name>] [--network public|private] [--storage-load-drive-id <id>] [--storage-save-drive-id <id>] [--wait] [--no-open] [--json]
 ornn access push-keys <reservation-id> --ssh-key-id <id> [--json]
 ornn access keys list <reservation-id> [--json]
 ornn access keys add <reservation-id> --public-key <key> [--label <label>] [--json]
 ornn access keys add <reservation-id> --public-key-file <path> [--label <label>] [--json]
 ornn access keys push <reservation-id> --ssh-key-id <id> [--json]
 ornn access keys status <reservation-id> [--json]
-ornn resale browse [--json]
-ornn resale list <reservation-id> --ask-price <usd> [--no-open] [--json]
-ornn resale update <reservation-id> --ask-price <usd> [--no-open] [--json]
-ornn resale delist <reservation-id> [--no-open] [--json]
 ornn ssh-keys list [--json]
 ornn ssh-keys add --public-key <key> [--label <label>] [--json]
 ornn ssh-keys add --public-key-file <path> [--label <label>] [--json]
 ornn ssh-keys delete <key-id> [--json]
+ornn billing summary [--json]
+ornn billing invoices [--json]
+ornn billing showback --start <yyyy-mm-dd> --end <yyyy-mm-dd> [--json]
 ornn billing open [--no-open] [--json]
 ornn api <get|post|patch|put|delete> <compute-path> [--data <json>] [--raw]
 ornn logout
 ```
 
+UI aliases are first-class in the CLI: `listings` maps to the older
+`availability` command, `exchange` maps to `bid`, and `gpus` maps to
+`reservations`. The older command names remain available for scripts.
+
 Commands print concise human-readable output by default. Use `--json` on
 read/show/list commands and transaction handoffs when you need structured
 stdout for scripts. Errors and login/browser progress go to stderr.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ornncompute/cli",
-  "version": "0.1.2",
-  "description": "Command-line interface for Ornn bare-metal compute workflows.",
+  "version": "0.1.3",
+  "description": "Command-line interface for Ornn compute access workflows.",
   "type": "module",
   "bin": {
     "ornn": "bin/ornn.js"

package/src/api-client.mjs

@@ -1,4 +1,4 @@
-import { loadAuthSession } from "./auth-store.mjs";
+import { clearAuthSession, loadAuthSession } from "./auth-store.mjs";
 import { resolveAuthBaseUrl } from "./device-auth.mjs";
 
 export class CliApiError extends Error {
@@ -70,12 +70,18 @@ export async function cliRequest({
   if (raw) {
     const text = await response.text();
     if (!response.ok) {
+      await handleAuthExpiry({ env, response, hadToken: Boolean(authSession?.accessToken) });
       throw new CliApiError(text || response.statusText, { status: response.status });
     }
     return text;
   }
 
   const text = await response.text();
+  if (!response.ok) {
+    // Clear a dead token before parsing, so a 401 with a non-JSON body
+    // (e.g. a gateway/WAF error page) still triggers the re-login flow.
+    await handleAuthExpiry({ env, response, hadToken: Boolean(authSession?.accessToken) });
+  }
   const data = text ? parseJson(text, url.toString(), response) : null;
   if (!response.ok) {
     const detail = data?.detail ?? data?.error ?? response.statusText;
@@ -119,6 +125,16 @@ function parseJson(text, url, response) {
   }
 }
 
+async function handleAuthExpiry({ env, response, hadToken }) {
+  if (response.status !== 401 || !hadToken) {
+    return;
+  }
+  await clearAuthSession({ env });
+  throw new CliApiError("Your Ornn session has expired or was revoked. Run `ornn login` to sign in again.", {
+    status: 401,
+  });
+}
+
 function detailMessage(detail) {
   if (typeof detail === "string") {
     return detail;