@ornncompute/cli 1.0.25 → 1.0.34

package/vendor/capabilities/capabilities/listings.js

@@ -1,7 +1,7 @@
+import { listSupplierOrganizations } from "../supplier-directory.js";
 import { z } from "zod";
 import { defineCapability, preview } from "../capability.js";
-import { bindHardwareFields, HARDWARE_LISTING_FIELDS, HARDWARE_LISTING_FILTERS, loadHardwareCatalog, projectCatalogTerms, } from "../spec-catalog.js";
-import { capacityOfferForecastVnext, executeCapacityOfferForecast } from "./capacity-offers.js";
+import { bindHardwareFields, HARDWARE_LISTING_FIELDS, HARDWARE_LISTING_FILTERS, loadHardwareCatalog, projectCatalogTerms, resolveCatalogTerm, } from "../spec-catalog.js";
 function queryPath(path, params) {
     const parts = [];
     for (const [key, value] of Object.entries(params)) {
@@ -11,8 +11,8 @@ function queryPath(path, params) {
     return parts.length ? `${path}?${parts.join("&")}` : path;
 }
 export const listingCreateInput = z.object({
-    operatorId: z.string().optional(),
-    operator_id: z.string().optional(),
+    organizationId: z.string().optional(),
+    organization_id: z.string().optional(),
     facilityId: z.string().optional(),
     facility_id: z.string().optional(),
     kind: z.enum(["gpu", "cpu", "node", "link"]).optional(),
@@ -31,7 +31,7 @@ export const listingCreateInput = z.object({
     node_count: z.number().int().optional(),
     gpus_per_node: z.number().int().optional(),
     site_nickname: z.string().optional(),
-    site_operator: z.string().optional(),
+    site_supplier: z.string().optional(),
     ram: z.string().optional(),
     storage: z.string().optional(),
     internet: z.string().optional(),
@@ -46,20 +46,24 @@ export const listingCreateInput = z.object({
         .describe("End of the availability window. YYYY-MM-DD or RFC3339."),
     available_from: z.string().optional().describe("Alias for available_start_at."),
     available_to: z.string().optional().describe("Alias for available_end_at."),
-    buy_now_price_per_gpu_hour: z.number().optional(),
-    cost_per_gpu_hour: z.number().optional(),
+    buy_now_price_per_gpu_hour: z
+        .number()
+        .optional()
+        .describe("Price buyers pay, USD per GPU-hour. The spread over cost_per_gpu_hour is Ornn's."),
+    cost_per_gpu_hour: z
+        .number()
+        .optional()
+        .describe("Supplier price, USD per GPU-hour. Defaults to the buy-now price (spread 0)."),
     deposit_percent: z.number().optional(),
+    down_payment_cents: z.number().int().nonnegative().optional(),
+    access_mode: z.enum(["bare-metal", "virtual-machine"]).optional(),
+    state: z.enum(["available", "internal"]).optional(),
     price_omitted: z.boolean().optional(),
     announce: z.boolean().optional(),
     text: z.string().optional(),
     confirm: z.boolean().optional(),
 });
 const catalogTermsInput = z.object({ kind: z.enum(["gpu", "cpu", "node", "link"]).optional() });
-export const listingForecastInput = z.object({
-    $positionals: z.array(z.string()).max(0).default([]),
-    limit: z.coerce.number().int().min(1).max(500).optional(),
-    cursor: z.string().min(1).optional(),
-});
 const slackListingCreateParams = {
     type: "object",
     properties: {
@@ -70,7 +74,7 @@ const slackListingCreateParams = {
         node_count: { type: "integer" },
         gpus_per_node: { type: "integer" },
         site_nickname: { type: "string" },
-        site_operator: { type: "string" },
+        site_supplier: { type: "string" },
         ram: { type: "string" },
         storage: { type: "string" },
         available_start_at: { type: "string" },
@@ -149,29 +153,19 @@ export const listListingsCapability = defineCapability({
         return ctx.fetch("/listings/available", { method: "GET", body: bound.payload });
     },
 });
-export const forecastListingsCapability = defineCapability({
-    id: "listings.forecast",
-    domain: "listings",
-    roles: ["user"],
-    description: "List the next 48 hourly availability buckets for customer-visible compute listings.",
-    mutation: "read",
-    http: { method: "GET", path: "/v1/workflows/commerce/listings/forecast" },
-    cli: {
-        command: ["capacity-offers", "forecast"],
-        vnext: capacityOfferForecastVnext,
-    },
-    slack: false,
-    input: listingForecastInput,
-    execute: async (ctx, input) => {
-        const parsed = listingForecastInput.parse(input);
-        if (ctx.cli?.interaction)
-            return executeCapacityOfferForecast(ctx, parsed);
-        return ctx.fetch(queryPath("/v1/workflows/commerce/listings/forecast", {
-            limit: parsed.limit?.toString(),
-            cursor: parsed.cursor,
-        }), { method: "GET" });
-    },
-});
+const MICRO_USD = 1_000_000;
+function microUsd(dollars) {
+    return Math.round(dollars * MICRO_USD);
+}
+/**
+ * A primary listing's down payment in cents, from a percentage of the buyer
+ * total over the window: price (micro-USD per GPU-hour) x GPUs x hours.
+ */
+export function primaryDownPaymentCents(terms) {
+    const hours = (Date.parse(terms.endsAt) - Date.parse(terms.startsAt)) / 3_600_000;
+    const totalCents = (terms.pricePerGpuHourMicroUsd * terms.nodeCount * terms.gpusPerNode * hours) / 10_000;
+    return Math.max(0, Math.round((totalCents * terms.percent) / 100));
+}
 /** Commerce parses listing windows as RFC3339 timestamps, not bare dates. */
 function rfc3339(value) {
     const trimmed = value.trim();
@@ -199,18 +193,27 @@ const LISTING_CREATE_INPUT_ONLY_KEYS = [
     "site",
     "kind",
     "confirm",
-    "operatorId",
-    "operator_id",
+    "organizationId",
+    "organization_id",
+    "site_supplier",
     "facilityId",
     "facility_id",
+    "buy_now_price_per_gpu_hour",
+    "cost_per_gpu_hour",
+    "deposit_percent",
+    "down_payment_cents",
+    "access_mode",
+    "state",
+    "price_omitted",
 ];
 export const createListingCapability = defineCapability({
     id: "listings.create",
     domain: "listings",
     roles: ["admin"],
-    description: "Create a marketplace listing. gpu_type, cpu, node_model, and fabric_type must exact-match an orchestrator catalog display name, canonical, or alias. CLI asks y/N. Slack never POSTs until a human replies confirm. MCP creates on this tool call.",
+    description: "Create a primary marketplace listing (admin). gpu_type, cpu, node_model, and fabric_type must exact-match an orchestrator catalog display name, canonical, or alias; gpu_type becomes the listing's GPU slug. " +
+        "cost_per_gpu_hour is the supplier price and buy_now_price_per_gpu_hour the price buyers pay; the difference is Ornn's spread. Nodes are attached afterwards. CLI asks y/N. Slack never POSTs until a human replies confirm. MCP creates on this tool call.",
     mutation: "preview-confirm",
-    http: { method: "POST", path: "/inventory" },
+    http: { method: "POST", path: "/commerce/listings" },
     slack: { parameters: slackListingCreateParams },
     input: listingCreateInput,
     execute: async (ctx, input) => {
@@ -225,135 +228,123 @@ export const createListingCapability = defineCapability({
         const bound = bindHardwareFields(hardware.terms, normalized, HARDWARE_LISTING_FIELDS);
         if (!bound.ok)
             return bound;
-        let operatorId = parsed.operatorId ?? parsed.operator_id;
+        let organizationId = parsed.organizationId ?? parsed.organization_id;
         let facilityId = parsed.facilityId ?? parsed.facility_id;
-        if (ctx.confirmed || parsed.site_operator || parsed.site_nickname || parsed.site) {
-            if (!operatorId) {
-                try {
-                    const opsResp = (await ctx.fetch("/provisioning/operators", { method: "GET" }));
-                    const ops = opsResp?.operators ?? [];
-                    const query = (parsed.site_operator ?? parsed.site ?? "").trim().toLowerCase();
-                    if (query) {
-                        const match = ops.find((o) => o.operatorId.toLowerCase() === query ||
-                            o.slug.toLowerCase() === query ||
-                            o.displayName.toLowerCase() === query);
-                        if (match)
-                            operatorId = match.operatorId;
-                    }
-                    if (!operatorId && ops.length > 0) {
-                        operatorId = ops[0].operatorId;
-                    }
-                }
-                catch {
-                    // Ignore fetch failure (e.g. in unit tests)
-                }
+        const supplierQuery = (parsed.site_supplier ?? "").trim().toLowerCase();
+        const facilityQuery = (parsed.site_nickname ?? parsed.site ?? "").trim().toLowerCase();
+        if (!organizationId && supplierQuery) {
+            const matches = (await listSupplierOrganizations(ctx.fetch)).filter((org) => org.id.toLowerCase() === supplierQuery || org.name.toLowerCase() === supplierQuery);
+            if (matches.length !== 1) {
+                return { ok: false, error: matches.length ? "ambiguous_supplier" : "supplier_not_found" };
             }
-            if (!facilityId) {
-                try {
-                    const facsResp = (await ctx.fetch("/provisioning/facilities", { method: "GET" }));
-                    const facs = facsResp?.facilities ?? [];
-                    const query = (parsed.site_nickname ?? parsed.site ?? "").trim().toLowerCase();
-                    if (query) {
-                        const match = facs.find((f) => f.facilityId.toLowerCase() === query ||
-                            f.slug.toLowerCase() === query ||
-                            f.displayName.toLowerCase() === query);
-                        if (match)
-                            facilityId = match.facilityId;
-                    }
-                    if (!facilityId && operatorId) {
-                        const match = facs.find((f) => f.operatorId === operatorId);
-                        if (match)
-                            facilityId = match.facilityId;
-                    }
-                    if (!facilityId && facs.length > 0) {
-                        facilityId = facs[0].facilityId;
+            organizationId = matches[0].id;
+        }
+        if ((facilityId && !organizationId) || (!facilityId && (facilityQuery || organizationId))) {
+            const matches = [];
+            const seenCursors = new Set();
+            let cursor;
+            do {
+                const response = (await ctx.fetch(queryPath("/provisioning/facilities", { cursor }), { method: "GET" }));
+                if (!Array.isArray(response.facilities))
+                    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.slug, facility.displayName ?? facility.display_name]
+                            .some((value) => value?.toLowerCase() === facilityQuery))));
+                cursor = response.nextCursor ?? undefined;
+                if (cursor) {
+                    if (seenCursors.has(cursor) || seenCursors.size >= 49) {
+                        throw new Error("facility catalog pagination did not complete");
                     }
+                    seenCursors.add(cursor);
                 }
-                catch {
-                    // Ignore fetch failure
-                }
+            } while (cursor);
+            if (matches.length !== 1) {
+                return { ok: false, error: matches.length ? "ambiguous_facility" : "facility_not_found" };
             }
+            facilityId = matches[0].facilityId ?? matches[0].id;
+            organizationId ??= matches[0].organizationId ?? matches[0].organization_id;
+            if (!facilityId || !organizationId)
+                return { ok: false, error: "invalid_facility_owner" };
         }
         // Every window alias resolves to the same pair, and both are normalized:
-        // commerce decodes startAt/endAt as time.Time, so a bare "2026-09-01"
+        // commerce decodes startsAt/endsAt as time.Time, so a bare "2026-09-01"
         // fails the whole request body rather than the one field.
-        const startAt = rfc3339(parsed.available_start_at ??
+        const startsAt = rfc3339(parsed.available_start_at ??
             parsed.available_from ??
             parsed.starts_after ??
             new Date().toISOString());
-        // `ends_before` is the window's closing bound and the counterpart of the
-        // `starts_after` the opening bound already accepts. Only `ends_after` was
-        // consulted here, so naming an end with `ends_before` was silently dropped
-        // and endAt fell back to the +30d default.
-        const endAt = rfc3339(parsed.available_end_at ??
+        const endsAt = rfc3339(parsed.available_end_at ??
             parsed.available_to ??
             parsed.ends_before ??
             parsed.ends_after ??
             new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString());
-        const capacityNodes = parsed.node_count ?? parsed.min_nodes ?? 1;
+        const nodeCount = parsed.node_count ?? parsed.min_nodes ?? 1;
         const gpusPerNode = parsed.gpus_per_node ?? 8;
-        const buyNowPrice = parsed.buy_now_price_per_gpu_hour;
-        const costPrice = parsed.cost_per_gpu_hour;
-        // `deposit_percent` and `price_omitted` were both declared on the schema and
-        // then never read, so they rode into the body under their own names and
-        // commerce ignored them: a deposit plan never took, and a listing whose
-        // source quoted no price still got the invented 1.00 floor below.
-        const depositPercent = parsed.deposit_percent;
-        const priceOmitted = parsed.price_omitted === true;
-        const floorRate = costPrice != null ? String(costPrice) : priceOmitted ? null : "1.00";
-        const { buy_now_price_per_gpu_hour: _, cost_per_gpu_hour: __, deposit_percent: ___, price_omitted: ____, ...boundPayload } = bound.payload;
-        const cleanPayload = Object.fromEntries(Object.entries(boundPayload).filter(([key]) => !LISTING_CREATE_INPUT_ONLY_KEYS.includes(key)));
-        const payload = {
-            backing_mode: "forward",
-            ...cleanPayload,
-            ...(operatorId ? { operatorId, operator_id: operatorId } : {}),
-            ...(facilityId ? { facilityId, facility_id: facilityId } : {}),
-            ...(operatorId
-                ? {
-                    startAt,
-                    start_at: startAt,
-                    endAt,
-                    end_at: endAt,
-                    capacityNodes,
-                    capacity_nodes: capacityNodes,
+        const boundPayload = bound.payload;
+        const draft = Object.fromEntries(Object.entries(boundPayload).filter(([key]) => !LISTING_CREATE_INPUT_ONLY_KEYS.includes(key)));
+        const gpuSlug = normalized.gpu_type
+            ? resolveCatalogTerm(hardware.terms, "gpu", normalized.gpu_type).canonical
+            : null;
+        const buyerPrice = parsed.buy_now_price_per_gpu_hour;
+        const supplierPrice = parsed.cost_per_gpu_hour ?? buyerPrice;
+        const supplierMicro = supplierPrice != null ? microUsd(supplierPrice) : null;
+        const buyerMicro = buyerPrice != null ? microUsd(buyerPrice) : supplierMicro;
+        if (supplierMicro != null && buyerMicro != null && buyerMicro < supplierMicro) {
+            return { ok: false, error: "price_below_supplier_price" };
+        }
+        const downPaymentCents = parsed.down_payment_cents ??
+            (parsed.deposit_percent != null && buyerMicro != null
+                ? primaryDownPaymentCents({
+                    pricePerGpuHourMicroUsd: buyerMicro,
+                    nodeCount,
                     gpusPerNode,
-                    gpus_per_node: gpusPerNode,
-                    currency: "USD",
-                    buyNowEnabled: buyNowPrice != null,
-                    buy_now_enabled: buyNowPrice != null,
-                    ...(buyNowPrice != null
-                        ? {
-                            buyNowRatePerGpuHour: String(buyNowPrice),
-                            buy_now_rate_per_gpu_hour: String(buyNowPrice),
-                        }
-                        : {}),
-                    ...(depositPercent != null
-                        ? {
-                            allowsDepositPlan: true,
-                            allows_deposit_plan: true,
-                            downPaymentPct: String(depositPercent),
-                            down_payment_pct: String(depositPercent),
-                        }
-                        : {}),
-                    bidEnabled: true,
-                    bid_enabled: true,
-                    // Commerce takes a null floor rate; only a stated cost becomes one.
-                    // The old 1.00 fallback published a floor nobody had quoted.
-                    ...(floorRate != null
-                        ? { floorRatePerGpuHour: floorRate, floor_rate_per_gpu_hour: floorRate }
-                        : {}),
-                }
-                : {}),
-        };
+                    startsAt,
+                    endsAt,
+                    percent: parsed.deposit_percent,
+                })
+                : 0);
+        const listing = organizationId && facilityId && gpuSlug && supplierMicro != null && buyerMicro != null
+            ? {
+                organizationId,
+                facilityId,
+                gpuSlug,
+                gpusPerNode,
+                accessMode: parsed.access_mode ?? "virtual-machine",
+                startsAt,
+                endsAt,
+                ...(typeof draft.cpu === "string" ? { cpu: draft.cpu } : {}),
+                ...(typeof draft.ram === "string" ? { ram: draft.ram } : {}),
+                ...(typeof draft.storage === "string" ? { storage: draft.storage } : {}),
+                ...(typeof draft.fabric_type === "string" ? { fabricType: draft.fabric_type } : {}),
+                ...(typeof draft.internet === "string" ? { internet: draft.internet } : {}),
+                ...(parsed.node_count ? { plannedNodeCount: parsed.node_count } : {}),
+                supplierPricePerGpuHourMicroUsd: supplierMicro,
+                spreadPerGpuHourMicroUsd: buyerMicro - supplierMicro,
+                downPaymentCents,
+                ...(parsed.state ? { state: parsed.state } : {}),
+            }
+            : null;
         if (!ctx.confirmed) {
-            return preview("create_listing", payload);
+            return preview("create_listing", {
+                ...draft,
+                node_count: nodeCount,
+                gpus_per_node: gpusPerNode,
+                ...(listing ? { listing } : {}),
+            });
+        }
+        if (!listing) {
+            return {
+                ok: false,
+                error: !organizationId || !facilityId ? "facility_required" : gpuSlug ? "price_required" : "gpu_required",
+            };
         }
-        return ctx.fetch("/inventory", { method: "POST", body: payload });
+        return ctx.fetch("/commerce/listings", { method: "POST", body: listing });
     },
 });
 export const listingCapabilities = [
     listCatalogTermsCapability,
     listListingsCapability,
-    forecastListingsCapability,
     createListingCapability,
 ];

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

@@ -0,0 +1,44 @@
+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([]);
+export const flag = z.preprocess((value) => (value === "true" ? true : value === "false" ? false : value), z.boolean());
+export function seg(value) {
+    return encodeURIComponent(value);
+}
+export function query(params) {
+    const parts = Object.entries(params)
+        .filter(([, value]) => value !== undefined && value !== null && String(value).trim() !== "")
+        .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
+    return parts.length > 0 ? `?${parts.join("&")}` : "";
+}
+/** Without a CLI runtime or a supplied key, the transport mints one per write. */
+export function idempotencyHeaders(ctx, supplied) {
+    const key = ctx.cli?.interaction?.idempotencyKey(supplied) ?? supplied?.trim();
+    return key ? { "Idempotency-Key": key } : undefined;
+}
+/**
+ * One consent gate for every surface: the CLI reviews the terms in the
+ * terminal (or takes `--yes`), MCP and Slack return a preview until the
+ * caller confirms. `null` means go ahead.
+ */
+export async function consent(ctx, action, title, terms, payload) {
+    const interaction = ctx.cli?.interaction;
+    if (interaction) {
+        if (await interaction.review({ title, terms }))
+            return null;
+        return interaction.result({
+            data: null,
+            errors: [{ code: "action_declined", message: "No changes were made.", retryable: false }],
+            exitCode: 1,
+            outcome: { class: "ended", phase: "declined" },
+            presentation: { lines: ["No changes were made."] },
+        });
+    }
+    return ctx.confirmed ? null : preview(action, payload);
+}
+export function microUsdLabel(value) {
+    return typeof value === "number" && Number.isFinite(value)
+        ? `$${(value / 1_000_000).toFixed(2)} per GPU-hour`
+        : "market";
+}