@ornncompute/cli 1.0.72 → 1.0.97

package/src/mount-commands.mjs

@@ -640,7 +640,7 @@ async function show(input, runtime, command) {
   return mountResult(runtime.interaction, await fetchMount(runtime, reservationId), reservationId);
 }
 
-export async function attachVolumeMount(input, runtime, { skipReview = false } = {}) {
+export async function attachVolumeMount(input, runtime) {
   const [rawReservation] = positionals(
     input,
     1,
@@ -684,50 +684,23 @@ export async function attachVolumeMount(input, runtime, { skipReview = false } =
       }
     );
   }
-  if (!skipReview) {
-    const accepted = await runtime.interaction.review({
-      title: "Attach managed volume",
-      terms: [
-        { label: "Capacity reservation", value: reservationId },
-        { label: "Managed volume", value: `${projectedVolume.name} (${projectedVolume.id})` },
-        { label: "Access", value: access },
-        { label: "Machine scope", value: "Every machine in the reservation" },
-        {
-          label: "Volume lifecycle",
-          value: "The volume remains independent from this relationship",
-        },
-      ],
-      prompt: "Attach this volume?",
+  const refreshedVolume = safeVolume(await resolveVolume(runtime, projectedVolume.id));
+  if (refreshedVolume.id !== projectedVolume.id || refreshedVolume.name !== projectedVolume.name) {
+    runtime.interaction.error("The selected managed volume changed before attachment.", {
+      code: "volume_selection_changed",
+    });
+  }
+  current = await fetchMount(runtime, reservationId);
+  if (current && ["detached", "ended"].includes(current.lifecycle.phase)) current = null;
+  if (mountSatisfied(current, goal)) {
+    return wait && !mountReady(current)
+      ? waitForMount(input, runtime, reservationId, current, "volume-mounts attach")
+      : mountResult(runtime.interaction, current, reservationId, { replayed: true });
+  }
+  if (current) {
+    runtime.interaction.error("The volume-mount relationship changed before attachment.", {
+      code: "volume_mount_conflict",
     });
-    if (!accepted) {
-      return runtime.interaction.result({
-        errors: [{ code: "declined", message: "Volume attachment declined.", retryable: false }],
-        exitCode: 1,
-        outcome: { class: "ended", phase: "declined" },
-        presentation: { lines: ["Volume attachment declined. No relationship was created."] },
-      });
-    }
-    const refreshedVolume = safeVolume(await resolveVolume(runtime, projectedVolume.id));
-    if (
-      refreshedVolume.id !== projectedVolume.id ||
-      refreshedVolume.name !== projectedVolume.name
-    ) {
-      runtime.interaction.error("The selected managed volume changed after review.", {
-        code: "volume_selection_changed",
-      });
-    }
-    current = await fetchMount(runtime, reservationId);
-    if (current && ["detached", "ended"].includes(current.lifecycle.phase)) current = null;
-    if (mountSatisfied(current, goal)) {
-      return wait && !mountReady(current)
-        ? waitForMount(input, runtime, reservationId, current, "volume-mounts attach")
-        : mountResult(runtime.interaction, current, reservationId, { replayed: true });
-    }
-    if (current) {
-      runtime.interaction.error("The volume-mount relationship changed after review.", {
-        code: "volume_mount_conflict",
-      });
-    }
   }
 
   try {
@@ -805,7 +778,7 @@ async function waitCommand(input, runtime, command) {
   );
 }
 
-export async function detachVolumeMount(input, runtime, { skipReview = false } = {}) {
+export async function detachVolumeMount(input, runtime) {
   const [rawReservation] = positionals(
     input,
     1,
@@ -831,42 +804,13 @@ export async function detachVolumeMount(input, runtime, { skipReview = false } =
       },
     });
   }
-  if (!skipReview) {
-    const accepted = await runtime.interaction.review({
-      title: "Detach managed volume",
-      terms: [
-        { label: "Capacity reservation", value: reservationId },
-        {
-          label: "Managed volume",
-          value: `${current.volume.name ?? "Managed volume"} (${current.volume.id})`,
-        },
-        {
-          label: "Mounted machines",
-          value: `${current.readiness.ready} of ${current.readiness.expected}`,
-        },
-        {
-          label: "Consequence",
-          value: "Mounted access ends; the managed volume and its data remain",
-        },
-      ],
-      prompt: "Detach this volume?",
+  const refreshed = await fetchMount(runtime, reservationId);
+  if (!refreshed || refreshed.id !== current.id || refreshed.volume.id !== current.volume.id) {
+    runtime.interaction.error("The volume-mount relationship changed before detachment.", {
+      code: "volume_mount_changed",
     });
-    if (!accepted) {
-      return runtime.interaction.result({
-        errors: [{ code: "declined", message: "Volume detachment declined.", retryable: false }],
-        exitCode: 1,
-        outcome: { class: "ended", phase: "declined" },
-        presentation: { lines: ["Volume detachment declined. No relationship was changed."] },
-      });
-    }
-    const refreshed = await fetchMount(runtime, reservationId);
-    if (!refreshed || refreshed.id !== current.id || refreshed.volume.id !== current.volume.id) {
-      runtime.interaction.error("The volume-mount relationship changed after review.", {
-        code: "volume_mount_changed",
-      });
-    }
-    current = refreshed;
   }
+  current = refreshed;
   try {
     await runtime.fetch(reservationAttachmentPath(reservationId), {
       method: "DELETE",
@@ -933,28 +877,10 @@ async function deployFilesystem(input, runtime) {
       ? waitForMount(input, runtime, reservationId, current, "filesystems deploy")
       : mountResult(runtime.interaction, current, reservationId, { replayed: true });
   }
-  const accepted = await runtime.interaction.review({
-    title: "Deploy managed filesystem",
-    terms: [
-      { label: "Capacity reservation", value: reservationId },
-      { label: "Performance tier", value: performanceTier },
-      { label: "Capacity", value: `${capacityGib} GiB` },
-      { label: "Readiness", value: "Reported independently for every machine" },
-    ],
-    prompt: "Deploy this filesystem?",
-  });
-  if (!accepted) {
-    return runtime.interaction.result({
-      errors: [{ code: "declined", message: "Filesystem deployment declined.", retryable: false }],
-      exitCode: 1,
-      outcome: { class: "ended", phase: "declined" },
-      presentation: { lines: ["Filesystem deployment declined. No deployment was created."] },
-    });
-  }
   current = await fetchMount(runtime, reservationId);
   if (current && ["detached", "ended"].includes(current.lifecycle.phase)) current = null;
   if (current && !filesystemSatisfied(current, performanceTier, capacityGib)) {
-    runtime.interaction.error("The managed filesystem relationship changed after review.", {
+    runtime.interaction.error("The managed filesystem relationship changed before deployment.", {
       code: "filesystem_deployment_conflict",
     });
   }
@@ -1032,41 +958,9 @@ async function deleteFilesystem(input, runtime) {
       },
     });
   }
-  const accepted = await runtime.interaction.review({
-    title: "Delete managed filesystem deployment",
-    terms: [
-      { label: "Capacity reservation", value: reservationId },
-      {
-        label: "Managed volume",
-        value: `${current.volume.name ?? "Managed volume"} (${current.volume.id})`,
-      },
-      {
-        label: "Mounted machines",
-        value: `${current.readiness.ready} of ${current.readiness.expected}`,
-      },
-      {
-        label: "Consequence",
-        value: "Filesystem access ends; the managed volume and its data remain",
-      },
-    ],
-    prompt: "Delete this filesystem deployment?",
-  });
-  if (!accepted) {
-    return runtime.interaction.result({
-      data: {
-        filesystem_deployment: current,
-        reservation_id: reservationId,
-        volume_preserved: current.volume,
-      },
-      errors: [{ code: "declined", message: "Filesystem deletion declined.", retryable: false }],
-      exitCode: 1,
-      outcome: { class: "ended", phase: "declined" },
-      presentation: { lines: ["Filesystem deletion declined. No relationship was changed."] },
-    });
-  }
   const refreshed = await fetchMount(runtime, reservationId);
   if (!refreshed || refreshed.id !== current.id || refreshed.volume.id !== current.volume.id) {
-    runtime.interaction.error("The managed filesystem relationship changed after review.", {
+    runtime.interaction.error("The managed filesystem relationship changed before deletion.", {
       code: "filesystem_deployment_changed",
     });
   }

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/storage-commands.mjs

@@ -21,11 +21,6 @@ import {
 const DEFAULT_PAGE_LIMIT = 50;
 const MAX_PAGE_LIMIT = 500;
 const STORAGE_PREFIX = "/nodes/storage-drives";
-const UNSAFE_CONTENT_COMMANDS = new Set([
-  "storage.volumes.clear",
-  "storage.volumes.files.delete",
-  "storage.volumes.folders.delete",
-]);
 
 /**
  * Narrow CLI adapter expected by executeStorageCommand:
@@ -381,48 +376,11 @@ export async function resolveVolume(runtime, reference) {
   return resolveFromRows(await fetchDrives(runtime), reference);
 }
 
-async function review(runtime, options) {
-  const accepted = await runtime.interaction.review(options);
-  if (accepted !== false) return null;
-  return runtime.interaction.result({
-    data: null,
-    exitCode: 1,
-    outcome: { class: "ended", phase: "declined" },
-  });
-}
-
-async function unsafeReview(command, input, runtime, reference, remotePath) {
-  if (!UNSAFE_CONTENT_COMMANDS.has(command)) return null;
-  const title =
-    command === "storage.volumes.clear"
-      ? "Clear volume contents"
-      : command === "storage.volumes.files.delete"
-        ? "Delete volume file"
-        : "Delete volume folder";
-  const terms = [
-    { label: "Volume", value: reference },
-    ...(remotePath ? [{ label: "Remote path", value: remotePath }] : []),
-    {
-      label: "Consequence",
-      value:
-        command === "storage.volumes.clear"
-          ? "Every file and folder will be permanently deleted"
-          : "The selected content will be permanently deleted",
-    },
-  ];
-  return review(runtime, {
-    prompt: "Continue?",
-    requireLive: true,
-    terms,
-    title,
-  });
-}
-
 async function createVolume(input, runtime) {
   positionals(
     input,
     0,
-    "Usage: ornn volumes create --name <name> [--source <volume>] [--yes] [--idempotency-key <key>]"
+    "Usage: ornn volumes create --name <name> [--source <volume>] [--idempotency-key <key>]"
   );
   requireMachineMutationKey(input, runtime);
   const name = normalizeVolumeName(input.name);
@@ -439,21 +397,6 @@ async function createVolume(input, runtime) {
       { code: "volume_name_ambiguous", field: "name" }
     );
   }
-  const declined = await review(runtime, {
-    prompt: "Create this volume?",
-    terms: [
-      { label: "Volume name", value: name },
-      { label: "Source", value: source ? String(source.id) : "empty volume" },
-      {
-        label: "Consequence",
-        value: source
-          ? "Create a durable managed volume copied from the selected source"
-          : "Create an empty durable managed volume",
-      },
-    ],
-    title: "Create volume",
-  });
-  if (declined) return declined;
   if (matches.length === 1) {
     const existing = matches[0];
     const existingSource = existing?.source_drive_id ?? existing?.source?.source_drive_id ?? null;
@@ -550,8 +493,6 @@ async function showVolume(input, runtime, { refresh = false } = {}) {
 
 async function clearVolume(input, runtime) {
   const [reference] = positionals(input, 1, "Usage: ornn volumes clear <volume>");
-  const declined = await unsafeReview("storage.volumes.clear", input, runtime, reference);
-  if (declined) return declined;
   const drive = await resolveVolume(runtime, reference);
   try {
     const payload = await runtime.fetch(
@@ -590,15 +531,6 @@ async function clearVolume(input, runtime) {
 async function deleteVolume(input, runtime) {
   const [reference] = positionals(input, 1, "Usage: ornn volumes delete <volume>");
   requireMachineMutationKey(input, runtime);
-  const declined = await review(runtime, {
-    prompt: "Delete this volume?",
-    terms: [
-      { label: "Volume", value: reference },
-      { label: "Consequence", value: "The volume and all data in it will be permanently deleted" },
-    ],
-    title: "Delete volume",
-  });
-  if (declined) return declined;
   const drive = await resolveVolume(runtime, reference);
   try {
     await runtime.fetch(
@@ -802,7 +734,7 @@ async function uploadFile(input, runtime) {
   const [reference, localFile] = positionals(
     input,
     2,
-    "Usage: ornn volumes files upload <volume> <local-file> [--path <remote-path>] [--content-type <type>] [--yes] [--idempotency-key <key>]"
+    "Usage: ornn volumes files upload <volume> <local-file> [--path <remote-path>] [--content-type <type>] [--idempotency-key <key>]"
   );
   requireMachineMutationKey(input, runtime);
   let fileInfo;
@@ -825,21 +757,6 @@ async function uploadFile(input, runtime) {
     ? requiredText(input.contentType, "--content-type")
     : "application/octet-stream";
   const drive = await resolveVolume(runtime, reference);
-  const declined = await review(runtime, {
-    prompt: "Upload this file?",
-    terms: [
-      { label: "Volume", value: `${drive.name} (${drive.id})` },
-      { label: "Local file", value: localFile },
-      { label: "Remote path", value: remotePath },
-      { label: "Bytes", value: String(fileInfo.size) },
-      {
-        label: "Consequence",
-        value: "Create or replace the selected path in the managed volume",
-      },
-    ],
-    title: "Upload volume file",
-  });
-  if (declined) return declined;
   const requestHash = createHash("sha256");
   for await (const chunk of createReadStream(localFile)) requestHash.update(chunk);
   const sha256 = requestHash.digest("hex");
@@ -1032,8 +949,6 @@ async function deleteContent(command, input, runtime) {
     `Usage: ornn volumes ${kind === "file" ? "files" : "folders"} delete <volume> <remote-path>`
   );
   const remotePath = normalizeRemotePath(rawRemotePath);
-  const declined = await unsafeReview(command, input, runtime, reference, remotePath);
-  if (declined) return declined;
   const drive = await resolveVolume(runtime, reference);
   const endpoint = computeEndpoint(
     `${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}/${kind}s/${encodedRemotePath(remotePath)}`