@ornncompute/cli 0.1.1 → 0.1.3

package/README.md

@@ -1,11 +1,13 @@
-# Ornn Fabric CLI
+# Ornn CLI
 
-Command-line access for Ornn Fabric 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 root [`CLI.md`](../../CLI.md).
+the [`docs/cli.md`](../../docs/cli.md) guide.
 
 ## Install
 
@@ -14,9 +16,9 @@ curl -fsSL https://compute.ornn.com/cli/install | sh
 ```
 
 The installer requires Node.js 20 or newer and npm. It installs `@ornncompute/cli`
-globally, exposes both `fabric` and `ornn` binaries, adds the npm global bin
-directory to the user's shell profile when needed, and writes
-`ORNN_AUTH_BASE_URL` for the Fabric host that served the installer. The
+globally, exposes the `ornn` binary, adds the npm global bin directory to the
+user's shell profile when needed, and writes
+`ORNN_AUTH_BASE_URL` for the Ornn host that served the installer. The
 installer prints a short Ornn Compute welcome banner and login prompt; set
 `ORNN_INSTALL_BANNER=0` to skip it or `ORNN_INSTALL_ANIMATION=0` to keep it
 static.
@@ -24,46 +26,100 @@ static.
 ## Commands
 
 ```bash
-fabric help [command]
-fabric login [--auth-base <url>] [--no-browser] [--timeout <seconds>]
-fabric whoami [--json]
-fabric status [--json]
-fabric availability list [--gpu-type <type>] [--facility <name>] [--operator <name>] [--json]
-fabric availability show <listing-id> [--open] [--json]
-fabric buy <listing-id> [--no-open] [--json]
-fabric 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]
-fabric bid list [--json]
-fabric bid show <bid-id> [--open] [--json]
-fabric bid update <bid-id> --gpu-count <n> --min-gpu-count <n> --start-date <yyyy-mm-dd> --end-date <yyyy-mm-dd> --price <usd>
-fabric bid withdraw <bid-id>
-fabric reservations list [--status <status>] [--json]
-fabric reservations show <reservation-id> [--open] [--json]
-fabric reservations checkout <reservation-id> [--no-open] [--json]
-fabric access show <reservation-id> [--json]
-fabric access activate <reservation-id> --ssh-key-id <id> [--username <name>] [--no-open] [--json]
-fabric access push-keys <reservation-id> --ssh-key-id <id> [--json]
-fabric resale browse [--json]
-fabric resale list <reservation-id> --ask-price <usd> [--no-open] [--json]
-fabric resale update <reservation-id> --ask-price <usd> [--no-open] [--json]
-fabric resale delist <reservation-id> [--no-open] [--json]
-fabric ssh-keys list [--json]
-fabric ssh-keys add --public-key <key> [--label <label>] [--json]
-fabric ssh-keys add --public-key-file <path> [--label <label>] [--json]
-fabric ssh-keys delete <key-id> [--json]
-fabric billing open [--no-open] [--json]
-fabric api <get|post|patch|put|delete> <compute-path> [--data <json>] [--raw]
-fabric logout
+ornn help [command]
+ornn login [--auth-base <url>] [--no-browser] [--timeout <seconds>]
+ornn whoami [--json]
+ornn status [--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 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> --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 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.
 
-`fabric login` opens a browser to the Fabric auth origin, lets the user sign in
+`ornn login` opens a browser to the Ornn auth origin, lets the user sign in
 with the normal web account flow, and then completes automatically in the
 terminal once the browser session approves the CLI device request. If the CLI
 cannot open a browser, copy the printed URL into any browser and sign in there;
 the terminal keeps polling until the login is approved or expires.
 
-Run `fabric --help` for the full command list and `fabric api` for the
+Run `ornn --help` for the full command list and `ornn api` for the
 allowlisted compute API escape hatch.

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@ornncompute/cli",
-  "version": "0.1.1",
-  "description": "Command-line interface for Ornn Fabric bare-metal compute workflows.",
+  "version": "0.1.3",
+  "description": "Command-line interface for Ornn compute access workflows.",
   "type": "module",
   "bin": {
-    "fabric": "bin/ornn.js",
     "ornn": "bin/ornn.js"
   },
   "files": [

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 {
@@ -23,7 +23,7 @@ export function resolveApiBaseUrl({ env = process.env, explicit, session } = {})
 export async function loadRequiredSession({ env = process.env } = {}) {
   const session = await loadAuthSession({ env });
   if (!session?.accessToken) {
-    throw new CliApiError("Not logged in. Run `fabric login` first.", { status: 401 });
+    throw new CliApiError("Not logged in. Run `ornn login` first.", { status: 401 });
   }
   return session;
 }
@@ -64,23 +64,29 @@ export async function cliRequest({
     });
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    throw new CliApiError(`Could not reach Fabric at ${baseUrl}: ${message}`);
+    throw new CliApiError(`Could not reach Ornn at ${baseUrl}: ${message}`);
   }
 
   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;
     const message = detailMessage(detail) || response.statusText;
-    throw new CliApiError(`Fabric request failed: ${message}`, {
+    throw new CliApiError(`Ornn request failed: ${message}`, {
       detail: data,
       status: response.status,
     });
@@ -111,14 +117,24 @@ function parseJson(text, url, response) {
     const contentType = response?.headers?.get?.("content-type") || "";
     const isHtml = /html/i.test(contentType) || /^\s*</.test(text);
     const hint = isHtml
-      ? " The Fabric host may not have this CLI endpoint deployed yet."
+      ? " The Ornn host may not have this CLI endpoint deployed yet."
       : "";
-    throw new CliApiError(`Fabric returned a non-JSON response from ${url}.${hint}`, {
+    throw new CliApiError(`Ornn returned a non-JSON response from ${url}.${hint}`, {
       status: response?.status,
     });
   }
 }
 
+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;