@ornncompute/cli 1.0.139 → 1.0.141

package/package.json

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

package/src/evidence-commands.mjs

@@ -1,3 +1,4 @@
+import { metricsSnapshotCapability, metricsHistoryCapability } from "../vendor/capabilities/cli.js";
 import * as gatewayApi from "../vendor/api-client/gateway.js";
 import { gpuLabeler } from "./gpu-catalog.mjs";
 import { clusterFactLabel, reservationFactsForCluster } from "./kubernetes-commands.mjs";
@@ -777,19 +778,20 @@ function invalidEvidenceResponse(code) {
 async function metricSource(machine, reservation, window, maximum, deps, deadline, signal, live) {
   const response = await fetchEvidence(
     async (requestSignal) => {
+      const context = {
+        actor: "",
+        role: "user",
+        fetch: (path, init) => deps.fetch(path, { ...init, signal: requestSignal }),
+      };
+      const input = { reservationId: reservation, machineId: machine.id };
       const payload = live
-        ? await gatewayApi.getReservationLiveMetrics(
-            deps.fetch,
-            reservation,
-            { machine_id: machine.id },
-            requestSignal
-          )
-        : await gatewayApi.getReservationTelemetryHistory(
-            deps.fetch,
-            reservation,
-            { machine_id: machine.id, start: window.start, end: window.end, max_points: maximum },
-            requestSignal
-          );
+        ? (await metricsSnapshotCapability.execute(context, input))[0]
+        : await metricsHistoryCapability.execute(context, {
+            ...input,
+            start: window.start,
+            end: window.end,
+            maxPoints: maximum,
+          });
       const points = metricPoints(payload, maximum, window);
       if (points === null) throw invalidEvidenceResponse("invalid_metrics_response");
       return points;

package/src/vm-commands.mjs

@@ -1,3 +1,7 @@
+import {
+  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";
@@ -731,41 +735,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,
+        };
+      }),
     })),
   };
 }
@@ -4435,10 +4420,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 +4488,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",