@ornncompute/cli 0.2.19 → 0.2.21

package/src/cli.mjs

@@ -11,8 +11,8 @@ import { pipeline } from "node:stream/promises";
 import {
   CliApiError,
   cliRequest,
-  computeEndpoint,
   loadRequiredSession,
+  normalizeComputePath,
   operatorRequest,
   raiseForFailedResponse,
   resolveApiBaseUrl,
@@ -1727,6 +1727,41 @@ async function status(args, { env, fetchImpl, stdout }) {
   return 0;
 }
 
+function rewriteCustomerApiPath(path) {
+  if (path.startsWith("/v1/")) {
+    return path;
+  }
+  const queryIndex = path.indexOf("?");
+  const pathname = queryIndex === -1 ? path : path.slice(0, queryIndex);
+  const search = queryIndex === -1 ? "" : path.slice(queryIndex);
+  if (pathname === "/storage-targets") {
+    return `/v1/orchestrator/storage-targets${search}`;
+  }
+  if (pathname === "/tenants/me" || pathname.startsWith("/tenants/me/")) {
+    const rest = pathname === "/tenants/me" ? "" : pathname.slice("/tenants/me".length);
+    return `/v1/workflows/commerce${rest}${search}`;
+  }
+  if (pathname === "/organizations/me" || pathname.startsWith("/organizations/me/")) {
+    return `/v1/workflows/compute/nodes${pathname}${search}`;
+  }
+  if (pathname === "/inventory") {
+    return `/v1/workflows/commerce/inventory${search}`;
+  }
+  if (pathname === "/listings" || pathname.startsWith("/listings/") || pathname === "/marketplace" || pathname.startsWith("/marketplace/")) {
+    return `/v1/workflows/commerce${pathname}${search}`;
+  }
+  if (pathname === "/networks" || pathname.startsWith("/networks/")) {
+    return `/v1/orchestrator${pathname}${search}`;
+  }
+  if (pathname === "/nodes/storage-drives" || pathname.startsWith("/nodes/storage-drives/")) {
+    return `/v1/orchestrator/drives${pathname.slice("/nodes/storage-drives".length)}${search}`;
+  }
+  if (pathname.startsWith("/nodes/")) {
+    return `/v1/workflows/compute${pathname}${search}`;
+  }
+  return path;
+}
+
 async function api(args, { env, fetchImpl, stdout }) {
   const [method, path, ...rest] = args;
   if (!method || !path) {
@@ -1746,7 +1781,7 @@ async function api(args, { env, fetchImpl, stdout }) {
   const body = await readJsonOption(options.data);
   const response = await cliRequest({
     body,
-    endpoint: computeEndpoint(path),
+    endpoint: rewriteCustomerApiPath(normalizeComputePath(path)),
     env,
     fetchImpl,
     method: normalizedMethod,
@@ -1790,7 +1825,7 @@ async function availability(args, context) {
     );
     const { limit, cursor } = listPaginationOptions(options);
     const forecast = await cliRequest({
-      endpoint: computeEndpoint(`/listings/forecast${buildQuery({ limit, cursor })}`),
+      endpoint: `/v1/workflows/commerce/listings/forecast${buildQuery({ limit, cursor })}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
     });
@@ -1866,7 +1901,7 @@ async function bid(args, context) {
     );
     const { limit, cursor } = listPaginationOptions(options);
     const bids = await cliRequest({
-      endpoint: computeEndpoint(`/tenants/me/bids${buildQuery({ limit, cursor })}`),
+      endpoint: `/v1/workflows/commerce/bids${buildQuery({ limit, cursor })}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
     });
@@ -1953,7 +1988,7 @@ async function bid(args, context) {
     }
     const created = await cliRequest({
       body: payload,
-      endpoint: computeEndpoint("/tenants/me/bids"),
+      endpoint: "/v1/workflows/commerce/bids",
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "POST",
@@ -2013,7 +2048,7 @@ async function bid(args, context) {
     };
     const updated = await cliRequest({
       body: payload,
-      endpoint: computeEndpoint(`/tenants/me/bids/${id}`),
+      endpoint: `/v1/workflows/commerce/bids/${id}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "PATCH",
@@ -2034,7 +2069,7 @@ async function bid(args, context) {
       `Usage: ornn ${commandName} withdraw <${idPlaceholder}> [--json]`
     );
     const response = await cliRequest({
-      endpoint: computeEndpoint(`/tenants/me/bids/${id}`),
+      endpoint: `/v1/workflows/commerce/bids/${id}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "DELETE",
@@ -2414,7 +2449,7 @@ async function guideClusterCreate(reservationId, originalOptions, context) {
     if (!selectedReservationId) {
       const reservations = requireArrayPayload(
         await cliRequest({
-          endpoint: computeEndpoint("/clusters/reservations"),
+          endpoint: "/v1/workflows/compute/clusters/reservations",
           env: context.env,
           fetchImpl: context.fetchImpl,
         }),
@@ -2572,7 +2607,7 @@ async function reservationOp(subcommand, id, rest, context) {
         throw new Error("--listing must be a Commerce listing UUID.");
       }
       const result = await operatorRequest({
-        endpoint: `/internal/commerce-reservations/deployable${buildQuery({ tenant_id: tenant.id, listing_id: listingId })}`,
+        endpoint: `/v1/staff/internal/commerce-reservations/deployable${buildQuery({ tenant_id: tenant.id, listing_id: listingId })}`,
         env: context.env,
         fetchImpl: context.fetchImpl,
       });
@@ -2650,7 +2685,7 @@ async function reservationOp(subcommand, id, rest, context) {
       }
       const result = await operatorRequest({
         body,
-        endpoint: "/internal/commerce-reservations",
+        endpoint: "/v1/staff/internal/commerce-reservations",
         env: context.env,
         fetchImpl: context.fetchImpl,
         method: "POST",
@@ -2702,7 +2737,7 @@ async function reservationOp(subcommand, id, rest, context) {
     }
     const result = await operatorRequest({
       body,
-      endpoint: `/internal/reservations/${encodeURIComponent(id)}/transfer`,
+      endpoint: `/v1/staff/internal/reservations/${encodeURIComponent(id)}/transfer`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "POST",
@@ -2759,7 +2794,7 @@ async function reservationOp(subcommand, id, rest, context) {
     }
     const result = await operatorRequest({
       body,
-      endpoint: `/internal/nodes/${encodeURIComponent(id)}/deploy`,
+      endpoint: `/v1/staff/internal/nodes/${encodeURIComponent(id)}/deploy`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "POST",
@@ -2798,7 +2833,7 @@ async function reservations(args, context) {
     const { limit, cursor } = listPaginationOptions(options);
     const query = buildQuery({ status: options.status, limit, cursor });
     const rows = await cliRequest({
-      endpoint: computeEndpoint(`/tenants/me/reservations${query}`),
+      endpoint: `/v1/workflows/commerce/reservations${query}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
     });
@@ -2911,7 +2946,7 @@ async function nodeOps(args, context) {
   if (subcommand === "health") {
     const options = parseCommandOptions(rest, { boolean: ["json"] }, nodeOpUsage(subcommand));
     const node = await operatorRequest({
-      endpoint: `/internal/nodes/${encodeURIComponent(id)}`,
+      endpoint: `/v1/orchestrator/internal/nodes/${encodeURIComponent(id)}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
     });
@@ -2928,7 +2963,7 @@ async function nodeOps(args, context) {
     // source.mode tags the validation run as CLI-originated for compute audit.
     const job = await operatorRequest({
       body: { node_id: id, source: { mode: "cli" }, burn_time_minutes: 0 },
-      endpoint: "/jobs",
+      endpoint: "/v1/benchmark/jobs",
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "POST",
@@ -2990,7 +3025,7 @@ async function nodeOpList(rest, context) {
   }
   const suffix = query.toString() ? `?${query.toString()}` : "";
   const nodesList = await operatorRequest({
-    endpoint: `/internal/nodes${suffix}`,
+    endpoint: `/v1/orchestrator/internal/nodes${suffix}`,
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -3023,7 +3058,7 @@ async function nodeRebootOp(subcommand, id, rest, context) {
   const instanceId = await resolveNodeInstanceId(id, context);
   const result = await operatorRequest({
     body: { mode: subcommand === "hard-reset" ? "hard_reset" : "reboot" },
-    endpoint: `/nodes/${encodeURIComponent(instanceId)}/reboot`,
+    endpoint: `/v1/orchestrator/nodes/${encodeURIComponent(instanceId)}/reboot`,
     env: context.env,
     fetchImpl: context.fetchImpl,
     method: "POST",
@@ -3052,7 +3087,7 @@ async function nodeAdminKeyOp(id, rest, context) {
     nodeOpUsage("admin-key")
   );
   const result = await operatorRequest({
-    endpoint: `/enrollment/admin-ssh-key?node_id=${encodeURIComponent(id)}`,
+    endpoint: `/v1/orchestrator/enrollment/admin-ssh-key?node_id=${encodeURIComponent(id)}`,
     env: context.env,
     fetchImpl: context.fetchImpl,
     method: options.generate ? "POST" : "GET",
@@ -3083,7 +3118,7 @@ async function nodeAdminKeyOp(id, rest, context) {
 // chain the internal dashboard uses.
 async function resolveNodeInstanceId(nodeId, context) {
   const node = await operatorRequest({
-    endpoint: `/internal/nodes/${encodeURIComponent(nodeId)}`,
+      endpoint: `/v1/orchestrator/internal/nodes/${encodeURIComponent(nodeId)}`,
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -3098,7 +3133,7 @@ async function resolveNodeInstanceId(nodeId, context) {
     throw new CliApiError(`Node ${nodeId} has no assigned reservation to reboot.`);
   }
   const machines = await operatorRequest({
-    endpoint: `/nodes/reservations/${encodeURIComponent(reservationId)}/machines`,
+    endpoint: `/v1/orchestrator/nodes/reservations/${encodeURIComponent(reservationId)}/machines`,
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -3136,7 +3171,7 @@ async function resolveOperatorId(operatorFilter, context) {
     return operatorFilter;
   }
   const operators = await operatorRequest({
-    endpoint: "/provisioning/operators",
+    endpoint: "/internal/v1/operators",
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -3173,7 +3208,7 @@ async function operatorsList(args, context) {
   }
   const options = parseCommandOptions(rest, { boolean: ["json"] }, usage);
   const operators = await operatorRequest({
-    endpoint: "/provisioning/operators",
+    endpoint: "/internal/v1/operators",
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -3201,7 +3236,7 @@ async function facilitiesList(args, context) {
   }
   const options = parseCommandOptions(rest, { boolean: ["json"], value: ["operator"] }, usage);
   const facilities = await operatorRequest({
-    endpoint: "/provisioning/facilities",
+    endpoint: "/internal/v1/facilities",
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -3288,7 +3323,7 @@ async function tokensCommand(args, context) {
     }
     const options = parseCommandOptions(revokeRest, { boolean: ["json"] }, revokeUsage);
     const result = await operatorRequest({
-      endpoint: `/enrollment/tokens/${encodeURIComponent(id)}/revoke`,
+      endpoint: `/v1/orchestrator/enrollment-tokens/${encodeURIComponent(id)}/revoke`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "POST",
@@ -3686,7 +3721,7 @@ async function clusters(args, context) {
       "Usage: ornn clusters reservations [--json]"
     );
     const rows = await cliRequest({
-      endpoint: computeEndpoint("/clusters/reservations"),
+      endpoint: "/v1/workflows/compute/clusters/reservations",
       env: context.env,
       fetchImpl: context.fetchImpl,
     });
@@ -4165,7 +4200,7 @@ async function networks(args, context) {
       "Usage: ornn networks list [--json]"
     );
     const payload = await cliRequest({
-      endpoint: computeEndpoint("/networks"),
+      endpoint: "/v1/orchestrator/networks",
       env: context.env,
       fetchImpl: context.fetchImpl,
     });
@@ -4185,7 +4220,7 @@ async function networks(args, context) {
       "Usage: ornn networks show <network-id> [--json]"
     );
     const network = await cliRequest({
-      endpoint: computeEndpoint(`/networks/${encodeURIComponent(id)}`),
+      endpoint: `/v1/orchestrator/networks/${encodeURIComponent(id)}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
     });
@@ -4210,7 +4245,7 @@ async function networks(args, context) {
     };
     const created = await cliRequest({
       body: payload,
-      endpoint: computeEndpoint("/networks"),
+      endpoint: "/v1/orchestrator/networks",
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "POST",
@@ -4248,7 +4283,7 @@ async function networks(args, context) {
     }
     const updated = await cliRequest({
       body: payload,
-      endpoint: computeEndpoint(`/networks/${encodeURIComponent(id)}`),
+      endpoint: `/v1/orchestrator/networks/${encodeURIComponent(id)}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "PATCH",
@@ -4277,7 +4312,7 @@ async function networks(args, context) {
     );
     if (!confirmed) return 1;
     await cliRequest({
-      endpoint: computeEndpoint(`/networks/${encodeURIComponent(id)}`),
+      endpoint: `/v1/orchestrator/networks/${encodeURIComponent(id)}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "DELETE",
@@ -4298,7 +4333,7 @@ async function networks(args, context) {
       "Usage: ornn networks reservation <reservation-id> [--json]"
     );
     const payload = await cliRequest({
-      endpoint: computeEndpoint(`/nodes/reservations/${encodeURIComponent(id)}/network`),
+      endpoint: `/v1/workflows/compute/nodes/reservations/${encodeURIComponent(id)}/network`,
       env: context.env,
       fetchImpl: context.fetchImpl,
     });
@@ -4319,7 +4354,7 @@ async function networks(args, context) {
     const networkId = requiredOption(options.network || options.networkId, "--network");
     const payload = await cliRequest({
       body: { network_id: networkId },
-      endpoint: computeEndpoint(`/nodes/reservations/${encodeURIComponent(id)}/network`),
+      endpoint: `/v1/workflows/compute/nodes/reservations/${encodeURIComponent(id)}/network`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "POST",
@@ -4341,7 +4376,7 @@ async function networks(args, context) {
     );
     const payload = await cliRequest({
       body: { network_id: null },
-      endpoint: computeEndpoint(`/nodes/reservations/${encodeURIComponent(id)}/network`),
+      endpoint: `/v1/workflows/compute/nodes/reservations/${encodeURIComponent(id)}/network`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "POST",
@@ -4460,9 +4495,7 @@ async function putSignedStorageUpload({
 async function cancelStorageUploadSession({ driveId, env, fetchImpl, uploadId }) {
   try {
     await cliRequest({
-      endpoint: computeEndpoint(
-        `/nodes/storage-drives/${encodeURIComponent(driveId)}/file-uploads/${encodeURIComponent(uploadId)}`
-      ),
+      endpoint: `/v1/orchestrator/drives/${encodeURIComponent(driveId)}/file-uploads/${encodeURIComponent(uploadId)}`,
       env,
       fetchImpl,
       method: "DELETE",
@@ -4591,9 +4624,7 @@ async function storage(rawArgs, context) {
     try {
       session = await cliRequest({
         body: { path: destination, content_type: contentType, size_bytes: fileInfo.size },
-        endpoint: computeEndpoint(
-          `/nodes/storage-drives/${encodeURIComponent(id)}/file-upload-url`
-        ),
+        endpoint: `/v1/orchestrator/drives/${encodeURIComponent(id)}/file-upload-url`,
         env: context.env,
         fetchImpl: context.fetchImpl,
         method: "POST",
@@ -4627,9 +4658,7 @@ async function storage(rawArgs, context) {
       } finally {
         progress?.finish();
       }
-      const completionEndpoint = computeEndpoint(
-        `/nodes/storage-drives/${encodeURIComponent(id)}/file-uploads/${encodeURIComponent(session.upload_id)}/complete`
-      );
+      const completionEndpoint = `/v1/orchestrator/drives/${encodeURIComponent(id)}/file-uploads/${encodeURIComponent(session.upload_id)}/complete`;
       try {
         result = await cliRequest({
           body: { uploaded_generation: uploadedGeneration },
@@ -4698,8 +4727,8 @@ async function storage(rawArgs, context) {
       .map((segment) => encodeURIComponent(segment))
       .join("/");
     const url = new URL(
-      computeEndpoint(`/nodes/storage-drives/${encodeURIComponent(id)}/files/${remoteSegments}`),
-      `${baseUrl}/`
+      `/v1/orchestrator/drives/${encodeURIComponent(id)}/files/${remoteSegments}`,
+      `${baseUrl}/`,
     );
     const response = await context.fetchImpl(url, {
       headers: {
@@ -4763,9 +4792,7 @@ async function storage(rawArgs, context) {
       "--reservation"
     );
     const payload = await cliRequest({
-      endpoint: computeEndpoint(
-        `/nodes/reservations/${encodeURIComponent(reservationId)}/storage-attachment`
-      ),
+      endpoint: `/v1/workflows/compute/nodes/reservations/${encodeURIComponent(reservationId)}/storage-attachment`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "DELETE",
@@ -4804,9 +4831,7 @@ async function storage(rawArgs, context) {
             ? { capacity_gib: positiveIntegerOption(options.capacityGib, "--capacity-gib") }
             : {}),
         },
-        endpoint: computeEndpoint(
-          `/nodes/reservations/${encodeURIComponent(reservationId)}/filesystem-deployment`
-        ),
+        endpoint: `/v1/workflows/compute/nodes/reservations/${encodeURIComponent(reservationId)}/filesystem-deployment`,
         env: context.env,
         fetchImpl: context.fetchImpl,
         method: "POST",
@@ -4833,9 +4858,7 @@ async function storage(rawArgs, context) {
         "--reservation"
       );
       const payload = await cliRequest({
-        endpoint: computeEndpoint(
-          `/nodes/reservations/${encodeURIComponent(reservationId)}/storage-attachment`
-        ),
+        endpoint: `/v1/workflows/compute/nodes/reservations/${encodeURIComponent(reservationId)}/storage-attachment`,
         env: context.env,
         fetchImpl: context.fetchImpl,
         timeoutMs: 30_000,
@@ -4869,9 +4892,7 @@ async function storage(rawArgs, context) {
       );
       if (!confirmed) return 1;
       const payload = await cliRequest({
-        endpoint: computeEndpoint(
-          `/nodes/reservations/${encodeURIComponent(reservationId)}/filesystem-deployment`
-        ),
+        endpoint: `/v1/workflows/compute/nodes/reservations/${encodeURIComponent(reservationId)}/filesystem-deployment`,
         env: context.env,
         fetchImpl: context.fetchImpl,
         method: "DELETE",
@@ -4908,9 +4929,7 @@ async function storage(rawArgs, context) {
     }
     const fetchAttachment = () =>
       cliRequest({
-        endpoint: computeEndpoint(
-          `/nodes/reservations/${encodeURIComponent(reservationId)}/storage-attachment`
-        ),
+        endpoint: `/v1/workflows/compute/nodes/reservations/${encodeURIComponent(reservationId)}/storage-attachment`,
         env: context.env,
         fetchImpl: context.fetchImpl,
         timeoutMs: 30_000,
@@ -5054,9 +5073,7 @@ async function storage(rawArgs, context) {
         access_mode: options.readOnly ? "read-only" : "read-write",
         ...(options.allNodes ? { all_nodes: true } : {}),
       },
-      endpoint: computeEndpoint(
-        `/nodes/reservations/${encodeURIComponent(reservationId)}/storage-deployment`
-      ),
+      endpoint: `/v1/workflows/compute/nodes/reservations/${encodeURIComponent(reservationId)}/storage-deployment`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "POST",
@@ -5092,11 +5109,7 @@ async function storage(rawArgs, context) {
       "Usage: ornn storage targets [--json]"
     );
     const [payload, drivesPayload] = await Promise.all([
-      cliRequest({
-        endpoint: "/v1/cli/storage-targets",
-        env: context.env,
-        fetchImpl: context.fetchImpl,
-      }),
+      cliRequest({ endpoint: "/v1/orchestrator/storage-targets", env: context.env, fetchImpl: context.fetchImpl }),
       fetchStorageDrives(context),
     ]);
     const targets = Array.isArray(payload?.targets) ? payload.targets : [];
@@ -5180,7 +5193,7 @@ async function storage(rawArgs, context) {
         "Usage: ornn storage buckets verify <drive-id> [--json]"
       );
       const drive = await cliRequest({
-        endpoint: computeEndpoint(`/nodes/storage-drives/${encodeURIComponent(id)}/verify-source`),
+        endpoint: `/v1/orchestrator/drives/${encodeURIComponent(id)}/verify-source`,
         env: context.env,
         fetchImpl: context.fetchImpl,
         method: "POST",
@@ -5219,9 +5232,7 @@ async function storage(rawArgs, context) {
           external_access_key_id: requiredOption(options.accessKeyId, "--access-key-id"),
           external_secret_access_key: secretAccessKey,
         },
-        endpoint: computeEndpoint(
-          `/nodes/storage-drives/${encodeURIComponent(id)}/source-credentials`
-        ),
+        endpoint: `/v1/orchestrator/drives/${encodeURIComponent(id)}/source-credentials`,
         env: context.env,
         fetchImpl: context.fetchImpl,
         method: "PATCH",
@@ -5241,7 +5252,7 @@ async function storage(rawArgs, context) {
         "Usage: ornn storage buckets disconnect <drive-id> [--json]"
       );
       await cliRequest({
-        endpoint: computeEndpoint(`/nodes/storage-drives/${encodeURIComponent(id)}`),
+        endpoint: `/v1/orchestrator/drives/${encodeURIComponent(id)}`,
         env: context.env,
         fetchImpl: context.fetchImpl,
         method: "DELETE",
@@ -5331,7 +5342,7 @@ async function storage(rawArgs, context) {
         ...(options.accessKeyId ? { external_access_key_id: options.accessKeyId } : {}),
         ...(secretAccessKey ? { external_secret_access_key: secretAccessKey } : {}),
       },
-      endpoint: computeEndpoint("/nodes/storage-drives"),
+      endpoint: "/v1/orchestrator/drives",
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "POST",
@@ -5418,7 +5429,7 @@ async function storage(rawArgs, context) {
         name: requiredOption(options.name, "--name"),
         source_drive_id: sourceDriveId,
       },
-      endpoint: computeEndpoint("/nodes/storage-drives"),
+      endpoint: "/v1/orchestrator/drives",
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "POST",
@@ -5439,7 +5450,7 @@ async function storage(rawArgs, context) {
       "Usage: ornn storage volumes refresh <drive-id> [--json]"
     );
     const drive = await cliRequest({
-      endpoint: computeEndpoint(`/nodes/storage-drives/${encodeURIComponent(id)}/refresh`),
+      endpoint: `/v1/orchestrator/drives/${encodeURIComponent(id)}/refresh`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "POST",
@@ -5467,7 +5478,7 @@ async function storage(rawArgs, context) {
     );
     if (!confirmed) return 1;
     await cliRequest({
-      endpoint: computeEndpoint(`/nodes/storage-drives/${encodeURIComponent(id)}/contents`),
+      endpoint: `/v1/orchestrator/drives/${encodeURIComponent(id)}/contents`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "DELETE",
@@ -5495,7 +5506,7 @@ async function storage(rawArgs, context) {
     );
     if (!confirmed) return 1;
     await cliRequest({
-      endpoint: computeEndpoint(`/nodes/storage-drives/${encodeURIComponent(id)}`),
+      endpoint: `/v1/orchestrator/drives/${encodeURIComponent(id)}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "DELETE",
@@ -5848,7 +5859,7 @@ async function billing(args, context) {
     );
     const { limit, cursor } = listPaginationOptions(options);
     const invoices = await cliRequest({
-      endpoint: computeEndpoint(`/tenants/me/invoices${buildQuery({ limit, cursor })}`),
+      endpoint: `/v1/workflows/commerce/invoices${buildQuery({ limit, cursor })}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
     });
@@ -5871,9 +5882,7 @@ async function billing(args, context) {
       startDate: options.start,
     });
     const report = await cliRequest({
-      endpoint: computeEndpoint(
-        `/tenants/me/showback${buildQuery({ end: endDate, start: startDate })}`
-      ),
+      endpoint: `/v1/workflows/commerce/showback${buildQuery({ end: endDate, start: startDate })}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
     });
@@ -5913,7 +5922,7 @@ async function sshKeys(args, context) {
       "Usage: ornn ssh-keys list [--json]"
     );
     const keys = await cliRequest({
-      endpoint: computeEndpoint("/nodes/organizations/me/ssh-keys"),
+      endpoint: "/v1/workflows/compute/nodes/organizations/me/ssh-keys",
       env: context.env,
       fetchImpl: context.fetchImpl,
     });
@@ -5939,7 +5948,7 @@ async function sshKeys(args, context) {
         label: requiredOption(options.label, "--label"),
         public_key: publicKey,
       },
-      endpoint: computeEndpoint("/nodes/organizations/me/ssh-keys"),
+      endpoint: "/v1/workflows/compute/nodes/organizations/me/ssh-keys",
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "POST",
@@ -5962,7 +5971,7 @@ async function sshKeys(args, context) {
       "Usage: ornn ssh-keys delete <key-id> [--json]"
     );
     const response = await cliRequest({
-      endpoint: computeEndpoint(`/nodes/organizations/me/ssh-keys/${id}`),
+      endpoint: `/v1/workflows/compute/nodes/organizations/me/ssh-keys/${id}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "DELETE",
@@ -5988,7 +5997,7 @@ async function loadAvailabilityListings(context) {
 
 async function fetchInventoryList(context) {
   const payload = await cliRequest({
-    endpoint: computeEndpoint("/inventory"),
+    endpoint: "/v1/workflows/commerce/inventory",
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -5997,7 +6006,7 @@ async function fetchInventoryList(context) {
 
 async function fetchInventory(id, context) {
   return await cliRequest({
-    endpoint: computeEndpoint(`/inventory/${encodeURIComponent(id)}`),
+    endpoint: `/v1/workflows/commerce/inventory/${encodeURIComponent(id)}`,
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -6530,7 +6539,7 @@ async function findBid(id, context) {
   let found;
   try {
     found = await cliRequest({
-      endpoint: computeEndpoint(`/tenants/me/bids/${encodeURIComponent(id)}`),
+      endpoint: `/v1/workflows/commerce/bids/${encodeURIComponent(id)}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
     });
@@ -6602,7 +6611,7 @@ async function findReservation(id, context) {
   let found;
   try {
     found = await cliRequest({
-      endpoint: computeEndpoint(`/tenants/me/reservations/${encodeURIComponent(id)}`),
+      endpoint: `/v1/workflows/commerce/reservations/${encodeURIComponent(id)}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
     });
@@ -6625,7 +6634,7 @@ export async function fetchAllTenantReservations(context) {
   let cursor;
   for (let page = 0; page < 201; page += 1) {
     const payload = await cliRequest({
-      endpoint: computeEndpoint(`/tenants/me/reservations${buildQuery({ limit, cursor })}`),
+      endpoint: `/v1/workflows/commerce/reservations${buildQuery({ limit, cursor })}`,
       env: context.env,
       fetchImpl: context.fetchImpl,
     });
@@ -6736,7 +6745,7 @@ async function resolveTenantByEmail(tenantInput, context) {
     throw new Error("--tenant must be the tenant contact email address.");
   }
   const rows = await operatorRequest({
-    endpoint: `/internal/users?q=${encodeURIComponent(input)}&approved=true&limit=1000`,
+    endpoint: `/v1/staff/internal/users?q=${encodeURIComponent(input)}&approved=true&limit=1000`,
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -6848,7 +6857,7 @@ async function resolveStorageMountUsers(attachment, context) {
 
 async function getReservationMachines(reservationId, context) {
   const payload = await cliRequest({
-    endpoint: computeEndpoint(`/nodes/reservations/${reservationId}/machines`),
+    endpoint: `/v1/workflows/compute/nodes/reservations/${reservationId}/machines`,
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -6857,7 +6866,7 @@ async function getReservationMachines(reservationId, context) {
 
 async function fetchBillingInvoices(context) {
   const payload = await cliRequest({
-    endpoint: computeEndpoint("/tenants/me/invoices"),
+    endpoint: "/v1/workflows/commerce/invoices",
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -6870,7 +6879,7 @@ async function fetchBillingInvoices(context) {
 
 async function fetchStorageDrives(context) {
   return await cliRequest({
-    endpoint: computeEndpoint("/nodes/storage-drives"),
+    endpoint: "/v1/orchestrator/drives",
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -6878,7 +6887,7 @@ async function fetchStorageDrives(context) {
 
 async function verifyStorageBucketSource(driveId, context) {
   return await cliRequest({
-    endpoint: computeEndpoint(`/nodes/storage-drives/${encodeURIComponent(driveId)}/verify-source`),
+    endpoint: `/v1/orchestrator/drives/${encodeURIComponent(driveId)}/verify-source`,
     env: context.env,
     fetchImpl: context.fetchImpl,
     method: "POST",
@@ -6908,7 +6917,7 @@ async function findStorageBucket(driveId, context, { label = "bucket" } = {}) {
 }
 
 function reservationSshKeysEndpoint(reservationId) {
-  return computeEndpoint(`/nodes/reservations/${reservationId}/ssh-keys`);
+  return `/v1/workflows/compute/nodes/reservations/${reservationId}/ssh-keys`;
 }
 
 async function fetchReservationSshKeys(reservationId, context) {
@@ -6960,14 +6969,14 @@ async function launchReservationAccess(
   }
   const access = await cliRequest({
     body: { access_mode: mode, image_id: null },
-    endpoint: computeEndpoint(`/tenants/me/reservations/${reservationId}/access-mode`),
+    endpoint: `/v1/workflows/commerce/reservations/${reservationId}/access-mode`,
     env: context.env,
     fetchImpl: context.fetchImpl,
     method: "POST",
   });
   const launch = await cliRequest({
     body: launchPayload,
-    endpoint: computeEndpoint(`/nodes/reservations/${reservationId}/launch`),
+    endpoint: `/v1/workflows/compute/nodes/reservations/${reservationId}/launch`,
     env: context.env,
     fetchImpl: context.fetchImpl,
     method: "POST",
@@ -7013,7 +7022,7 @@ async function switchReservationAccess(reservationId, options, context) {
   };
   const switched = await cliRequest({
     body: switchPayload,
-    endpoint: computeEndpoint(`/nodes/reservations/${reservationId}/switch-access`),
+    endpoint: `/v1/workflows/compute/nodes/reservations/${reservationId}/switch-access`,
     env: context.env,
     fetchImpl: context.fetchImpl,
     method: "POST",
@@ -7045,7 +7054,7 @@ function accessActivateJsonResult(result) {
 
 async function fetchTenantClusters(context) {
   return await cliRequest({
-    endpoint: computeEndpoint("/clusters"),
+    endpoint: "/v1/workflows/compute/clusters",
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -7053,7 +7062,7 @@ async function fetchTenantClusters(context) {
 
 async function fetchEligibleClusterNodes(reservationId, type, networkMode, context) {
   const payload = await cliRequest({
-    endpoint: computeEndpoint(`/nodes/reservations/${encodeURIComponent(reservationId)}/machines`),
+    endpoint: `/v1/workflows/compute/nodes/reservations/${encodeURIComponent(reservationId)}/machines`,
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -7078,7 +7087,7 @@ async function fetchEligibleClusterNodes(reservationId, type, networkMode, conte
 
 async function fetchCluster(reservationId, type, context) {
   return await cliRequest({
-    endpoint: computeEndpoint(clusterEndpoint(type, reservationId, "cluster")),
+    endpoint: clusterEndpoint(type, reservationId, "cluster"),
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -7086,7 +7095,7 @@ async function fetchCluster(reservationId, type, context) {
 
 async function fetchClusterCredentials(reservationId, type, context) {
   return await cliRequest({
-    endpoint: computeEndpoint(clusterEndpoint(type, reservationId, "credentials")),
+    endpoint: clusterEndpoint(type, reservationId, "credentials"),
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -7095,7 +7104,7 @@ async function fetchClusterCredentials(reservationId, type, context) {
 async function launchCluster(reservationId, type, options, context) {
   return await cliRequest({
     body: clusterLaunchPayload(options),
-    endpoint: computeEndpoint(clusterEndpoint(type, reservationId, "cluster/launch")),
+    endpoint: clusterEndpoint(type, reservationId, "cluster/launch"),
     env: context.env,
     fetchImpl: context.fetchImpl,
     method: "POST",
@@ -7104,7 +7113,7 @@ async function launchCluster(reservationId, type, options, context) {
 
 async function teardownCluster(reservationId, type, context) {
   return await cliRequest({
-    endpoint: computeEndpoint(clusterEndpoint(type, reservationId, "cluster/teardown")),
+    endpoint: clusterEndpoint(type, reservationId, "cluster/teardown"),
     env: context.env,
     fetchImpl: context.fetchImpl,
     method: "POST",
@@ -7114,9 +7123,7 @@ async function teardownCluster(reservationId, type, context) {
 async function addClusterNode(reservationId, nodeId, context) {
   return await cliRequest({
     body: { node_id: nodeId },
-    endpoint: computeEndpoint(
-      `/clusters/reservations/${encodeURIComponent(reservationId)}/cluster/nodes`
-    ),
+    endpoint: `/v1/workflows/compute/clusters/reservations/${encodeURIComponent(reservationId)}/cluster/nodes`,
     env: context.env,
     fetchImpl: context.fetchImpl,
     method: "POST",
@@ -7125,9 +7132,7 @@ async function addClusterNode(reservationId, nodeId, context) {
 
 async function removeClusterNode(reservationId, nodeId, context) {
   return await cliRequest({
-    endpoint: computeEndpoint(
-      `/clusters/reservations/${encodeURIComponent(reservationId)}/cluster/nodes/${encodeURIComponent(nodeId)}`
-    ),
+    endpoint: `/v1/workflows/compute/clusters/reservations/${encodeURIComponent(reservationId)}/cluster/nodes/${encodeURIComponent(nodeId)}`,
     env: context.env,
     fetchImpl: context.fetchImpl,
     method: "DELETE",
@@ -7202,7 +7207,7 @@ async function waitForClusterActive(reservationId, type, options, context) {
 }
 
 function clusterEndpoint(type, reservationId, suffix) {
-  return `/${normalizeClusterType(type)}/reservations/${encodeURIComponent(reservationId)}/${suffix}`;
+  return `/v1/workflows/compute/${normalizeClusterType(type)}/reservations/${encodeURIComponent(reservationId)}/${suffix}`;
 }
 
 function clusterLaunchPayload(options) {
@@ -7259,7 +7264,7 @@ async function fetchTenantMachines(context, { requireComplete = false } = {}) {
 
 async function fetchMachine(nodeId, context) {
   return await cliRequest({
-    endpoint: computeEndpoint(`/nodes/${nodeId}`),
+    endpoint: `/v1/workflows/compute/nodes/${nodeId}`,
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -7373,9 +7378,7 @@ async function fetchMetricHistoryForNode(nodeId, options, context) {
     start: options.start,
   });
   const series = await cliRequest({
-    endpoint: computeEndpoint(
-      `/nodes/reservations/${encodeURIComponent(machine.reservation_id)}/telemetry-history${query}`
-    ),
+    endpoint: `/v1/workflows/compute/nodes/reservations/${encodeURIComponent(machine.reservation_id)}/telemetry-history${query}`,
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -7392,9 +7395,7 @@ async function fetchMetricSnapshotForMachine(machine, context) {
     return metricSnapshotFromMachine(machine, { error: "Reservation context unavailable." });
   }
   const payload = await cliRequest({
-    endpoint: computeEndpoint(
-      `/nodes/reservations/${encodeURIComponent(reservationId)}/live-metrics?machine_id=${encodeURIComponent(machineId(machine))}`
-    ),
+    endpoint: `/v1/workflows/compute/nodes/reservations/${encodeURIComponent(reservationId)}/live-metrics?machine_id=${encodeURIComponent(machineId(machine))}`,
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -7492,7 +7493,7 @@ async function runNodeAction(nodeId, action, options, context) {
   const mode = action === "hard-reset" ? "hard_reset" : "reboot";
   return await cliRequest({
     body: { mode },
-    endpoint: computeEndpoint(`/nodes/${nodeId}/reboot`),
+    endpoint: `/v1/workflows/compute/nodes/${nodeId}/reboot`,
     env: context.env,
     fetchImpl: context.fetchImpl,
     method: "POST",
@@ -7505,7 +7506,7 @@ async function pushNodeKeys(nodeId, sshKeyIds, requestId, context) {
       request_id: requestId || `cli-node-push-keys:${nodeId}:${Date.now()}`,
       ssh_key_ids: sshKeyIds,
     },
-    endpoint: computeEndpoint(`/nodes/${nodeId}/push-keys`),
+    endpoint: `/v1/workflows/compute/nodes/${nodeId}/push-keys`,
     env: context.env,
     fetchImpl: context.fetchImpl,
     method: "POST",
@@ -7641,7 +7642,7 @@ async function ensureAccountSshKey(publicKey, label, context) {
       label: savedLabel,
       public_key: normalized,
     },
-    endpoint: computeEndpoint("/nodes/organizations/me/ssh-keys"),
+    endpoint: "/v1/workflows/compute/nodes/organizations/me/ssh-keys",
     env: context.env,
     fetchImpl: context.fetchImpl,
     method: "POST",
@@ -7650,7 +7651,7 @@ async function ensureAccountSshKey(publicKey, label, context) {
 
 async function fetchAccountSshKeys(context) {
   return await cliRequest({
-    endpoint: computeEndpoint("/nodes/organizations/me/ssh-keys"),
+    endpoint: "/v1/workflows/compute/nodes/organizations/me/ssh-keys",
     env: context.env,
     fetchImpl: context.fetchImpl,
   });
@@ -7704,7 +7705,7 @@ async function pushReservationKeys(reservationId, sshKeyIds, requestId, context)
         request_id: requestId || `cli-push-keys:${id}:${Date.now()}`,
         ssh_key_ids: sshKeyIds,
       },
-      endpoint: computeEndpoint(`/nodes/${id}/push-keys`),
+      endpoint: `/v1/workflows/compute/nodes/${id}/push-keys`,
       env: context.env,
       fetchImpl: context.fetchImpl,
       method: "POST",