@ornncompute/cli 1.0.25 → 1.0.34

package/README.md

@@ -8,11 +8,10 @@ For the customer install and usage guide, see [`docs/cli.md`](../../docs/cli.md)
 The shared capability catalog in `packages/capabilities` is the authority for
 command identity, role visibility, input schemas, help, and resource discovery.
 The CLI imports `@ornn/capabilities/cli`; packaging includes only that entrypoint's
-dependencies, excluding staff bidding and CRM handlers.
+dependencies, excluding staff commerce and CRM handlers.
 
 For GCS imports, start with the [source-bucket permissions and version-specific CLI guide](https://docs.ornn.com/cli#gcs-imports-and-storage-transfer-service).
-It documents Ornn's Storage Transfer service agent, the required `gcloud` IAM
-grants, and the current CLI 1.x GCS verification limitation. Scoped
+It documents the current CLI 1.x GCS verification limitation. Scoped
 `ornn help external-buckets connect`, `verify`, and `import` help links to the
 same guide.
 
@@ -26,8 +25,11 @@ ornn login
 ornn context
 ```
 
-`ornn login` uses the browser device flow. Login links must use HTTP(S) on the configured authentication origin. Use `--no-browser` when the CLI must
-print the URL instead of opening it. Session and endpoint configuration remains
+`ornn login` uses the browser device flow. A fresh npm install defaults to
+`https://compute.ornn.com` for browser authorization and `https://api.ornn.com`
+for API requests. Use `ORNN_AUTH_BASE_URL` and `ORNN_API_BASE_URL` for explicit
+local or staging endpoints. Login links must use HTTP(S) on the configured
+authentication origin. Use `--no-browser` when the CLI must print the URL instead of opening it. Session and endpoint configuration remains
 in `~/.config/ornn`; the gateway re-derives organization and role scope from the
 bearer on every request.
 
@@ -57,7 +59,12 @@ ornn resources
 Advanced customer resources are registered under one noun and one verb:
 
 ```text
-capacity-offers  list | forecast | show
+capacity-offers  list | show | relist | update | delist
+reservations     list | show | invoices
+fees             show
+spot             books | book | trades | bid | orders | cancel
+schedules        list | show | buy
+offers           list | post | accept | cancel
 machines         list | show | wait | switch | reboot | reset | metrics | logs
 clusters         list | show | wait | eligible-machines | add-node | remove-node | teardown | metrics | logs
 ssh-keys         list | add | delete
@@ -72,22 +79,38 @@ external-buckets list | show | connect | update-credentials | verify | import |
 filesystems      deploy | show | wait | delete
 ```
 
-Listing discovery is read-only: list, inspect, and forecast capacity, including
-advertised prices. Purchases, bids, payments, resale, billing, and commercial
-reservation management use the web app. Launch consumes already allocated
-capacity; internal reservation lookups remain necessary for access and ownership.
-
-Only admins can create listings or reservations through
+`ssh-keys list` uses backend cursors; see [pagination](../../docs/cli.md#advanced-customer-resources).
+
+Market commands call one gateway route each and print that route's JSON.
+`capacity-offers` reads Commerce listings (`/commerce/listings`) and relists a
+schedule reservation you hold, or a primary listing you own, as a secondary
+listing with an asking price, its only price: buyers buy its windows at that
+price with no acceptance. `reservations` reads Commerce
+reservations, schedule and spot alike. `spot`, `schedules`, and `offers` call
+Markets (`/v1/markets`): place 1-8 GPU spot bids (one node each), buy a
+secondary window at its asking price (`schedules buy`), post offers on a
+primary listing's schedule, and accept or cancel offers on primaries you own.
+Prices are integer micro-USD per GPU-hour (`1000000` is $1.00). Every write
+reviews its terms and needs default-no consent, or `--yes` with
+`--format json`; writes accept `--idempotency-key`. Payment methods and
+invoices are managed in the web app. Launch consumes already allocated
+capacity; internal reservation lookups remain necessary for access and
+ownership.
+
+Only admins can create primary listings or reservations through
 `ornn admin capacity-offers create` and `ornn admin reservations create`.
-The CLI and gateway both enforce the admin role before mutation. Both commands
-retain explicit commercial-term validation and default-no human confirmation.
+They post to the role-aware `POST /commerce/listings` and
+`POST /commerce/reservations` with the admin's own session; Commerce enforces
+the admin role. Both commands retain explicit commercial-term validation and
+default-no human confirmation. A new primary listing reaches the market once
+staff attach its nodes.
 
 All staff discovery and execution starts at `ornn admin`. A fresh staff preflight
 runs before the catalog is shown. The seven roots are:
 
 ```text
 ornn admin users
-ornn admin operators
+ornn admin suppliers
 ornn admin facilities
 ornn admin nodes
 ornn admin enrollment-tokens
@@ -96,9 +119,22 @@ ornn admin reservations
 ```
 
 Every `ornn admin` command, read or mutation, requires an admin session.
+`ornn admin nodes --help` lists the authorized node commands. Node health
+returns the node detail object; metrics preserve the owner `tier` and `windows`;
+logs return `data.logs` and an opaque continuation cursor in `page.next_cursor`.
+The cursor preserves the node, stream, count, time window, and owner position;
+pass it unchanged with the same node ID. The human `Next` command includes that
+node ID. Changing filters requires a new first-page request. Legacy raw owner
+cursors require the original `--before` value and filters.
+Metrics and logs use node-scoped staff gateway routes. Exported private keys
+include the final newline required by OpenSSH, both in files and with `--print`.
 `ornn admin nodes enroll` takes optional `--filter COMPARTMENT_IDS`
 (omit to run every compartment step); the retired `--mode` flag is gone. The
 gateway, not CLI metadata, authoritatively enforces the admin role.
+Suppliers are Authorization supplier organizations: `ornn admin suppliers list`
+returns their `id` and `name`, and `--supplier UUID` on `facilities list`,
+`nodes list`, `enrollment-tokens create`, and `nodes enroll` takes that
+organization ID.
 
 Token revocation looks up the token by ID, including tokens outside the newest
 500-row list. Creation-time checks and safe retries still apply.
@@ -171,7 +207,9 @@ advertised, including JSON and NDJSON. The CLI resolves them through the
 bounded owned-machine list and sends only the canonical machine ID to the
 machine owner route. Bare `connect` discovers VM, Bare Metal,
 Kubernetes, and Slurm targets before making one safe-fact choice across the
-combined set. `connect --print` renders a native direct-access command; raw
+combined set. An unresolved target fails with
+`connect_target_not_found` before any private-network or VPN setup.
+`connect --print` renders a native direct-access command; raw
 secret `--print` rejects every explicit `--format`. Direct human `connect`
 announces the native command and explains that Ctrl-C ends only local SSH while
 the remote machine keeps running before it starts the session. Human metrics
@@ -220,11 +258,11 @@ with one replacement and <https://docs.ornn.com/cli#migrating-to-vnext>.
 | `ornn account`, `ornn whoami`                                                                   | `ornn context`                                                |
 | `ornn catalog search`, `gpu-types`, `availability *`, `listing *`, `listings` read leaves       | matching `ornn capacity-offers` leaf                          |
 | `ornn listings create`                                                                          | `ornn admin capacity-offers create`                           |
-| `ornn buy`                                                                                      | Use the Ornn web app. |
-| `ornn bid create`, `exchange create`                                                            | Use the Ornn web app. |
-| `ornn bid` or `exchange` list, show, update, withdraw                                           | Use the Ornn web app. |
-| `ornn gpu` or `gpus` list, show                                                                 | Use the Ornn web app. |
-| `ornn gpu` or `gpus` checkout, `reservations checkout`                                          | Use the Ornn web app. |
+| `ornn buy`                                                                                      | Use the Ornn web app.                                         |
+| `ornn bid create`, `exchange create`                                                            | Use the Ornn web app.                                         |
+| `ornn bid` or `exchange` list, show, update, withdraw                                           | Use the Ornn web app.                                         |
+| `ornn gpu` or `gpus` list, show                                                                 | Use the Ornn web app.                                         |
+| `ornn gpu` or `gpus` checkout, `reservations checkout`                                          | Use the Ornn web app.                                         |
 | `ornn nodes launch`                                                                             | `ornn launch`                                                 |
 | `ornn nodes` list, show, wait, switch, reboot, hard-reset                                       | matching `ornn machines` leaf; reset needs erase flag         |
 | `ornn ssh`, `nodes ssh-command`                                                                 | `ornn connect`                                                |
@@ -237,8 +275,8 @@ with one replacement and <https://docs.ornn.com/cli#migrating-to-vnext>.
 | `ornn storage files *`                                                                          | `ornn volumes files <verb>`                                   |
 | `ornn storage buckets *`                                                                        | `ornn external-buckets <verb>`                                |
 | Storage targets, deploy, status, detach, filesystem                                             | exact `ornn volume-mounts` or `ornn filesystems` leaf printed |
-| `ornn billing`                                                                                  | Use the Ornn web app. |
-| customer-root `operator(s)`, `facilities`, `tokens`, `users`, `node`, or staff `reservations *` | exact `ornn admin ...` command printed by the error           |
+| `ornn billing`                                                                                  | Use the Ornn web app.                                         |
+| customer-root `facilities`, `tokens`, `users`, `node`, or staff `reservations *`                | exact `ornn admin ...` command printed by the error           |
 | `ornn api`, `commerce`, `orchestrator`, `cache purge`                                           | `ornn resources`; no generic replacement exists               |
 | `--json`                                                                                        | `--format json`                                               |
 | `--interactive`                                                                                 | `--guided`                                                    |
@@ -323,3 +361,18 @@ Ornn CLI 1.0.22 and later request storage lists one page at a time.
 `page.next_cursor` to `--cursor` for the next page; null means the end.
 Refresh from the first page after changes. Older CLI versions receive an
 upgrade error for storage lists. File-list pagination is unchanged.
+
+### Reliable retries and discovery
+
+CLI 1.0.28 forwards staff facility/node `--cursor` and `--limit` to the owner
+and preserves filters in the printed next-page command. A repeated owner cursor
+fails explicitly. Volume mount discovery uses the authenticated
+`/v1/orchestrator/storage-targets` route.
+
+File uploads include a SHA-256 request fingerprint. Reusing `--idempotency-key`
+with the same volume, path, bytes, and content type reuses the upload; a completed
+replay returns its original upload ID without sending bytes again. A changed
+request conflicts, and an expired incomplete request requires a new key.
+`ornn volumes refresh <volume>` reconciles recorded usage against stored files.
+The upload replay contract requires the matching gateway/orchestrator release;
+see [the service contract](../../services/orchestrator/README.md#file-upload-replay-and-usage).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ornncompute/cli",
-  "version": "1.0.25",
+  "version": "1.0.34",
   "description": "Command-line interface for Ornn compute access workflows.",
   "type": "module",
   "bin": {

package/src/admin-capacity-reservations.mjs

@@ -1,14 +1,17 @@
 import { ADMIN_MUTATION_SAFETY, AdminMutationError, runAdminMutation } from "./admin-mutations.mjs";
+import { gpuLabeler } from "./gpu-catalog.mjs";
 
 const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 const DECIMAL = /^\d+(?:\.\d{1,6})?$/;
 
 const USAGE = {
   "listings.create":
-    "Usage: ornn admin capacity-offers create --gpu GPU --nodes COUNT --gpus-per-node COUNT --site SITE --starts-at TIME --ends-at TIME --price-per-gpu-hour USD [--yes]",
+    "Usage: ornn admin capacity-offers create --gpu GPU --nodes COUNT --gpus-per-node COUNT --site SITE --starts-at TIME --ends-at TIME --price-per-gpu-hour USD [--supplier-price-per-gpu-hour USD] [--down-payment-cents CENTS] [--access-mode bare-metal|virtual-machine] [--yes]",
   "reservations.create":
-    "Usage: ornn admin reservations create --organization ID --capacity-offer ID --nodes COUNT --starts-at TIME --ends-at TIME --price-per-gpu-hour USD [--yes]",
+    "Usage: ornn admin reservations create --organization ID --capacity-offer ID --starts-at TIME --ends-at TIME --price-per-gpu-hour USD [--down-payment-cents CENTS] [--yes]",
 };
+const ACCESS_MODES = new Set(["bare-metal", "virtual-machine"]);
+const STAFF_HARDWARE_CATALOG = "/catalog/hardware";
 
 function parseOptions(argv, { values, positionals }, usage) {
   const options = {};
@@ -78,17 +81,29 @@ function timestamp(options, name, usage) {
   return new Date(parsed).toISOString();
 }
 
-function price(options, usage) {
-  const value = required(options, "price-per-gpu-hour", usage);
+function price(options, usage, name = "price-per-gpu-hour") {
+  const value = required(options, name, usage);
   if (!DECIMAL.test(value)) {
     throw new AdminMutationError(
-      "--price-per-gpu-hour must be zero or a positive decimal with at most 6 decimal places.",
-      { field: "price-per-gpu-hour" }
+      `--${name} must be zero or a positive decimal with at most 6 decimal places.`,
+      { field: name }
     );
   }
   return value;
 }
 
+function optionalCents(options) {
+  const value = options["down-payment-cents"]?.trim();
+  if (value === undefined) return undefined;
+  const parsed = Number(value);
+  if (!Number.isSafeInteger(parsed) || parsed < 0) {
+    throw new AdminMutationError("--down-payment-cents must be a whole number of cents.", {
+      field: "down-payment-cents",
+    });
+  }
+  return parsed;
+}
+
 function assertWindow(start, end) {
   if (Date.parse(start) >= Date.parse(end)) {
     throw new AdminMutationError("--ends-at must be later than --starts-at.", { field: "ends-at" });
@@ -109,6 +124,9 @@ function parseCapacityOffer(argv) {
         "starts-at",
         "ends-at",
         "price-per-gpu-hour",
+        "supplier-price-per-gpu-hour",
+        "down-payment-cents",
+        "access-mode",
         "idempotency-key",
       ],
     },
@@ -117,6 +135,13 @@ function parseCapacityOffer(argv) {
   const startsAt = timestamp(options, "starts-at", usage);
   const endsAt = timestamp(options, "ends-at", usage);
   assertWindow(startsAt, endsAt);
+  const accessMode = options["access-mode"]?.trim();
+  if (accessMode !== undefined && !ACCESS_MODES.has(accessMode)) {
+    throw new AdminMutationError("--access-mode must be bare-metal or virtual-machine.", {
+      field: "access-mode",
+    });
+  }
+  const downPaymentCents = optionalCents(options);
   return {
     input: {
       gpu_type: required(options, "gpu", usage),
@@ -126,6 +151,13 @@ function parseCapacityOffer(argv) {
       available_start_at: startsAt,
       available_end_at: endsAt,
       buy_now_price_per_gpu_hour: Number(price(options, usage)),
+      ...(options["supplier-price-per-gpu-hour"] !== undefined
+        ? {
+            cost_per_gpu_hour: Number(price(options, usage, "supplier-price-per-gpu-hour")),
+          }
+        : {}),
+      ...(downPaymentCents !== undefined ? { down_payment_cents: downPaymentCents } : {}),
+      ...(accessMode ? { access_mode: accessMode } : {}),
     },
     mutation: {
       idempotencyKey: options["idempotency-key"],
@@ -144,10 +176,10 @@ function parseReservationCreate(argv) {
       values: [
         "organization",
         "capacity-offer",
-        "nodes",
         "starts-at",
         "ends-at",
         "price-per-gpu-hour",
+        "down-payment-cents",
         "idempotency-key",
       ],
     },
@@ -156,14 +188,15 @@ function parseReservationCreate(argv) {
   const startsAt = timestamp(options, "starts-at", usage);
   const endsAt = timestamp(options, "ends-at", usage);
   assertWindow(startsAt, endsAt);
+  const downPaymentCents = optionalCents(options);
   return {
     input: {
       organization_id: uuid(options, "organization", usage),
       listing_id: uuid(options, "capacity-offer", usage),
-      node_count: positiveInteger(options, "nodes", usage),
       start_at: startsAt,
       end_at: endsAt,
       price_per_gpu_hour: price(options, usage),
+      ...(downPaymentCents !== undefined ? { down_payment_cents: downPaymentCents } : {}),
     },
     mutation: {
       idempotencyKey: options["idempotency-key"],
@@ -187,44 +220,32 @@ function previewPayload(value) {
   return value.payload;
 }
 
-function capacityOfferReview(payload, input) {
+function usd(microUsd) {
+  return typeof microUsd === "number" ? (microUsd / 1_000_000).toFixed(6) : undefined;
+}
+
+function capacityOfferReview(payload, input, gpuLabel) {
+  const listing = payload.listing ?? {};
   return {
     title: "Create capacity offer",
     fields: [
-      { label: "GPU", value: payload.gpu_type ?? input.gpu_type },
-      {
-        label: "Nodes",
-        value:
-          payload.capacityNodes ?? payload.capacity_nodes ?? payload.node_count ?? input.node_count,
-      },
-      {
-        label: "GPUs per node",
-        value: payload.gpusPerNode ?? payload.gpus_per_node ?? input.gpus_per_node,
-      },
+      { label: "GPU", value: gpuLabel(payload.gpu_type ?? listing.gpuSlug) },
+      { label: "Nodes to attach", value: payload.node_count ?? input.node_count },
+      { label: "GPUs per node", value: listing.gpusPerNode ?? input.gpus_per_node },
       { label: "Site", value: payload.site_nickname ?? input.site_nickname },
+      { label: "Access mode", value: listing.accessMode },
+      { label: "Starts at", value: listing.startsAt ?? input.available_start_at },
+      { label: "Ends at", value: listing.endsAt ?? input.available_end_at },
+      { label: "Price per GPU-hour (USD)", value: input.buy_now_price_per_gpu_hour },
       {
-        label: "Starts at",
-        value:
-          payload.start_at ??
-          payload.startAt ??
-          payload.available_start_at ??
-          input.available_start_at,
-      },
-      {
-        label: "Ends at",
-        value:
-          payload.end_at ?? payload.endAt ?? payload.available_end_at ?? input.available_end_at,
-      },
-      {
-        label: "Price per GPU-hour (USD)",
-        value:
-          payload.buy_now_rate_per_gpu_hour ??
-          payload.buyNowRatePerGpuHour ??
-          payload.buy_now_price_per_gpu_hour ??
-          input.buy_now_price_per_gpu_hour,
+        label: "Supplier price per GPU-hour (USD)",
+        value: usd(listing.supplierPricePerGpuHourMicroUsd),
       },
+      { label: "Spread per GPU-hour (USD)", value: usd(listing.spreadPerGpuHourMicroUsd) },
+      { label: "Down payment (cents)", value: listing.downPaymentCents },
     ],
-    consequence: "Publishes new commercial capacity terms.",
+    consequence:
+      "Publishes a primary listing with these terms; attach its nodes before it reaches the market.",
   };
 }
 
@@ -234,22 +255,26 @@ function reservationCreateReview(input) {
     fields: [
       { label: "Organization", value: input.organization_id },
       { label: "Capacity offer", value: input.listing_id },
-      { label: "Nodes", value: input.node_count },
       { label: "Starts at", value: input.start_at },
       { label: "Ends at", value: input.end_at },
       { label: "Price per GPU-hour (USD)", value: input.price_per_gpu_hour },
+      ...(input.down_payment_cents !== undefined
+        ? [{ label: "Down payment (cents)", value: input.down_payment_cents }]
+        : []),
     ],
-    consequence: "Creates a reservation with the reviewed quantity, dates, and price.",
+    consequence:
+      "Creates a schedule reservation on the listing's nodes with the reviewed dates and price.",
   };
 }
 
-async function runCapacityOffer({ execute, input, mutation, runtime }) {
+async function runCapacityOffer({ execute, fetch, input, mutation, runtime }) {
   return runAdminMutation({
     ...runtime,
     ...mutation,
     prepare: async () => {
       const payload = previewPayload(await execute(input));
-      return { review: capacityOfferReview(payload, input), value: input };
+      const gpuLabel = await gpuLabeler(fetch, STAFF_HARDWARE_CATALOG);
+      return { review: capacityOfferReview(payload, input, gpuLabel), value: input };
     },
     execute: (value) => execute(value, { confirmed: true }),
   });

package/src/admin-enrollment.mjs

@@ -11,11 +11,11 @@ const ENROLLMENT_LOG_READ_TIMEOUT_MS = 5_000;
 
 const USAGE = {
   "tokens.create":
-    "Usage: ornn admin enrollment-tokens create --operator UUID --expires-in SECONDS (--print | --output PATH) [--overwrite] [--yes]",
+    "Usage: ornn admin enrollment-tokens create --supplier UUID --expires-in SECONDS (--print | --output PATH) [--overwrite] [--yes]",
   "tokens.revoke":
     "Usage: ornn admin enrollment-tokens revoke <token-id> [--expected-created-at TIME] [--yes] [--idempotency-key KEY]",
   "nodes.enroll":
-    "Usage: ornn admin nodes enroll <node-id> --host HOST --operator UUID --facility UUID [--filter COMPARTMENT_IDS] --identity-file PATH --token-ttl SECONDS --replace-existing-management [--verbose] [--yes]",
+    "Usage: ornn admin nodes enroll <node-id> --host HOST --supplier UUID --facility UUID [--filter COMPARTMENT_IDS] --identity-file PATH --token-ttl SECONDS --replace-existing-management [--verbose] [--yes]",
   "nodes.export-key":
     "Usage: ornn admin nodes export-key <node-id> (--print | --output PATH) [--overwrite]",
   "nodes.rotate-key":
@@ -110,13 +110,13 @@ function parseTokenCreate(argv) {
     {
       booleans: ["overwrite", "print", "yes"],
       positionals: 0,
-      values: ["operator", "expires-in", "output"],
+      values: ["supplier", "expires-in", "output"],
     },
     usage
   );
   return {
     input: {
-      operator_id: uuid(required(options, "operator", usage), "operator"),
+      organization_id: uuid(required(options, "supplier", usage), "supplier"),
       expires_in_seconds: boundedInteger(
         required(options, "expires-in", usage),
         "expires-in",
@@ -169,8 +169,8 @@ function parseNodeEnroll(argv) {
         "filter",
         "host",
         "identity-file",
-        "operator",
         "port",
+        "supplier",
         "token-ttl",
         "username",
       ],
@@ -190,7 +190,7 @@ function parseNodeEnroll(argv) {
     input: {
       node_id: uuid(positionals[0], "node-id"),
       host: required(options, "host", usage),
-      operator_id: uuid(required(options, "operator", usage), "operator"),
+      organization_id: uuid(required(options, "supplier", usage), "supplier"),
       facility_id: uuid(required(options, "facility", usage), "facility"),
       ...(filter ? { filter } : {}),
       identity_file: required(options, "identity-file", usage),
@@ -247,7 +247,7 @@ function text(value, fallback = "") {
 function safeTokenMetadata(payload) {
   return {
     id: text(payload?.id) || null,
-    operator_id: text(payload?.operator_id) || null,
+    organization_id: text(payload?.organization_id) || null,
     status: text(payload?.status, "active"),
     expires_at: text(payload?.expires_at) || null,
     created_at: text(payload?.created_at) || null,
@@ -258,9 +258,10 @@ function secretMaterial(capabilityId, payload) {
   if (capabilityId === "tokens.create") {
     return text(payload?.token) || text(payload?.plaintext);
   }
-  return typeof payload?.private_key === "string" && payload.private_key.length
-    ? payload.private_key
-    : "";
+  const key = payload?.private_key;
+  if (typeof key !== "string" || !key.length) return "";
+  // OpenSSH rejects otherwise valid private keys without a terminating newline.
+  return key.endsWith("\n") ? key : `${key}\n`;
 }
 
 function keyMetadata(input, payload) {
@@ -342,7 +343,7 @@ function reviewFor(capabilityId, input, prepared) {
     return {
       title: "Create enrollment token",
       fields: [
-        { label: "Operator", value: input.operator_id },
+        { label: "Supplier", value: input.organization_id },
         { label: "Expires in", value: `${input.expires_in_seconds} seconds` },
         {
           label: "Secret destination",
@@ -359,7 +360,7 @@ function reviewFor(capabilityId, input, prepared) {
       fields: [
         { label: "Token", value: input.token_id },
         { label: "Created", value: target?.created_at ?? input.expected_created_at ?? "absent" },
-        { label: "Operator", value: target?.operator_id ?? "unknown" },
+        { label: "Supplier", value: target?.organization_id ?? "unknown" },
         { label: "Expires", value: target?.expires_at ?? "unknown" },
       ],
       consequence: "Prevents this exact token generation from enrolling another node.",
@@ -371,7 +372,7 @@ function reviewFor(capabilityId, input, prepared) {
       fields: [
         { label: "Node", value: input.node_id },
         { label: "SSH target", value: `${input.username}@${input.host}:${input.port}` },
-        { label: "Operator", value: input.operator_id },
+        { label: "Supplier", value: input.organization_id },
         { label: "Facility", value: input.facility_id },
         ...(input.filter
           ? [{ label: "Compartment filter", value: input.filter }]

package/src/admin-node-lifecycle.mjs

@@ -215,7 +215,7 @@ function nodeSnapshot(node) {
     node_id: nodeId(node),
     hostname: text(node?.hostname ?? node?.k8s_node_name),
     status: text(node?.status),
-    operator_id: text(node?.operator_id ?? node?.operatorId),
+    organization_id: text(node?.organization_id),
     facility_id: text(node?.facility_id ?? node?.facilityId),
     reservation_id: reservationId(node),
     off_grid: node?.off_grid === true,
@@ -358,22 +358,19 @@ async function resolveLiveMachine(fetch, node) {
 
 function reservationSnapshot(reservation, requestedId) {
   return {
-    reservation_id:
-      text(reservation?.reservationId ?? reservation?.reservation_id ?? reservation?.id) ||
-      requestedId,
-    organization_id: text(
-      reservation?.organizationId ?? reservation?.organization_id ?? reservation?.tenant_id
-    ),
-    listing_id: text(reservation?.listingId ?? reservation?.listing_id),
+    reservation_id: text(reservation?.reservationId) || requestedId,
+    organization_id: text(reservation?.organizationId),
+    listing_id: text(reservation?.listingId),
+    kind: text(reservation?.kind),
     status: text(reservation?.status),
-    node_count: Number(reservation?.nodeCount ?? reservation?.node_count ?? 0) || 0,
-    start_at: text(reservation?.startAt ?? reservation?.start_at),
-    end_at: text(reservation?.endAt ?? reservation?.end_at),
+    node_count: Number(reservation?.nodeCount ?? 0) || 0,
+    starts_at: text(reservation?.startsAt),
+    ends_at: text(reservation?.endsAt),
   };
 }
 
 async function readReservation(fetch, id) {
-  const reservation = await fetch(`/internal/v1/reservations/${encodeURIComponent(id)}`, {
+  const reservation = await fetch(`/commerce/reservations/${encodeURIComponent(id)}`, {
     method: "GET",
   });
   return reservationSnapshot(reservation, id);
@@ -395,7 +392,7 @@ function commonReviewFields(node) {
   const snapshot = nodeSnapshot(node);
   return [
     { label: "Node", value: `${snapshot.hostname || "unnamed"} (${snapshot.node_id})` },
-    { label: "Operator", value: label(snapshot.operator_id) },
+    { label: "Supplier", value: label(snapshot.organization_id) },
     { label: "Facility", value: label(snapshot.facility_id) },
     { label: "Capacity reservation", value: capacityLabel(node) },
   ];