@ornncompute/cli 1.0.48 → 1.0.63

package/README.md

@@ -59,10 +59,9 @@ ornn resources
 Advanced customer resources are registered under one noun and one verb:
 
 ```text
-capacity-offers  list | show | terms | relist | delist
-reservations     list | show | invoices
-spot             books | book | trades | bid | orders | cancel
-schedules        list | show | buy
+capacity-offers  list | show | terms | availability | relist | delist
+reservations     list | show | invoices | buy
+market           books | book | trades | bid | orders | cancel
 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
@@ -85,31 +84,41 @@ Market commands call one gateway route each and print that route's JSON.
 (`/commerce/v2/listings*`). List/show return parent fields with `capacityListingId`;
 pass it as `--listing-id`. `terms` separately returns advertised financial choices
 with `listingTermsId`, price, duration bounds, down payment and renewable flag.
-List accepts limits of 1–100 and the owner cursor unchanged. Relisting uses
-`POST /commerce/reservations/{id}/relist` with `nodeCount`, dates, optional node
-selection and a `terms` array. Delisting uses the native parent’s `/delist` POST. `reservations` reads Commerce
-reservations, schedule and spot alike. `spot`, `schedules`, and `offers` call
-Markets (`/v1/markets`): place 8-GPU spot bids (one full 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.
+List accepts limits of 1–100 and the owner cursor unchanged. `availability`
+reads Markets `/v1/markets/listings/{id}/availability` (optional `--from`/`--to`)
+as windows of free GPUs and the whole machines those GPUs make
+([Markets routes](../../services/markets/README.md#routes)). Relisting uses
+`POST /commerce/reservations/{id}/relist` with `nodeCount`, dates, and a
+`terms` array. The body does not take node IDs. Delisting uses the native parent’s `/delist` POST. `reservations` reads Commerce
+reservations, schedule and spot alike; `reservations buy` books one window of a
+relisted (secondary) listing term with Markets `POST /v1/markets/bookings`
+(`{legs: [...]}`), at the term price `terms` shows; it becomes a reservation
+when the window starts. `market` and `offers` call Markets (`/v1/markets`):
+buy `--nodes` at market (Markets also takes GPU counts and limit bids; the
+CLI does not send them yet), end a fill with
+`market end` (Commerce `POST /commerce/reservations/{id}/stop`), post an offer
+on a whole primary listing for one of its terms (`--listing-term-id`, optional
+`--duration-seconds`), list the offers your organization made or received, and
+accept or cancel offers by `--offer-id`.
 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
+`--format json`; writes accept `--idempotency-key`. Customer payment methods and
+billing stay 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`.
-They post to the role-aware `POST /commerce/v2/listings` and
-`POST /commerce/reservations` with the admin's own session; Commerce enforces
+They post to the role-aware `POST /commerce/v2/listings` and Markets
+`POST /v1/markets/bookings` with the admin's own session; the owners enforce
 the admin role. Both commands retain explicit commercial-term validation and
-default-no human confirmation. Reservation creation takes `--customer UUID`,
-`--listing-term UUID`, `--nodes COUNT`, `--gpus COUNT`, `--starts-at TIME`, and
-`--transaction UUID`, plus optional `--ends-at TIME` and `--vm-disk UUID`.
-Prices and down payments come from the selected listing term. Omit `--ends-at`
-for hourly terms, and reuse the same transaction UUID and payload on retries.
-Creation requires an eligible human terminal. Native capacity creation takes
+default-no human confirmation. Reservation creation books a window for a
+customer and takes `--organization-id UUID`, `--listing-id UUID`,
+`--listing-term-id UUID`, `--nodes COUNT`, `--starts-at TIME`, `--ends-at TIME`,
+`--price-per-gpu-hour-micro-usd N`, and `--idempotency-key KEY`. The window is
+whole seconds, the term is non-renewable Reserved, and the price is the term's.
+Reuse the key and payload on retries. Creation requires an eligible human
+terminal. Native capacity creation takes
 `--gpu-slug`, `--capacity-node-count`, `--gpus-per-node`, `--facility-id`,
 `--provisioning-type`, `--state`, `--terms` (a JSON array) and `--idempotency-key`,
 plus optional `--organization-id`. Supply availability dates or `--days-to-rfs`.
@@ -146,6 +155,15 @@ on `POST /v1/staff/invites`. The result includes the sign-in invitation path and
 `email_sent`. If delivery is uncertain, the invitation remains valid; check
 delivery or share the sign-in link before retrying. Use `--format json` for automation.
 
+`ornn admin organizations grant-credit --organization UUID --amount-cents 10000
+--note "Customer goodwill credit" --idempotency-key UUID` grants $100.00 in Ornn
+credits to the organization. Find the organization with the directory commands
+above. Like admin reservation creation, it requires a human terminal and
+reviews the organization, USD amount, note, and UUID before default-no consent.
+The key supplies the existing API's required `adjustmentId`; repeating it with
+the same details returns the same grant. The admin's session supplies audit
+identity. See the [credit-adjustment contract](../../services/commerce/README.md#staff-credit-adjustments).
+
 `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`.
@@ -280,33 +298,33 @@ error record. Progress is additive and contains no secret or supplier identity.
 vNext is a clean cutover. Retired forms are never aliases: each fails before I/O
 with one replacement and <https://docs.ornn.com/cli#migrating-to-vnext>.
 
-| Retired form                                                                                    | Replacement                                                   |
+| Retired form                                                                              | Replacement                                                   |
 | ----------------------------------------------------------------------------------------- | ------------------------------------------------------------- |
-| `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 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`                                                |
-| `ornn metrics`, `telemetry`, `logs`                                                             | `ornn check`, `machines metrics`, or `machines logs`          |
-| `ornn clusters create`, `kubernetes launch`, `slurm launch`                                     | `ornn launch --mode kubernetes` or `ornn launch --mode slurm` |
-| Kubernetes or Slurm status, credentials, SSH, teardown                                          | `ornn clusters show`, `connect`, or `clusters teardown`       |
-| `ornn network *`, `networks *`                                                                  | `ornn private-networks <verb>`                                |
-| `ornn access *`, `keys`                                                                         | exact `ornn machines` or `ornn ssh-keys` leaf printed         |
-| `ornn storage volumes *`                                                                        | `ornn volumes <verb>`                                         |
-| `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 `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`                                                    |
+| `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 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`                                                |
+| `ornn metrics`, `telemetry`, `logs`                                                       | `ornn check`, `machines metrics`, or `machines logs`          |
+| `ornn clusters create`, `kubernetes launch`, `slurm launch`                               | `ornn launch --mode kubernetes` or `ornn launch --mode slurm` |
+| Kubernetes or Slurm status, credentials, SSH, teardown                                    | `ornn clusters show`, `connect`, or `clusters teardown`       |
+| `ornn network *`, `networks *`                                                            | `ornn private-networks <verb>`                                |
+| `ornn access *`, `keys`                                                                   | exact `ornn machines` or `ornn ssh-keys` leaf printed         |
+| `ornn storage volumes *`                                                                  | `ornn volumes <verb>`                                         |
+| `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 `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`                                                    |
 
 Changed behavior is intentional: waits are deadline-bound, consent is semantic
 and default-no, pagination is bounded and cursor-based, machine output is always

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ornncompute/cli",
-  "version": "1.0.48",
+  "version": "1.0.63",
   "description": "Command-line interface for Ornn compute access workflows.",
   "type": "module",
   "bin": {
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "picocolors": "^1.1.1",
-    "zod": "^4.6.5",
+    "zod": "^4.6.7",
     "update-notifier": "7.3.1"
   }
 }

package/src/admin-capacity-reservations.mjs

@@ -5,7 +5,7 @@ const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-
 
 const USAGE = {
   "reservations.create":
-    "Usage: ornn admin reservations create --customer ID --listing-term ID --nodes COUNT --gpus COUNT --starts-at TIME --transaction ID [--ends-at TIME] [--vm-disk ID] [--yes]",
+    "Usage: ornn admin reservations create --organization-id ID --listing-id ID --listing-term-id ID --nodes COUNT --starts-at TIME --ends-at TIME --price-per-gpu-hour-micro-usd N --idempotency-key KEY [--yes]",
 };
 
 function parseOptions(argv, { values, positionals }, usage) {
@@ -67,40 +67,20 @@ function uuid(options, name, usage) {
   return value.toLowerCase();
 }
 
+// Markets books windows in whole seconds.
 function timestamp(options, name, usage) {
   const value = required(options, name, usage);
   const parsed = Date.parse(value);
-  if (!Number.isFinite(parsed)) {
-    throw new AdminMutationError(`--${name} must be an ISO timestamp.`, { field: name });
+  if (!Number.isFinite(parsed) || !/(?:Z|[+-]\d{2}:\d{2})$/i.test(value)) {
+    throw new AdminMutationError(`--${name} must be an ISO timestamp with a timezone.`, {
+      field: name,
+    });
   }
-  return new Date(parsed).toISOString();
-}
-
-// Preserve the microseconds Commerce uses to match a reservation to its accepted term.
-function reservationTimestamp(options, name, usage) {
-  const value = required(options, name, usage);
-  const match = value.match(
-    /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.(\d{1,6}))?(?:Z|[+-]\d{2}:\d{2})$/
-  );
-  if (!match) {
-    throw new AdminMutationError(
-      `--${name} must be an ISO timestamp with a timezone and at most 6 fractional digits.`,
-      { field: name }
-    );
-  }
-  const normalized = timestamp(options, name, usage);
-  return match[1]?.length > 3 ? `${normalized.slice(0, 19)}.${match[1]}Z` : normalized;
-}
-
-function timestampMicroseconds(value) {
-  const fraction = value.match(/\.(\d+)Z$/)?.[1] ?? "";
-  return BigInt(Date.parse(value)) * 1000n + BigInt(fraction.padEnd(6, "0").slice(3));
-}
-
-function assertWindow(start, end) {
-  if (timestampMicroseconds(start) >= timestampMicroseconds(end)) {
-    throw new AdminMutationError("--ends-at must be later than --starts-at.", { field: "ends-at" });
+  // Date.parse drops sub-millisecond digits, so check the text itself.
+  if (/\.\d*[1-9]/.test(value)) {
+    throw new AdminMutationError(`--${name} must be in whole seconds.`, { field: name });
   }
+  return new Date(parsed).toISOString();
 }
 
 function parseCapacityOffer(argv) {
@@ -123,36 +103,37 @@ function parseReservationCreate(argv) {
     {
       positionals: 0,
       values: [
-        "customer",
-        "listing-term",
+        "organization-id",
+        "listing-id",
+        "listing-term-id",
         "nodes",
-        "gpus",
         "starts-at",
         "ends-at",
-        "transaction",
-        "vm-disk",
+        "price-per-gpu-hour-micro-usd",
         "idempotency-key",
       ],
     },
     usage
   );
-  const startsAt = reservationTimestamp(options, "starts-at", usage);
-  const endsAt =
-    options["ends-at"] === undefined ? null : reservationTimestamp(options, "ends-at", usage);
-  if (endsAt !== null) assertWindow(startsAt, endsAt);
+  const startsAt = timestamp(options, "starts-at", usage);
+  const endsAt = timestamp(options, "ends-at", usage);
+  if (Date.parse(endsAt) <= Date.parse(startsAt)) {
+    throw new AdminMutationError("--ends-at must be later than --starts-at.", { field: "ends-at" });
+  }
+  const idempotencyKey = required(options, "idempotency-key", usage);
   return {
     input: {
-      customerId: uuid(options, "customer", usage),
-      listingTermId: uuid(options, "listing-term", usage),
-      reservedNodeCount: positiveInteger(options, "nodes", usage),
-      reservedGpuCount: positiveInteger(options, "gpus", usage),
+      organizationId: uuid(options, "organization-id", usage),
+      listingId: uuid(options, "listing-id", usage),
+      listingTermId: uuid(options, "listing-term-id", usage),
+      nodes: positiveInteger(options, "nodes", usage),
       startsAt,
       endsAt,
-      transactionId: uuid(options, "transaction", usage),
-      ...(options["vm-disk"] !== undefined ? { vmDiskId: uuid(options, "vm-disk", usage) } : {}),
+      pricePerGpuHourMicroUsd: positiveInteger(options, "price-per-gpu-hour-micro-usd", usage),
+      idempotencyKey,
     },
     mutation: {
-      idempotencyKey: options["idempotency-key"],
+      idempotencyKey,
       safety: ADMIN_MUTATION_SAFETY.eligibleHumanOnly,
       yes: options.yes === true,
     },
@@ -174,18 +155,19 @@ function capacityOfferReview(body, editing) {
 
 function reservationCreateReview(input) {
   return {
-    title: "Create capacity reservation",
+    title: "Book reservation for customer",
     fields: [
-      { label: "Customer", value: input.customerId },
+      { label: "Customer organization", value: input.organizationId },
+      { label: "Listing", value: input.listingId },
       { label: "Listing term", value: input.listingTermId },
-      { label: "Reserved nodes", value: input.reservedNodeCount },
-      { label: "Reserved GPUs", value: input.reservedGpuCount },
+      { label: "Nodes", value: input.nodes },
       { label: "Starts at", value: input.startsAt },
-      { label: "Ends at", value: input.endsAt ?? "Open-ended" },
-      { label: "Transaction", value: input.transactionId },
-      ...(input.vmDiskId ? [{ label: "VM disk", value: input.vmDiskId }] : []),
+      { label: "Ends at", value: input.endsAt },
+      { label: "Price per GPU-hour (micro-USD)", value: input.pricePerGpuHourMicroUsd },
+      { label: "Idempotency key", value: input.idempotencyKey },
     ],
-    consequence: "Reserves the reviewed quantities and dates under the selected listing term.",
+    consequence:
+      "Holds the reviewed nodes for the window; the customer's reservation starts when it opens.",
   };
 }
 

package/src/admin-command-handlers.mjs

@@ -1,4 +1,5 @@
 import { adminCapacityReservationHandlers } from "./admin-capacity-reservations.mjs";
+import { adminCreditHandlers } from "./admin-credits.mjs";
 import { adminEnrollmentHandlers } from "./admin-enrollment.mjs";
 import { adminNodeDiagnosticsHandlers } from "./admin-node-diagnostics.mjs";
 import { adminNodeLifecycleHandlers } from "./admin-node-lifecycle.mjs";
@@ -6,6 +7,7 @@ import { ADMIN_MUTATION_SAFETY, assertAdminMutationContext } from "./admin-mutat
 
 const handlers = [
   ...adminCapacityReservationHandlers,
+  ...adminCreditHandlers,
   ...adminEnrollmentHandlers,
   ...adminNodeDiagnosticsHandlers,
   ...adminNodeLifecycleHandlers,

package/src/admin-credits.mjs

@@ -0,0 +1,57 @@
+import { ADMIN_MUTATION_SAFETY, AdminMutationError, runAdminMutation } from "./admin-mutations.mjs";
+import { parseSemanticArguments } from "./interaction-runtime.mjs";
+
+function parseGrant(argv, capability) {
+  const { $positionals, yes, organization, amountCents, note, idempotencyKey, ...extra } =
+    parseSemanticArguments(argv);
+  if ($positionals.length || Object.keys(extra).length) {
+    throw new AdminMutationError(`Usage: ${capability.cli.vnext.human}`);
+  }
+  const parsed = capability.input.safeParse({
+    organizationId: organization,
+    adjustmentId: idempotencyKey,
+    amountCents: amountCents === undefined ? undefined : Number(amountCents),
+    note,
+  });
+  if (!parsed.success) {
+    throw new AdminMutationError(`Usage: ${capability.cli.vnext.human}\n${parsed.error.message}`);
+  }
+  return {
+    input: parsed.data,
+    mutation: {
+      idempotencyKey: parsed.data.adjustmentId,
+      safety: ADMIN_MUTATION_SAFETY.eligibleHumanOnly,
+      yes: yes === true,
+    },
+  };
+}
+
+async function runGrant({ execute, input, mutation, runtime }) {
+  return runAdminMutation({
+    ...runtime,
+    ...mutation,
+    prepare: async () => ({
+      review: {
+        title: "Grant Ornn credits",
+        fields: [
+          { label: "Customer organization", value: input.organizationId },
+          { label: "Amount (USD)", value: `$${(input.amountCents / 100).toFixed(2)}` },
+          { label: "Note", value: input.note },
+          { label: "Grant UUID", value: input.adjustmentId },
+        ],
+        consequence: "Adds spendable Ornn credits to the selected organization.",
+      },
+      value: input,
+    }),
+    execute: (value) => execute(value, { confirmed: true }),
+  });
+}
+
+export const adminCreditHandlers = [
+  {
+    capabilityId: "credits.grant",
+    parse: parseGrant,
+    run: runGrant,
+    safety: ADMIN_MUTATION_SAFETY.eligibleHumanOnly,
+  },
+];

package/src/admin-enrollment.mjs

@@ -498,7 +498,7 @@ function enrollmentProgressTransport(fetch, runtime, privateKey) {
       }
       return minted;
     }
-    if (path !== "/internal/remote" || !tokenId) return request(path, init);
+    if (path !== "/remote" || !tokenId) return request(path, init);
 
     const remote = request(path, init).then(
       (value) => ({ ok: true, value }),

package/src/admin-node-diagnostics.mjs

@@ -155,7 +155,7 @@ function reviewFields(target) {
 }
 
 async function prepareTarget(input, runtime, fetch) {
-  const payload = await fetch(`/internal/nodes/${encodeURIComponent(input.node_id)}`, {
+  const payload = await fetch(`/nodes/${encodeURIComponent(input.node_id)}`, {
     method: "GET",
     ...(runtime.signal ? { signal: runtime.signal } : {}),
   });

package/src/admin-node-lifecycle.mjs

@@ -262,7 +262,7 @@ function isNotFound(error) {
 
 async function readNodeById(fetch, id, { allowMissing = false, signal } = {}) {
   try {
-    return await fetch(`/internal/nodes/${encodeURIComponent(id)}`, {
+    return await fetch(`/nodes/${encodeURIComponent(id)}`, {
       method: "GET",
       ...(signal ? { signal } : {}),
     });

package/src/admin-shell.mjs

@@ -186,10 +186,11 @@ function parseAdminInput(capability, argv) {
   }
 
   const offsetPagination = ["users.list", "organization.list"].includes(capability.id);
+  const reservationList = capability.id === "reservation.list";
   const limit = positiveInteger(
     options.limit,
     "limit",
-    offsetPagination ? 100 : MAX_PAGE_LIMIT
+    offsetPagination || reservationList ? 100 : MAX_PAGE_LIMIT
   ) ?? (offsetPagination ? 25 : DEFAULT_PAGE_LIMIT);
   const input = {};
   if (nodeCommand) input.node_id = positionals[0];
@@ -200,6 +201,10 @@ function parseAdminInput(capability, argv) {
   if (options.facility) input.facility_id = options.facility;
   if (options.status) input.status = options.status;
   if (options.email) input.email = options.email;
+  if (options.reservation) input.reservation_id = options.reservation;
+  if (options.customer) input.customerId = options.customer;
+  if (options.listing) input.listingId = options.listing;
+  if (options["listing-term"]) input.listingTermId = options["listing-term"];
   if (options.query) input.q = options.query;
   if (options.role) input.role = options.role;
   const approved = booleanOption(options.approved, "approved");
@@ -218,7 +223,9 @@ function parseAdminInput(capability, argv) {
 
   if (command === "admin nodes logs") return parseLogPage(input);
 
-  const ownerPagination = ["facilities.list", "nodes.list"].includes(capability.id);
+  const ownerPagination = ["facilities.list", "nodes.list", "reservation.list"].includes(
+    capability.id
+  );
   const explicitOffset = nonnegativeInteger(options.offset, "offset");
   if (ownerPagination) {
     input.limit = limit;
@@ -515,7 +522,10 @@ export function writeAdminResultHuman(stdout, command, result, input = {}) {
       ["organization", command === "admin users list" ? input.organization_id : undefined],
       ["facility", input.facility_id],
       ["status", input.status],
-      ["email", input.email],
+      ["reservation", input.reservation_id],
+      ["customer", input.customerId],
+      ["listing", input.listingId],
+      ["listing-term", input.listingTermId],
       ["query", input.q],
       ["role", input.role],
       ["approved", input.approved],

package/src/catalog-shell.mjs

@@ -834,16 +834,13 @@ function parseCapabilityInput(capability, rawInput) {
 
 // Commerce's market routes and Markets serve every caller on one path and
 // decide from the session what it may do; a staff session is an admin there.
-const ROLE_AWARE_PREFIXES = [
-  "/commerce/v2/listings",
-  "/commerce/reservations",
-  "/commerce/fees",
-  "/v1/markets",
-];
+const ROLE_AWARE_PREFIXES = ["/commerce/v2/listings", "/commerce/reservations", "/v1/markets"];
 
 function isRoleAwarePath(path) {
   const pathname = String(path).split("?")[0];
-  return ROLE_AWARE_PREFIXES.some((prefix) => pathname === prefix || pathname.startsWith(`${prefix}/`));
+  return ROLE_AWARE_PREFIXES.some(
+    (prefix) => pathname === prefix || pathname.startsWith(`${prefix}/`)
+  );
 }
 
 function adminFetch(io, path, init = {}) {

package/vendor/capabilities/capabilities/admin-capacity-reservations.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { defineCapability, preview } from "../capability.js";
 import { nativeListingCreateInput } from "./native-listing.js";
-import { idempotencyHeaders } from "./market-shared.js";
+import { idempotencyHeaders, microUsd } from "./market-shared.js";
 function adminHelp(command, outcome, human, automation, review) {
     return {
         audience: "admin",
@@ -38,37 +38,54 @@ export const adminCapacityOffersCreateCapability = defineCapability({
         });
     },
 });
+// Markets books whole-second windows; a fractional digit would shift or refuse one.
+const wholeSecondInstant = z.iso
+    .datetime({ offset: true })
+    .refine((value) => !/\.\d*[1-9]/.test(value), "Use a time in whole seconds.");
 export const reservationCreateInput = z.object({
-    customerId: z.string().uuid(),
-    listingTermId: z.string().uuid(),
-    reservedNodeCount: z.number().int().positive().max(2_147_483_647),
-    reservedGpuCount: z.number().int().positive().max(2_147_483_647),
-    startsAt: z.iso.datetime({ offset: true }),
-    endsAt: z.iso.datetime({ offset: true }).nullable().optional(),
-    transactionId: z
+    organizationId: z.string().uuid().describe("The customer organization the window is booked for."),
+    listingId: z
         .string()
         .uuid()
-        .describe("Reuse this transaction ID when retrying the same reservation."),
-    vmDiskId: z.string().uuid().nullable().optional(),
+        .describe("The listing's capacityListingId. Staff may book any available listing."),
+    listingTermId: z
+        .string()
+        .uuid()
+        .describe("The listingTermsId of a non-renewable Reserved term on that listing."),
+    nodes: z.number().int().positive().max(2_147_483_647).describe("Whole nodes to book."),
+    startsAt: wholeSecondInstant.describe("RFC 3339 start of the window in whole seconds, no more than five minutes ago."),
+    endsAt: wholeSecondInstant.describe("RFC 3339 end of the window in whole seconds, at least an hour after the start and within the term's duration range."),
+    pricePerGpuHourMicroUsd: microUsd.describe("The term's price in micro-USD per GPU-hour. A changed price refuses the booking."),
+    idempotencyKey: z
+        .string()
+        .trim()
+        .min(1)
+        .max(200)
+        .describe("Reuse this key when retrying the same booking."),
 });
 export const adminReservationsCreateCapability = defineCapability({
     id: "reservations.create",
     domain: "reservations",
     roles: ["admin"],
-    description: "Create one reservation from a listing term, customer, quantities, dates, and a stable transaction ID (admin).",
+    description: "Book a window of a listing term for a customer organization (admin). Markets holds the GPUs until the window starts, then settles a Commerce reservation with the booking's ID. Returns {bookings}.",
     mutation: "preview-confirm",
-    http: { method: "POST", path: "/commerce/reservations" },
+    http: { method: "POST", path: "/v1/markets/bookings" },
     cli: {
         command: ["admin", "reservations", "create"],
-        vnext: adminHelp(["admin", "reservations", "create"], "Create one reservation using the selected listing term and quantities.", "ornn admin reservations create --customer ID --listing-term ID --nodes COUNT --gpus COUNT --starts-at TIME --transaction ID [--ends-at TIME] [--vm-disk ID]", "Requires an eligible human terminal. Reuse --transaction when retrying the same reservation.", "Customer, listing term, reserved quantities, dates, VM disk, and transaction ID are reviewed before default-no consent."),
+        vnext: adminHelp(["admin", "reservations", "create"], "Book a listing term window for a customer organization.", "ornn admin reservations create --organization-id UUID --listing-id UUID --listing-term-id UUID --nodes COUNT --starts-at TIME --ends-at TIME --price-per-gpu-hour-micro-usd N --idempotency-key KEY", "Requires an eligible human terminal. Reuse --idempotency-key when retrying the same booking.", "Customer organization, listing, term, nodes, window, price, and idempotency key are reviewed before default-no consent."),
     },
     slack: false,
     input: reservationCreateInput,
     execute: async (ctx, input) => {
-        const body = reservationCreateInput.parse(input);
+        const { organizationId, idempotencyKey, ...leg } = reservationCreateInput.parse(input);
+        const body = { organizationId, legs: [leg] };
         if (!ctx.confirmed)
             return { preview: body };
-        return { reservation: await ctx.fetch("/commerce/reservations", { method: "POST", body }) };
+        return ctx.fetch("/v1/markets/bookings", {
+            method: "POST",
+            body,
+            headers: idempotencyHeaders(ctx, idempotencyKey),
+        });
     },
 });
 export const adminCapacityReservationCapabilities = [

package/vendor/capabilities/capabilities/admin-enrollment.js

@@ -109,7 +109,7 @@ export const adminEnrollmentTokenRevokeCapability = defineCapability({
     roles: ["admin"],
     description: "Revoke one exact enrollment-token generation after reconciling its durable goal.",
     mutation: "preview-confirm",
-    http: { method: "POST", path: "/enrollment/tokens/{id}/revoke" },
+    http: { method: "DELETE", path: "/enrollment-tokens/{id}" },
     cli: {
         command: ["admin", "enrollment-tokens", "revoke"],
         vnext: adminHelp(["admin", "enrollment-tokens", "revoke"], "Revoke one exact enrollment-token generation.", "ornn admin enrollment-tokens revoke <token-id> [--expected-created-at TIME] [--yes]", "ornn admin enrollment-tokens revoke <token-id> --expected-created-at TIME --yes --idempotency-key KEY --format json", ["canonical token UUID", "token created_at generation"], "Review the exact token generation and the loss of future enrollment access."),
@@ -136,8 +136,8 @@ export const adminEnrollmentTokenRevokeCapability = defineCapability({
         if (!current.target.created_at) {
             throw codedError("token_identity_unavailable", `Enrollment token ${parsed.token_id} has no stable creation identity and cannot be revoked safely.`);
         }
-        const revoked = (await ctx.fetch(`/enrollment/tokens/${encodeURIComponent(parsed.token_id)}/revoke`, {
-            method: "POST",
+        const revoked = (await ctx.fetch(`/enrollment-tokens/${encodeURIComponent(parsed.token_id)}`, {
+            method: "DELETE",
             ...(parsed.idempotency_key
                 ? { headers: { "Idempotency-Key": parsed.idempotency_key } }
                 : {}),
@@ -187,7 +187,7 @@ export const adminNodeEnrollCapability = defineCapability({
     roles: ["admin"],
     description: "Enroll one explicit node over SSH with an explicit supplier and facility assignment.",
     mutation: "preview-confirm",
-    http: { method: "POST", path: "/internal/remote" },
+    http: { method: "POST", path: "/remote" },
     cli: {
         command: ["admin", "nodes", "enroll"],
         vnext: adminHelp(["admin", "nodes", "enroll"], "Install Ornn management on one explicitly assigned node.", "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]", "Unsupported: remote enrollment requires an eligible human terminal.", ["canonical node UUID", "canonical supplier organization UUID", "canonical facility UUID"], "Review node identity, SSH target, assignment, compartment filter, and replacement of existing management."),
@@ -234,7 +234,7 @@ export const adminNodeEnrollCapability = defineCapability({
             restoreNodeId: parsed.node_id,
             force: true,
         });
-        const remote = await ctx.fetch("/internal/remote", {
+        const remote = await ctx.fetch("/remote", {
             method: "POST",
             body: {
                 host: parsed.host,