@ornncompute/cli 1.0.34 → 1.0.48

package/src/admin-shell.mjs

@@ -156,6 +156,24 @@ function positiveInteger(value, name, maximum) {
   return parsed;
 }
 
+function nonnegativeInteger(value, name) {
+  if (value === undefined) return undefined;
+  const parsed = Number(value);
+  if (!Number.isSafeInteger(parsed) || parsed < 0) {
+    throw new AdminUsageError(`--${name} must be a non-negative integer.`, {
+      field: name,
+    });
+  }
+  return parsed;
+}
+
+function booleanOption(value, name) {
+  if (value === undefined) return undefined;
+  if (value === "true") return true;
+  if (value === "false") return false;
+  throw new AdminUsageError(`--${name} must be true or false.`, { field: name });
+}
+
 function parseAdminInput(capability, argv) {
   const command = vnextCommand(capability).join(" ");
   const help = capability.cli.vnext;
@@ -167,22 +185,32 @@ function parseAdminInput(capability, argv) {
     throw new AdminUsageError(usage);
   }
 
-  const limit = positiveInteger(options.limit, "limit", MAX_PAGE_LIMIT) ?? DEFAULT_PAGE_LIMIT;
+  const offsetPagination = ["users.list", "organization.list"].includes(capability.id);
+  const limit = positiveInteger(
+    options.limit,
+    "limit",
+    offsetPagination ? 100 : MAX_PAGE_LIMIT
+  ) ?? (offsetPagination ? 25 : DEFAULT_PAGE_LIMIT);
   const input = {};
   if (nodeCommand) input.node_id = positionals[0];
   if (options.supplier) input.organization_id = options.supplier;
+  if (options.organization && ["users.list", "organization.invite"].includes(capability.id)) {
+    input.organization_id = options.organization;
+  }
   if (options.facility) input.facility_id = options.facility;
   if (options.status) input.status = options.status;
   if (options.email) input.email = options.email;
-  if (options.organization) input.organization = options.organization;
-  if (options.name) input.name = options.name;
+  if (options.query) input.q = options.query;
+  if (options.role) input.role = options.role;
+  const approved = booleanOption(options.approved, "approved");
+  if (approved !== undefined) input.approved = approved;
+  if (options.ids) input.ids = options.ids.split(",");
   if (options.span) input.span = options.span;
   if (options.start) input.start = options.start;
   if (options.end) input.end = options.end;
   if (options.before) input.before = options.before;
   if (options.stream) input.stream = options.stream;
   if (options.cursor && command === "admin nodes logs") input.cursor = options.cursor;
-  if (command === "admin users search") input.max = 1000;
   const maxPoints = positiveInteger(options["max-points"], "max-points", 500);
   if (maxPoints !== undefined) input.max_points = maxPoints;
   const count = positiveInteger(options.count, "count", 500);
@@ -191,10 +219,20 @@ function parseAdminInput(capability, argv) {
   if (command === "admin nodes logs") return parseLogPage(input);
 
   const ownerPagination = ["facilities.list", "nodes.list"].includes(capability.id);
+  const explicitOffset = nonnegativeInteger(options.offset, "offset");
   if (ownerPagination) {
     input.limit = limit;
     if (options.cursor) input.cursor = options.cursor;
   }
+  if (offsetPagination) {
+    if (explicitOffset !== undefined && options.cursor) {
+      throw new AdminUsageError("--offset and --cursor cannot be used together.", {
+        field: "offset",
+      });
+    }
+    input.limit = limit;
+    input.offset = explicitOffset ?? decodeCursor(command, options.cursor);
+  }
 
   return {
     input,
@@ -202,6 +240,8 @@ function parseAdminInput(capability, argv) {
       cursor: options.cursor,
       limit,
       ownerPagination,
+      ownerOffsetPagination: offsetPagination,
+      offset: input.offset,
     },
   };
 }
@@ -281,7 +321,16 @@ function collectionKey(capability) {
   if (root === "nodes" && leaf === "logs") return "logs";
   if (!["list", "search"].includes(leaf)) return null;
   if (root === "enrollment-tokens") return "enrollment_tokens";
-  return ["facilities", "nodes", "reservations", "suppliers", "users"].includes(root) ? root : null;
+  return [
+    "facilities",
+    "nodes",
+    "organizations",
+    "reservations",
+    "suppliers",
+    "users",
+  ].includes(root)
+    ? root
+    : null;
 }
 
 function isSensitiveAdminField(key) {
@@ -337,21 +386,36 @@ function encodeCursor(command, offset) {
 
 function decodeCursor(command, cursor) {
   if (!cursor) return 0;
+  let decoded;
   try {
-    const decoded = JSON.parse(Buffer.from(cursor, "base64url").toString("utf8"));
-    if (decoded.command === command && Number.isInteger(decoded.offset) && decoded.offset >= 0) {
-      return decoded.offset;
-    }
-    if (decoded.command !== undefined || decoded.offset !== undefined) {
-      throw new AdminUsageError("The pagination cursor belongs to a different admin command.", {
-        code: "invalid_cursor",
-        field: "cursor",
-      });
-    }
-  } catch (error) {
-    if (error instanceof AdminUsageError) throw error;
+    const bytes = Buffer.from(cursor, "base64url");
+    if (bytes.toString("base64url") !== cursor) throw new Error("invalid base64url");
+    decoded = JSON.parse(bytes.toString("utf8"));
+  } catch {
+    throw new AdminUsageError("The pagination cursor is invalid.", {
+      code: "invalid_cursor",
+      field: "cursor",
+    });
+  }
+  if (!decoded || typeof decoded !== "object" || Array.isArray(decoded)) {
+    throw new AdminUsageError("The pagination cursor is invalid.", {
+      code: "invalid_cursor",
+      field: "cursor",
+    });
+  }
+  if (decoded.command !== command) {
+    throw new AdminUsageError("The pagination cursor belongs to a different admin command.", {
+      code: "invalid_cursor",
+      field: "cursor",
+    });
+  }
+  if (!Number.isSafeInteger(decoded.offset) || decoded.offset < 0) {
+    throw new AdminUsageError("The pagination cursor has an invalid offset.", {
+      code: "invalid_cursor",
+      field: "cursor",
+    });
   }
-  return 0;
+  return decoded.offset;
 }
 
 export function finalizeAdminResult(capability, payload, pagination) {
@@ -362,18 +426,27 @@ export function finalizeAdminResult(capability, payload, pagination) {
   const rows = collectionRows(payload, key);
   const offset = pagination.ownerPagination
     ? 0
-    : pagination.logQuery
+    : pagination.logQuery || pagination.ownerOffsetPagination
       ? pagination.offset
       : decodeCursor(command, pagination.cursor);
   const selected = (
-    pagination.ownerPagination ? rows : rows.slice(offset, offset + pagination.limit)
+    pagination.ownerPagination || pagination.ownerOffsetPagination
+      ? rows
+      : rows.slice(offset, offset + pagination.limit)
   ).map(sanitizeAdminValue);
+  const ownerNextOffset =
+    pagination.ownerOffsetPagination && payload && !Array.isArray(payload)
+      ? payload.next_offset
+      : undefined;
   const ownerNextCursor =
     payload && !Array.isArray(payload)
       ? (payload.next_cursor ?? payload.nextCursor ?? payload.page?.next_cursor ?? null)
       : null;
-  let nextCursor =
-    !pagination.ownerPagination && offset + selected.length < rows.length
+  let nextCursor = pagination.ownerOffsetPagination
+    ? Number.isSafeInteger(ownerNextOffset) && ownerNextOffset > offset
+      ? encodeCursor(command, ownerNextOffset)
+      : null
+    : !pagination.ownerPagination && offset + selected.length < rows.length
       ? encodeCursor(command, offset + selected.length)
       : (ownerNextCursor ?? null);
   if (pagination.ownerPagination && nextCursor !== null && nextCursor === pagination.cursor) {
@@ -438,12 +511,15 @@ export function writeAdminResultHuman(stdout, command, result, input = {}) {
   if (result.page.next_cursor) {
     const target = command === "admin nodes logs" ? ` ${shellSingleQuote(input.node_id)}` : "";
     const filters = [
-      ["supplier", input.organization_id],
+      ["supplier", command === "admin users list" ? undefined : input.organization_id],
+      ["organization", command === "admin users list" ? input.organization_id : undefined],
       ["facility", input.facility_id],
       ["status", input.status],
       ["email", input.email],
-      ["organization", input.organization],
-      ["name", input.name],
+      ["query", input.q],
+      ["role", input.role],
+      ["approved", input.approved],
+      ["ids", Array.isArray(input.ids) ? input.ids.join(",") : undefined],
       ["limit", input.limit],
     ]
       .filter(([, value]) => value !== undefined)

package/src/catalog-shell.mjs

@@ -1,5 +1,3 @@
-import { HARDWARE_CATALOG_PATH } from "../vendor/capabilities/cli.js";
-
 import {
   CliApiError,
   cliRequest,
@@ -793,7 +791,7 @@ const CUSTOMER_FORBIDDEN_FIELDS = {
 };
 const SUPPLIER_OWNER_FIELDS = { organizationId: true, organization_id: true };
 
-// The caller's own organization on a listing it relisted is not supplier identity.
+// A listing owner may receive its own organization ID.
 function assertCustomerResultSafe(value, ownOrganizationId) {
   if (Array.isArray(value)) {
     for (const item of value) assertCustomerResultSafe(item, ownOrganizationId);
@@ -802,6 +800,7 @@ function assertCustomerResultSafe(value, ownOrganizationId) {
   if (!value || typeof value !== "object") return;
   const ownedBySupplier = supplierOwnedRecord(value);
   for (const [key, child] of Object.entries(value)) {
+    if (key === "supplierId" && value.capacityListingId && child === ownOrganizationId) continue;
     if (
       CUSTOMER_FORBIDDEN_FIELDS[key] === true ||
       (ownedBySupplier &&
@@ -835,7 +834,12 @@ function parseCapabilityInput(capability, rawInput) {
 
 // Commerce's market routes and Markets serve every caller on one path and
 // decide from the session what it may do; a staff session is an admin there.
-const ROLE_AWARE_PREFIXES = ["/commerce/listings", "/commerce/reservations", "/commerce/fees", "/v1/markets"];
+const ROLE_AWARE_PREFIXES = [
+  "/commerce/v2/listings",
+  "/commerce/reservations",
+  "/commerce/fees",
+  "/v1/markets",
+];
 
 function isRoleAwarePath(path) {
   const pathname = String(path).split("?")[0];
@@ -852,7 +856,9 @@ function adminFetch(io, path, init = {}) {
     ...(init.headers !== undefined ? { headers: init.headers } : {}),
     ...((init.signal ?? io.signal) !== undefined ? { signal: init.signal ?? io.signal } : {}),
   };
-  return isRoleAwarePath(path) ? cliRequest(request) : operatorRequest(request);
+  return isRoleAwarePath(path) || (path === "/v1/staff/invites" && request.method === "POST")
+    ? cliRequest(request)
+    : operatorRequest(request);
 }
 
 async function customerCapabilityFetch(io, path, init = {}, sessionSnapshot) {
@@ -992,20 +998,6 @@ async function executeCapability(
         role,
         fetch: (path, init = {}) => {
           if (executionRuntime?.transport) return executionRuntime.transport(path, init);
-          if (
-            audience === "admin" &&
-            capability.id === "listings.create" &&
-            path === HARDWARE_CATALOG_PATH
-          ) {
-            return operatorRequest({
-              endpoint: "/catalog/hardware",
-              env: io.env,
-              fetchImpl: io.fetchImpl,
-              method: init.method ?? "GET",
-              ...(init.headers !== undefined ? { headers: init.headers } : {}),
-              ...(init.signal !== undefined ? { signal: init.signal } : {}),
-            });
-          }
           if (audience === "admin") {
             // Shared observability capabilities use their owner namespace;
             // the CLI reaches those same node-scoped routes through staff auth.
@@ -1173,9 +1165,12 @@ export async function runCatalogCli(argv, io, { version }) {
         eligibleHuman,
         machine,
       });
-      const role = await resolveAdminRole(io);
       const adminRequest = resolveAdminRequest(catalog, capabilities.ADMIN_CLI_ROOTS, request.argv);
       activeCommand = adminRequest.command;
+      if (adminRequest.kind === "command" && !adminRequest.handler) {
+        adminRequest.input = parseCapabilityInput(adminRequest.capability, adminRequest.input);
+      }
+      const role = await resolveAdminRole(io);
       if (adminRequest.kind === "root") {
         const data = adminRootData(catalog, capabilities.ADMIN_CLI_ROOTS, adminRequest.root);
         if (machine) writeMachine(stdout, format, resultEnvelope(adminRequest.command, data));

package/src/evidence-commands.mjs

@@ -1040,7 +1040,7 @@ function metricSummary(metrics) {
     .join(", ");
 }
 
-function evidenceLines(data) {
+function evidenceLines(data, printedLogs = new Map()) {
   const lines = [
     data.resource.kind === "machine"
       ? `Machine: ${data.resource.hostname ?? "selected machine"}`
@@ -1063,7 +1063,7 @@ function evidenceLines(data) {
   if (data.logs) {
     lines.push(`Logs (${data.logs.stream}): ${data.logs.state}`);
     for (const [index, source] of data.logs.sources.entries()) {
-      for (const entry of source.entries) {
+      for (const entry of unprintedLogLines(source, printedLogs.get(index)).fresh) {
         lines.push(
           `  ${evidenceSourceLabel(data, index)} · ${entry.observed_at} · ${entry.severity} · ${entry.message}`
         );
@@ -1131,7 +1131,21 @@ function liveState(data) {
   };
 }
 
-function writeHumanProgress(stdout, data) {
+// Follow re-reads the whole live window, so count each line's occurrences
+// rather than trusting timestamps: identical records still print once each,
+// and a late older line is still new.
+function unprintedLogLines(source, printed = new Map()) {
+  const counts = new Map();
+  const fresh = source.entries.filter((line) => {
+    const key = `${line.observed_at} ${line.severity} ${line.message}`;
+    counts.set(key, (counts.get(key) ?? 0) + 1);
+    return counts.get(key) > (printed.get(key) ?? 0);
+  });
+  for (const [key, count] of counts) counts.set(key, Math.max(count, printed.get(key) ?? 0));
+  return { fresh, seen: counts };
+}
+
+function writeHumanProgress(stdout, data, printedLogs) {
   if (data.metrics) {
     for (const [index, source] of data.metrics.series.entries()) {
       const point = source.points.at(-1);
@@ -1144,7 +1158,9 @@ function writeHumanProgress(stdout, data) {
   }
   if (data.logs) {
     for (const [index, source] of data.logs.sources.entries()) {
-      for (const line of source.entries) {
+      const { fresh, seen } = unprintedLogLines(source, printedLogs.get(index));
+      printedLogs.set(index, seen);
+      for (const line of fresh) {
         stdout.write(
           `${evidenceSourceLabel(data, index)} ${line.observed_at} ${line.severity} ${line.message}\n`
         );
@@ -1153,14 +1169,14 @@ function writeHumanProgress(stdout, data) {
   }
 }
 
-function streamResult(interaction, data, progress, exitCode, outcome, errors = []) {
+function streamResult(interaction, data, progress, printedLogs, exitCode, outcome, errors = []) {
   return interaction.result({
     data,
     errors: publicErrors(errors),
     exitCode,
     outcome,
     progress,
-    presentation: { lines: evidenceLines(data) },
+    presentation: { lines: evidenceLines(data, printedLogs) },
   });
 }
 
@@ -1191,12 +1207,13 @@ async function follow(resource, requested, initialWindow, options, deps, interac
   const deadline = timeoutMs === null ? Number.POSITIVE_INFINITY : startedAt + timeoutMs;
   let current = resourceBase(resource);
   const progress = [];
+  const printedLogs = new Map();
   let iteration = 0;
   try {
     for (;;) {
       if (signal.aborted) {
         current = streamState(current, "interrupted");
-        return streamResult(interaction, current, progress, 130, {
+        return streamResult(interaction, current, progress, printedLogs, 130, {
           class: "ended",
           phase: "interrupted",
         });
@@ -1204,7 +1221,7 @@ async function follow(resource, requested, initialWindow, options, deps, interac
       const observedAt = nowMilliseconds(deps.now);
       if (observedAt >= deadline) {
         current = streamState(current, "ended");
-        return streamResult(interaction, current, progress, 124, {
+        return streamResult(interaction, current, progress, printedLogs, 124, {
           class: "ended",
           phase: "observation_timeout",
         });
@@ -1230,7 +1247,7 @@ async function follow(resource, requested, initialWindow, options, deps, interac
           { ...resourceBase(resource), metrics: collected.metrics, logs: collected.logs },
           "interrupted"
         );
-        return streamResult(interaction, current, progress, 130, {
+        return streamResult(interaction, current, progress, printedLogs, 130, {
           class: "ended",
           phase: "interrupted",
         });
@@ -1248,6 +1265,7 @@ async function follow(resource, requested, initialWindow, options, deps, interac
           interaction,
           current,
           progress,
+          printedLogs,
           status.exitCode,
           status.outcome,
           collected.errors
@@ -1261,11 +1279,11 @@ async function follow(resource, requested, initialWindow, options, deps, interac
         sequence: iteration,
       };
       if (interaction.machine) progress.push(progressEntry);
-      else writeHumanProgress(deps.stdout, current);
+      else writeHumanProgress(deps.stdout, current, printedLogs);
 
       if (count !== null && iteration >= count) {
         current = streamState(current, "ended");
-        return streamResult(interaction, current, progress, 0, {
+        return streamResult(interaction, current, progress, printedLogs, 0, {
           class: "ended",
           phase: "observation_complete",
         });
@@ -1275,7 +1293,7 @@ async function follow(resource, requested, initialWindow, options, deps, interac
       const continued = await sleepUntil(Math.min(intervalMs, remaining), deps, signal);
       if (!continued) {
         current = streamState(current, "interrupted");
-        return streamResult(interaction, current, progress, 130, {
+        return streamResult(interaction, current, progress, printedLogs, 130, {
           class: "ended",
           phase: "interrupted",
         });

package/src/kubernetes-commands.mjs

@@ -330,6 +330,35 @@ function parsePositiveInteger(runtime, value, option) {
   return parsed;
 }
 
+/** Running VMs that join as workers alongside the selected machines. */
+function requestedVirtualMachineIds(runtime, input) {
+  const raw = text(input.vms);
+  const ids = raw
+    ? raw
+        .split(",")
+        .map((value) => value.trim())
+        .filter(Boolean)
+    : [];
+  if (ids.some((id) => !UUID.test(id))) {
+    runtime.usage("--vms takes canonical VM IDs.", {
+      code: "canonical_vm_id_required",
+      field: "vms",
+    });
+  }
+  if (new Set(ids).size !== ids.length) {
+    runtime.usage("Each selected VM must be unique.", {
+      code: "duplicate_vm_selection",
+      field: "vms",
+    });
+  }
+  return ids.sort();
+}
+
+function parseMembershipCount(runtime, value, allowZero) {
+  if (allowZero && Number(value) === 0) return 0;
+  return parsePositiveInteger(runtime, value, "--nodes");
+}
+
 function parseTimeoutSeconds(runtime, raw, { required = false } = {}) {
   if (raw === undefined || raw === null || raw === "") {
     if (required)
@@ -1088,11 +1117,14 @@ export async function launchClusterMode(
   }
   const label = clusterModeLabel(accessMode);
   requireWaitShape(runtime, input);
+  const virtualMachineIds = requestedVirtualMachineIds(runtime, input);
   const membershipValue = input.nodes ?? input.nodeCount;
   let membershipCount =
     membershipValue === undefined || membershipValue === null
-      ? null
-      : parsePositiveInteger(runtime, membershipValue, "--nodes");
+      ? virtualMachineIds.length
+        ? 0
+        : null
+      : parseMembershipCount(runtime, membershipValue, virtualMachineIds.length > 0);
   if (membershipCount === null && !runtime.eligibleHuman) {
     runtime.usage("--nodes is required outside an interactive terminal.", {
       code: "missing_input",
@@ -1145,7 +1177,7 @@ export async function launchClusterMode(
     membershipCount !== null &&
     requestedReferences.length === membershipCount &&
     requestedReferences.every((reference) => UUID.test(reference));
-  if (initialEligibility.length === 0 && !emptyProvisioningReplay) {
+  if (initialEligibility.length === 0 && !emptyProvisioningReplay && membershipCount !== 0) {
     runtime.error(`No machines are currently eligible for ${label} launch.`, {
       code: "no_eligible_machines",
     });
@@ -1165,14 +1197,18 @@ export async function launchClusterMode(
   }
   const selected = emptyProvisioningReplay
     ? requestedReferences.map((id) => ({ id, hostname: id }))
-    : await selectLaunchMachines(
-        runtime,
-        input,
-        initialEligibility,
-        membershipCount,
-        initialExisting
-      );
+    : membershipCount === 0
+      ? []
+      : await selectLaunchMachines(
+          runtime,
+          input,
+          initialEligibility,
+          membershipCount,
+          initialExisting
+        );
   const selectedIds = selected.map((machine) => machine.id).sort();
+  // A VM member is listed under its VM id.
+  const goalIds = [...selectedIds, ...virtualMachineIds].sort();
   const reviewedKey = record(keyPlan?.key);
   const requested = {
     reservation_id: reservationId,
@@ -1180,6 +1216,7 @@ export async function launchClusterMode(
     network_mode: networkMode,
     membership_count: membershipCount,
     machine_ids: selectedIds,
+    ...(virtualMachineIds.length ? { virtual_machine_ids: virtualMachineIds } : {}),
     idempotency_key: idempotencyKey,
     organization,
     ...(keyPlan
@@ -1209,7 +1246,7 @@ export async function launchClusterMode(
         );
       }
     } else {
-      if (!sameMembers(currentIds, selectedIds)) {
+      if (!sameMembers(currentIds, goalIds)) {
         runtime.error(
           `This reservation already has a ${label} cluster with a different membership goal.`,
           { code: "cluster_launch_goal_conflict" }
@@ -1231,7 +1268,7 @@ export async function launchClusterMode(
                 signal: runtime.signal,
                 sleep: runtime.sleep,
               },
-              goalIds: selectedIds,
+              goalIds,
               input,
               requireAccess: true,
             })
@@ -1270,6 +1307,10 @@ export async function launchClusterMode(
         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) {
@@ -1313,7 +1354,7 @@ export async function launchClusterMode(
         });
       }
     } else {
-      if (!sameMembers(currentIds, selectedIds)) {
+      if (!sameMembers(currentIds, goalIds)) {
         runtime.error(`A different ${label} membership goal was accepted after review.`, {
           code: "cluster_launch_goal_conflict",
         });
@@ -1328,7 +1369,7 @@ export async function launchClusterMode(
               accepted: { replayed: true, requested },
               cluster: current,
               deps: { fetch: context.fetch, interaction: runtime },
-              goalIds: selectedIds,
+              goalIds,
               input,
               requireAccess: true,
             })
@@ -1364,8 +1405,9 @@ export async function launchClusterMode(
       headers: { "Idempotency-Key": idempotencyKey },
       body: {
         network_mode: networkMode,
-        node_count: membershipCount,
+        ...(membershipCount > 0 ? { node_count: membershipCount } : {}),
         node_ids: selectedIds,
+        ...(virtualMachineIds.length ? { virtual_machine_ids: virtualMachineIds } : {}),
         ...(selectedKeyId ? { ssh_key_ids: [selectedKeyId] } : {}),
       },
     }
@@ -1402,7 +1444,7 @@ export async function launchClusterMode(
       sleep: runtime.sleep,
       stderr: runtime.stderr,
     },
-    goalIds: selectedIds,
+    goalIds,
     input,
     requireAccess: true,
   });

package/src/launch-mode-handlers.mjs

@@ -32,10 +32,10 @@ const MODE_OPTIONS = new Map([
       "volume",
     ]),
   ],
-  ["kubernetes", new Set([...COMMON_OPTIONS, "machine", "machines", "network", "nodes"])],
+  ["kubernetes", new Set([...COMMON_OPTIONS, "machine", "machines", "network", "nodes", "vms"])],
   [
     "slurm",
-    new Set([...COMMON_OPTIONS, ...KEY_OPTIONS, "machine", "machines", "network", "nodes"]),
+    new Set([...COMMON_OPTIONS, ...KEY_OPTIONS, "machine", "machines", "network", "nodes", "vms"]),
   ],
 ]);
 const OPTION_FLAGS = {

package/src/storage-commands.mjs

@@ -646,6 +646,13 @@ async function deleteVolume(input, runtime) {
   }
 }
 
+function shellQuote(value) {
+  const rendered = String(value);
+  return /^[A-Za-z0-9_./:@%+=,-]+$/.test(rendered)
+    ? rendered
+    : `'${rendered.replaceAll("'", `'\\''`)}'`;
+}
+
 async function fetchFileRows(runtime, drive, prefix) {
   const folder = prefix.includes("/") ? prefix.slice(0, prefix.lastIndexOf("/")) : "";
   const entries = [];
@@ -1121,8 +1128,9 @@ export function writeStorageResultHuman(stdout, capabilityId, execution) {
     }
     for (const file of files) stdout.write(`${file.path}  ${file.size_bytes} bytes\n`);
     if (execution.page?.next_cursor) {
+      const prefixFlag = data.prefix ? ` --prefix=${shellQuote(data.prefix)}` : "";
       stdout.write(
-        `Next: ornn volumes files list ${data.volume.id} --cursor ${execution.page.next_cursor} --format human\n`
+        `Next: ornn volumes files list ${data.volume.id}${prefixFlag} --cursor ${execution.page.next_cursor} --format human\n`
       );
     }
     return;

package/src/vm-commands.mjs

@@ -1191,7 +1191,7 @@ export const vmLaunchModeHandler = {
             body: {
               access_mode: "virtual-machine",
               network_mode: "public",
-              image_id: null,
+              disk_id: null,
               machine_count: 1,
               request_id: idempotencyKey,
               ssh_key_ids: [resourceId(key)],
@@ -2056,7 +2056,7 @@ async function launchDurableBareMetalWorkspace({
           method: "POST",
           body: {
             access_mode: "bare-metal",
-            image_id: null,
+            disk_id: null,
             machine_count: 1,
             network_mode: "private",
             request_id: `${id}:machine`,
@@ -2456,7 +2456,7 @@ export const bareMetalLaunchModeHandler = {
         const launchBody = {
           access_mode: "bare-metal",
           network_mode: "public",
-          image_id: null,
+          disk_id: null,
           machine_count: 1,
           request_id: idempotencyKey,
           ssh_key_ids: [resourceId(key)],