@ornncompute/cli 1.0.140 → 1.0.142

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ornncompute/cli",
-  "version": "1.0.140",
+  "version": "1.0.142",
   "description": "Command-line interface for Ornn compute access workflows.",
   "type": "module",
   "bin": {

package/src/vm-commands.mjs

@@ -1,3 +1,10 @@
+import {
+  sshKeyListCapability,
+  sshKeyAddCapability,
+  sshKeyDeleteCapability,
+  sshKeyAssignmentStatusCapability,
+  sshKeyDeliveryStatus,
+} from "../vendor/capabilities/cli.js";
 import * as orchestrator from "../vendor/api-client/orchestrator.js";
 import * as gatewayApi from "../vendor/api-client/gateway.js";
 import { getReservation } from "../vendor/api-client/commerce.js";
@@ -529,7 +536,7 @@ async function fetchOrganizationKeys(context) {
   const seen = new Set();
   let cursor = null;
   do {
-    const page = await gatewayApi.listAccountSshKeys(context.fetch, {
+    const page = await sshKeyListCapability.execute(context, {
       status: "active",
       limit: 500,
       ...(cursor ? { cursor } : {}),
@@ -664,11 +671,11 @@ export async function materializeKey(context, plan, interaction, idempotencyKey)
   const replay = keys.find((key) => text(key.public_key) === publicKey);
   if (replay) return replay;
   const created = record(
-    await gatewayApi.createAccountSshKey(
-      context.fetch,
-      { label: text(plan.key.label), public_key: publicKey },
-      { headers: { "Idempotency-Key": idempotencyKey } }
-    )
+    await sshKeyAddCapability.execute(context, {
+      publicKey,
+      label: text(plan.key.label),
+      idempotencyKey,
+    })
   );
   if (!resourceId(created) || text(created.public_key) !== publicKey) {
     interaction.error("The saved SSH key did not match the reviewed public key.", {
@@ -731,41 +738,22 @@ function virtualMachineForNode(payload, node, interaction) {
   return matches[0] ?? null;
 }
 
-function keyDeliveryForMachine(key, machine) {
-  const keyId = resourceId(key);
-  const metadata = Array.isArray(machine.authorized_key_metadata)
-    ? machine.authorized_key_metadata
-        .map(record)
-        .find(
-          (item) =>
-            text(item.ssh_key_id) === keyId || text(item.fingerprint) === text(key.fingerprint)
-        )
-    : null;
-  const fingerprints = Array.isArray(machine.authorized_key_fingerprints)
-    ? machine.authorized_key_fingerprints
-    : [];
-  const installed =
-    text(key.fingerprint) && fingerprints.includes(text(key.fingerprint)) && machine.keys_pushed_at;
-  return {
-    machine_id: machineId(machine),
-    hostname: machineHostname(machine) || null,
-    machine_state: machineState(machine),
-    status: text(metadata?.status) ?? (installed ? "installed" : "associated"),
-    queued_at: text(metadata?.queued_at),
-    pushed_at: text(metadata?.pushed_at) ?? (installed ? text(machine.keys_pushed_at) : null),
-    failed_at: text(metadata?.failed_at),
-    failure_reason: text(metadata?.failure_reason),
-    request_id: text(metadata?.request_id),
-  };
-}
-
 function assignmentStatus(reservationId, keys, machines) {
   return {
     reservation_id: reservationId,
     machine_count: machines.length,
     keys: keys.map((key) => ({
       ...projectKey(key),
-      machines: machines.map((machine) => keyDeliveryForMachine(key, machine)),
+      machines: machines.map((machine) => {
+        const { linux_username: _username, ...delivery } = sshKeyDeliveryStatus(key, machine);
+        return {
+          machine_id: machine.node_id,
+          hostname: machine.hostname || null,
+          machine_state: machine.status,
+          queued_at: null,
+          ...delivery,
+        };
+      }),
     })),
   };
 }
@@ -4317,7 +4305,7 @@ export async function executeSshKeyCommand(command, input, context, interaction)
   if (command === "list") {
     positional(input, 0, "ornn ssh-keys list [--limit <1-500>] [--cursor <cursor>]", interaction);
     const limit = input.limit ?? 50;
-    const payload = await gatewayApi.listAccountSshKeys(context.fetch, {
+    const payload = await sshKeyListCapability.execute(context, {
       status: "active",
       limit,
       ...(text(input.cursor) ? { cursor: input.cursor } : {}),
@@ -4411,8 +4399,9 @@ export async function executeSshKeyCommand(command, input, context, interaction)
         presentation: { lines: ["SSH-key deletion declined."] },
       });
     }
-    await gatewayApi.deleteAccountSshKey(context.fetch, resourceId(key), {
-      headers: { "Idempotency-Key": text(input.idempotencyKey) ?? interaction.idempotencyKey() },
+    await sshKeyDeleteCapability.execute(context, {
+      keyId: resourceId(key),
+      idempotencyKey: text(input.idempotencyKey) ?? interaction.idempotencyKey(),
     });
     return interaction.result({
       data: { ssh_key: projectKey(key) },
@@ -4435,10 +4424,10 @@ export async function executeSshKeyCommand(command, input, context, interaction)
   }
 
   if (command === "assignments.status") {
-    const [keys, machines] = await Promise.all([
-      fetchAssignedKeys(context, reservationId),
-      fetchMachines(context, reservationId),
-    ]);
+    const { keys, nodes: machines } = await sshKeyAssignmentStatusCapability.execute(
+      { actor: "", role: "user", fetch: context.fetch },
+      { reservationId }
+    );
     keys.sort((left, right) => String(resourceId(left)).localeCompare(String(resourceId(right))));
     const page = cursorPage(keys, input, interaction);
     const status = assignmentStatus(reservationId, page.items, machines);
@@ -4503,10 +4492,10 @@ export async function executeSshKeyCommand(command, input, context, interaction)
   }
 
   if (command === "assignments.sync") {
-    const [keys, machines] = await Promise.all([
-      fetchAssignedKeys(context, reservationId),
-      fetchMachines(context, reservationId),
-    ]);
+    const { keys, nodes: machines } = await sshKeyAssignmentStatusCapability.execute(
+      { actor: "", role: "user", fetch: context.fetch },
+      { reservationId }
+    );
     if (!keys.length) {
       interaction.error("No SSH keys are assigned to this capacity reservation.", {
         code: "ssh_key_assignment_missing",