@ornncompute/cli 1.0.35 → 1.0.62

package/vendor/capabilities/capabilities/listings.js

@@ -46,22 +46,16 @@ 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()
-        .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)."),
+    buy_now_price_per_gpu_hour: z.number().optional().describe("Price buyers pay, USD per GPU-hour."),
     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(),
+    state: z.enum(["available", "draft"]).optional(),
     price_omitted: z.boolean().optional(),
     announce: z.boolean().optional(),
     text: z.string().optional(),
     confirm: z.boolean().optional(),
+    idempotencyKey: z.string().min(1).max(200).optional(),
 });
 const catalogTermsInput = z.object({ kind: z.enum(["gpu", "cpu", "node", "link"]).optional() });
 const slackListingCreateParams = {
@@ -80,7 +74,6 @@ const slackListingCreateParams = {
         available_start_at: { type: "string" },
         available_end_at: { type: "string" },
         buy_now_price_per_gpu_hour: { type: "number" },
-        cost_per_gpu_hour: { type: "number" },
         deposit_percent: { type: "number" },
         price_omitted: { type: "boolean" },
         announce: { type: "boolean" },
@@ -166,6 +159,23 @@ export function primaryDownPaymentCents(terms) {
     const totalCents = (terms.pricePerGpuHourMicroUsd * terms.nodeCount * terms.gpusPerNode * hours) / 10_000;
     return Math.max(0, Math.round((totalCents * terms.percent) / 100));
 }
+/** Shared native creation body for Slack's preview and human-confirmed write. */
+export function primaryListingBody(input, pricePerGpuHourMicroUsd, downPaymentCents) {
+    return {
+        ...input,
+        kind: "primary",
+        terms: [
+            {
+                type: "reserved",
+                minDurationHours: 1 / 3600,
+                maxDurationHours: (Date.parse(input.availableUntil) - Date.parse(input.availableAt)) / 3600000,
+                renewable: false,
+                pricePerGpuHourMicroUsd,
+                downPaymentCents,
+            },
+        ],
+    };
+}
 /** Commerce parses listing windows as RFC3339 timestamps, not bare dates. */
 function rfc3339(value) {
     const trimmed = value.trim();
@@ -193,13 +203,13 @@ const LISTING_CREATE_INPUT_ONLY_KEYS = [
     "site",
     "kind",
     "confirm",
+    "idempotencyKey",
     "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",
@@ -208,12 +218,13 @@ const LISTING_CREATE_INPUT_ONLY_KEYS = [
 ];
 export const createListingCapability = defineCapability({
     id: "listings.create",
+    mcp: false,
     domain: "listings",
     roles: ["admin"],
     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.",
+        "buy_now_price_per_gpu_hour is the customer price; deposit_percent is the upfront payment as a percentage of the full availability window. Nodes are attached afterwards. Slack never POSTs until a human replies confirm. MCP and CLI use native listing.create instead.",
     mutation: "preview-confirm",
-    http: { method: "POST", path: "/commerce/listings" },
+    http: { method: "POST", path: "/commerce/v2/listings" },
     slack: { parameters: slackListingCreateParams },
     input: listingCreateInput,
     execute: async (ctx, input) => {
@@ -244,14 +255,21 @@ export const createListingCapability = defineCapability({
             const seenCursors = new Set();
             let cursor;
             do {
-                const response = (await ctx.fetch(queryPath("/provisioning/facilities", { cursor }), { method: "GET" }));
+                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) &&
+                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))));
+                        : !facilityQuery ||
+                            [
+                                facility.facilityId ?? facility.id,
+                                facility.region,
+                                facility.displayName ?? facility.display_name,
+                            ].some((value) => value?.toLowerCase() === facilityQuery))));
                 cursor = response.nextCursor ?? undefined;
                 if (cursor) {
                     if (seenCursors.has(cursor) || seenCursors.size >= 49) {
@@ -274,12 +292,12 @@ export const createListingCapability = defineCapability({
         const startsAt = rfc3339(parsed.available_start_at ??
             parsed.available_from ??
             parsed.starts_after ??
-            new Date().toISOString());
+            new Date(Math.floor(Date.now() / 1000) * 1000).toISOString());
         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());
+            new Date(Math.floor(Date.now() / 1000) * 1000 + 30 * 24 * 60 * 60 * 1000).toISOString());
         const nodeCount = parsed.node_count ?? parsed.min_nodes ?? 1;
         const gpusPerNode = parsed.gpus_per_node ?? 8;
         const boundPayload = bound.payload;
@@ -288,12 +306,7 @@ export const createListingCapability = defineCapability({
             ? 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 buyerMicro = buyerPrice != null ? microUsd(buyerPrice) : null;
         const downPaymentCents = parsed.down_payment_cents ??
             (parsed.deposit_percent != null && buyerMicro != null
                 ? primaryDownPaymentCents({
@@ -305,26 +318,23 @@ export const createListingCapability = defineCapability({
                     percent: parsed.deposit_percent,
                 })
                 : 0);
-        const listing = organizationId && facilityId && gpuSlug && supplierMicro != null && buyerMicro != null
-            ? {
+        const listing = organizationId && facilityId && gpuSlug && buyerMicro != null
+            ? primaryListingBody({
                 organizationId,
                 facilityId,
                 gpuSlug,
                 gpusPerNode,
-                accessMode: parsed.access_mode ?? "virtual-machine",
-                startsAt,
-                endsAt,
+                provisioningType: parsed.access_mode ?? "virtual-machine",
+                availableAt: startsAt,
+                availableUntil: 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 } : {}),
-            }
+                capacityNodeCount: nodeCount,
+                state: parsed.state ?? "available",
+            }, buyerMicro, downPaymentCents)
             : null;
         if (!ctx.confirmed) {
             return preview("create_listing", {
@@ -337,10 +347,20 @@ export const createListingCapability = defineCapability({
         if (!listing) {
             return {
                 ok: false,
-                error: !organizationId || !facilityId ? "facility_required" : gpuSlug ? "price_required" : "gpu_required",
+                error: !organizationId || !facilityId
+                    ? "facility_required"
+                    : gpuSlug
+                        ? "price_required"
+                        : "gpu_required",
             };
         }
-        return ctx.fetch("/commerce/listings", { method: "POST", body: listing });
+        if (!parsed.idempotencyKey)
+            return { ok: false, error: "idempotency_key_required" };
+        return ctx.fetch("/commerce/v2/listings", {
+            method: "POST",
+            body: listing,
+            headers: { "Idempotency-Key": parsed.idempotencyKey },
+        });
     },
 });
 export const listingCapabilities = [

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);