@ornncompute/cli 1.0.67 → 1.0.75

package/src/vm-commands.mjs

@@ -303,7 +303,6 @@ function failedOperationRecoveryCommand(value, interaction) {
       `--mode ${accessMode}`,
       `--network ${networkMode}`,
       accessMode !== sourceMode ? "--erase-local-data" : null,
-      "--yes",
       `--idempotency-key ${requestId}`,
     ]
       .filter(Boolean)
@@ -317,7 +316,6 @@ function failedOperationRecoveryCommand(value, interaction) {
       `ornn machines ${command}`,
       shellQuote(id),
       command === "reset" ? "--erase-local-data" : null,
-      "--yes",
       `--idempotency-key ${requestId}`,
     ]
       .filter(Boolean)
@@ -392,7 +390,7 @@ function positional(input, expected, usage, interaction) {
   return values;
 }
 
-function machineMutationPreflight(input, interaction, { requireYes = true } = {}) {
+function machineMutationPreflight(input, interaction) {
   if (!interaction.machine) return;
   if (!text(input.idempotencyKey)) {
     interaction.usage("--idempotency-key is required for automation.", {
@@ -400,12 +398,6 @@ function machineMutationPreflight(input, interaction, { requireYes = true } = {}
       field: "idempotencyKey",
     });
   }
-  if (requireYes && input.yes !== true) {
-    interaction.usage("--yes is required for automation after reviewing the exact intent.", {
-      code: "consent_required",
-      field: "yes",
-    });
-  }
 }
 
 async function selectedOrganization(context, interaction, expectedId) {
@@ -415,8 +407,8 @@ async function selectedOrganization(context, interaction, expectedId) {
   const selected = record(record(result.data).selected_organization);
   const id = text(selected.id);
   const name = text(selected.name);
-  if (!id || !name || selected.approved !== true) {
-    interaction.usage("Your current organization must be approved before launch.", {
+  if (!id || !name) {
+    interaction.usage("Join an organization before launching compute.", {
       code: "organization_required",
       field: "organization",
     });
@@ -821,12 +813,6 @@ function launchInputPreflight(input, interaction) {
       field: "label",
     });
   }
-  if (input.yes !== true) {
-    interaction.usage("--yes is required for automation after reviewing the launch intent.", {
-      code: "consent_required",
-      field: "yes",
-    });
-  }
   if (!text(input.idempotencyKey)) {
     interaction.usage("--idempotency-key is required for automation.", {
       code: "idempotency_key_required",
@@ -1199,7 +1185,7 @@ export const vmLaunchModeHandler = {
           resourceId(key),
           "--idempotency-key",
           idempotencyKey,
-          ...(interaction.machine ? ["--yes", "--no-wait", "--format", "json"] : []),
+          ...(interaction.machine ? ["--no-wait", "--format", "json"] : []),
         ].join(" ");
         return uncertainMutationFailure(interaction, error, {
           data: {
@@ -1559,7 +1545,6 @@ function durableWorkspaceAllocation(reservation, interaction) {
 function workspaceStepContext(context, interaction, signal) {
   const stepInteraction = Object.create(interaction);
   stepInteraction.review = async () => true;
-  stepInteraction.options = { ...interaction.options, yes: true };
   return {
     ...context,
     fetch: (path, init = {}) =>
@@ -1681,7 +1666,7 @@ function workspaceResumeCommand(input, goal, facts, id, interaction, localResume
   if (goal.username) parts.push("--username", goal.username);
   if (input.noWait) parts.push("--no-wait");
   if (input.wait) parts.push("--wait", "--timeout", text(input.timeout));
-  if (interaction.machine) parts.push("--yes", "--format", interaction.format);
+  if (interaction.machine) parts.push("--format", interaction.format);
   return parts.map(shellQuote).join(" ");
 }
 
@@ -1952,7 +1937,6 @@ async function launchDurableBareMetalWorkspace({
         $positionals: [reservationId],
         key: resourceId(key),
         idempotencyKey: `${id}:ssh-key`,
-        yes: true,
       }
     );
     states.ssh_key_assignment = {
@@ -1988,7 +1972,6 @@ async function launchDurableBareMetalWorkspace({
         idempotencyKey: `${id}:volume-mount`,
         noWait: true,
         volume: facts.volume.id,
-        yes: true,
       }
     );
     facts.volumeMount = mount.data.volume_mount;
@@ -2464,7 +2447,7 @@ export const bareMetalLaunchModeHandler = {
           resourceId(key),
           "--idempotency-key",
           idempotencyKey,
-          ...(interaction.machine ? ["--yes", "--no-wait", "--format", "json"] : []),
+          ...(interaction.machine ? ["--no-wait", "--format", "json"] : []),
         ].join(" ");
         return uncertainMutationFailure(interaction, error, {
           data: {
@@ -3002,24 +2985,12 @@ function validateWaitInput(input, interaction, { waitCommand = false } = {}) {
 function requireMachineMutationSafety(input, interaction, { destructive = false } = {}) {
   validateWaitInput(input, interaction);
   if (destructive && input.eraseLocalData !== true) {
-    interaction.usage(
-      "machines reset requires --erase-local-data; --yes cannot infer destructive scope.",
-      {
-        code: "erase_local_data_required",
-        field: "eraseLocalData",
-      }
-    );
+    interaction.usage("machines reset requires --erase-local-data.", {
+      code: "erase_local_data_required",
+      field: "eraseLocalData",
+    });
   }
   if (interaction.machine || !interaction.eligibleHuman) {
-    if (input.yes !== true) {
-      interaction.usage(
-        "--yes is required outside an eligible terminal after reviewing the exact intent.",
-        {
-          code: "consent_required",
-          field: "yes",
-        }
-      );
-    }
     if (!text(input.idempotencyKey)) {
       interaction.usage("--idempotency-key is required outside an eligible terminal.", {
         code: "idempotency_key_required",
@@ -3452,7 +3423,7 @@ async function switchMachine(input, context, interaction) {
   const erasesLocalData = targetMode !== currentMode;
   if (erasesLocalData && input.eraseLocalData !== true) {
     interaction.usage(
-      "Changing between VM and Bare Metal permanently erases source-local data and requires --erase-local-data; --yes cannot infer destructive scope.",
+      "Changing between VM and Bare Metal permanently erases source-local data and requires --erase-local-data; cannot infer destructive scope.",
       { code: "erase_local_data_required", field: "eraseLocalData" }
     );
   }
@@ -3561,7 +3532,6 @@ async function switchMachine(input, context, interaction) {
     requestedMode ? `--mode ${requestedMode}` : null,
     requestedNetwork ? `--network ${requestedNetwork}` : null,
     erasesLocalData ? "--erase-local-data" : null,
-    "--yes",
     "--no-wait",
     `--idempotency-key ${shellQuote(idempotencyKey)}`,
   ]
@@ -3663,7 +3633,6 @@ async function switchMachine(input, context, interaction) {
     `--mode ${targetMode}`,
     `--network ${targetNetwork}`,
     erasesLocalData ? "--erase-local-data" : null,
-    "--yes",
     `--idempotency-key ${shellQuote(interaction.idempotencyKey())}`,
   ]
     .filter(Boolean)
@@ -3781,7 +3750,6 @@ async function maintainMachine(command, input, context, interaction) {
     `ornn machines ${command}`,
     shellQuote(machineId(machine)),
     destructive ? "--erase-local-data" : null,
-    "--yes",
     "--no-wait",
     `--idempotency-key ${shellQuote(idempotencyKey)}`,
   ]
@@ -3874,7 +3842,6 @@ async function maintainMachine(command, input, context, interaction) {
     `ornn machines ${command}`,
     shellQuote(machineId(waitOutcome.value)),
     destructive ? "--erase-local-data" : null,
-    "--yes",
     `--idempotency-key ${shellQuote(interaction.idempotencyKey())}`,
   ]
     .filter(Boolean)

package/vendor/capabilities/capabilities/admin-capacity-reservations.js

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { defineCapability, preview } from "../capability.js";
+import { ensureFacility, locateRegion, unplacedLocation } from "./locality.js";
 import { nativeListingCreateInput } from "./native-listing.js";
 import { idempotencyHeaders, microUsd } from "./market-shared.js";
 function adminHelp(command, outcome, human, automation, review) {
@@ -18,22 +19,28 @@ export const adminCapacityOffersCreateCapability = defineCapability({
     id: "listing.create",
     domain: "listings",
     roles: ["admin"],
-    description: "Create native capacity with explicit organization/facility IDs, hardware, availability and advertised terms. Returns {listing, terms}. Requires an idempotencyKey reused on retries and confirm: true.",
+    description: "Create native capacity with an organization, a facilityId or a location, hardware, availability and advertised terms. A location is any state, city, address, or catalog region (us-west-3); Ornn places it in a catalog region and uses the organization's facility there. Primary capacity needs daysToRfs (0 when ready now) or both availableAt and availableUntil. nodeIds attach nodes at creation. Returns {listing, terms}. Requires an idempotencyKey reused on retries and confirm: true.",
     mutation: "preview-confirm",
     http: { method: "POST", path: "/commerce/v2/listings" },
     input: nativeListingCreateInput,
     slack: false,
     cli: {
         command: ["admin", "capacity-offers", "create"],
-        vnext: adminHelp(["admin", "capacity-offers", "create"], "Create native capacity and its advertised financial terms.", "ornn admin capacity-offers create --gpu-slug GPU --capacity-node-count COUNT --gpus-per-node COUNT --facility-id UUID --provisioning-type bare-metal|virtual-machine --state draft|available --terms JSON --idempotency-key KEY [--organization-id UUID] [--available-at TIME --available-until TIME] [--days-to-rfs DAYS]", "Requires an eligible human terminal; reuse --idempotency-key on retries.", "Review the native parent fields and each financial term before default-no consent."),
+        vnext: adminHelp(["admin", "capacity-offers", "create"], "Create native capacity and its advertised financial terms.", "ornn admin capacity-offers create --gpu-slug GPU --gpus-per-node COUNT (--facility-id UUID | --location PLACE) --provisioning-type bare-metal|virtual-machine --state draft|available --terms JSON --idempotency-key KEY (--days-to-rfs DAYS | --available-at TIME --available-until TIME) [--capacity-node-count COUNT] [--node-ids JSON] [--organization-id UUID]", "Requires an eligible human terminal; --location also needs --organization-id; reuse --idempotency-key on retries.", "Review the native parent fields and each financial term before default-no consent."),
     },
     execute: async (ctx, input) => {
-        const { confirm: _confirm, idempotencyKey, ...body } = nativeListingCreateInput.parse(input);
+        const { confirm: _confirm, idempotencyKey, location, ...body } = nativeListingCreateInput.parse(input);
+        const located = location ? await locateRegion(ctx.fetch, location) : null;
+        if (location && !located)
+            throw new Error(unplacedLocation(location));
         if (!ctx.confirmed)
-            return preview("listing.create", body);
+            return preview("listing.create", located ? { ...body, located } : body);
+        const facilityId = located
+            ? (await ensureFacility(ctx.fetch, body.organizationId, located.region)).facilityId
+            : body.facilityId;
         return ctx.fetch("/commerce/v2/listings", {
             method: "POST",
-            body,
+            body: { ...body, facilityId },
             headers: idempotencyHeaders(ctx, idempotencyKey),
         });
     },

package/vendor/capabilities/capabilities/admin-enrollment.js

@@ -44,11 +44,13 @@ export const adminEnrollmentTokensListCapability = {
         };
     },
 };
-export const adminEnrollmentTokenCreateCapability = withVnextBinding(tokensCreateCapability, adminHelp(["admin", "enrollment-tokens", "create"], "Create one expiring enrollment token through an explicit secret export.", "ornn admin enrollment-tokens create --supplier UUID --expires-in SECONDS (--print | --output PATH) [--overwrite] [--yes]", "Unsupported: token creation requires an eligible human terminal.", ["canonical supplier organization UUID"], "Review the supplier, expiry, and secret destination before minting the token."));
+export const adminEnrollmentTokenCreateCapability = withVnextBinding(tokensCreateCapability, adminHelp(["admin", "enrollment-tokens", "create"], "Create one expiring enrollment token through an explicit secret export.", "ornn admin enrollment-tokens create --supplier UUID --expires-in SECONDS (--print | --output PATH) [--overwrite] []", "Unsupported: token creation requires an eligible human terminal.", ["canonical supplier organization UUID"], "Review the supplier, expiry, and secret destination before minting the token."));
 const tokenRevokeInput = z.object({
-    token_id: UUID,
+    tokenId: z.string().min(1),
+    token_id: UUID.optional(),
     expected_created_at: nonEmpty.optional(),
     idempotency_key: nonEmpty.optional(),
+    confirm: z.boolean().optional(),
 });
 function rowsFromTokenList(payload) {
     if (Array.isArray(payload))
@@ -104,22 +106,23 @@ async function readExactToken(ctx, tokenId, expectedCreatedAt) {
     return { disposition: "apply", target };
 }
 export const adminEnrollmentTokenRevokeCapability = defineCapability({
-    id: "tokens.revoke",
+    id: "enrollment.token.revoke",
     domain: "fleet",
     roles: ["admin"],
-    description: "Revoke one exact enrollment-token generation after reconciling its durable goal.",
+    description: "Internal staff only: revoke one exact enrollment-token generation after reconciling its durable goal.",
     mutation: "preview-confirm",
-    http: { method: "DELETE", path: "/enrollment-tokens/{id}" },
+    http: { method: "DELETE", path: "/enrollment-tokens/{tokenId}" },
     cli: {
         command: ["admin", "enrollment-tokens", "revoke"],
-        vnext: adminHelp(["admin", "enrollment-tokens", "revoke"], "Revoke one exact enrollment-token generation.", "ornn admin enrollment-tokens revoke <token-id> [--expected-created-at TIME] [--yes]", "ornn admin enrollment-tokens revoke <token-id> --expected-created-at TIME --yes --idempotency-key KEY --format json", ["canonical token UUID", "token created_at generation"], "Review the exact token generation and the loss of future enrollment access."),
+        vnext: adminHelp(["admin", "enrollment-tokens", "revoke"], "Revoke one exact enrollment-token generation.", "ornn admin enrollment-tokens revoke <token-id> [--expected-created-at TIME] []", "ornn admin enrollment-tokens revoke <token-id> --expected-created-at TIME  --idempotency-key KEY --format json", ["canonical token UUID", "token created_at generation"], "Review the exact token generation and the loss of future enrollment access."),
     },
-    mcp: false,
     slack: false,
+    mcp: { name: "enrollment_token_revoke" },
     input: tokenRevokeInput,
     execute: async (ctx, input) => {
         const parsed = tokenRevokeInput.parse(input);
-        const current = await readExactToken(ctx, parsed.token_id, parsed.expected_created_at);
+        const tokenId = parsed.tokenId ?? parsed.token_id;
+        const current = await readExactToken(ctx, tokenId, parsed.expected_created_at);
         if (!ctx.confirmed)
             return current;
         if (current.disposition === "conflict") {
@@ -127,23 +130,21 @@ export const adminEnrollmentTokenRevokeCapability = defineCapability({
         }
         if (current.disposition === "satisfied") {
             return {
-                id: parsed.token_id,
+                id: tokenId,
                 created_at: parsed.expected_created_at ?? current.target?.created_at ?? null,
                 status: "revoked",
                 reconciled: true,
             };
         }
         if (!current.target.created_at) {
-            throw codedError("token_identity_unavailable", `Enrollment token ${parsed.token_id} has no stable creation identity and cannot be revoked safely.`);
+            throw codedError("token_identity_unavailable", `Enrollment token ${tokenId} has no stable creation identity and cannot be revoked safely.`);
         }
-        const revoked = (await ctx.fetch(`/enrollment-tokens/${encodeURIComponent(parsed.token_id)}`, {
+        const revoked = (await ctx.fetch(`/enrollment-tokens/${encodeURIComponent(tokenId)}`, {
             method: "DELETE",
-            ...(parsed.idempotency_key
-                ? { headers: { "Idempotency-Key": parsed.idempotency_key } }
-                : {}),
+            ...(parsed.idempotency_key ? { headers: { "Idempotency-Key": parsed.idempotency_key } } : {}),
         }));
         return {
-            id: parsed.token_id,
+            id: tokenId,
             created_at: current.target.created_at,
             organization_id: current.target.organization_id,
             expires_at: current.target.expires_at,
@@ -190,7 +191,7 @@ export const adminNodeEnrollCapability = defineCapability({
     http: { method: "POST", path: "/remote" },
     cli: {
         command: ["admin", "nodes", "enroll"],
-        vnext: adminHelp(["admin", "nodes", "enroll"], "Install Ornn management on one explicitly assigned node.", "ornn admin nodes enroll <node-id> --host HOST --supplier UUID --facility UUID [--filter COMPARTMENT_IDS] --identity-file PATH --token-ttl SECONDS --replace-existing-management [--verbose] [--yes]", "Unsupported: remote enrollment requires an eligible human terminal.", ["canonical node UUID", "canonical supplier organization UUID", "canonical facility UUID"], "Review node identity, SSH target, assignment, compartment filter, and replacement of existing management."),
+        vnext: adminHelp(["admin", "nodes", "enroll"], "Install Ornn management on one explicitly assigned node.", "ornn admin nodes enroll <node-id> --host HOST --supplier UUID --facility UUID [--filter COMPARTMENT_IDS] --identity-file PATH --token-ttl SECONDS --replace-existing-management [--verbose] []", "Unsupported: remote enrollment requires an eligible human terminal.", ["canonical node UUID", "canonical supplier organization UUID", "canonical facility UUID"], "Review node identity, SSH target, assignment, compartment filter, and replacement of existing management."),
     },
     mcp: false,
     slack: false,
@@ -291,7 +292,7 @@ export const adminNodeRotateKeyCapability = defineCapability({
     http: { method: "POST", path: "/enrollment/admin-ssh-key" },
     cli: {
         command: ["admin", "nodes", "rotate-key"],
-        vnext: adminHelp(["admin", "nodes", "rotate-key"], "Rotate one node admin key and export the replacement deliberately.", "ornn admin nodes rotate-key <node-id> (--print | --output PATH) [--overwrite] [--yes]", "Unsupported: key rotation requires an eligible human terminal.", ["canonical node UUID"], "Review the node and loss of access through the previous private key."),
+        vnext: adminHelp(["admin", "nodes", "rotate-key"], "Rotate one node admin key and export the replacement deliberately.", "ornn admin nodes rotate-key <node-id> (--print | --output PATH) [--overwrite] []", "Unsupported: key rotation requires an eligible human terminal.", ["canonical node UUID"], "Review the node and loss of access through the previous private key."),
     },
     mcp: false,
     slack: false,

package/vendor/capabilities/capabilities/admin-nodes-lifecycle.js

@@ -18,16 +18,10 @@ const rebootInput = z.object({
 const hardResetInput = rebootInput.extend({
     erase_local_data: z.literal(true),
 });
-const terminationInput = z.object({
-    ...commonInput,
-    delete_node_record: z.literal(true),
-    skip_cleanup: z.boolean().optional(),
-});
 const assignmentInput = z.object({
     ...commonInput,
     reservation_id: z.string().trim().min(1),
 });
-const managementInput = z.object(commonInput);
 function adminLifecycleHelp(command, outcome, human, automation, review) {
     return {
         audience: "admin",
@@ -83,7 +77,7 @@ export const adminNodeRebootCapability = defineCapability({
     http: { method: "POST", path: "/nodes/{id}/reboot" },
     cli: {
         command: ["admin", "nodes", "reboot"],
-        vnext: adminLifecycleHelp(["admin", "nodes", "reboot"], "Reboot one exact live machine while preserving local data and access configuration.", "ornn admin nodes reboot <node-ref> [--yes] [--no-wait] [--timeout SECONDS]", "Unsupported: reboot requires an eligible human terminal.", "Node and live-machine identities, supplier, facility, capacity assignment, and preserved access."),
+        vnext: adminLifecycleHelp(["admin", "nodes", "reboot"], "Reboot one exact live machine while preserving local data and access configuration.", "ornn admin nodes reboot <node-ref> [] [--no-wait] [--timeout SECONDS]", "Unsupported: reboot requires an eligible human terminal.", "Node and live-machine identities, supplier, facility, capacity assignment, and preserved access."),
     },
     mcp: false,
     slack: false,
@@ -99,102 +93,13 @@ export const adminNodeHardResetCapability = defineCapability({
     http: { method: "POST", path: "/nodes/{id}/reboot" },
     cli: {
         command: ["admin", "nodes", "hard-reset"],
-        vnext: adminLifecycleHelp(["admin", "nodes", "hard-reset"], "Erase local tenant data and hard reset one exact live machine.", "ornn admin nodes hard-reset <node-ref> --erase-local-data [--yes] [--no-wait] [--timeout SECONDS]", "Unsupported: hard reset requires an eligible human terminal.", "Node and live-machine identities, supplier, facility, capacity assignment, erased local data, and restored keys."),
+        vnext: adminLifecycleHelp(["admin", "nodes", "hard-reset"], "Erase local tenant data and hard reset one exact live machine.", "ornn admin nodes hard-reset <node-ref> --erase-local-data [] [--no-wait] [--timeout SECONDS]", "Unsupported: hard reset requires an eligible human terminal.", "Node and live-machine identities, supplier, facility, capacity assignment, erased local data, and restored keys."),
     },
     mcp: false,
     slack: false,
     input: hardResetInput,
     execute: (ctx, input) => reboot(ctx, input, "hard_reset"),
 });
-export const adminNodeSuspendManagementCapability = defineCapability({
-    id: "nodes.suspend_management",
-    domain: "fleet",
-    roles: ["admin"],
-    description: "Suspend Ornn management while leaving the exact host powered on.",
-    mutation: "preview-confirm",
-    http: { method: "POST", path: "/nodes/{id}/off-grid" },
-    cli: {
-        command: ["admin", "nodes", "suspend-management"],
-        vnext: adminLifecycleHelp(["admin", "nodes", "suspend-management"], "Remove Ornn management and managed access from one powered-on node.", "ornn admin nodes suspend-management <node-ref> [--reason TEXT] [--yes] [--no-wait]", "ornn admin nodes suspend-management <node-id> --yes --idempotency-key KEY --format json", "Node, supplier, facility, capacity assignment, management removal, and managed-access loss."),
-    },
-    mcp: false,
-    slack: false,
-    input: managementInput,
-    execute: async (ctx, input) => {
-        const parsed = managementInput.parse(input);
-        const id = nodeId(parsed);
-        const body = {
-            ...(parsed.idempotency_key ? { request_id: parsed.idempotency_key } : {}),
-            ...(parsed.reason ? { reason: parsed.reason } : {}),
-        };
-        if (!ctx.confirmed)
-            return preview("nodes.suspend_management", { node_id: id, ...body });
-        return ctx.fetch(`/nodes/${encodeURIComponent(id)}/off-grid`, {
-            method: "POST",
-            body,
-            headers: requestHeaders(parsed.idempotency_key),
-        });
-    },
-});
-export const adminNodeResumeManagementCapability = defineCapability({
-    id: "nodes.resume_management",
-    domain: "fleet",
-    roles: ["admin"],
-    description: "Resume Ornn management for one exact off-grid node.",
-    mutation: "preview-confirm",
-    http: { method: "POST", path: "/nodes/{id}/on-grid" },
-    cli: {
-        command: ["admin", "nodes", "resume-management"],
-        vnext: adminLifecycleHelp(["admin", "nodes", "resume-management"], "Restore Ornn management and managed access on one off-grid node.", "ornn admin nodes resume-management <node-ref> [--yes] [--no-wait]", "ornn admin nodes resume-management <node-id> --yes --idempotency-key KEY --format json", "Node, supplier, facility, capacity assignment, remote re-enrollment, and restored managed access."),
-    },
-    mcp: false,
-    slack: false,
-    input: managementInput,
-    execute: async (ctx, input) => {
-        const parsed = managementInput.parse(input);
-        const id = nodeId(parsed);
-        if (!ctx.confirmed)
-            return preview("nodes.resume_management", { node_id: id });
-        return ctx.fetch(`/nodes/${encodeURIComponent(id)}/on-grid`, {
-            method: "POST",
-            body: {
-                ...(parsed.idempotency_key ? { request_id: parsed.idempotency_key } : {}),
-            },
-            headers: requestHeaders(parsed.idempotency_key),
-        });
-    },
-});
-export const adminNodeTerminateCapability = defineCapability({
-    id: "nodes.terminate",
-    domain: "fleet",
-    roles: ["admin"],
-    description: "Delete one exact node record with explicit cleanup scope and consequence review.",
-    mutation: "preview-confirm",
-    http: { method: "POST", path: "/nodes/{id}/terminate" },
-    cli: {
-        command: ["admin", "nodes", "terminate"],
-        vnext: adminLifecycleHelp(["admin", "nodes", "terminate"], "End managed access and permanently delete one exact node record.", "ornn admin nodes terminate <node-ref> --delete-node-record [--skip-cleanup] [--reason TEXT] [--yes]", "ornn admin nodes terminate <node-id> --delete-node-record --yes --idempotency-key KEY --format json", "Node, supplier, facility, reservation/capacity, host cleanup, node-record deletion, and access loss."),
-    },
-    mcp: false,
-    slack: false,
-    input: terminationInput,
-    execute: async (ctx, input) => {
-        const parsed = terminationInput.parse(input);
-        const id = nodeId(parsed);
-        const body = {
-            force: parsed.skip_cleanup === true,
-            ...(parsed.idempotency_key ? { request_id: parsed.idempotency_key } : {}),
-            ...(parsed.reason ? { reason: parsed.reason } : {}),
-        };
-        if (!ctx.confirmed)
-            return preview("nodes.terminate", { node_id: id, ...body });
-        return ctx.fetch(`/nodes/${encodeURIComponent(id)}/terminate`, {
-            method: "POST",
-            body,
-            headers: requestHeaders(parsed.idempotency_key),
-        });
-    },
-});
 export const adminNodeAssignCapability = defineCapability({
     id: "nodes.assign",
     domain: "fleet",
@@ -204,7 +109,7 @@ export const adminNodeAssignCapability = defineCapability({
     http: { method: "POST", path: "/nodes/{id}/assign" },
     cli: {
         command: ["admin", "nodes", "assign"],
-        vnext: adminLifecycleHelp(["admin", "nodes", "assign"], "Assign one exact node to one exact capacity reservation.", "ornn admin nodes assign <node-ref> --reservation <reservation-id> [--yes] [--no-wait]", "ornn admin nodes assign <node-id> --reservation <reservation-id> --yes --idempotency-key KEY --format json", "Node, supplier, facility, previous and requested capacity assignments, and tenant access change."),
+        vnext: adminLifecycleHelp(["admin", "nodes", "assign"], "Assign one exact node to one exact capacity reservation.", "ornn admin nodes assign <node-ref> --reservation <reservation-id> [] [--no-wait]", "ornn admin nodes assign <node-id> --reservation <reservation-id>  --idempotency-key KEY --format json", "Node, supplier, facility, previous and requested capacity assignments, and tenant access change."),
     },
     mcp: false,
     slack: false,
@@ -228,8 +133,5 @@ export const adminNodeAssignCapability = defineCapability({
 export const adminNodeLifecycleCapabilities = [
     adminNodeRebootCapability,
     adminNodeHardResetCapability,
-    adminNodeSuspendManagementCapability,
-    adminNodeResumeManagementCapability,
-    adminNodeTerminateCapability,
     adminNodeAssignCapability,
 ];

package/vendor/capabilities/capabilities/admin.js

@@ -36,9 +36,9 @@ function withAdminBinding(capability, help) {
         },
     };
 }
-export const adminUsersListCapability = withAdminBinding(usersListCapability, adminHelp(["admin", "users", "list"], "List users belonging to organizations in the Authorization directory.", "ornn admin users list [--query QUERY] [--organization UUID] [--limit 25] [--offset OFFSET] [--cursor CURSOR]", "ornn admin users list --query QUERY --limit 25 [--cursor CURSOR] --format json"));
-export const adminOrganizationsListCapability = withAdminBinding(organizationListCapability, adminHelp(["admin", "organizations", "list"], "List organizations in the Authorization directory.", "ornn admin organizations list [--query QUERY] [--role consumer|supplier] [--approved true|false] [--ids UUID,...] [--limit 25] [--offset OFFSET] [--cursor CURSOR]", "ornn admin organizations list --query QUERY --limit 25 [--cursor CURSOR] --format json"));
-export const adminSuppliersListCapability = withAdminBinding(listSuppliersCapability, adminHelp(["admin", "suppliers", "list"], "List supplier organizations visible to staff.", "ornn admin suppliers list [--limit 50] [--cursor CURSOR]", "ornn admin suppliers list --limit 50 --format json"));
+export const adminUsersListCapability = withAdminBinding(usersListCapability, adminHelp(["admin", "users", "list"], "List users in the Authorization directory; pass next_offset as --offset to continue.", "ornn admin users list [--query QUERY] [--organization UUID] [--limit 25] [--offset OFFSET]", "ornn admin users list --query QUERY --limit 25 [--offset OFFSET] --format json"));
+export const adminOrganizationsListCapability = withAdminBinding(organizationListCapability, adminHelp(["admin", "organizations", "list"], "List organizations in the Authorization directory; pass next_offset as --offset to continue.", "ornn admin organizations list [--query QUERY] [--role consumer|supplier] [--approved true|false] [--ids UUID,...] [--limit 25] [--offset OFFSET]", "ornn admin organizations list --query QUERY --limit 25 [--offset OFFSET] --format json"));
+export const adminSuppliersListCapability = withAdminBinding(listSuppliersCapability, adminHelp(["admin", "suppliers", "list"], "List supplier organizations visible to staff; pass next_offset as --offset to continue.", "ornn admin suppliers list [--limit 50] [--offset OFFSET]", "ornn admin suppliers list --limit 50 --offset OFFSET --format json"));
 export const adminFacilitiesListCapability = withAdminBinding(listFacilitiesCapability, adminHelp(["admin", "facilities", "list"], "List facilities visible to staff.", "ornn admin facilities list [--supplier UUID] [--limit 50] [--cursor CURSOR]", "ornn admin facilities list --limit 50 --format json"));
 export const adminNodesListCapability = withAdminBinding(listNodesCapability, adminHelp(["admin", "nodes", "list"], "List enrolled, ghost, and off-grid nodes.", "ornn admin nodes list [--supplier UUID] [--facility FACILITY] [--status STATUS] [--reservation UUID] [--limit 50] [--cursor CURSOR]", "ornn admin nodes list --limit 50 [--cursor CURSOR] --format json"));
 const nodeInput = z.object({ node_id: z.string().min(1) });

package/vendor/capabilities/capabilities/clusters.js

@@ -204,7 +204,7 @@ export const clusterCliCapabilities = [
         mutation: "preview-confirm",
         outcome: "Add one currently eligible machine, or rediscover that exact membership goal.",
         human: "ornn clusters add-node [<cluster-id>] [<machine-id-or-hostname>] [--guided] [--no-wait]",
-        automation: "ornn clusters add-node <cluster-id> <machine-id> --yes --idempotency-key <key> --format json",
+        automation: "ornn clusters add-node <cluster-id> <machine-id>  --idempotency-key <key> --format json",
         acceptedReferences: [
             "canonical cluster ID",
             "canonical machine ID",
@@ -221,7 +221,7 @@ export const clusterCliCapabilities = [
         mutation: "preview-confirm",
         outcome: "Remove one exact member, or rediscover that exact membership goal.",
         human: "ornn clusters remove-node [<cluster-id>] [<machine-id-or-hostname>] [--guided] [--no-wait]",
-        automation: "ornn clusters remove-node <cluster-id> <machine-id> --yes --idempotency-key <key> --format json",
+        automation: "ornn clusters remove-node <cluster-id> <machine-id>  --idempotency-key <key> --format json",
         acceptedReferences: [
             "canonical cluster ID",
             "canonical machine ID",
@@ -238,7 +238,7 @@ export const clusterCliCapabilities = [
         mutation: "preview-confirm",
         outcome: "End cluster lifecycle while reporting partial member failures and continuing reservation charges.",
         human: "ornn clusters teardown [<cluster-id>] [--guided] [--no-wait]",
-        automation: "ornn clusters teardown <cluster-id> --yes --idempotency-key <key> --format json",
+        automation: "ornn clusters teardown <cluster-id>  --idempotency-key <key> --format json",
         acceptedReferences: ["canonical cluster ID", "invocation-local guided choice"],
         review: "The cluster and native access end; the capacity reservation and its charges remain.",
         related: ["clusters show", "reservations show"],

package/vendor/capabilities/capabilities/commerce-market.js

@@ -33,7 +33,7 @@ export const listingsListCapability = defineCapability({
     id: "listings.list",
     domain: "listings",
     roles: ["user"],
-    description: "List native capacity listings. Primary listings require organization approval. Returns capacityListingId, hardware, capacity and availability; read listings.terms separately for prices and durations.",
+    description: "List native capacity listings. Primary listings require organization approval. Returns capacityListingId, hardware, capacity and availability; when nextCursor is present, pass it back as cursor for the next page. Read listings.terms separately for prices and durations.",
     mutation: "read",
     http: { method: "GET", path: "/commerce/v2/listings" },
     input: listingsListInput,
@@ -142,13 +142,13 @@ export const listingRelistCapability = defineCapability({
     id: "listings.relist",
     domain: "listings",
     roles: ["user"],
-    description: "Relist whole nodes of a reservation's capacity using a native availability window, nodeCount and financial terms. Buyers run on nodes Ornn assigns when their rental starts. Requires confirm: true.",
+    description: "Relist whole nodes of a reservation's capacity using a native availability window, nodeCount and financial terms. Buyers run on nodes Ornn assigns when their rental starts..",
     mutation: "preview-confirm",
     http: { method: "POST", path: "/commerce/reservations/{reservationId}/relist" },
     input: listingRelistInput,
     cli: {
         command: ["capacity-offers", "relist"],
-        vnext: help(["capacity-offers", "relist"], "Relist reserved capacity with explicit financial terms.", "ornn capacity-offers relist --reservation-id UUID --node-count COUNT --starts-at TIME --ends-at TIME --terms JSON", "ornn capacity-offers relist --reservation-id UUID --node-count 1 --starts-at TIME --ends-at TIME --terms JSON --idempotency-key KEY --yes --format json", ["capacity-offers terms", "capacity-offers delist"], 24, ["reservation ID"]),
+        vnext: help(["capacity-offers", "relist"], "Relist reserved capacity with explicit financial terms.", "ornn capacity-offers relist --reservation-id UUID --node-count COUNT --starts-at TIME --ends-at TIME --terms JSON", "ornn capacity-offers relist --reservation-id UUID --node-count 1 --starts-at TIME --ends-at TIME --terms JSON --idempotency-key KEY  --format json", ["capacity-offers terms", "capacity-offers delist"], 24, ["reservation ID"]),
     },
     slack: false,
     execute: async (ctx, input) => {
@@ -179,7 +179,7 @@ export const listingUpdateCapability = defineCapability({
     id: "listings.update",
     domain: "listings",
     roles: ["admin"],
-    description: "Staff only: edit one advertised native financial term with its complete financial fields. Reuse idempotencyKey on retries. Requires confirm: true.",
+    description: "Staff only: edit one advertised native financial term with its complete financial fields. Reuse idempotencyKey on retries..",
     mutation: "preview-confirm",
     http: { method: "PATCH", path: "/commerce/v2/listings/{listingId}/terms/{listingTermsId}" },
     input: listingUpdateInput,
@@ -212,13 +212,13 @@ export const listingDelistCapability = defineCapability({
     id: "listings.delist",
     domain: "listings",
     roles: ["user"],
-    description: "Delist a listing you own. Its unsold time leaves the market, its spot asks are cancelled and running spot reservations on it end. Windows already bought stay sold. Requires confirm: true.",
+    description: "Delist a listing you own. Its unsold time leaves the market, its spot asks are cancelled and running spot reservations on it end. Windows already bought stay sold..",
     mutation: "preview-confirm",
     http: { method: "POST", path: "/commerce/v2/listings/{listingId}/delist" },
     input: listingDelistInput,
     cli: {
         command: ["capacity-offers", "delist"],
-        vnext: help(["capacity-offers", "delist"], "Delist a listing you relisted.", "ornn capacity-offers delist --listing-id <id>", "ornn capacity-offers delist --listing-id <id> --yes --format json", ["capacity-offers relist"], 26, ["listing ID"]),
+        vnext: help(["capacity-offers", "delist"], "Delist a listing you relisted.", "ornn capacity-offers delist --listing-id <id>", "ornn capacity-offers delist --listing-id <id>  --format json", ["capacity-offers relist"], 26, ["listing ID"]),
     },
     slack: false,
     execute: async (ctx, input) => {
@@ -256,7 +256,7 @@ export const reservationsListCapability = defineCapability({
     id: "reservations.list",
     domain: "reservations",
     roles: ["user"],
-    description: "List this organization's reservations, schedule and spot alike (a running spot reservation has no end time). With listingId, list the trades on a listing you own.",
+    description: "List this organization's reservations, schedule and spot alike (a running spot reservation has no end time). With listingId, list the trades on a listing you own. When nextCursor is present, pass it back as cursor for the next page.",
     mutation: "read",
     http: { method: "GET", path: "/commerce/reservations" },
     input: reservationsListInput,
@@ -348,13 +348,13 @@ export const reservationPurchaseCapability = defineCapability({
     id: "reservations.purchase",
     domain: "reservations",
     roles: ["user"],
-    description: "Book a window of a relisted (secondary) listing on one of its terms at the term's price. The GPUs are held for you until the window starts; then it becomes your reservation, with the booking's ID. Nothing is charged when you book. Primary listings take offers instead (offers.post). Requires confirm: true.",
+    description: "Book a window of a relisted (secondary) listing on one of its terms at the term's price. The GPUs are held for you until the window starts; then it becomes your reservation, with the booking's ID. Nothing is charged when you book. Primary listings take offers instead (offers.post)..",
     mutation: "preview-confirm",
     http: { method: "POST", path: "/v1/markets/bookings" },
     input: reservationPurchaseInput,
     cli: {
         command: ["reservations", "buy"],
-        vnext: help(["reservations", "buy"], "Book a window of relisted capacity at its term's price.", "ornn reservations buy --listing-id <id> --listing-term-id <id> --starts-at <time> --ends-at <time> --price-per-gpu-hour-micro-usd <n> [--node-count <n>]", "ornn reservations buy --listing-id <id> --listing-term-id <id> --starts-at <time> --ends-at <time> --price-per-gpu-hour-micro-usd 4000000 --idempotency-key <key> --yes --format json", ["capacity-offers availability", "capacity-offers terms", "reservations show"], 30, ["listingTermsId from capacity-offers terms"]),
+        vnext: help(["reservations", "buy"], "Book a window of relisted capacity at its term's price.", "ornn reservations buy --listing-id <id> --listing-term-id <id> --starts-at <time> --ends-at <time> --price-per-gpu-hour-micro-usd <n> [--node-count <n>]", "ornn reservations buy --listing-id <id> --listing-term-id <id> --starts-at <time> --ends-at <time> --price-per-gpu-hour-micro-usd 4000000 --idempotency-key <key>  --format json", ["capacity-offers availability", "capacity-offers terms", "reservations show"], 30, ["listingTermsId from capacity-offers terms"]),
     },
     slack: false,
     execute: async (ctx, input) => {