@ornncompute/cli 1.0.116 → 1.0.118

package/package.json

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

package/src/api-client.mjs

@@ -251,9 +251,9 @@ export function resolveInstallerBaseUrl({ env = process.env } = {}) {
 }
 
 function operatorProxyEndpoint(endpoint) {
-  // Benchmark functions use their owner namespace; retain the existing staff
-  // envelope, including its admin-role and impersonation checks.
-  const path = normalizeComputePath(endpoint).replace(/^\/v1\/benchmark(?=\/|$)/, "");
+  // Shared clients use canonical staff or Benchmark paths. Keep the existing
+  // staff envelope, including its admin-role and impersonation checks.
+  const path = normalizeComputePath(endpoint).replace(/^\/v1\/(?:staff|benchmark)(?=\/|$)/, "");
   return `/v1/staff${path}`;
 }
 

package/src/evidence-commands.mjs

@@ -1,3 +1,4 @@
+import * as gatewayApi from "../vendor/api-client/gateway.js";
 import { gpuLabeler } from "./gpu-catalog.mjs";
 import { clusterFactLabel, reservationFactsForCluster } from "./kubernetes-commands.mjs";
 import { listOwnedActiveMachines, resolveMachineReference } from "./machine-reference.mjs";
@@ -410,7 +411,7 @@ async function activeMachines(fetch, interaction) {
 }
 
 async function clusters(fetch, interaction) {
-  const payload = await fetch("/v1/workflows/compute/clusters");
+  const payload = await gatewayApi.listClusters(fetch);
   const rows = payloadRows(payload, "clusters");
   if (!rows)
     interaction.error("The gateway returned an invalid cluster collection.", {
@@ -769,23 +770,22 @@ function invalidEvidenceResponse(code) {
   return error;
 }
 
-function query(params) {
-  return new URLSearchParams(
-    Object.entries(params).filter(([, value]) => value !== null && value !== undefined)
-  ).toString();
-}
-
 async function metricSource(machine, reservation, window, maximum, deps, deadline, signal, live) {
-  const path = live ? "live-metrics" : "telemetry-history";
-  const params = live
-    ? { machine_id: machine.id }
-    : { machine_id: machine.id, start: window.start, end: window.end, max_points: String(maximum) };
   const response = await fetchEvidence(
     async (requestSignal) => {
-      const payload = await deps.fetch(
-        `/v1/workflows/compute/nodes/reservations/${encodeURIComponent(reservation)}/${path}?${query(params)}`,
-        { signal: requestSignal }
-      );
+      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
+          );
       const points = metricPoints(payload, maximum, window);
       if (points === null) throw invalidEvidenceResponse("invalid_metrics_response");
       return points;
@@ -830,16 +830,18 @@ async function logSource(
 ) {
   const response = await fetchEvidence(
     async (requestSignal) => {
-      const payload = await deps.fetch(
-        `/v1/workflows/compute/nodes/reservations/${encodeURIComponent(reservation)}/logs?${query({
+      const payload = await gatewayApi.getReservationLogs(
+        deps.fetch,
+        reservation,
+        {
           machine_id: machine.id,
           stream,
           start: window.start,
           end: window.end,
-          limit: String(limit),
+          limit,
           cursor,
-        })}`,
-        { signal: requestSignal }
+        },
+        requestSignal
       );
       const entries = logLines(payload, limit, window);
       if (entries === null) throw invalidEvidenceResponse("invalid_logs_response");

package/src/external-bucket-commands.mjs

@@ -1,3 +1,4 @@
+import * as gatewayApi from "../vendor/api-client/gateway.js";
 import { createHash } from "node:crypto";
 import { readFile } from "node:fs/promises";
 
@@ -84,7 +85,8 @@ function verificationCode(source) {
   return typeof code === "string" && /^[A-Za-z][A-Za-z0-9_.-]{0,127}$/.test(code) ? code : null;
 }
 
-const TRANSFER_ACCOUNT_PATTERN = /^[a-z][a-z0-9-]{4,28}[a-z0-9]@[a-z][a-z0-9-]{4,28}[a-z0-9]\.iam\.gserviceaccount\.com$/;
+const TRANSFER_ACCOUNT_PATTERN =
+  /^[a-z][a-z0-9-]{4,28}[a-z0-9]@[a-z][a-z0-9-]{4,28}[a-z0-9]\.iam\.gserviceaccount\.com$/;
 
 function safeTransferAccount(value) {
   return typeof value === "string" && TRANSFER_ACCOUNT_PATTERN.test(value) ? value : null;
@@ -767,11 +769,10 @@ function attachmentFrom(payload) {
 
 async function fetchImportAttachment(runtime, reservationId, { signal } = {}) {
   try {
-    const payload = await runtime.fetch(
-      computeEndpoint(
-        `/nodes/reservations/${encodeURIComponent(reservationId)}/storage-attachment`
-      ),
-      { method: "GET", ...(signal ? { signal } : {}) }
+    const payload = await gatewayApi.getReservationStorageAttachment(
+      runtime.fetch,
+      reservationId,
+      signal
     );
     return attachmentFrom(payload);
   } catch (error) {
@@ -1217,21 +1218,16 @@ async function importBucket(input, runtime) {
   const replayed = attachment !== null;
   if (!attachment) {
     try {
-      const payload = await runtime.fetch(
-        computeEndpoint(
-          `/nodes/reservations/${encodeURIComponent(reservationId)}/storage-deployment`
-        ),
+      const payload = await gatewayApi.deployReservationStorage(
+        runtime.fetch,
+        reservationId,
         {
-          body: {
-            drive_id: bucket.id,
-            mount_path: "/home/tenant/volume",
-            mount_mode: "fuse",
-            access_mode: "read-write",
-          },
-          headers: idempotencyHeaders(input),
-          method: "POST",
-          signal: runtime.signal,
-        }
+          drive_id: bucket.id,
+          mount_path: "/home/tenant/volume",
+          mount_mode: "fuse",
+          access_mode: "read-write",
+        },
+        { headers: idempotencyHeaders(input), signal: runtime.signal }
       );
       attachment = attachmentFrom(payload);
       if (!attachment || String(attachment.drive_id ?? "") !== bucket.id) {

package/src/kubernetes-commands.mjs

@@ -1,3 +1,4 @@
+import * as gatewayApi from "../vendor/api-client/gateway.js";
 import { getReservation } from "../vendor/api-client/commerce.js";
 import { createHash } from "node:crypto";
 
@@ -13,7 +14,6 @@ import { listActiveReservations, reservationLabeler } from "./machine-reference.
 import { keyInputShapePreflight, keyPlanFromInput, materializeKey } from "./vm-commands.mjs";
 
 const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-const CLUSTERS_PATH = "/v1/workflows/compute/clusters";
 const DEFAULT_LIMIT = 50;
 const MAX_LIMIT = 500;
 const DEFAULT_WAIT_SECONDS = 600;
@@ -135,17 +135,8 @@ function clusterLines(cluster) {
   ];
 }
 
-function eligibilityPath(reservationId, accessMode = "kubernetes") {
-  const query = new URLSearchParams({ access_mode: accessMode });
-  return `/v1/workflows/compute/tenants/me/reservations/${encodeURIComponent(reservationId)}/cluster-eligible-machines?${query}`;
-}
-
-function clusterPath(cluster, suffix) {
-  return `/v1/workflows/compute/${cluster.access_mode}/reservations/${encodeURIComponent(cluster.reservation_id)}/${suffix}`;
-}
-
 async function fetchClusters(fetch) {
-  const payload = await fetch(CLUSTERS_PATH, { method: "GET" });
+  const payload = await gatewayApi.listClusters(fetch);
   const rows = Array.isArray(payload)
     ? payload
     : Array.isArray(record(payload).clusters)
@@ -240,10 +231,12 @@ async function resolveCluster(fetch, runtime, input) {
 async function fetchClusterDetail(fetch, runtime, cluster, { allowMissing = false, signal } = {}) {
   let payload;
   try {
-    payload = await fetch(clusterPath(cluster, "cluster"), {
-      method: "GET",
-      ...(signal ? { signal } : {}),
-    });
+    payload = await gatewayApi.getReservationCluster(
+      fetch,
+      cluster.access_mode,
+      cluster.reservation_id,
+      signal
+    );
   } catch (error) {
     if (allowMissing && error?.status === 404) return null;
     throw error;
@@ -263,7 +256,9 @@ async function fetchClusterDetail(fetch, runtime, cluster, { allowMissing = fals
 
 async function fetchEligibility(fetch, runtime, reservationId, accessMode = "kubernetes") {
   const payload = record(
-    await fetch(eligibilityPath(reservationId, accessMode), { method: "GET" })
+    await gatewayApi.getReservationClusterEligibility(fetch, reservationId, {
+      access_mode: accessMode,
+    })
   );
   if (
     text(payload.reservation_id) !== reservationId ||
@@ -558,10 +553,12 @@ function partialClusterExecution(runtime, cluster, accepted = {}) {
 async function clusterAccessIsReady(fetch, cluster, signal) {
   try {
     const credentials = record(
-      await fetch(clusterPath(cluster, "credentials"), {
-        method: "GET",
-        ...(signal ? { signal } : {}),
-      })
+      await gatewayApi.getReservationClusterCredentials(
+        fetch,
+        cluster.access_mode,
+        cluster.reservation_id,
+        signal
+      )
     );
     if (cluster.access_mode === "slurm") {
       return Boolean(text(credentials.login_host));
@@ -1280,19 +1277,18 @@ export async function launchClusterMode(
     });
   }
   if (selectedKeyId && requested.ssh_key) requested.ssh_key.id = selectedKeyId;
-  const response = await context.fetch(
-    `/v1/workflows/compute/${accessMode}/reservations/${encodeURIComponent(reservationId)}/cluster/launch`,
+  const response = await gatewayApi.launchReservationCluster(
+    context.fetch,
+    accessMode,
+    reservationId,
     {
-      method: "POST",
-      headers: { "Idempotency-Key": idempotencyKey },
-      body: {
-        network_mode: networkMode,
-        ...(membershipCount > 0 ? { node_count: membershipCount } : {}),
-        node_ids: selectedIds,
-        ...(virtualMachineIds.length ? { virtual_machine_ids: virtualMachineIds } : {}),
-        ...(selectedKeyId ? { ssh_key_ids: [selectedKeyId] } : {}),
-      },
-    }
+      network_mode: networkMode,
+      ...(membershipCount > 0 ? { node_count: membershipCount } : {}),
+      node_ids: selectedIds,
+      ...(virtualMachineIds.length ? { virtual_machine_ids: virtualMachineIds } : {}),
+      ...(selectedKeyId ? { ssh_key_ids: [selectedKeyId] } : {}),
+    },
+    { headers: { "Idempotency-Key": idempotencyKey } }
   );
   let cluster = projectCluster(response);
   if (!UUID.test(cluster.id ?? "")) {
@@ -1555,13 +1551,11 @@ async function addNode(input, deps) {
       code: "cluster_eligibility_changed",
     });
   }
-  await deps.fetch(
-    `/v1/workflows/compute/clusters/reservations/${encodeURIComponent(current.reservation_id)}/cluster/nodes`,
-    {
-      method: "POST",
-      headers: { "Idempotency-Key": prepared.idempotencyKey },
-      body: { node_id: machine.id },
-    }
+  await gatewayApi.addReservationClusterNode(
+    deps.fetch,
+    current.reservation_id,
+    { node_id: machine.id },
+    { headers: { "Idempotency-Key": prepared.idempotencyKey } }
   );
   const accepted = { membership_goal: goalIds, replayed: false };
   if (!shouldWait(deps.interaction, input))
@@ -1647,13 +1641,9 @@ async function removeNode(input, deps) {
       code: "cluster_membership_changed",
     });
   }
-  await deps.fetch(
-    `/v1/workflows/compute/clusters/reservations/${encodeURIComponent(current.reservation_id)}/cluster/nodes/${encodeURIComponent(machine.id)}`,
-    {
-      method: "DELETE",
-      headers: { "Idempotency-Key": prepared.idempotencyKey },
-    }
-  );
+  await gatewayApi.removeReservationClusterNode(deps.fetch, current.reservation_id, machine.id, {
+    headers: { "Idempotency-Key": prepared.idempotencyKey },
+  });
   const accepted = { membership_goal: goalIds, replayed: false };
   if (!shouldWait(deps.interaction, input))
     return deps.interaction.result({
@@ -1723,10 +1713,12 @@ async function teardownCluster(input, deps) {
       code: "cluster_membership_changed",
     });
   }
-  await deps.fetch(clusterPath(current, "cluster/teardown"), {
-    method: "POST",
-    headers: { "Idempotency-Key": idempotencyKey },
-  });
+  await gatewayApi.teardownReservationCluster(
+    deps.fetch,
+    current.access_mode,
+    current.reservation_id,
+    { headers: { "Idempotency-Key": idempotencyKey } }
+  );
   const accepted = {
     replayed: false,
     capacity_reservation: { id: current.reservation_id, retained: true, charges_continue: true },
@@ -1909,7 +1901,11 @@ export async function readClusterModeConnectContext(state, accessMode) {
   let credentialError = null;
   try {
     credentials = record(
-      await state.context.fetch(clusterPath(current, "credentials"), { method: "GET" })
+      await gatewayApi.getReservationClusterCredentials(
+        state.context.fetch,
+        current.access_mode,
+        current.reservation_id
+      )
     );
   } catch (error) {
     const status = Number(error?.status);
@@ -2046,7 +2042,11 @@ export const kubernetesConnectModeHandler = {
       });
     }
     const credentials = record(
-      await state.context.fetch(clusterPath(current, "credentials"), { method: "GET" })
+      await gatewayApi.getReservationClusterCredentials(
+        state.context.fetch,
+        current.access_mode,
+        current.reservation_id
+      )
     );
     const kubeconfig =
       typeof credentials.kubeconfig === "string" && credentials.kubeconfig.trim()

package/src/mount-commands.mjs

@@ -1,4 +1,5 @@
-import { CliApiError, computeEndpoint } from "./api-client.mjs";
+import * as gatewayApi from "../vendor/api-client/gateway.js";
+import { CliApiError } from "./api-client.mjs";
 import { isRecoverableWaitFailure } from "./interaction-runtime.mjs";
 import { resolveVolume, safeVolume } from "./storage-commands.mjs";
 
@@ -118,18 +119,6 @@ function safeFailure(
   });
 }
 
-function reservationAttachmentPath(reservationId) {
-  return computeEndpoint(
-    `/nodes/reservations/${encodeURIComponent(reservationId)}/storage-attachment`
-  );
-}
-
-function reservationDeploymentPath(reservationId) {
-  return computeEndpoint(
-    `/nodes/reservations/${encodeURIComponent(reservationId)}/storage-deployment`
-  );
-}
-
 function stableAttachmentPhase(value) {
   const state = text(value)?.toLowerCase() ?? "pending";
   if (["attached", "ready"].includes(state)) return state;
@@ -355,10 +344,11 @@ async function withMachineCount(runtime, mount, reservationId, signal) {
 
 async function fetchMount(runtime, reservationId, { preserveFailure = false, signal } = {}) {
   try {
-    const payload = await runtime.fetch(reservationAttachmentPath(reservationId), {
-      method: "GET",
-      ...(signal ? { signal } : {}),
-    });
+    const payload = await gatewayApi.getReservationStorageAttachment(
+      runtime.fetch,
+      reservationId,
+      signal
+    );
     return withMachineCount(
       runtime,
       projectVolumeMount(payload, reservationId),
@@ -679,15 +669,12 @@ export async function attachVolumeMount(input, runtime) {
   }
 
   try {
-    const payload = await runtime.fetch(reservationDeploymentPath(reservationId), {
-      method: "POST",
-      headers: idempotencyHeaders(input),
-      body: {
-        drive_id: projectedVolume.id,
-        mount_mode: "fuse",
-        access_mode: access,
-      },
-    });
+    const payload = await gatewayApi.deployReservationStorage(
+      runtime.fetch,
+      reservationId,
+      { drive_id: projectedVolume.id, mount_mode: "fuse", access_mode: access },
+      { headers: idempotencyHeaders(input) }
+    );
     current = await withMachineCount(
       runtime,
       projectVolumeMount(payload, reservationId),
@@ -787,10 +774,12 @@ export async function detachVolumeMount(input, runtime) {
   }
   current = refreshed;
   try {
-    await runtime.fetch(reservationAttachmentPath(reservationId), {
-      method: "DELETE",
-      headers: idempotencyHeaders(input),
-    });
+    await gatewayApi.detachReservationStorage(
+      runtime.fetch,
+      reservationId,
+      {},
+      { headers: idempotencyHeaders(input) }
+    );
   } catch (error) {
     if (error instanceof CliApiError && (error.status === undefined || error.status >= 500)) {
       const reconciled = await fetchMount(runtime, reservationId);

package/src/vm-commands.mjs

@@ -1,3 +1,4 @@
+import * as gatewayApi from "../vendor/api-client/gateway.js";
 import { getReservation } from "../vendor/api-client/commerce.js";
 import { spawn as spawnProcessDefault } from "node:child_process";
 import { createHash } from "node:crypto";
@@ -513,11 +514,11 @@ async function fetchOrganizationKeys(context) {
   const seen = new Set();
   let cursor = null;
   do {
-    const query = new URLSearchParams({ status: "active", limit: "500" });
-    if (cursor) query.set("cursor", cursor);
-    const page = await context.fetch(
-      `/v1/workflows/compute/nodes/organizations/me/ssh-keys?${query}`
-    );
+    const page = await gatewayApi.listAccountSshKeys(context.fetch, {
+      status: "active",
+      limit: 500,
+      ...(cursor ? { cursor } : {}),
+    });
     keys.push(...keysFromPayload(page));
     cursor = page.next_cursor ?? null;
     if (cursor && seen.has(cursor)) throw new Error("SSH key pagination did not advance.");
@@ -648,11 +649,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 context.fetch("/v1/workflows/compute/nodes/organizations/me/ssh-keys", {
-      method: "POST",
-      headers: { "Idempotency-Key": idempotencyKey },
-      body: { label: text(plan.key.label), public_key: publicKey },
-    })
+    await gatewayApi.createAccountSshKey(
+      context.fetch,
+      { label: text(plan.key.label), public_key: publicKey },
+      { headers: { "Idempotency-Key": idempotencyKey } }
+    )
   );
   if (!resourceId(created) || text(created.public_key) !== publicKey) {
     interaction.error("The saved SSH key did not match the reviewed public key.", {
@@ -1385,15 +1386,14 @@ function projectVolumeMount(value, reservationId) {
 }
 
 async function bareMetalRelationships(context, reservationId) {
-  const encoded = encodeURIComponent(reservationId);
   const missingAttachment = (error) => {
     if (!isReferenceMiss(error)) throw error;
     return null;
   };
   const [network, storage] = await Promise.all([
     context.fetch(`/v1/workflows/compute/networks/shared?overlay=true`),
-    context
-      .fetch(`/v1/workflows/compute/nodes/reservations/${encoded}/storage-attachment`)
+    gatewayApi
+      .getReservationStorageAttachment(context.fetch, reservationId)
       .catch(missingAttachment),
   ]);
   return {
@@ -3945,11 +3945,11 @@ 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 query = new URLSearchParams({ status: "active", limit: String(limit) });
-    if (text(input.cursor)) query.set("cursor", input.cursor);
-    const payload = await context.fetch(
-      `/v1/workflows/compute/nodes/organizations/me/ssh-keys?${query}`
-    );
+    const payload = await gatewayApi.listAccountSshKeys(context.fetch, {
+      status: "active",
+      limit,
+      ...(text(input.cursor) ? { cursor: input.cursor } : {}),
+    });
     const items = activeKeys(keysFromPayload(payload));
     const page = {
       items,
@@ -4039,13 +4039,9 @@ export async function executeSshKeyCommand(command, input, context, interaction)
         presentation: { lines: ["SSH-key deletion declined."] },
       });
     }
-    await context.fetch(
-      `/v1/workflows/compute/nodes/organizations/me/ssh-keys/${encodeURIComponent(resourceId(key))}`,
-      {
-        method: "DELETE",
-        headers: { "Idempotency-Key": text(input.idempotencyKey) ?? interaction.idempotencyKey() },
-      }
-    );
+    await gatewayApi.deleteAccountSshKey(context.fetch, resourceId(key), {
+      headers: { "Idempotency-Key": text(input.idempotencyKey) ?? interaction.idempotencyKey() },
+    });
     return interaction.result({
       data: { ssh_key: projectKey(key) },
       outcome: { class: "ended", phase: "deleted" },

package/vendor/api-client/commerce.js

@@ -370,6 +370,27 @@ function deleteComputeDealAddOn(request, id2, addOnId, body) {
   });
 }
 
+// ../../packages/api-client/dist/commerce/compute-contract-line-matches.js
+var matchesPath = "/internal/v1/gtm/compute-contract-line-matches";
+var capacityPath = "/internal/v1/gtm/compute-contract-line-capacity";
+function listComputeContractLineMatches(request, input, signal) {
+  const query = new URLSearchParams();
+  for (const id2 of input.dealIds ?? [])
+    query.append("dealId", id2);
+  for (const id2 of input.reservationIds ?? [])
+    query.append("reservationId", id2);
+  for (const id2 of input.listingIds ?? [])
+    query.append("listingId", id2);
+  return request(`${matchesPath}?${query}`, { method: "GET", signal });
+}
+function listComputeContractLineCapacity(request, input, signal) {
+  const query = new URLSearchParams();
+  for (const id2 of input.lineIds)
+    query.append("lineId", id2);
+  query.set("on", input.on);
+  return request(`${capacityPath}?${query}`, { method: "GET", signal });
+}
+
 // ../../packages/api-client/dist/commerce/staff.js
 function listDowntime(request, input = {}, signal) {
   return request("/internal/v1/downtime" + queryString(input), {
@@ -752,6 +773,8 @@ export {
   listCapacityNodes,
   listCapacityTerms,
   listCapacityTermsBatch,
+  listComputeContractLineCapacity,
+  listComputeContractLineMatches,
   listComputeDealAddOns,
   listComputeDeals,
   listContractFiles,