@ornncompute/cli 1.0.72 → 1.0.97

package/src/kubernetes-commands.mjs

@@ -1,3 +1,4 @@
+import { getReservation } from "../vendor/api-client/commerce.js";
 import { createHash } from "node:crypto";
 
 import {
@@ -8,7 +9,7 @@ import {
 import { isRecoverableWaitFailure } from "./interaction-runtime.mjs";
 import { waitForGoal as waitForReadGoal } from "./wait-runtime.mjs";
 import { gpuLabeler } from "./gpu-catalog.mjs";
-import { reservationLabeler } from "./machine-reference.mjs";
+import { listActiveReservations, reservationLabeler } from "./machine-reference.mjs";
 import { keyInputShapePreflight, keyPlanFromInput, materializeKey } from "./vm-commands.mjs";
 
 const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
@@ -51,8 +52,7 @@ function clusterNativeAccess(accessMode) {
   return accessMode === "slurm" ? "SSH login" : "kubeconfig";
 }
 function reservationAccessMode(value) {
-  const mode = cleanState(record(value).access_mode ?? record(value).accessMode);
-  return mode === "virtual-machine" ? "vm" : mode;
+  return text(record(value).provisioningType);
 }
 
 function clusterConnectCommand(cluster) {
@@ -736,17 +736,13 @@ async function waitForClusterGoal({
 }
 
 async function fetchReservation(fetch, runtime, reservationId, accessMode = "kubernetes") {
-  const reservation = record(
-    await fetch(`/v1/workflows/commerce/reservations/${encodeURIComponent(reservationId)}`, {
-      method: "GET",
-    })
-  );
-  if (text(reservation.id) !== reservationId) {
+  const reservation = record(await getReservation(fetch, reservationId));
+  if (text(reservation.reservationId) !== reservationId) {
     runtime.error("The gateway returned a different capacity reservation.", {
       code: "reservation_identity_changed",
     });
   }
-  const status = cleanState(reservation.status ?? reservation.state);
+  const status = cleanState(reservation.status);
   if (reservationAccessMode(reservation) !== accessMode) {
     runtime.error(
       `The selected capacity reservation is not reserved for ${clusterModeLabel(accessMode)}.`,
@@ -766,50 +762,6 @@ async function fetchReservation(fetch, runtime, reservationId, accessMode = "kub
   return reservation;
 }
 
-async function fetchActiveReservations(fetch, runtime) {
-  const reservations = [];
-  const seen = new Set();
-  let cursor;
-  for (let page = 0; page < 20; page += 1) {
-    const query = new URLSearchParams({ limit: "500", state: "active" });
-    if (cursor) query.set("cursor", cursor);
-    const payload = await fetch(`/v1/workflows/commerce/reservations?${query}`, {
-      method: "GET",
-    });
-    const source = record(payload);
-    const rows = Array.isArray(payload)
-      ? payload
-      : Array.isArray(source.reservations)
-        ? source.reservations
-        : null;
-    if (!rows) {
-      runtime.error("Capacity reservations returned an unsafe response.", {
-        code: "reservation_projection_invalid",
-      });
-    }
-    reservations.push(
-      ...rows.filter((value) => {
-        const reservation = record(value);
-        return (
-          UUID.test(text(reservation.id) ?? "") &&
-          cleanState(reservation.status ?? reservation.state) === "active"
-        );
-      })
-    );
-    const next = text(source.next_cursor);
-    if (!next) return reservations;
-    if (seen.has(next))
-      runtime.error("Capacity-reservation pagination did not advance.", {
-        code: "reservation_pagination_invalid",
-      });
-    seen.add(next);
-    cursor = next;
-  }
-  runtime.error("Capacity-reservation pagination exceeded its safety bound.", {
-    code: "reservation_pagination_invalid",
-  });
-}
-
 async function resolveLaunchReservation(context, runtime, input, accessMode) {
   const positionals = input.$positionals ?? [];
   if (positionals.length > 1) {
@@ -838,7 +790,7 @@ async function resolveLaunchReservation(context, runtime, input, accessMode) {
       field: "reservation",
     });
   }
-  const active = (await fetchActiveReservations(context.fetch, runtime)).filter(
+  const active = (await listActiveReservations(context, runtime)).filter(
     (reservation) => reservationAccessMode(reservation) === accessMode
   );
   if (active.length === 0) {
@@ -850,14 +802,14 @@ async function resolveLaunchReservation(context, runtime, input, accessMode) {
     );
   }
   if (active.length === 1) {
-    return fetchReservation(context.fetch, runtime, text(record(active[0]).id), accessMode);
+    return fetchReservation(context.fetch, runtime, text(active[0].reservationId), accessMode);
   }
   const reservationLabel = await reservationLabeler(context.fetch);
   const selected = await runtime.ask({
     label: "Capacity reservation",
     choices: active.flatMap((value) => {
       const reservation = record(value);
-      const id = text(reservation.id);
+      const id = text(reservation.reservationId);
       return id ? [{ label: reservationLabel(reservation), value: id }] : [];
     }),
   });
@@ -914,12 +866,6 @@ function clusterMachineLaunchPreflight(runtime, input, membershipCount) {
     });
   }
   if (runtime.eligibleHuman) return;
-  if (input.yes !== true) {
-    runtime.usage("--yes is required for automation after reviewing the exact intent.", {
-      code: "consent_required",
-      field: "yes",
-    });
-  }
   const references = requestedMachineReferences(input);
   if (membershipCount === null || references.length !== membershipCount) {
     runtime.usage("Automation requires --machines with exactly the --nodes membership count.", {
@@ -1130,7 +1076,7 @@ export async function launchClusterMode(
   const organization = await selectedOrganization(context, runtime);
   const keyPlan = accessMode === "slurm" ? await keyPlanFromInput(context, input, runtime) : null;
   const reservation = await resolveLaunchReservation(context, runtime, input, accessMode);
-  const reservationId = text(reservation.id);
+  const reservationId = text(reservation.reservationId);
   const initialExisting = await existingReservationCluster(
     context.fetch,
     runtime,
@@ -1257,47 +1203,13 @@ export async function launchClusterMode(
     accessMode
   );
   if (eligibilitySignature(reviewEligibility) !== eligibilitySignature(initialEligibility)) {
-    runtime.error(`${label} eligibility changed before review; no cluster was created.`, {
+    runtime.error(`${label} eligibility changed before launch; no cluster was created.`, {
       code: "cluster_eligibility_changed",
     });
   }
-  const confirmed = await runtime.review({
-    title: `Launch ${label} cluster`,
-    terms: [
-      { label: "Organization", value: `${organization.name} (${organization.id})` },
-      { label: "Capacity reservation", value: reservationId },
-      { label: "Access mode", value: label },
-      { label: "Network", value: networkMode },
-      ...(keyPlan
-        ? [
-            {
-              label: "SSH key",
-              value: `${text(reviewedKey.label) ?? "SSH key"} (${text(reviewedKey.fingerprint) ?? text(reviewedKey.id) ?? "new key"})`,
-            },
-          ]
-        : []),
-      { label: "Cluster membership", value: String(membershipCount) },
-      ...selected.map((machine, index) => ({
-        label: `Machine ${index + 1}`,
-        value: `${machine.hostname} (${machine.id})`,
-      })),
-      ...virtualMachineIds.map((virtualMachineId, index) => ({
-        label: `VM ${index + 1}`,
-        value: `${virtualMachineId} (SSH keys are set aside while it is in the cluster)`,
-      })),
-    ],
-  });
-  if (!confirmed) {
-    return runtime.result({
-      data: { created: false, requested },
-      exitCode: 1,
-      outcome: { class: "ended", phase: "declined" },
-      presentation: { lines: ["No cluster was created."] },
-    });
-  }
   const currentOrganization = await selectedOrganization(context, runtime);
   if (currentOrganization.id !== organization.id) {
-    runtime.error("The selected organization changed after review; no cluster was created.", {
+    runtime.error("The selected organization changed before launch; no cluster was created.", {
       code: "organization_changed",
       exitCode: 2,
     });
@@ -1312,20 +1224,20 @@ export async function launchClusterMode(
   if (racedExisting) {
     const current = await fetchClusterDetail(context.fetch, runtime, racedExisting);
     if (current.network_mode && current.network_mode !== networkMode) {
-      runtime.error(`A different ${label} network goal was accepted after review.`, {
+      runtime.error(`A different ${label} network goal was accepted before launch.`, {
         code: "cluster_launch_goal_conflict",
       });
     }
     const currentIds = memberIds(current);
     if (currentIds.length === 0) {
       if (current.lifecycle.phase !== "provisioning") {
-        runtime.error(`A non-recoverable empty ${label} cluster appeared after review.`, {
+        runtime.error(`A non-recoverable empty ${label} cluster appeared before launch.`, {
           code: "cluster_launch_goal_conflict",
         });
       }
     } else {
       if (!sameMembers(currentIds, goalIds)) {
-        runtime.error(`A different ${label} membership goal was accepted after review.`, {
+        runtime.error(`A different ${label} membership goal was accepted before launch.`, {
           code: "cluster_launch_goal_conflict",
         });
       }
@@ -1618,21 +1530,6 @@ async function addNode(input, deps) {
   if (!machine)
     deps.interaction.usage("Choose one exact eligible machine.", { code: "machine_not_eligible" });
   const goalIds = [...initialMembers, machine.id].sort();
-  const confirmed = await deps.interaction.review({
-    title: `Add ${clusterModeLabel(prepared.cluster.access_mode)} cluster node`,
-    terms: [
-      { label: "Cluster", value: prepared.cluster.id },
-      { label: "Machine", value: `${machine.hostname} (${machine.id})` },
-      { label: "Membership goal", value: String(goalIds.length) },
-    ],
-  });
-  if (!confirmed)
-    return deps.interaction.result({
-      data: { changed: false, cluster: prepared.cluster },
-      exitCode: 1,
-      outcome: { class: "ended", phase: "declined" },
-      presentation: { lines: ["Cluster membership was not changed."] },
-    });
   const current = await fetchClusterDetail(deps.fetch, deps.interaction, prepared.cluster);
   const currentIds = memberIds(current);
   if (sameMembers(currentIds, goalIds)) {
@@ -1643,7 +1540,7 @@ async function addNode(input, deps) {
     });
   }
   if (!sameMembers(currentIds, initialMembers)) {
-    deps.interaction.error("Cluster membership changed after review; no node was added.", {
+    deps.interaction.error("Cluster membership changed before adding the node.", {
       code: "cluster_membership_changed",
     });
   }
@@ -1654,7 +1551,7 @@ async function addNode(input, deps) {
     current.access_mode
   );
   if (eligibilitySignature(currentEligibility) !== eligibilitySignature(initialEligibility)) {
-    deps.interaction.error("Eligible machines changed after review; no node was added.", {
+    deps.interaction.error("Eligible machines changed before adding the node.", {
       code: "cluster_eligibility_changed",
     });
   }
@@ -1736,22 +1633,6 @@ async function removeNode(input, deps) {
       code: "cluster_member_not_found",
     });
   const goalIds = initialMembers.filter((id) => id !== machine.id);
-  const confirmed = await deps.interaction.review({
-    title: `Remove ${clusterModeLabel(prepared.cluster.access_mode)} cluster node`,
-    terms: [
-      { label: "Cluster", value: prepared.cluster.id },
-      { label: "Machine", value: `${machine.hostname} (${machine.id})` },
-      { label: "Membership goal", value: String(goalIds.length) },
-      { label: "Consequence", value: "Workloads and native access on this member stop." },
-    ],
-  });
-  if (!confirmed)
-    return deps.interaction.result({
-      data: { changed: false, cluster: prepared.cluster },
-      exitCode: 1,
-      outcome: { class: "ended", phase: "declined" },
-      presentation: { lines: ["Cluster membership was not changed."] },
-    });
   const current = await fetchClusterDetail(deps.fetch, deps.interaction, prepared.cluster);
   const currentIds = memberIds(current);
   if (sameMembers(currentIds, goalIds)) {
@@ -1762,7 +1643,7 @@ async function removeNode(input, deps) {
     });
   }
   if (!sameMembers(currentIds, initialMembers)) {
-    deps.interaction.error("Cluster membership changed after review; no node was removed.", {
+    deps.interaction.error("Cluster membership changed before removing the node.", {
       code: "cluster_membership_changed",
     });
   }
@@ -1836,29 +1717,9 @@ async function teardownCluster(input, deps) {
         });
   }
   const reviewedMembers = memberIds(reviewed);
-  const confirmed = await deps.interaction.review({
-    title: `Tear down ${clusterModeLabel(reviewed.access_mode)} cluster`,
-    terms: [
-      { label: "Cluster", value: reviewed.id },
-      { label: "Members", value: String(reviewedMembers.length) },
-      {
-        label: "Native access",
-        value: `${clusterNativeAccess(reviewed.access_mode)} access ends.`,
-      },
-      { label: "Capacity reservation", value: `${reviewed.reservation_id} remains active.` },
-      { label: "Charges", value: "Capacity charges continue after cluster teardown." },
-    ],
-  });
-  if (!confirmed)
-    return deps.interaction.result({
-      data: { changed: false, cluster: reviewed },
-      exitCode: 1,
-      outcome: { class: "ready", phase: "unchanged" },
-      presentation: { lines: ["The cluster remains active. Capacity charges continue."] },
-    });
   const current = await fetchClusterDetail(deps.fetch, deps.interaction, reviewed);
   if (!sameMembers(memberIds(current), reviewedMembers)) {
-    deps.interaction.error("Cluster membership changed after review; teardown was not submitted.", {
+    deps.interaction.error("Cluster membership changed before teardown was submitted.", {
       code: "cluster_membership_changed",
     });
   }
@@ -1901,44 +1762,25 @@ export async function executeKubernetesClusterCommand(command, input, deps) {
   return handler(input, deps);
 }
 
-function projectReservationFacts(value, expectedId, runtime) {
-  const reservation = record(value);
-  const id = text(reservation.id);
-  if (id !== expectedId) {
+export async function reservationFactsForCluster(fetch, runtime, cluster) {
+  const reservation = await getReservation(fetch, cluster.reservation_id);
+  if (reservation.reservationId !== cluster.reservation_id) {
     runtime.error("The gateway returned facts for a different capacity reservation.", {
       code: "reservation_identity_changed",
     });
   }
-  return {
-    id,
-    facility:
-      text(reservation.facility_name) ??
-      text(reservation.site_nickname) ??
-      text(reservation.facility),
-    hardware: text(reservation.gpu_type) ?? text(reservation.hardware),
-    machine_count: integer(reservation.node_count) ?? integer(reservation.machines),
-    region: text(reservation.region),
-  };
-}
-
-export async function reservationFactsForCluster(fetch, runtime, cluster) {
-  const payload = await fetch(
-    `/v1/workflows/commerce/reservations/${encodeURIComponent(cluster.reservation_id)}`,
-    { method: "GET" }
-  );
-  return projectReservationFacts(payload, cluster.reservation_id, runtime);
+  return reservation;
 }
 
 export function clusterFactLabel(cluster, reservation, gpuLabel) {
-  const location = reservation.facility ?? reservation.region ?? "location unknown";
-  const gpu = reservation.hardware ?? cluster.gpu_type;
+  const gpu = reservation.gpuSlug ?? (reservation.reservedGpuCount === 0 ? "cpu" : null);
   const hardware = gpu ? gpuLabel(gpu) : "hardware unknown";
   const nodeCount =
     integer(cluster.membership_count) ??
     integer(cluster.node_count) ??
     (Array.isArray(cluster.machines) ? cluster.machines.length : 0);
   const lifecycle = text(record(cluster.lifecycle).class) ?? text(cluster.state) ?? "unknown";
-  return `${location} · ${clusterModeLabel(cluster.access_mode)} · ${hardware} · ${nodeCount} nodes · ${lifecycle}`;
+  return `${clusterModeLabel(cluster.access_mode)} · ${hardware} · ${nodeCount} nodes · ${lifecycle}`;
 }
 const clusterConnectCandidatesCache = new WeakMap();
 

package/src/launch-mode-handlers.mjs

@@ -15,7 +15,6 @@ const COMMON_OPTIONS = [
   "reservation",
   "timeout",
   "wait",
-  "yes",
 ];
 const KEY_OPTIONS = ["key", "keyId", "label", "publicKey", "publicKeyFile"];
 const MODE_OPTIONS = new Map([

package/src/machine-reference.mjs

@@ -1,8 +1,7 @@
+import { listAllReservations } from "../vendor/api-client/commerce.js";
 import { gpuLabeler } from "./gpu-catalog.mjs";
 
 const CANONICAL_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-const PAGE_SIZE = 500;
-const MAX_RESERVATION_PAGES = 20;
 const TERMINAL_MACHINE_STATES = new Set([
   "canceled",
   "cancelled",
@@ -31,18 +30,12 @@ function rows(payload, field) {
 }
 
 function reservationId(value) {
-  const source = record(value);
-  return (
-    text(source.id) ??
-    text(source.ref) ??
-    text(source.reservation_id) ??
-    text(source.commerce_reservation_id)
-  );
+  return text(value.reservationId);
 }
 
 function reservationMode(value) {
   const source = record(value);
-  const mode = text(source.access_mode) ?? text(source.accessMode);
+  const mode = text(source.provisioningType);
   return mode?.toLowerCase() === "virtual-machine" ? "vm" : (mode?.toLowerCase() ?? null);
 }
 
@@ -63,21 +56,16 @@ function reservationModeLabel(value) {
 
 export function reservationChoiceLabel(value, gpuLabel) {
   const reservation = record(value);
-  const gpu = text(reservation.gpu_type);
-  const hardware = gpu ? gpuLabel(gpu) : (text(reservation.hardware) ?? "GPU capacity");
-  const quantity = Number(reservation.node_count ?? reservation.machine_count ?? 1);
+  // CPU capacity has no GPU type and no GPUs; the labeler names it CPU.
+  const gpu = text(reservation.gpuSlug) ?? (reservation.reservedGpuCount === 0 ? "cpu" : null);
+  const hardware = gpu ? gpuLabel(gpu) : "GPU capacity";
+  const quantity = reservation.reservedNodeCount;
   const machines = Number.isInteger(quantity) && quantity > 0 ? quantity : 1;
-  const location =
-    text(reservation.site_nickname) ??
-    text(reservation.facility) ??
-    text(reservation.location) ??
-    text(reservation.region) ??
-    "location unreported";
-  const start = text(reservation.start_at) ?? text(reservation.start_date);
-  const end = text(reservation.end_at) ?? text(reservation.end_date);
-  const createdAt = text(reservation.created_at);
+  const start = text(reservation.startsAt);
+  const end = text(reservation.endsAt);
+  const createdAt = text(reservation.createdAt);
   return [
-    `${hardware}, ${machines} machine${machines === 1 ? "" : "s"}, ${location}`,
+    `${hardware}, ${machines} machine${machines === 1 ? "" : "s"}`,
     reservationModeLabel(reservation),
     start && end ? `${start} to ${end}` : null,
     createdAt ? `reserved ${createdAt}` : null,
@@ -91,13 +79,6 @@ export async function reservationLabeler(fetch) {
   return (reservation) => reservationChoiceLabel(reservation, gpuLabel);
 }
 
-function isActiveDirectReservation(value) {
-  const source = record(value);
-  const status = (text(source.status) ?? text(source.state) ?? "").toLowerCase();
-  const mode = reservationMode(source);
-  return status === "active" && (!mode || mode === "vm" || mode === "bare-metal");
-}
-
 export function canonicalMachineId(value) {
   const source = record(value);
   return (
@@ -130,35 +111,31 @@ function invalidGateway(interaction, message) {
   });
 }
 
-export async function listActiveDirectReservations(context, interaction) {
-  const reservations = [];
-  const seen = new Set();
-  let cursor = null;
-  for (let page = 0; page < MAX_RESERVATION_PAGES; page += 1) {
-    const query = new URLSearchParams({ limit: String(PAGE_SIZE), status: "active" });
-    if (cursor) query.set("cursor", cursor);
-    const payload = await context.fetch(`/v1/workflows/commerce/reservations?${query}`, {
-      method: "GET",
+export async function listActiveReservations(context, interaction) {
+  const session = context.cli?.session
+    ? (await context.cli.session("context", {})).data
+    : await context.fetch("/v1/cli/session");
+  const customerId = text((session.selectedOrganization ?? session.selected_organization)?.id);
+  if (!customerId) {
+    interaction.usage("Select an organization before choosing a reservation.", {
+      code: "organization_required",
+      field: "organization",
     });
-    const pageRows = rows(payload, "reservations");
-    if (!pageRows)
-      invalidGateway(interaction, "The gateway returned an invalid capacity-reservation page.");
-    reservations.push(...pageRows.map(record).filter(isActiveDirectReservation));
-
-    const source = record(payload);
-    const next = text(source.next_cursor) ?? text(source.nextCursor);
-    if (!next || Array.isArray(payload)) return reservations;
-    if (seen.has(next)) {
-      invalidGateway(interaction, "Capacity-reservation pagination repeated a cursor.");
-    }
-    seen.add(next);
-    cursor = next;
   }
-  interaction.error("Machine resolution exceeded its bounded capacity-reservation search.", {
-    code: "resource_search_incomplete",
-    exitCode: 6,
-    retryable: true,
+  // Native Commerce permits staff to read all organizations. Customer pickers
+  // retain the selected-organization scope of the published CLI workflow.
+  const { reservations } = await listAllReservations(context.fetch, {
+    customerId,
+    status: "active",
   });
+  return reservations.filter((reservation) => reservation.status === "active");
+}
+
+export async function listActiveDirectReservations(context, interaction) {
+  return (await listActiveReservations(context, interaction)).filter(
+    ({ provisioningType }) =>
+      provisioningType === "virtual-machine" || provisioningType === "bare-metal"
+  );
 }
 
 export async function listOwnedActiveMachines(context, interaction) {