@ornncompute/cli 1.0.48 → 1.0.62

package/vendor/capabilities/capabilities/commerce-market.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { nativeTermsInput, nativeTermFields, listingWriteControls } from "./native-listing.js";
 import { defineCapability, preview } from "../capability.js";
-import { consent, idempotencyHeaders, positionals, query, seg } from "./market-shared.js";
+import { consent, idempotencyHeaders, microUsd, microUsdLabel, positionals, query, seg, } from "./market-shared.js";
 // Commerce market verbs: one capability per role-aware `/commerce` route.
 // Commerce decides from the caller's session what each listing or
 // reservation reveals; these verbs return its JSON unchanged.
@@ -20,12 +20,6 @@ function help(command, outcome, human, automation, related, order, acceptedRefer
     };
 }
 const pageLimit = z.coerce.number().int().min(1).max(200).optional();
-const nodeIdList = z.preprocess((value) => typeof value === "string"
-    ? value
-        .split(",")
-        .map((part) => part.trim())
-        .filter(Boolean)
-    : value, z.array(z.string().uuid()).min(1));
 export const listingsListInput = z.object({
     $positionals: positionals,
     kind: z.enum(["primary", "secondary", "on_demand"]).optional(),
@@ -45,7 +39,7 @@ export const listingsListCapability = defineCapability({
     input: listingsListInput,
     cli: {
         command: ["capacity-offers", "list"],
-        vnext: help(["capacity-offers", "list"], "List capacity parents with bounded pagination; read their financial terms separately.", "ornn capacity-offers list [--kind primary|secondary|on_demand] [--source-reservation-id <id>] [--limit <1-100>] [--cursor <opaque>]", "ornn capacity-offers list --limit 50 --format json", ["capacity-offers show", "capacity-offers terms", "schedules list"], 20, ["opaque page cursor"]),
+        vnext: help(["capacity-offers", "list"], "List capacity parents with bounded pagination; read their financial terms separately.", "ornn capacity-offers list [--kind primary|secondary|on_demand] [--source-reservation-id <id>] [--limit <1-100>] [--cursor <opaque>]", "ornn capacity-offers list --limit 50 --format json", ["capacity-offers show", "capacity-offers terms", "capacity-offers availability"], 20, ["opaque page cursor"]),
     },
     slack: false,
     execute: async (ctx, input) => {
@@ -74,7 +68,7 @@ export const listingShowCapability = defineCapability({
     input: listingShowInput,
     cli: {
         command: ["capacity-offers", "show"],
-        vnext: help(["capacity-offers", "show"], "Inspect one listing's hardware, capacity and availability.", "ornn capacity-offers show --listing-id <id>", "ornn capacity-offers show --listing-id <id> --format json", ["capacity-offers list", "capacity-offers terms", "schedules show"], 21, ["listing ID"]),
+        vnext: help(["capacity-offers", "show"], "Inspect one listing's hardware, capacity and availability.", "ornn capacity-offers show --listing-id <id>", "ornn capacity-offers show --listing-id <id> --format json", ["capacity-offers list", "capacity-offers terms", "capacity-offers availability"], 21, ["listing ID"]),
     },
     slack: false,
     execute: async (ctx, input) => {
@@ -86,13 +80,13 @@ export const listingTermsCapability = defineCapability({
     id: "listings.terms",
     domain: "listings",
     roles: ["user"],
-    description: "Read a capacity listing's advertised financial terms. Each term returns listingTermsId, capacityListingId, pricePerGpuHourMicroUsd, duration bounds, downPaymentCents and renewable. Use the parent's capacityListingId as listingId. Prices are integer micro-USD per GPU-hour.",
+    description: "Read a capacity listing's advertised financial terms. Each term returns listingTermsId, capacityListingId, pricePerGpuHourMicroUsd, duration bounds, downPaymentCents and renewable. Use the parent's capacityListingId as listingId. Prices are gross integer micro-USD per GPU-hour, the price reservations.purchase expects.",
     mutation: "read",
     http: { method: "GET", path: "/commerce/v2/listings/{listingId}/terms" },
     input: listingShowInput,
     cli: {
         command: ["capacity-offers", "terms"],
-        vnext: help(["capacity-offers", "terms"], "Read the advertised financial terms for a capacity listing.", "ornn capacity-offers terms --listing-id <id>", "ornn capacity-offers terms --listing-id <id> --format json", ["capacity-offers show", "offers post"], 22, ["capacityListingId from capacity-offers list or show"]),
+        vnext: help(["capacity-offers", "terms"], "Read the advertised financial terms for a capacity listing.", "ornn capacity-offers terms --listing-id <id>", "ornn capacity-offers terms --listing-id <id> --format json", ["capacity-offers show", "offers post", "reservations buy"], 22, ["capacityListingId from capacity-offers list or show"]),
     },
     slack: false,
     execute: async (ctx, input) => {
@@ -100,33 +94,65 @@ export const listingTermsCapability = defineCapability({
         return ctx.fetch(`/commerce/v2/listings/${seg(parsed.listingId)}/terms`, { method: "GET" });
     },
 });
-export const listingRelistInput = z.object({
+export const listingAvailabilityInput = z.object({
+    $positionals: positionals,
+    listingId: z.string().uuid(),
+    from: z.iso
+        .datetime({ offset: true })
+        .optional()
+        .describe("RFC 3339 start of the range to read. Defaults to now or the listing's start."),
+    to: z.iso
+        .datetime({ offset: true })
+        .optional()
+        .describe("RFC 3339 end of the range to read. Defaults to the listing's end."),
+});
+export const listingAvailabilityCapability = defineCapability({
+    id: "listings.availability",
+    domain: "listings",
+    roles: ["user"],
+    description: "Read how much of a capacity listing is free to book over time: windows of startsAt, endsAt, gpus and nodes (the nodes with any GPU free) from now until the listing ends (for an open-ended listing, 30 days ahead for a Market listing and far enough for any term of a Reserve listing), optionally narrowed by from and to. Use the parent's capacityListingId as listingId.",
+    mutation: "read",
+    http: { method: "GET", path: "/v1/markets/listings/{listingId}/availability" },
+    input: listingAvailabilityInput,
+    cli: {
+        command: ["capacity-offers", "availability"],
+        vnext: help(["capacity-offers", "availability"], "Show how many of a listing's nodes are free over time.", "ornn capacity-offers availability --listing-id <id> [--from <time>] [--to <time>]", "ornn capacity-offers availability --listing-id <id> --format json", ["capacity-offers terms", "reservations buy", "offers post"], 23, ["capacityListingId from capacity-offers list or show"]),
+    },
+    slack: false,
+    execute: async (ctx, input) => {
+        const parsed = listingAvailabilityInput.parse(input);
+        return ctx.fetch(`/v1/markets/listings/${seg(parsed.listingId)}/availability${query({
+            from: parsed.from,
+            to: parsed.to,
+        })}`, { method: "GET" });
+    },
+});
+export const listingRelistInput = z.strictObject({
     $positionals: positionals,
     reservationId: z.string().uuid(),
     startsAt: z.iso.datetime({ offset: true }),
     endsAt: z.iso.datetime({ offset: true }),
     nodeCount: z.coerce.number().int().positive(),
-    nodeIds: nodeIdList.optional(),
-    reservedNodeIds: nodeIdList.optional(),
     terms: nativeTermsInput,
     idempotencyKey: z.string().min(1).max(200).optional(),
     confirm: z.boolean().optional(),
+    yes: z.boolean().optional(),
 });
 export const listingRelistCapability = defineCapability({
     id: "listings.relist",
     domain: "listings",
     roles: ["user"],
-    description: "Relist delivered capacity from a reservation using a native availability window, nodeCount and financial terms. Supply nodeIds or reservedNodeIds only when selecting specific nodes. Requires confirm: true.",
+    description: "Relist whole nodes of a reservation's capacity using a native availability window, nodeCount and financial terms. Buyers run on nodes Ornn assigns when their rental starts. Requires confirm: true.",
     mutation: "preview-confirm",
     http: { method: "POST", path: "/commerce/reservations/{reservationId}/relist" },
     input: listingRelistInput,
     cli: {
         command: ["capacity-offers", "relist"],
-        vnext: help(["capacity-offers", "relist"], "Relist reserved capacity with explicit financial terms.", "ornn capacity-offers relist --reservation-id UUID --node-count COUNT --starts-at TIME --ends-at TIME --terms JSON [--node-ids UUID,...] [--reserved-node-ids UUID,...]", "ornn capacity-offers relist --reservation-id UUID --node-count 1 --starts-at TIME --ends-at TIME --terms JSON --idempotency-key KEY --yes --format json", ["capacity-offers terms", "capacity-offers delist"], 23, ["reservation ID"]),
+        vnext: help(["capacity-offers", "relist"], "Relist reserved capacity with explicit financial terms.", "ornn capacity-offers relist --reservation-id UUID --node-count COUNT --starts-at TIME --ends-at TIME --terms JSON", "ornn capacity-offers relist --reservation-id UUID --node-count 1 --starts-at TIME --ends-at TIME --terms JSON --idempotency-key KEY --yes --format json", ["capacity-offers terms", "capacity-offers delist"], 24, ["reservation ID"]),
     },
     slack: false,
     execute: async (ctx, input) => {
-        const { $positionals: _, reservationId, confirm: _confirm, idempotencyKey, ...body } = listingRelistInput.parse(input);
+        const { $positionals: _, reservationId, confirm: _confirm, yes: _yes, idempotencyKey, ...body } = listingRelistInput.parse(input);
         const gate = await consent(ctx, "listings.relist", "Relist capacity", [
             { label: "Reservation", value: reservationId },
             { label: "Capacity and financial terms", value: JSON.stringify(body) },
@@ -160,7 +186,7 @@ export const listingUpdateCapability = defineCapability({
     cli: {
         command: ["admin", "capacity-offers", "update"],
         vnext: {
-            ...help(["admin", "capacity-offers", "update"], "Edit one advertised financial term as staff.", "ornn admin capacity-offers update --listing-id UUID --listing-terms-id UUID --min-duration-hours HOURS --max-duration-hours HOURS --price-per-gpu-hour-micro-usd RATE --renewable true|false --idempotency-key KEY [--type reserved|spot|on-demand] [--down-payment-cents CENTS]", "Requires an eligible human terminal; reuse --idempotency-key on retries.", ["capacity-offers terms"], 24),
+            ...help(["admin", "capacity-offers", "update"], "Edit one advertised financial term as staff.", "ornn admin capacity-offers update --listing-id UUID --listing-terms-id UUID --min-duration-hours HOURS --max-duration-hours HOURS --price-per-gpu-hour-micro-usd RATE --renewable true|false --idempotency-key KEY [--type reserved|spot|on-demand] [--down-payment-cents CENTS]", "Requires an eligible human terminal; reuse --idempotency-key on retries.", ["capacity-offers terms"], 25),
             audience: "admin",
         },
     },
@@ -192,7 +218,7 @@ export const listingDelistCapability = defineCapability({
     input: listingDelistInput,
     cli: {
         command: ["capacity-offers", "delist"],
-        vnext: help(["capacity-offers", "delist"], "Delist a listing you relisted.", "ornn capacity-offers delist --listing-id <id>", "ornn capacity-offers delist --listing-id <id> --yes --format json", ["capacity-offers relist"], 25, ["listing ID"]),
+        vnext: help(["capacity-offers", "delist"], "Delist a listing you relisted.", "ornn capacity-offers delist --listing-id <id>", "ornn capacity-offers delist --listing-id <id> --yes --format json", ["capacity-offers relist"], 26, ["listing ID"]),
     },
     slack: false,
     execute: async (ctx, input) => {
@@ -236,7 +262,7 @@ export const reservationsListCapability = defineCapability({
     input: reservationsListInput,
     cli: {
         command: ["reservations", "list"],
-        vnext: help(["reservations", "list"], "List your organization's schedule and spot reservations.", "ornn reservations list [--kind schedule|spot] [--status <status>] [--listing-id <id>] [--limit <1-200>] [--cursor <opaque>]", "ornn reservations list --format json", ["reservations show", "capacity-offers relist"], 26, ["opaque page cursor"]),
+        vnext: help(["reservations", "list"], "List your organization's schedule and spot reservations.", "ornn reservations list [--kind schedule|spot] [--status <status>] [--listing-id <id>] [--limit <1-200>] [--cursor <opaque>]", "ornn reservations list --format json", ["reservations show", "capacity-offers relist"], 27, ["opaque page cursor"]),
     },
     slack: false,
     execute: async (ctx, input) => {
@@ -264,7 +290,7 @@ export const reservationsShowCapability = defineCapability({
     input: reservationLookupInput,
     cli: {
         command: ["reservations", "show"],
-        vnext: help(["reservations", "show"], "Inspect one reservation.", "ornn reservations show --reservation-id <id>", "ornn reservations show --reservation-id <id> --format json", ["reservations list", "reservations invoices"], 27, ["reservation ID"]),
+        vnext: help(["reservations", "show"], "Inspect one reservation.", "ornn reservations show --reservation-id <id>", "ornn reservations show --reservation-id <id> --format json", ["reservations list", "reservations invoices"], 28, ["reservation ID"]),
     },
     slack: false,
     execute: async (ctx, input) => {
@@ -282,7 +308,7 @@ export const reservationInvoicesCapability = defineCapability({
     input: reservationLookupInput,
     cli: {
         command: ["reservations", "invoices"],
-        vnext: help(["reservations", "invoices"], "List one reservation's invoices.", "ornn reservations invoices --reservation-id <id>", "ornn reservations invoices --reservation-id <id> --format json", ["reservations show"], 28, ["reservation ID"]),
+        vnext: help(["reservations", "invoices"], "List one reservation's invoices.", "ornn reservations invoices --reservation-id <id>", "ornn reservations invoices --reservation-id <id> --format json", ["reservations show"], 29, ["reservation ID"]),
     },
     slack: false,
     execute: async (ctx, input) => {
@@ -292,14 +318,88 @@ export const reservationInvoicesCapability = defineCapability({
         });
     },
 });
+export const reservationPurchaseInput = z.object({
+    $positionals: positionals,
+    listingId: z
+        .string()
+        .uuid()
+        .describe("The relisted (secondary) listing's capacityListingId, from listings.list."),
+    listingTermId: z
+        .string()
+        .uuid()
+        .describe("The listingTermsId of the listing's term, from listings.terms."),
+    nodeCount: z.coerce
+        .number()
+        .int()
+        .positive()
+        .optional()
+        .describe("Whole nodes to book for the window. Defaults to every node the listing sells."),
+    startsAt: z.iso
+        .datetime({ offset: true })
+        .describe("RFC 3339 start of the window, in whole seconds, inside the listing and not in the past."),
+    endsAt: z.iso
+        .datetime({ offset: true })
+        .describe("RFC 3339 end of the window, at least an hour after the start and within the term's duration range, or at the listing's end."),
+    pricePerGpuHourMicroUsd: microUsd.describe("The term's price from listings.terms, in micro-USD per GPU-hour. A changed price refuses the purchase."),
+    idempotencyKey: z.string().min(1).max(200).optional(),
+    confirm: z.boolean().optional(),
+});
+export const reservationPurchaseCapability = defineCapability({
+    id: "reservations.purchase",
+    domain: "reservations",
+    roles: ["user"],
+    description: "Book a window of a relisted (secondary) listing on one of its terms at the term's price. The GPUs are held for you until the window starts; then it becomes your reservation, with the booking's ID. Nothing is charged when you book. Primary listings take offers instead (offers.post). Requires confirm: true.",
+    mutation: "preview-confirm",
+    http: { method: "POST", path: "/v1/markets/bookings" },
+    input: reservationPurchaseInput,
+    cli: {
+        command: ["reservations", "buy"],
+        vnext: help(["reservations", "buy"], "Book a window of relisted capacity at its term's price.", "ornn reservations buy --listing-id <id> --listing-term-id <id> --starts-at <time> --ends-at <time> --price-per-gpu-hour-micro-usd <n> [--node-count <n>]", "ornn reservations buy --listing-id <id> --listing-term-id <id> --starts-at <time> --ends-at <time> --price-per-gpu-hour-micro-usd 4000000 --idempotency-key <key> --yes --format json", ["capacity-offers availability", "capacity-offers terms", "reservations show"], 30, ["listingTermsId from capacity-offers terms"]),
+    },
+    slack: false,
+    execute: async (ctx, input) => {
+        const parsed = reservationPurchaseInput.parse(input);
+        const body = {
+            legs: [
+                {
+                    listingId: parsed.listingId,
+                    listingTermId: parsed.listingTermId,
+                    ...(parsed.nodeCount !== undefined ? { nodes: parsed.nodeCount } : {}),
+                    startsAt: parsed.startsAt,
+                    endsAt: parsed.endsAt,
+                    pricePerGpuHourMicroUsd: parsed.pricePerGpuHourMicroUsd,
+                },
+            ],
+        };
+        const gate = await consent(ctx, "reservations.purchase", "Book relisted window", [
+            { label: "Listing term", value: parsed.listingTermId },
+            {
+                label: "Nodes",
+                value: parsed.nodeCount !== undefined ? String(parsed.nodeCount) : "Every node on the listing",
+            },
+            { label: "Window", value: `${parsed.startsAt} to ${parsed.endsAt}` },
+            { label: "Price", value: microUsdLabel(parsed.pricePerGpuHourMicroUsd) },
+            { label: "Payment", value: "Nothing is charged when you book." },
+        ], body);
+        if (gate)
+            return gate;
+        return ctx.fetch("/v1/markets/bookings", {
+            method: "POST",
+            body,
+            headers: idempotencyHeaders(ctx, parsed.idempotencyKey),
+        });
+    },
+});
 export const commerceMarketCapabilities = [
     listingsListCapability,
     listingShowCapability,
     listingTermsCapability,
+    listingAvailabilityCapability,
     listingRelistCapability,
     listingUpdateCapability,
     listingDelistCapability,
     reservationsListCapability,
     reservationsShowCapability,
     reservationInvoicesCapability,
+    reservationPurchaseCapability,
 ];

package/vendor/capabilities/capabilities/credits.js

@@ -0,0 +1,78 @@
+import { z } from "zod";
+import { defineCapability, preview } from "../capability.js";
+export const creditGrantInput = z.object({
+    organizationId: z
+        .uuid()
+        .describe("Customer organization UUID. Resolve names or emails with organization_list; ask which organization if matches are ambiguous."),
+    adjustmentId: z
+        .uuid()
+        .describe("The credit-adjustment API's required grant UUID. Keep the same UUID when confirming this grant."),
+    amountCents: z
+        .number()
+        .int()
+        .min(1)
+        .max(100_000_000)
+        .describe("USD cents: 10000 grants $100.00."),
+    note: z
+        .string()
+        .trim()
+        .min(1)
+        .refine((value) => new TextEncoder().encode(value).length <= 500, "Keep the note under 500 UTF-8 bytes.")
+        .describe("Reason for the credit grant."),
+    confirm: z.boolean().optional(),
+});
+export const creditGrantCapability = defineCapability({
+    id: "credits.grant",
+    domain: "billing",
+    roles: ["admin"],
+    description: "Grant Ornn credits to a customer organization using the same operation as Internal Billing. " +
+        "Credits belong to the organization, not an individual person. Resolve the intended organization first. " +
+        "Preview first; confirm:true posts the same grant with its adjustmentId. The verified staff actor supplies audit identity.",
+    mutation: "preview-confirm",
+    http: { method: "POST", path: "/internal/v1/organizations/{organizationId}/credit-adjustments" },
+    cli: {
+        command: ["admin", "organizations", "grant-credit"],
+        vnext: {
+            audience: "admin",
+            category: "resource",
+            command: ["admin", "organizations", "grant-credit"],
+            outcome: "Grant Ornn credits to a customer organization.",
+            human: "ornn admin organizations grant-credit --organization UUID --amount-cents N --note TEXT --idempotency-key UUID [--yes]",
+            automation: "Requires an eligible human terminal.",
+            acceptedReferences: ["organization UUID from admin organizations list"],
+            review: "Review the organization, USD amount, note, and grant UUID before default-no consent.",
+            related: ["admin organizations list", "admin users list"],
+        },
+    },
+    slack: {
+        parameters: {
+            type: "object",
+            properties: {
+                organizationId: {
+                    type: "string",
+                    format: "uuid",
+                    description: "Exact customer organization UUID from organization_list.",
+                },
+                amountCents: {
+                    type: "integer",
+                    minimum: 1,
+                    maximum: 100_000_000,
+                    description: "USD cents: 10000 grants $100.00.",
+                },
+                note: {
+                    type: "string",
+                    description: "Reason for the credit grant, at most 500 UTF-8 bytes.",
+                },
+            },
+            required: ["organizationId", "amountCents", "note"],
+        },
+    },
+    input: creditGrantInput,
+    execute: async (ctx, input) => {
+        const { organizationId, confirm: _confirm, ...grant } = creditGrantInput.parse(input);
+        const body = { ...grant, direction: "credit" };
+        if (!ctx.confirmed)
+            return preview("credits.grant", { organizationId, ...body });
+        return ctx.fetch(`/internal/v1/organizations/${encodeURIComponent(organizationId)}/credit-adjustments`, { method: "POST", body });
+    },
+});

package/vendor/capabilities/capabilities/fleet.js

@@ -27,7 +27,8 @@ const nodesInput = z.object({
     facility_id: z.string().optional(),
     facilityId: z.string().optional(),
     status: z.string().optional(),
-    email: z.string().optional(),
+    reservation_id: z.string().optional(),
+    reservationId: z.string().optional(),
     cursor: z.string().optional(),
     max: z.number().int().positive().max(5000).optional(),
     limit: z.number().int().positive().max(5000).optional(),
@@ -113,7 +114,7 @@ export const listNodesCapability = defineCapability({
     id: "nodes.list",
     domain: "fleet",
     roles: ["user", "admin"],
-    description: "List nodes. Users see their own reserved machines. Admins see enrolled, ghost, and off-grid nodes. Call with no filters for the whole fleet. Optional email lists nodes for that user's organizations. Optional organization_id (supplier), facility_id, and status (ghost, off-grid, bare-metal) narrow the same list. Paginate large fleets with cursor + max: pass the response's next_cursor back as cursor to fetch the next page; next_cursor is omitted once the page is not full. Never invent nodes. Never print private keys.",
+    description: "List nodes. Users see their own reserved machines. Admins see enrolled, ghost, and off-grid nodes. Call with no filters for the whole fleet. Optional reservation_id lists the nodes on one reservation (find a customer's reservations with reservation.list customerId). Optional organization_id (supplier), facility_id, and status (ghost, off-grid, bare-metal) narrow the same list. Paginate large fleets with cursor + max: pass the response's next_cursor back as cursor to fetch the next page; next_cursor is omitted once the page is not full. Never invent nodes. Never print private keys.",
     mutation: "read",
     http: { method: "GET", path: "/nodes" },
     slack: {
@@ -128,9 +129,9 @@ export const listNodesCapability = defineCapability({
                     type: "string",
                     description: "Optional commerce facility UUID from facilities.list.",
                 },
-                email: {
+                reservation_id: {
                     type: "string",
-                    description: "Optional. List nodes for this user's organizations.",
+                    description: "Optional reservation UUID from reservation_list. Lists that reservation's nodes.",
                 },
                 status: {
                     type: "string",
@@ -162,7 +163,7 @@ export const listNodesCapability = defineCapability({
             organization_id: parsed.organization_id ?? parsed.organizationId,
             facility_id: parsed.facility_id ?? parsed.facilityId,
             status: parsed.status,
-            email: parsed.email,
+            reservation_id: parsed.reservation_id ?? parsed.reservationId,
             ...pagination,
         }), { method: "GET" });
     },

package/vendor/capabilities/capabilities/listings.js

@@ -267,7 +267,7 @@ export const createListingCapability = defineCapability({
                         : !facilityQuery ||
                             [
                                 facility.facilityId ?? facility.id,
-                                facility.slug,
+                                facility.region,
                                 facility.displayName ?? facility.display_name,
                             ].some((value) => value?.toLowerCase() === facilityQuery))));
                 cursor = response.nextCursor ?? undefined;

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

@@ -2,6 +2,8 @@ import { z } from "zod";
 import { preview, } from "../capability.js";
 /** CLI semantic arguments arrive as strings; MCP and Slack send JSON values. */
 export const positionals = z.array(z.string()).max(0).default([]);
+/** Integer micro-USD per GPU-hour (1000000 = $1.00). */
+export const microUsd = z.coerce.number().int().positive();
 export const flag = z.preprocess((value) => (value === "true" ? true : value === "false" ? false : value), z.boolean());
 export function seg(value) {
     return encodeURIComponent(value);