@ornncompute/cli 1.0.48 → 1.0.63

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

@@ -53,7 +53,7 @@ export const nativeListingUpdateFields = {
     facilityId: z.string().uuid().optional(),
     provisioningType: z.enum(["bare-metal", "virtual-machine"]).optional(),
     availableAt: z.iso.datetime({ offset: true }).optional(),
-    availableUntil: z.iso.datetime({ offset: true }).optional(),
+    availableUntil: z.iso.datetime({ offset: true }).nullable().optional(),
     daysToRfs: z.coerce.number().int().nonnegative().optional(),
     cpu: z.string().optional(),
     ram: z.string().optional(),

package/vendor/capabilities/capabilities/reservation-list.js

@@ -0,0 +1,68 @@
+import { z } from "zod";
+import { defineCapability } from "../capability.js";
+import { queryString } from "./staff-shared.js";
+export const reservationListInput = z.object({
+    customerId: z.string().uuid().optional(),
+    listingId: z.string().uuid().optional(),
+    listingTermId: z.string().uuid().optional(),
+    status: z.enum(["confirmed", "active", "completed", "cancelled"]).optional(),
+    cursor: z.string().optional(),
+    limit: z.number().int().min(1).max(100).optional(),
+});
+// Staff on every surface: Slack and the CLI resolve a customer's reservations
+// with this, then nodes.list reservation_id for that reservation's machines.
+export const reservationListCapability = defineCapability({
+    id: "reservation.list",
+    domain: "reservations",
+    roles: ["admin"],
+    description: "Internal staff only: list Commerce reservations across organizations, optionally filtered by customer organization (customerId), listing, listing term, and derived status. Resolve a customer's organization with users.list or organization.list first; pass each reservationId to nodes.list reservation_id for its machines. Page with nextCursor as cursor.",
+    mutation: "read",
+    http: { method: "GET", path: "/commerce/reservations" },
+    cli: {
+        command: ["admin", "reservations", "list"],
+        vnext: {
+            audience: "admin",
+            category: "resource",
+            command: ["admin", "reservations", "list"],
+            outcome: "List reservations across organizations.",
+            human: "ornn admin reservations list [--customer UUID] [--listing UUID] [--listing-term UUID] [--status confirmed|active|completed|cancelled] [--limit 50] [--cursor CURSOR]",
+            automation: "ornn admin reservations list --customer UUID --limit 50 [--cursor CURSOR] --format json",
+            acceptedReferences: [],
+        },
+    },
+    slack: {
+        parameters: {
+            type: "object",
+            properties: {
+                customerId: {
+                    type: "string",
+                    description: "Optional customer organization UUID from users_list or organization_list.",
+                },
+                listingId: { type: "string", description: "Optional listing UUID." },
+                listingTermId: { type: "string", description: "Optional listing term UUID." },
+                status: {
+                    type: "string",
+                    enum: ["confirmed", "active", "completed", "cancelled"],
+                    description: "Optional derived reservation status.",
+                },
+                cursor: {
+                    type: "string",
+                    description: "Optional. Pass the previous response's nextCursor to fetch the next page.",
+                },
+                limit: { type: "integer", description: "Optional page size (Slack returns at most 10)." },
+            },
+        },
+    },
+    input: reservationListInput,
+    execute: async (ctx, input) => {
+        const parsed = reservationListInput.parse(input ?? {});
+        return ctx.fetch(`/commerce/reservations${queryString({
+            customerId: parsed.customerId,
+            listingId: parsed.listingId,
+            status: parsed.status,
+            listingTermId: parsed.listingTermId,
+            cursor: parsed.cursor,
+            limit: parsed.limit,
+        })}`, { method: "GET" });
+    },
+});

package/vendor/capabilities/capabilities/staff-shared.js

@@ -0,0 +1,64 @@
+/** Helpers shared by staff capabilities. */
+/**
+ * Build a request body from the fields that were actually supplied.
+ *
+ * Staff writes are almost all "PATCH the fields the caller named": `undefined`
+ * means leave alone, and `null` is a real value that clears the field. So the
+ * check is `!== undefined`, never truthiness.
+ */
+export function mapBody(input, mapping) {
+    const body = {};
+    for (const [field, wire] of Object.entries(mapping)) {
+        if (input[field] !== undefined)
+            body[wire] = input[field];
+    }
+    return body;
+}
+/** Path segment escape. */
+export function seg(value) {
+    return encodeURIComponent(value);
+}
+/**
+ * A transport failure's HTTP status, when it carries one.
+ *
+ * Capabilities cannot import a surface's error class (`apps/mcp`'s
+ * `WebApiError`, say), so read the status structurally.
+ */
+export function statusOf(error) {
+    if (error && typeof error === "object" && "status" in error) {
+        const status = error.status;
+        if (typeof status === "number")
+            return status;
+    }
+    return undefined;
+}
+/**
+ * Read a resource's current optimistic-concurrency version.
+ *
+ * Commerce rejects a PATCH or lifecycle action whose `version` is absent or
+ * non-positive ("missing version" / "version must be positive"), but no staff
+ * caller has that number to hand. Read it back when it was not supplied, and
+ * only once confirmed so a preview stays a pure dry run.
+ */
+export async function resolveVersion(ctx, path, provided) {
+    if (provided && provided > 0)
+        return provided;
+    if (!ctx.confirmed)
+        return 1;
+    try {
+        const current = (await ctx.fetch(path, { method: "GET" }));
+        if (typeof current?.version === "number" && current.version > 0)
+            return current.version;
+    }
+    catch {
+        // Fall through: send 1 and let commerce report the conflict, which names
+        // the expected version, rather than failing on a lookup the caller can't see.
+    }
+    return 1;
+}
+export function queryString(params) {
+    const parts = Object.entries(params)
+        .filter((entry) => entry[1] !== undefined && entry[1] !== "")
+        .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
+    return parts.length > 0 ? `?${parts.join("&")}` : "";
+}

package/vendor/capabilities/capabilities/tokens.js

@@ -142,7 +142,7 @@ export const tokensCreateCapability = defineCapability({
         }
         const results = [];
         for (const host of hosts) {
-            results.push(await ctx.fetch("/internal/remote", {
+            results.push(await ctx.fetch("/remote", {
                 method: "POST",
                 body: {
                     host,

package/vendor/capabilities/cli-catalog.js

@@ -6,6 +6,7 @@ import { adminEnrollmentCapabilities, bindAdminEnrollmentCapabilities, } from ".
 import { adminNodeDiagnosticCapabilities } from "./capabilities/admin-node-diagnostics.js";
 import { adminNodeLifecycleCapabilities } from "./capabilities/admin-nodes-lifecycle.js";
 import { computeCapabilities } from "./capabilities/compute.js";
+import { creditGrantCapability } from "./capabilities/credits.js";
 import { cliShellCapabilities } from "./capabilities/cli.js";
 import { clusterCliCapabilities, kubernetesCapabilities, slurmCapabilities, } from "./capabilities/clusters.js";
 import { externalBucketCapabilities } from "./capabilities/external-buckets.js";
@@ -18,6 +19,7 @@ import { listingCapabilities } from "./capabilities/listings.js";
 import { observabilityCapabilities } from "./capabilities/observability.js";
 import { organizationInviteCapability } from "./capabilities/organization-invites.js";
 import { networkCapabilities } from "./capabilities/networks.js";
+import { reservationListCapability } from "./capabilities/reservation-list.js";
 import { volumeCapabilities } from "./capabilities/volumes.js";
 import { userCapabilities } from "./capabilities/users.js";
 function canonicalCliCatalog(capabilities) {
@@ -62,8 +64,10 @@ export const catalog = [
         ])),
         ...adminCapabilities.filter((capability) => capability.id === "nodes.health"),
         ...adminCapacityReservationCapabilities,
+        reservationListCapability,
         ...adminNodeDiagnosticCapabilities,
         ...adminEnrollmentCapabilities,
         organizationInviteCapability,
+        creditGrantCapability,
     ]),
 ];

package/vendor/capabilities/cli-migrations.js

@@ -9,21 +9,25 @@ export const LEGACY_CLI_MIGRATIONS = [
     { legacy: ["catalog", "search"], replacement: "ornn capacity-offers list" },
     { legacy: ["gpu-types"], replacement: "ornn capacity-offers list" },
     { legacy: ["availability", "list"], replacement: "ornn capacity-offers list" },
-    { legacy: ["availability", "forecast"], replacement: "ornn schedules list" },
+    { legacy: ["availability", "forecast"], replacement: "ornn capacity-offers availability" },
     { legacy: ["availability", "show"], replacement: "ornn capacity-offers show" },
     { legacy: ["listing", "list"], replacement: "ornn capacity-offers list" },
-    { legacy: ["listing", "forecast"], replacement: "ornn schedules list" },
+    { legacy: ["listing", "forecast"], replacement: "ornn capacity-offers availability" },
     { legacy: ["listing", "show"], replacement: "ornn capacity-offers show" },
     { legacy: ["listings", "list"], replacement: "ornn capacity-offers list" },
-    { legacy: ["listings", "forecast"], replacement: "ornn schedules list" },
+    { legacy: ["listings", "forecast"], replacement: "ornn capacity-offers availability" },
     { legacy: ["listings", "show"], replacement: "ornn capacity-offers show" },
     { legacy: ["listings", "create"], replacement: "ornn admin capacity-offers create" },
     { legacy: ["buy"], replacement: "ornn offers post" },
-    { legacy: ["bid", "create"], replacement: "ornn spot bid" },
-    { legacy: ["bid", "list"], replacement: "ornn spot orders" },
-    { legacy: ["bid", "show"], replacement: "ornn spot orders" },
-    { legacy: ["bid", "update"], replacement: "ornn spot bid" },
-    { legacy: ["bid", "withdraw"], replacement: "ornn spot cancel" },
+    { legacy: ["schedules", "list"], replacement: "ornn capacity-offers list --kind secondary" },
+    { legacy: ["schedules", "show"], replacement: "ornn capacity-offers availability" },
+    { legacy: ["schedules", "buy"], replacement: "ornn reservations buy" },
+    { legacy: ["schedules"], replacement: "ornn capacity-offers list" },
+    { legacy: ["bid", "create"], replacement: "ornn market bid" },
+    { legacy: ["bid", "list"], replacement: "ornn market orders" },
+    { legacy: ["bid", "show"], replacement: "ornn market orders" },
+    { legacy: ["bid", "update"], replacement: "ornn market bid" },
+    { legacy: ["bid", "withdraw"], replacement: "ornn market cancel" },
     {
         legacy: ["exchange", "create"],
         replacement: "ornn capacity-offers list (use the Ornn web app for commercial workflows)",