@ornncompute/cli 1.0.67 → 1.0.72

package/README.md

@@ -58,7 +58,7 @@ ornn resources
 
 The CLI uses Authorization's newest membership on every request, regardless of
 approval. `ornn context` displays that current organization; login and launch
-use the same context. Restricted operations retain their approval requirements.
+use the same context. Reserve browsing and purchasing still require approval.
 
 Advanced customer resources are registered under one noun and one verb:
 
@@ -100,7 +100,7 @@ relisted (secondary) listing term with Markets `POST /v1/markets/bookings`
 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
+`market end` (Commerce `DELETE /commerce/reservations/{id}`), 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`.
@@ -123,11 +123,15 @@ customer and takes `--organization-id UUID`, `--listing-id UUID`,
 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`.
-Reuse the key and the same body on retries. Prices are integer micro-USD inside
-terms, with explicit duration bounds, nullable deposit and renewable flag.
+`--gpu-slug`, `--gpus-per-node`, `--facility-id`, `--provisioning-type`,
+`--state`, `--terms` (a JSON array) and `--idempotency-key`, plus optional
+`--organization-id`. Give `--capacity-node-count`, or `--node-ids` (a JSON array)
+to attach nodes at creation; the count then defaults to the number of nodes.
+Primary capacity takes `--days-to-rfs` (0 when ready now) or both
+`--available-at` and `--available-until`, not both. Reuse the key and the same
+body on retries. Prices are integer micro-USD inside terms, with explicit
+duration bounds, nullable deposit, renewable flag and optional
+`preemptNoticeSeconds`.
 `ornn admin capacity-offers update` edits a selected term using `--listing-id`,
 `--listing-terms-id`, the complete term fields and `--idempotency-key`. Financial
 editing remains staff-only. The old customer `capacity-offers update` is removed.

package/package.json

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

package/src/catalog-shell.mjs

@@ -236,17 +236,11 @@ function retiredSyntaxError(argv, findLegacyCliMigration, migrationGuideUrl) {
   );
 }
 
-function resolveRequest(catalog, argv, findLegacyCliMigration, migrationGuideUrl) {
-  if (argv.length === 0 || (argv.length === 1 && (argv[0] === "--help" || argv[0] === "-h"))) {
+function resolveRequest(catalog, argvIn, findLegacyCliMigration, migrationGuideUrl) {
+  const argv = argvIn[0] === "--help" || argvIn[0] === "-h" ? ["help", ...argvIn.slice(1)] : argvIn;
+  if (argv.length === 0) {
     return { kind: "root", command: "help" };
   }
-  if (argv[0] === "--help" || argv[0] === "-h") {
-    return {
-      kind: "error",
-      command: "help",
-      error: new VnextUsageError("Usage: ornn [--format human|json|ndjson]"),
-    };
-  }
 
   const retired = retiredSyntaxError(argv, findLegacyCliMigration, migrationGuideUrl);
   if (retired) {
@@ -311,15 +305,7 @@ function resolveRequest(catalog, argv, findLegacyCliMigration, migrationGuideUrl
   if (capability) {
     const command = vnextCommand(capability);
     const rest = argv.slice(command.length);
-    const helpFlags = rest.filter((argument) => argument === "--help" || argument === "-h");
-    if (helpFlags.length) {
-      if (rest.length !== 1) {
-        return {
-          kind: "error",
-          command: command.join(" "),
-          error: new VnextUsageError(`Usage: ${capability.cli.vnext.human}`),
-        };
-      }
+    if (rest.some((argument) => argument === "--help" || argument === "-h")) {
       return { kind: "help", command: `help ${command.join(" ")}`, capability };
     }
     if (rest.length && capability.cli.vnext.arguments !== "semantic") {

package/src/kubernetes-commands.mjs

@@ -875,8 +875,8 @@ async function selectedOrganization(context, runtime) {
   const selected = record(record(result.data).selected_organization);
   const id = text(selected.id);
   const name = text(selected.name);
-  if (!id || !name || selected.approved !== true) {
-    runtime.usage("Your current organization must be approved before launch.", {
+  if (!id || !name) {
+    runtime.usage("Join an organization before launching compute.", {
       code: "organization_required",
       field: "organization",
     });

package/src/vm-commands.mjs

@@ -415,8 +415,8 @@ async function selectedOrganization(context, interaction, expectedId) {
   const selected = record(record(result.data).selected_organization);
   const id = text(selected.id);
   const name = text(selected.name);
-  if (!id || !name || selected.approved !== true) {
-    interaction.usage("Your current organization must be approved before launch.", {
+  if (!id || !name) {
+    interaction.usage("Join an organization before launching compute.", {
       code: "organization_required",
       field: "organization",
     });

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

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { defineCapability, preview } from "../capability.js";
+import { ensureFacility, locateRegion, unplacedLocation } from "./locality.js";
 import { nativeListingCreateInput } from "./native-listing.js";
 import { idempotencyHeaders, microUsd } from "./market-shared.js";
 function adminHelp(command, outcome, human, automation, review) {
@@ -18,22 +19,28 @@ export const adminCapacityOffersCreateCapability = defineCapability({
     id: "listing.create",
     domain: "listings",
     roles: ["admin"],
-    description: "Create native capacity with explicit organization/facility IDs, hardware, availability and advertised terms. Returns {listing, terms}. Requires an idempotencyKey reused on retries and confirm: true.",
+    description: "Create native capacity with an organization, a facilityId or a location, hardware, availability and advertised terms. A location is any state, city, address, or catalog region (us-west-3); Ornn places it in a catalog region and uses the organization's facility there. Primary capacity needs daysToRfs (0 when ready now) or both availableAt and availableUntil. nodeIds attach nodes at creation. Returns {listing, terms}. Requires an idempotencyKey reused on retries and confirm: true.",
     mutation: "preview-confirm",
     http: { method: "POST", path: "/commerce/v2/listings" },
     input: nativeListingCreateInput,
     slack: false,
     cli: {
         command: ["admin", "capacity-offers", "create"],
-        vnext: adminHelp(["admin", "capacity-offers", "create"], "Create native capacity and its advertised financial terms.", "ornn admin capacity-offers create --gpu-slug GPU --capacity-node-count COUNT --gpus-per-node COUNT --facility-id UUID --provisioning-type bare-metal|virtual-machine --state draft|available --terms JSON --idempotency-key KEY [--organization-id UUID] [--available-at TIME --available-until TIME] [--days-to-rfs DAYS]", "Requires an eligible human terminal; reuse --idempotency-key on retries.", "Review the native parent fields and each financial term before default-no consent."),
+        vnext: adminHelp(["admin", "capacity-offers", "create"], "Create native capacity and its advertised financial terms.", "ornn admin capacity-offers create --gpu-slug GPU --gpus-per-node COUNT (--facility-id UUID | --location PLACE) --provisioning-type bare-metal|virtual-machine --state draft|available --terms JSON --idempotency-key KEY (--days-to-rfs DAYS | --available-at TIME --available-until TIME) [--capacity-node-count COUNT] [--node-ids JSON] [--organization-id UUID]", "Requires an eligible human terminal; --location also needs --organization-id; reuse --idempotency-key on retries.", "Review the native parent fields and each financial term before default-no consent."),
     },
     execute: async (ctx, input) => {
-        const { confirm: _confirm, idempotencyKey, ...body } = nativeListingCreateInput.parse(input);
+        const { confirm: _confirm, idempotencyKey, location, ...body } = nativeListingCreateInput.parse(input);
+        const located = location ? await locateRegion(ctx.fetch, location) : null;
+        if (location && !located)
+            throw new Error(unplacedLocation(location));
         if (!ctx.confirmed)
-            return preview("listing.create", body);
+            return preview("listing.create", located ? { ...body, located } : body);
+        const facilityId = located
+            ? (await ensureFacility(ctx.fetch, body.organizationId, located.region)).facilityId
+            : body.facilityId;
         return ctx.fetch("/commerce/v2/listings", {
             method: "POST",
-            body,
+            body: { ...body, facilityId },
             headers: idempotencyHeaders(ctx, idempotencyKey),
         });
     },

package/vendor/capabilities/capabilities/listings.js

@@ -1,6 +1,7 @@
 import { listSupplierOrganizations } from "../supplier-directory.js";
 import { z } from "zod";
 import { defineCapability, preview } from "../capability.js";
+import { ensureFacility, LOCATION_LOOKUP_UNAVAILABLE, locateRegion, unplacedLocation, } from "./locality.js";
 import { bindHardwareFields, HARDWARE_LISTING_FIELDS, HARDWARE_LISTING_FILTERS, loadHardwareCatalog, projectCatalogTerms, resolveCatalogTerm, } from "../spec-catalog.js";
 function queryPath(path, params) {
     const parts = [];
@@ -30,7 +31,10 @@ export const listingCreateInput = z.object({
     fabric_type: z.string().optional(),
     node_count: z.number().int().optional(),
     gpus_per_node: z.number().int().optional(),
-    site_nickname: z.string().optional(),
+    site_nickname: z
+        .string()
+        .optional()
+        .describe("A state, city, address, or catalog region such as us-west-3."),
     site_supplier: z.string().optional(),
     ram: z.string().optional(),
     storage: z.string().optional(),
@@ -67,7 +71,10 @@ const slackListingCreateParams = {
         fabric_type: { type: "string" },
         node_count: { type: "integer" },
         gpus_per_node: { type: "integer" },
-        site_nickname: { type: "string" },
+        site_nickname: {
+            type: "string",
+            description: "Where the capacity is, exactly as the user said it: a state, city, address, or catalog region such as us-west-3. Ornn places it in a catalog region.",
+        },
         site_supplier: { type: "string" },
         ram: { type: "string" },
         storage: { type: "string" },
@@ -242,7 +249,7 @@ export const createListingCapability = defineCapability({
         let organizationId = parsed.organizationId ?? parsed.organization_id;
         let facilityId = parsed.facilityId ?? parsed.facility_id;
         const supplierQuery = (parsed.site_supplier ?? "").trim().toLowerCase();
-        const facilityQuery = (parsed.site_nickname ?? parsed.site ?? "").trim().toLowerCase();
+        const place = (parsed.site_nickname ?? parsed.site ?? "").trim();
         if (!organizationId && supplierQuery) {
             const matches = (await listSupplierOrganizations(ctx.fetch)).filter((org) => org.id.toLowerCase() === supplierQuery || org.name.toLowerCase() === supplierQuery);
             if (matches.length !== 1) {
@@ -250,7 +257,19 @@ export const createListingCapability = defineCapability({
             }
             organizationId = matches[0].id;
         }
-        if ((facilityId && !organizationId) || (!facilityId && (facilityQuery || organizationId))) {
+        let located = null;
+        let lookupUnavailable = false;
+        if (!facilityId && place) {
+            try {
+                located = await locateRegion(ctx.fetch, place);
+            }
+            catch (error) {
+                if (ctx.confirmed)
+                    throw error;
+                lookupUnavailable = true;
+            }
+        }
+        if ((facilityId && !organizationId) || (!facilityId && !place && organizationId)) {
             const matches = [];
             const seenCursors = new Set();
             let cursor;
@@ -262,14 +281,7 @@ export const createListingCapability = defineCapability({
                     throw new Error("invalid facility catalog");
                 matches.push(...response.facilities.filter((facility) => (!organizationId ||
                     (facility.organizationId ?? facility.organization_id) === organizationId) &&
-                    (facilityId
-                        ? (facility.facilityId ?? facility.id) === facilityId
-                        : !facilityQuery ||
-                            [
-                                facility.facilityId ?? facility.id,
-                                facility.region,
-                                facility.displayName ?? facility.display_name,
-                            ].some((value) => value?.toLowerCase() === facilityQuery))));
+                    (!facilityId || (facility.facilityId ?? facility.id) === facilityId)));
                 cursor = response.nextCursor ?? undefined;
                 if (cursor) {
                     if (seenCursors.has(cursor) || seenCursors.size >= 49) {
@@ -302,6 +314,10 @@ export const createListingCapability = defineCapability({
         const gpusPerNode = parsed.gpus_per_node ?? 8;
         const boundPayload = bound.payload;
         const draft = Object.fromEntries(Object.entries(boundPayload).filter(([key]) => !LISTING_CREATE_INPUT_ONLY_KEYS.includes(key)));
+        if (located)
+            draft.site_nickname = located.name;
+        else if (place && !facilityId && !lookupUnavailable)
+            delete draft.site_nickname;
         const gpuSlug = normalized.gpu_type
             ? resolveCatalogTerm(hardware.terms, "gpu", normalized.gpu_type).canonical
             : null;
@@ -318,11 +334,12 @@ export const createListingCapability = defineCapability({
                     percent: parsed.deposit_percent,
                 })
                 : 0);
-        const listing = organizationId && facilityId && gpuSlug && buyerMicro != null
+        const priced = Boolean(organizationId && gpuSlug && buyerMicro != null);
+        const listingAt = (facility) => priced && facility
             ? primaryListingBody({
-                organizationId,
-                facilityId,
-                gpuSlug,
+                organizationId: organizationId,
+                facilityId: facility,
+                gpuSlug: gpuSlug,
                 gpusPerNode,
                 provisioningType: parsed.access_mode ?? "virtual-machine",
                 availableAt: startsAt,
@@ -337,13 +354,24 @@ export const createListingCapability = defineCapability({
             }, buyerMicro, downPaymentCents)
             : null;
         if (!ctx.confirmed) {
+            const listing = listingAt(facilityId);
             return preview("create_listing", {
                 ...draft,
                 node_count: nodeCount,
                 gpus_per_node: gpusPerNode,
+                ...(located ? { facility_region: located.region } : {}),
+                ...(lookupUnavailable
+                    ? { location_unavailable: place, location_hint: LOCATION_LOOKUP_UNAVAILABLE }
+                    : place && !facilityId && !located
+                        ? { location_unresolved: place, location_hint: unplacedLocation(place) }
+                        : {}),
                 ...(listing ? { listing } : {}),
             });
         }
+        if (located && !facilityId && priced) {
+            facilityId = (await ensureFacility(ctx.fetch, organizationId, located.region)).facilityId;
+        }
+        const listing = listingAt(facilityId);
         if (!listing) {
             return {
                 ok: false,

package/vendor/capabilities/capabilities/locality.js

@@ -0,0 +1,42 @@
+import { statusOf } from "./staff-shared.js";
+export const LOCALITY_GEOLOCATE_PATH = "/v1/orchestrator/locality/geolocate";
+export const FACILITY_ENSURE_PATH = "/provisioning/facilities/ensure";
+/**
+ * `GET /v1/orchestrator/locality/geolocate?address=`: the catalog region a typed
+ * place stands in. Orchestrator answers a region code or name as itself and
+ * geocodes anything else (state, city, address) to its nearest region.
+ * Null means Orchestrator could not place the text (404); an unavailable
+ * geocoder or gateway throws, so callers ask for a retry rather than new text.
+ */
+export async function locateRegion(fetch, place) {
+    const address = place.trim();
+    if (!address)
+        return null;
+    let located;
+    try {
+        located = (await fetch(`${LOCALITY_GEOLOCATE_PATH}?address=${encodeURIComponent(address)}`, {
+            method: "GET",
+        }));
+    }
+    catch (error) {
+        if (statusOf(error) === 404)
+            return null;
+        throw error;
+    }
+    const region = typeof located?.facility_slug === "string" ? located.facility_slug.trim() : "";
+    if (!region)
+        return null;
+    const name = typeof located?.region === "string" && located.region.trim() ? located.region.trim() : region;
+    return { region, name };
+}
+export function unplacedLocation(place) {
+    return `Ornn could not place "${place}". Give a state, city, address, or catalog region such as us-west-3.`;
+}
+export const LOCATION_LOOKUP_UNAVAILABLE = "Ornn's location lookup is unavailable right now. Keep this location and try again in a moment.";
+/** `POST /internal/v1/facilities/ensure`: the organization's facility at a catalog region. */
+export async function ensureFacility(fetch, organizationId, region) {
+    return (await fetch(FACILITY_ENSURE_PATH, {
+        method: "POST",
+        body: { organizationId, region },
+    }));
+}

package/vendor/capabilities/capabilities/markets.js

@@ -293,7 +293,7 @@ export const marketEndCapability = defineCapability({
     roles: ["user"],
     description: "End a running fill: its reservation stops, its VMs stop, and its GPUs go back on the book. Requires confirm: true.",
     mutation: "preview-confirm",
-    http: { method: "POST", path: "/commerce/reservations/{fillId}/stop" },
+    http: { method: "DELETE", path: "/commerce/reservations/{fillId}" },
     input: marketEndInput,
     cli: {
         command: ["market", "end"],
@@ -308,7 +308,7 @@ export const marketEndCapability = defineCapability({
         ], { fillId: parsed.fillId });
         if (gate)
             return gate;
-        return ctx.fetch(`/commerce/reservations/${seg(parsed.fillId)}/stop`, { method: "POST" });
+        return ctx.fetch(`/commerce/reservations/${seg(parsed.fillId)}`, { method: "DELETE" });
     },
 });
 export const offersListInput = z.object({

package/vendor/capabilities/capabilities/native-listing.js

@@ -7,35 +7,62 @@ export const nativeTermFields = {
     pricePerGpuHourMicroUsd: z.coerce.number().int().positive(),
     downPaymentCents: z.coerce.number().int().nonnegative().nullable().optional(),
     renewable: flag,
+    preemptNoticeSeconds: z.coerce.number().int().nonnegative().optional(),
 };
 export const nativeTermInput = z.object(nativeTermFields).strict();
-export const nativeTermsInput = z.preprocess((value) => {
-    if (typeof value !== "string")
-        return value;
-    try {
-        return JSON.parse(value);
-    }
-    catch {
-        return value;
-    }
-}, z.array(nativeTermInput));
+function jsonArray(item) {
+    return z.preprocess((value) => {
+        if (typeof value !== "string")
+            return value;
+        try {
+            return JSON.parse(value);
+        }
+        catch {
+            return value;
+        }
+    }, z.array(item));
+}
+export const nativeTermsInput = jsonArray(nativeTermInput);
 export const listingWriteControls = {
     confirm: z.boolean().optional(),
     idempotencyKey: z.string().min(1).max(200),
 };
+const listingLocation = z
+    .string()
+    .trim()
+    .min(1)
+    .max(256)
+    .optional()
+    .describe("Instead of facilityId: a state, city, address, or catalog region such as us-west-3. Ornn places it in a catalog region and uses the supplier's facility there.");
 export const nativeListingCreateInput = z
     .object({
     organizationId: z.string().uuid().nullable().optional(),
     kind: z.enum(["primary", "secondary"]).default("primary"),
     gpuSlug: z.string().min(1),
     gpusPerNode: z.coerce.number().int().positive(),
-    capacityNodeCount: z.coerce.number().int().positive(),
-    facilityId: z.string().uuid(),
+    capacityNodeCount: z.coerce
+        .number()
+        .int()
+        .positive()
+        .optional()
+        .describe("Defaults to the number of nodeIds."),
+    nodeIds: jsonArray(z.string().uuid()).optional(),
+    facilityId: z.string().uuid().optional(),
+    location: listingLocation,
     provisioningType: z.enum(["bare-metal", "virtual-machine"]),
     state: z.enum(["draft", "available"]),
-    availableAt: z.iso.datetime({ offset: true }).nullable().optional(),
+    availableAt: z.iso
+        .datetime({ offset: true })
+        .nullable()
+        .optional()
+        .describe("Primary capacity takes availableAt and availableUntil, or daysToRfs, not both."),
     availableUntil: z.iso.datetime({ offset: true }).nullable().optional(),
-    daysToRfs: z.coerce.number().int().nonnegative().optional(),
+    daysToRfs: z.coerce
+        .number()
+        .int()
+        .nonnegative()
+        .optional()
+        .describe("Days until ready for service; 0 when ready now. Required unless both dates are set."),
     cpu: z.string().optional(),
     ram: z.string().optional(),
     storage: z.string().optional(),
@@ -44,13 +71,22 @@ export const nativeListingCreateInput = z
     terms: nativeTermsInput,
     ...listingWriteControls,
 })
-    .strict();
+    .strict()
+    .refine((value) => Boolean(value.facilityId) !== Boolean(value.location), {
+    message: "Give exactly one of facilityId or location.",
+    path: ["facilityId"],
+})
+    .refine((value) => !value.location || Boolean(value.organizationId), {
+    message: "location needs organizationId, the supplier whose facility it is.",
+    path: ["organizationId"],
+});
 export const nativeListingUpdateFields = {
     state: z.enum(["draft", "available", "delisted"]).optional(),
     nodeCount: z.coerce.number().int().positive().optional(),
     gpuSlug: z.string().min(1).optional(),
     gpusPerNode: z.coerce.number().int().positive().optional(),
     facilityId: z.string().uuid().optional(),
+    location: listingLocation,
     provisioningType: z.enum(["bare-metal", "virtual-machine"]).optional(),
     availableAt: z.iso.datetime({ offset: true }).optional(),
     availableUntil: z.iso.datetime({ offset: true }).nullable().optional(),