@ornncompute/cli 1.0.75 → 1.0.107

package/src/slurm-commands.mjs

@@ -33,6 +33,17 @@ function commandText(invocation) {
   return [invocation.command, ...invocation.args].map(shellQuote).join(" ");
 }
 
+// Preserve the CLI result's summary; reads and picker state use Commerce JSON.
+function reservationSummary(reservation) {
+  return {
+    id: reservation.reservationId,
+    facility: null,
+    hardware: reservation.gpuSlug ?? (reservation.reservedGpuCount === 0 ? "cpu" : null),
+    machine_count: reservation.reservedNodeCount,
+    region: null,
+  };
+}
+
 function safeLogin(runtime, credentials, input) {
   const credentialType = text(credentials.credential_type);
   if (credentialType && credentialType !== "login-ssh") {
@@ -159,7 +170,7 @@ export function createSlurmConnectModeHandler({ spawnProcess = spawnProcessDefau
         return {
           action: retryConnectAction(prepared.cluster),
           data: {
-            capacity_reservation: prepared.capacityReservation,
+            capacity_reservation: reservationSummary(prepared.capacityReservation),
             cluster: prepared.cluster,
             private_transport: transport,
             ssh: null,
@@ -198,7 +209,7 @@ export function createSlurmConnectModeHandler({ spawnProcess = spawnProcessDefau
         user: login.user,
       };
       const data = {
-        capacity_reservation: prepared.capacityReservation,
+        capacity_reservation: reservationSummary(prepared.capacityReservation),
         cluster: prepared.cluster,
         private_transport: transport,
         ssh,

package/src/vm-commands.mjs

@@ -1,3 +1,4 @@
+import { getReservation } from "../vendor/api-client/commerce.js";
 import { spawn as spawnProcessDefault } from "node:child_process";
 import { createHash } from "node:crypto";
 import { readFile } from "node:fs/promises";
@@ -9,6 +10,7 @@ import { resolvedMountPath } from "./mount-commands.mjs";
 import {
   isReferenceMiss,
   listActiveDirectReservations,
+  listActiveReservations,
   listOwnedActiveMachines,
   reservationLabeler,
   resolveMachineReference,
@@ -70,14 +72,13 @@ function machineAccessMode(value) {
 
 function reservationAccessMode(value) {
   const reservation = record(value);
-  const mode =
-    (text(reservation.access_mode) ?? text(reservation.accessMode))?.toLowerCase() ?? null;
+  const mode = text(reservation.provisioningType)?.toLowerCase() ?? null;
   return mode === "virtual-machine" ? "vm" : mode;
 }
 
 function isDirectReservation(value) {
   const mode = reservationAccessMode(value);
-  return !mode || mode === "vm" || mode === "bare-metal";
+  return mode === "vm" || mode === "bare-metal";
 }
 
 function machineIsReady(value) {
@@ -424,7 +425,7 @@ async function selectedOrganization(context, interaction, expectedId) {
 
 function assertActiveReservation(value, expectedRef, interaction, expectedMode = null) {
   const reservation = record(value);
-  const ref = resourceId(reservation);
+  const ref = text(reservation.reservationId);
   if (!ref || ref !== expectedRef) {
     interaction.error("The gateway returned an unrelated capacity reservation.", {
       code: "reservation_correlation_changed",
@@ -463,7 +464,7 @@ async function resolveReservation(context, input, interaction, expectedMode = nu
   if (supplied) {
     const ref = requireCanonical(interaction, supplied, "reservation", "Capacity reservation");
     return assertActiveReservation(
-      await context.fetch(`/v1/workflows/commerce/reservations/${encodeURIComponent(ref)}`),
+      await getReservation(context.fetch, ref),
       ref,
       interaction,
       expectedMode
@@ -475,29 +476,23 @@ async function resolveReservation(context, input, interaction, expectedMode = nu
       field: "reservation",
     });
   }
-  const payload = await context.fetch("/v1/workflows/commerce/reservations?status=active&limit=50");
   const requestedMode = expectedMode ?? text(input.mode)?.toLowerCase() ?? null;
-  const candidates = (Array.isArray(payload) ? payload : (record(payload).reservations ?? []))
-    .map(record)
-    .filter(
-      (reservation) =>
-        (text(reservation.status) ?? "").toLowerCase() === ACTIVE_RESERVATION &&
-        resourceId(reservation) &&
-        (!requestedMode || reservationAccessMode(reservation) === requestedMode)
-    );
+  const candidates = (await listActiveReservations(context, interaction)).filter(
+    (reservation) => !requestedMode || reservationAccessMode(reservation) === requestedMode
+  );
   if (!candidates.length) {
     interaction.error("No active capacity reservation is eligible for launch.", {
       code: "no_active_reservation",
     });
   }
-  let ref = resourceId(candidates[0]);
+  let ref = text(candidates[0].reservationId);
   if (candidates.length > 1) {
     const reservationLabel = await reservationLabeler(context.fetch);
     ref = await interaction.ask({
       label: "Capacity reservation",
       choices: candidates.map((reservation) => ({
         label: reservationLabel(reservation),
-        value: resourceId(reservation),
+        value: text(reservation.reservationId),
       })),
     });
   }
@@ -506,7 +501,7 @@ async function resolveReservation(context, input, interaction, expectedMode = nu
       code: "missing_input",
     });
   return assertActiveReservation(
-    await context.fetch(`/v1/workflows/commerce/reservations/${encodeURIComponent(ref)}`),
+    await getReservation(context.fetch, ref),
     ref,
     interaction,
     expectedMode
@@ -1044,7 +1039,7 @@ export const vmLaunchModeHandler = {
     input = await normalizePublicKeyInput(input);
     const organization = await selectedOrganization(context, interaction);
     const reservation = await resolveReservation(context, input, interaction, "vm");
-    const reservationId = resourceId(reservation);
+    const reservationId = text(reservation.reservationId);
     const keyPlan = await keyPlanFromInput(context, input, interaction);
     const [reviewedMachines, reviewedRelationships] = await Promise.all([
       fetchMachines(context, reservationId),
@@ -1095,9 +1090,7 @@ export const vmLaunchModeHandler = {
 
     await selectedOrganization(context, interaction, organization.id);
     const currentReservation = assertActiveReservation(
-      await context.fetch(
-        `/v1/workflows/commerce/reservations/${encodeURIComponent(reservationId)}`
-      ),
+      await getReservation(context.fetch, reservationId),
       reservationId,
       interaction,
       "vm"
@@ -1348,15 +1341,13 @@ function reservationAllocationContext(value) {
   const reservation = record(value);
   return {
     term: {
-      start: text(reservation.start_at) ?? text(reservation.start),
-      end: text(reservation.end_at) ?? text(reservation.end),
+      start: text(reservation.startsAt),
+      end: text(reservation.endsAt),
     },
-    machine_count: Number.isSafeInteger(reservation.node_count)
-      ? reservation.node_count
-      : Number.isSafeInteger(reservation.machine_count)
-        ? reservation.machine_count
-        : null,
-    gpu_count: Number.isSafeInteger(reservation.gpu_count) ? reservation.gpu_count : null,
+    machine_count: reservation.reservedNodeCount,
+    gpu_count: Number.isSafeInteger(reservation.reservedGpuCount)
+      ? reservation.reservedGpuCount
+      : null,
   };
 }
 
@@ -1420,7 +1411,7 @@ function bareMetalIntentSignature(reservation, relationships) {
 }
 
 function bareMetalLaunchData(reservation, machine, key, relationships, waitPolicy, replayed) {
-  const reservationId = resourceId(reservation);
+  const reservationId = text(reservation.reservationId);
   const invocation = isSshReady(machine, key) ? sshInvocation(machine) : null;
   return {
     mode: "bare-metal",
@@ -1506,16 +1497,13 @@ function durableWorkspaceAllocation(reservation, interaction) {
   const endMilliseconds = Date.parse(end ?? "");
   const duration = endMilliseconds - startMilliseconds;
   const machineCount = allocation.machine_count;
-  const gpusPerMachine = Number.isSafeInteger(reservation.gpus_per_node)
-    ? reservation.gpus_per_node
-    : Number.isSafeInteger(reservation.gpus_per_machine)
-      ? reservation.gpus_per_machine
-      : null;
+  const gpusPerMachine = reservation.gpusPerNode;
   const gpuCount = Number.isSafeInteger(allocation.gpu_count)
     ? allocation.gpu_count
     : Number.isSafeInteger(machineCount) && Number.isSafeInteger(gpusPerMachine)
       ? machineCount * gpusPerMachine
       : null;
+  // CPU capacity has no GPUs; a workspace needs only its whole machines.
   if (
     !start ||
     !end ||
@@ -1523,9 +1511,7 @@ function durableWorkspaceAllocation(reservation, interaction) {
     !Number.isFinite(endMilliseconds) ||
     duration <= 0 ||
     !Number.isSafeInteger(machineCount) ||
-    machineCount < 1 ||
-    !Number.isSafeInteger(gpuCount) ||
-    gpuCount < 1
+    machineCount < 1
   ) {
     interaction.error("The active capacity reservation does not contain valid allocation facts.", {
       code: "reservation_allocation_incomplete",
@@ -1627,7 +1613,7 @@ function workspaceRelationshipConflict(facts, goal, interaction) {
 function durableWorkspaceSignature(reservation, key, facts, goal, interaction) {
   return JSON.stringify({
     capacity_reservation: {
-      id: resourceId(reservation),
+      id: text(reservation.reservationId),
       status: text(reservation.status),
       allocation: durableWorkspaceAllocation(reservation, interaction),
     },
@@ -1784,7 +1770,7 @@ async function launchDurableBareMetalWorkspace({
   keyPlan,
 }) {
   const id = workspaceId(input, interaction);
-  const reservationId = resourceId(reservation);
+  const reservationId = text(reservation.reservationId);
   if (keyPlan.kind !== "existing") {
     interaction.usage("A durable Bare Metal workspace requires a declared existing SSH key.", {
       code: "workspace_ssh_key_required",
@@ -1828,8 +1814,8 @@ async function launchDurableBareMetalWorkspace({
         value: `${allocation.term.start} to ${allocation.term.end} (${allocation.term.hours} hours)`,
       },
       {
-        label: "GPU quantity",
-        value: `${allocation.quantity.gpu_count} GPUs across ${allocation.quantity.machine_count} machine${allocation.quantity.machine_count === 1 ? "" : "s"}`,
+        label: "Quantity",
+        value: `${allocation.quantity.gpu_count > 0 ? `${allocation.quantity.gpu_count} GPUs` : "CPU"} across ${allocation.quantity.machine_count} machine${allocation.quantity.machine_count === 1 ? "" : "s"}`,
       },
       {
         label: "Creation",
@@ -1860,7 +1846,7 @@ async function launchDurableBareMetalWorkspace({
 
   await selectedOrganization(context, interaction, organization.id);
   const [currentReservationValue, currentKeyPlan, currentFacts] = await Promise.all([
-    context.fetch(`/v1/workflows/commerce/reservations/${encodeURIComponent(reservationId)}`),
+    getReservation(context.fetch, reservationId),
     keyPlanFromInput(context, input, interaction),
     workspaceResourceFacts(context, interaction, input, reservationId),
   ]);
@@ -2290,7 +2276,7 @@ export const bareMetalLaunchModeHandler = {
     input = await normalizePublicKeyInput(input);
     const organization = await selectedOrganization(context, interaction, resumeOrganizationId);
     const reservation = await resolveReservation(context, input, interaction, "bare-metal");
-    const reservationId = resourceId(reservation);
+    const reservationId = text(reservation.reservationId);
     const keyPlan = await keyPlanFromInput(context, input, interaction);
     if (durableWorkspace) {
       return launchDurableBareMetalWorkspace({
@@ -2358,7 +2344,7 @@ export const bareMetalLaunchModeHandler = {
 
     const [currentReservationValue, currentRelationships, existingAssigned, projectedMachines] =
       await Promise.all([
-        context.fetch(`/v1/workflows/commerce/reservations/${encodeURIComponent(reservationId)}`),
+        getReservation(context.fetch, reservationId),
         bareMetalRelationships(context, reservationId),
         fetchAssignedKeys(context, reservationId),
         fetchMachines(context, reservationId),
@@ -2740,9 +2726,7 @@ function createDirectMachineConnectModeHandler({
           code: "machine_correlation_failed",
         });
       }
-      const reservation = await context.fetch(
-        `/v1/workflows/commerce/reservations/${encodeURIComponent(reservationId)}`
-      );
+      const reservation = await getReservation(context.fetch, reservationId);
       if (!isDirectReservation(reservation)) return null;
       const privateTransportRequired = text(machine.network_mode) === "private";
       return {
@@ -3074,9 +3058,7 @@ async function resolveMachineCommandTarget(input, context, interaction, usage) {
       code: "machine_correlation_failed",
     });
   }
-  const reservation = await context.fetch(
-    `/v1/workflows/commerce/reservations/${encodeURIComponent(reservationId)}`
-  );
+  const reservation = await getReservation(context.fetch, reservationId);
   if (!isDirectReservation(reservation)) {
     interaction.error(
       "The selected machine belongs to a cluster rather than the direct-machine lifecycle.",
@@ -3331,19 +3313,19 @@ async function guidedSwitchReservation(context, interaction) {
       code: "no_active_reservation",
     });
   }
-  let reference = resourceId(reservations[0]);
+  let reference = text(reservations[0].reservationId);
   if (reservations.length > 1) {
     const reservationLabel = await reservationLabeler(context.fetch);
     reference = await interaction.ask({
       label: "Capacity reservation",
       choices: reservations.map((reservation) => ({
         label: reservationLabel(reservation),
-        value: resourceId(reservation),
+        value: text(reservation.reservationId),
       })),
     });
   }
   return assertActiveReservation(
-    await context.fetch(`/v1/workflows/commerce/reservations/${encodeURIComponent(reference)}`),
+    await getReservation(context.fetch, reference),
     reference,
     interaction
   );
@@ -3380,14 +3362,12 @@ async function switchMachine(input, context, interaction) {
   }
   const reservation = suppliedReservation
     ? assertActiveReservation(
-        await context.fetch(
-          `/v1/workflows/commerce/reservations/${encodeURIComponent(suppliedReservation)}`
-        ),
+        await getReservation(context.fetch, suppliedReservation),
         suppliedReservation,
         interaction
       )
     : await guidedSwitchReservation(context, interaction);
-  const reservationId = resourceId(reservation);
+  const reservationId = text(reservation.reservationId);
   if (!isDirectReservation(reservation)) {
     interaction.error("machines switch accepts only a direct VM or Bare Metal reservation.", {
       code: "reservation_not_direct",
@@ -3496,7 +3476,7 @@ async function switchMachine(input, context, interaction) {
   }
   const [currentReservationValue, currentMachines, currentRelationships, currentKeys] =
     await Promise.all([
-      context.fetch(`/v1/workflows/commerce/reservations/${encodeURIComponent(reservationId)}`),
+      getReservation(context.fetch, reservationId),
       fetchMachines(context, reservationId),
       bareMetalRelationships(context, reservationId),
       fetchAssignedKeys(context, reservationId),