@ornncompute/cli 1.0.67 → 1.0.75

package/src/admin-node-lifecycle.mjs

@@ -9,9 +9,9 @@ const POLL_INTERVAL_MS = 1_000;
 const COMMAND_BY_CAPABILITY = Object.freeze({
   "nodes.reboot": "reboot",
   "nodes.hard_reset": "hard-reset",
-  "nodes.suspend_management": "suspend-management",
-  "nodes.resume_management": "resume-management",
-  "nodes.terminate": "terminate",
+  "node.off-grid": "suspend-management",
+  "node.on-grid": "resume-management",
+  "node.terminate": "terminate",
   "nodes.assign": "assign",
 });
 
@@ -22,17 +22,17 @@ const CAPABILITY_BY_COMMAND = Object.freeze(
 );
 
 const USAGE = Object.freeze({
-  reboot: "Usage: ornn admin nodes reboot <node-ref> [--yes] [--no-wait] [--timeout SECONDS]",
+  reboot: "Usage: ornn admin nodes reboot <node-ref> [--no-wait] [--timeout SECONDS]",
   "hard-reset":
-    "Usage: ornn admin nodes hard-reset <node-ref> --erase-local-data [--yes] [--no-wait] [--timeout SECONDS]",
+    "Usage: ornn admin nodes hard-reset <node-ref> --erase-local-data [--no-wait] [--timeout SECONDS]",
   "suspend-management":
-    "Usage: ornn admin nodes suspend-management <node-ref> [--reason TEXT] [--yes] [--idempotency-key KEY] [--wait|--no-wait] [--timeout SECONDS]",
+    "Usage: ornn admin nodes suspend-management <node-ref> [--reason TEXT] [--idempotency-key KEY] [--wait|--no-wait] [--timeout SECONDS]",
   "resume-management":
-    "Usage: ornn admin nodes resume-management <node-ref> [--yes] [--idempotency-key KEY] [--wait|--no-wait] [--timeout SECONDS]",
+    "Usage: ornn admin nodes resume-management <node-ref> [--idempotency-key KEY] [--wait|--no-wait] [--timeout SECONDS]",
   terminate:
-    "Usage: ornn admin nodes terminate <node-ref> --delete-node-record [--skip-cleanup] [--reason TEXT] [--yes] [--idempotency-key KEY]",
+    "Usage: ornn admin nodes terminate <node-ref> --delete-node-record [--skip-cleanup] [--reason TEXT] [--idempotency-key KEY]",
   assign:
-    "Usage: ornn admin nodes assign <node-ref> --reservation RESERVATION [--yes] [--idempotency-key KEY] [--wait|--no-wait] [--timeout SECONDS]",
+    "Usage: ornn admin nodes assign <node-ref> --reservation RESERVATION [--idempotency-key KEY] [--wait|--no-wait] [--timeout SECONDS]",
 });
 
 const BOOLEAN_OPTIONS = new Set([
@@ -41,16 +41,15 @@ const BOOLEAN_OPTIONS = new Set([
   "no-wait",
   "skip-cleanup",
   "wait",
-  "yes",
 ]);
 const VALUE_OPTIONS = new Set(["idempotency-key", "reason", "reservation", "timeout"]);
 const ALLOWED_OPTIONS = Object.freeze({
-  reboot: new Set(["yes", "wait", "no-wait", "timeout"]),
-  "hard-reset": new Set(["erase-local-data", "yes", "wait", "no-wait", "timeout"]),
-  "suspend-management": new Set(["reason", "yes", "idempotency-key", "wait", "no-wait", "timeout"]),
-  "resume-management": new Set(["yes", "idempotency-key", "wait", "no-wait", "timeout"]),
-  terminate: new Set(["delete-node-record", "skip-cleanup", "reason", "yes", "idempotency-key"]),
-  assign: new Set(["reservation", "yes", "idempotency-key", "wait", "no-wait", "timeout"]),
+  reboot: new Set(["wait", "no-wait", "timeout"]),
+  "hard-reset": new Set(["erase-local-data", "wait", "no-wait", "timeout"]),
+  "suspend-management": new Set(["reason", "idempotency-key", "wait", "no-wait", "timeout"]),
+  "resume-management": new Set(["idempotency-key", "wait", "no-wait", "timeout"]),
+  terminate: new Set(["delete-node-record", "skip-cleanup", "reason", "idempotency-key"]),
+  assign: new Set(["reservation", "idempotency-key", "wait", "no-wait", "timeout"]),
 });
 
 function mutationError(message, { code = "usage_error", field } = {}) {
@@ -135,22 +134,16 @@ export function parseAdminNodeLifecycleInput(command, argv) {
     });
   }
   if (name === "hard-reset" && options["erase-local-data"] !== true) {
-    throw mutationError(
-      `${usage}\nHard reset requires --erase-local-data; --yes cannot imply data loss.`,
-      {
-        code: "erase_local_data_required",
-        field: "erase-local-data",
-      }
-    );
+    throw mutationError(`${usage}\nHard reset requires --erase-local-data.`, {
+      code: "erase_local_data_required",
+      field: "erase-local-data",
+    });
   }
   if (name === "terminate" && options["delete-node-record"] !== true) {
-    throw mutationError(
-      `${usage}\nTermination requires --delete-node-record; --yes cannot imply deletion.`,
-      {
-        code: "delete_node_record_required",
-        field: "delete-node-record",
-      }
-    );
+    throw mutationError(`${usage}\nTermination requires --delete-node-record.`, {
+      code: "delete_node_record_required",
+      field: "delete-node-record",
+    });
   }
   if (name === "assign" && !options.reservation) {
     throw mutationError(`${usage}\nAssignment requires --reservation.`, {
@@ -170,12 +163,11 @@ export function parseAdminNodeLifecycleInput(command, argv) {
   const idempotencyKey = options["idempotency-key"]?.trim();
   const safety =
     name === "reboot" || name === "hard-reset"
-      ? ADMIN_MUTATION_SAFETY.eligibleHumanOnly
+      ? ADMIN_MUTATION_SAFETY.direct
       : ADMIN_MUTATION_SAFETY.reconcile;
   return {
     input: {
       node_ref: nodeRef,
-      ...(options.yes ? { yes: true } : {}),
       ...(idempotencyKey ? { idempotency_key: idempotencyKey } : {}),
       ...(options.reason ? { reason: options.reason } : {}),
       ...(options.wait ? { wait: true } : options["no-wait"] ? { wait: false } : {}),
@@ -192,7 +184,6 @@ export function parseAdminNodeLifecycleInput(command, argv) {
     mutation: {
       idempotencyKey,
       safety,
-      yes: options.yes === true,
     },
   };
 }
@@ -900,15 +891,6 @@ export async function runAdminNodeLifecycle({
     },
   });
 
-  if (result.status === "declined") {
-    return {
-      ...result,
-      action: null,
-      resume: null,
-      errors: [],
-    };
-  }
-
   const accepted = {
     operation: command,
     reconciled: result.reconciled === true || lateReconciled,
@@ -939,7 +921,7 @@ export const adminNodeLifecycleHandlers = Object.keys(COMMAND_BY_CAPABILITY).map
     safety:
       COMMAND_BY_CAPABILITY[capabilityId] === "reboot" ||
       COMMAND_BY_CAPABILITY[capabilityId] === "hard-reset"
-        ? ADMIN_MUTATION_SAFETY.eligibleHumanOnly
+        ? ADMIN_MUTATION_SAFETY.direct
         : ADMIN_MUTATION_SAFETY.reconcile,
     run: runAdminNodeLifecycle,
   })

package/src/admin-shell.mjs

@@ -185,13 +185,21 @@ function parseAdminInput(capability, argv) {
     throw new AdminUsageError(usage);
   }
 
-  const offsetPagination = ["users.list", "organization.list"].includes(capability.id);
+  const offsetPagination = ["users.list", "organization.list", "supplier.list"].includes(
+    capability.id
+  );
+  const directoryPagination = ["users.list", "organization.list"].includes(capability.id);
   const reservationList = capability.id === "reservation.list";
-  const limit = positiveInteger(
-    options.limit,
-    "limit",
-    offsetPagination || reservationList ? 100 : MAX_PAGE_LIMIT
-  ) ?? (offsetPagination ? 25 : DEFAULT_PAGE_LIMIT);
+  const maxLimit = directoryPagination
+    ? 100
+    : capability.id === "supplier.list"
+      ? 1000
+      : reservationList
+        ? 100
+        : MAX_PAGE_LIMIT;
+  const limit =
+    positiveInteger(options.limit, "limit", maxLimit) ??
+    (directoryPagination ? 25 : DEFAULT_PAGE_LIMIT);
   const input = {};
   if (nodeCommand) input.node_id = positionals[0];
   if (options.supplier) input.organization_id = options.supplier;
@@ -232,13 +240,8 @@ function parseAdminInput(capability, argv) {
     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);
+    input.offset = explicitOffset ?? 0;
   }
 
   return {
@@ -328,14 +331,9 @@ 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",
-    "organizations",
-    "reservations",
-    "suppliers",
-    "users",
-  ].includes(root)
+  return ["facilities", "nodes", "organizations", "reservations", "suppliers", "users"].includes(
+    root
+  )
     ? root
     : null;
 }
@@ -445,14 +443,19 @@ export function finalizeAdminResult(capability, payload, pagination) {
     pagination.ownerOffsetPagination && payload && !Array.isArray(payload)
       ? payload.next_offset
       : undefined;
+  const nextOffset = pagination.ownerOffsetPagination
+    ? Number.isSafeInteger(ownerNextOffset) && ownerNextOffset > offset
+      ? ownerNextOffset
+      : selected.length === pagination.limit
+        ? offset + selected.length
+        : null
+    : undefined;
   const ownerNextCursor =
     payload && !Array.isArray(payload)
       ? (payload.next_cursor ?? payload.nextCursor ?? payload.page?.next_cursor ?? null)
       : null;
   let nextCursor = pagination.ownerOffsetPagination
-    ? Number.isSafeInteger(ownerNextOffset) && ownerNextOffset > offset
-      ? encodeCursor(command, ownerNextOffset)
-      : null
+    ? null
     : !pagination.ownerPagination && offset + selected.length < rows.length
       ? encodeCursor(command, offset + selected.length)
       : (ownerNextCursor ?? null);
@@ -480,11 +483,9 @@ export function finalizeAdminResult(capability, payload, pagination) {
   }
   return {
     data: { [key]: selected },
-    page: {
-      limit: pagination.limit,
-      returned: selected.length,
-      next_cursor: nextCursor,
-    },
+    page: pagination.ownerOffsetPagination
+      ? { limit: pagination.limit, returned: selected.length, next_offset: nextOffset }
+      : { limit: pagination.limit, returned: selected.length, next_cursor: nextCursor },
   };
 }
 
@@ -515,7 +516,15 @@ export function writeAdminResultHuman(stdout, command, result, input = {}) {
   } else {
     for (const row of rows) stdout.write(`${JSON.stringify(row)}\n`);
   }
-  if (result.page.next_cursor) {
+  const nextPage =
+    result.page.next_offset !== undefined
+      ? result.page.next_offset === null
+        ? null
+        : `--offset ${result.page.next_offset}`
+      : result.page.next_cursor
+        ? `--cursor ${shellSingleQuote(result.page.next_cursor)}`
+        : null;
+  if (nextPage) {
     const target = command === "admin nodes logs" ? ` ${shellSingleQuote(input.node_id)}` : "";
     const filters = [
       ["supplier", command === "admin users list" ? undefined : input.organization_id],
@@ -535,8 +544,6 @@ export function writeAdminResultHuman(stdout, command, result, input = {}) {
       .filter(([, value]) => value !== undefined)
       .map(([name, value]) => ` --${name} ${shellSingleQuote(String(value))}`)
       .join("");
-    stdout.write(
-      `Next: ornn ${command}${target} --cursor ${shellSingleQuote(result.page.next_cursor)}${filters}\n`
-    );
+    stdout.write(`Next: ornn ${command}${target} ${nextPage}${filters}\n`);
   }
 }

package/src/catalog-shell.mjs

@@ -236,17 +236,11 @@ function retiredSyntaxError(argv, findLegacyCliMigration, migrationGuideUrl) {
   );
 }
 
-function resolveRequest(catalog, argv, findLegacyCliMigration, migrationGuideUrl) {
-  if (argv.length === 0 || (argv.length === 1 && (argv[0] === "--help" || argv[0] === "-h"))) {
+function resolveRequest(catalog, argvIn, findLegacyCliMigration, migrationGuideUrl) {
+  const argv = argvIn[0] === "--help" || argvIn[0] === "-h" ? ["help", ...argvIn.slice(1)] : argvIn;
+  if (argv.length === 0) {
     return { kind: "root", command: "help" };
   }
-  if (argv[0] === "--help" || argv[0] === "-h") {
-    return {
-      kind: "error",
-      command: "help",
-      error: new VnextUsageError("Usage: ornn [--format human|json|ndjson]"),
-    };
-  }
 
   const retired = retiredSyntaxError(argv, findLegacyCliMigration, migrationGuideUrl);
   if (retired) {
@@ -311,15 +305,7 @@ function resolveRequest(catalog, argv, findLegacyCliMigration, migrationGuideUrl
   if (capability) {
     const command = vnextCommand(capability);
     const rest = argv.slice(command.length);
-    const helpFlags = rest.filter((argument) => argument === "--help" || argument === "-h");
-    if (helpFlags.length) {
-      if (rest.length !== 1) {
-        return {
-          kind: "error",
-          command: command.join(" "),
-          error: new VnextUsageError(`Usage: ${capability.cli.vnext.human}`),
-        };
-      }
+    if (rest.some((argument) => argument === "--help" || argument === "-h")) {
       return { kind: "help", command: `help ${command.join(" ")}`, capability };
     }
     if (rest.length && capability.cli.vnext.arguments !== "semantic") {

package/src/external-bucket-commands.mjs

@@ -402,7 +402,7 @@ function connectionEquivalent(drive, intent) {
   );
 }
 
-function requireMutationPreflight(input, runtime, { consent = false } = {}) {
+function requireMutationPreflight(input, runtime) {
   const noninteractive = runtime.interaction.machine || runtime.interaction.redirected;
   if (noninteractive && !String(input.idempotencyKey ?? "").trim()) {
     usage(
@@ -410,23 +410,6 @@ function requireMutationPreflight(input, runtime, { consent = false } = {}) {
       "idempotency-key"
     );
   }
-  if (noninteractive && consent && input.yes !== true) {
-    usage(
-      "Consent is required. Review the exact intent and supply --yes.",
-      "yes",
-      "consent_required"
-    );
-  }
-}
-
-async function reviewed(runtime, options) {
-  const accepted = await runtime.interaction.review(options);
-  if (accepted) return null;
-  return runtime.interaction.result({
-    data: null,
-    exitCode: 1,
-    outcome: { class: "ended", phase: "declined" },
-  });
 }
 
 const SAFE_EXTERNAL_ERRORS = {
@@ -493,28 +476,11 @@ async function showBucket(input, runtime) {
 
 async function connectBucket(input, runtime) {
   const intent = await connectionIntent(input);
-  requireMutationPreflight(input, runtime, { consent: true });
+  requireMutationPreflight(input, runtime);
   const fingerprint =
     intent.accessKeyId && intent.secretAccessKey
       ? credentialFingerprint(intent.accessKeyId, intent.secretAccessKey)
       : null;
-  const declined = await reviewed(runtime, {
-    title: "Connect external bucket",
-    terms: [
-      { label: "Kind", value: providerName(intent.kind) },
-      { label: "Name", value: intent.name },
-      { label: "Bucket", value: intent.bucket },
-      { label: "Prefix", value: intent.prefix ?? "(bucket root)" },
-      { label: "Access", value: intent.readOnly ? "read-only" : "read-write" },
-      {
-        label: "Credentials",
-        value: fingerprint ? `fingerprint ${fingerprint.slice(0, 12)}` : "ambient GCS access",
-      },
-      { label: "Verification", value: "separate command required" },
-    ],
-    prompt: "Connect this external bucket?",
-  });
-  if (declined) return declined;
 
   const rows = await fetchDrives(runtime);
   const sameName = bucketRows(rows).filter(
@@ -644,7 +610,7 @@ async function updateCredentials(input, runtime) {
   );
   const accessKeyId = requiredText(input.accessKeyId, "--access-key-id", "access-key-id");
   const secret = await readCredentialFile(input.secretAccessKeyFile);
-  requireMutationPreflight(input, runtime, { consent: true });
+  requireMutationPreflight(input, runtime);
   const fingerprint = credentialFingerprint(accessKeyId, secret);
   const source = resolveExternalBucket(await fetchDrives(runtime), reference);
   const kind = externalKind(source);
@@ -655,17 +621,6 @@ async function updateCredentials(input, runtime) {
     );
   }
   const id = safeIdentifier(source.id);
-  const declined = await reviewed(runtime, {
-    title: "Update external bucket credentials",
-    terms: [
-      { label: "External bucket", value: `${safeName(source.name)} (${id})` },
-      { label: "Kind", value: providerName(kind) },
-      { label: "Credential fingerprint", value: fingerprint.slice(0, 12) },
-      { label: "Verification", value: "must be run again" },
-    ],
-    prompt: "Replace these credentials?",
-  });
-  if (declined) return declined;
   let updated;
   try {
     updated = await runtime.fetch(
@@ -698,20 +653,9 @@ async function updateCredentials(input, runtime) {
 
 async function disconnectBucket(input, runtime) {
   const [reference] = positions(input, 1, "ornn external-buckets disconnect <external-bucket>");
-  requireMutationPreflight(input, runtime, { consent: true });
+  requireMutationPreflight(input, runtime);
   const source = resolveExternalBucket(await fetchDrives(runtime), reference);
   const safe = safeExternalBucket(source);
-  const declined = await reviewed(runtime, {
-    title: "Disconnect external bucket",
-    terms: [
-      { label: "External bucket", value: `${safe.name} (${safe.id})` },
-      { label: "Kind", value: providerName(safe.kind) },
-      { label: "Source writeback", value: "disabled" },
-      { label: "Consequence", value: "source access is removed after all mounts are detached" },
-    ],
-    prompt: "Disconnect this external bucket?",
-  });
-  if (declined) return declined;
   const attachedReservations = activeMountReservations(source);
   if (attachedReservations.length > 0) {
     throw new StorageCommandError(
@@ -1159,7 +1103,7 @@ async function importBucket(input, runtime) {
     usage("Noninteractive --wait requires --timeout <duration>.", "timeout");
   }
   const timeoutMs = parseTimeout(input.timeout);
-  requireMutationPreflight(input, runtime, { consent: true });
+  requireMutationPreflight(input, runtime);
 
   const source = resolveExternalBucket(await fetchDrives(runtime), reference);
   const bucket = safeExternalBucket(source);
@@ -1229,18 +1173,6 @@ async function importBucket(input, runtime) {
       : null;
   const replayed = attachment !== null;
   if (!attachment) {
-    const declined = await reviewed(runtime, {
-      title: "Import external bucket",
-      terms: [
-        { label: "Source", value: `${providerName(bucket.kind)} ${bucket.location.bucket}` },
-        { label: "Working volume", value: `${bucket.name} (${bucket.id})` },
-        { label: "Reservation", value: reservationId },
-        { label: "Isolation", value: "one Ornn-managed working copy" },
-        { label: "Source writeback", value: "disabled" },
-      ],
-      prompt: "Create this managed working copy?",
-    });
-    if (declined) return declined;
     try {
       const payload = await runtime.fetch(
         computeEndpoint(

package/src/interaction-runtime.mjs

@@ -18,7 +18,6 @@ const BOOLEAN_OPTIONS = new Set([
   "read-write",
   "recursive",
   "wait",
-  "yes",
 ]);
 
 const OPTIONAL_VALUE_OPTIONS = new Set(["resume"]);
@@ -230,42 +229,8 @@ export function createInteractionRuntime({
     return answer;
   }
 
-  async function review({ prompt = "Continue?", requireLive = false, terms, title }) {
-    if (machine) {
-      if (!requireLive && options.yes === true) return true;
-      usage(
-        requireLive
-          ? "This operation is supported only in an eligible interactive terminal."
-          : "Consent is required. Review the terms and supply --yes to continue.",
-        {
-          code: requireLive ? "unsupported_in_machine_mode" : "consent_required",
-          ...(!requireLive ? { field: "yes" } : {}),
-        }
-      );
-    }
-    if (requireLive && !eligibleHuman) {
-      usage("This operation is supported only in an eligible interactive terminal.", {
-        code: "unsupported_in_machine_mode",
-      });
-    }
-    stderr.write(`${title}\n`);
-    for (const term of terms) stderr.write(`  ${term.label}: ${term.value}\n`);
-
-    if (!requireLive && options.yes === true) return true;
-    if (!eligibleHuman) {
-      usage("Consent is required. Review the terms and supply --yes to continue.", {
-        code: "consent_required",
-        field: "yes",
-      });
-    }
-    let answer;
-    try {
-      answer = await readline().question(`${prompt} [y/N] `);
-    } catch (caught) {
-      if (caught?.code === "ERR_USE_AFTER_CLOSE") return false;
-      throw caught;
-    }
-    return /^(y|yes)$/i.test(String(answer ?? "").trim());
+  async function review() {
+    return true;
   }
 
   function webUrl(path) {