@ornncompute/cli 0.2.19 → 0.2.21

package/package.json

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

package/src/api-client.mjs

@@ -211,10 +211,10 @@ export function resolveInstallerBaseUrl({ env = process.env } = {}) {
 }
 
 function operatorProxyEndpoint(endpoint) {
-  return `/v1/cli/operator${normalizeComputePath(endpoint)}`;
+  return normalizeComputePath(endpoint);
 }
 
-// Staff path: CLI bearer → gateway /v1/cli/operator → the owning service.
+// Staff path: CLI bearer → gateway /v1/orchestrator/ → the owning service.
 // The gateway resolves the bearer and applies staff policy; the CLI never ships
 // a reviewer or service secret.
 export async function operatorRequest({
@@ -241,11 +241,6 @@ export async function operatorRequest({
   });
 }
 
-export function computeEndpoint(path) {
-  const normalized = normalizeComputePath(path);
-  return `/v1/cli/compute${normalized}`;
-}
-
 export function normalizeComputePath(path) {
   if (!path || typeof path !== "string") {
     throw new CliApiError("API path is required.");

package/src/catalog-dispatch.mjs

@@ -7,7 +7,6 @@ import {
   loadRequiredSession,
   operatorRequest,
   resolveApiBaseUrl,
-  resolveInstallerBaseUrl,
 } from "./api-client.mjs";
 
 async function collectSse(url, headers, durationMs, maxEvents, fetchImpl) {
@@ -85,6 +84,102 @@ export async function confirmCatalogMutation({ stdin, stdout, yes, label }) {
   }
 }
 
+function splitCatalogPath(input) {
+  const trimmed = input.startsWith("/") ? input : `/${input}`;
+  const queryIndex = trimmed.indexOf("?");
+  return queryIndex === -1
+    ? { pathname: trimmed, search: "" }
+    : { pathname: trimmed.slice(0, queryIndex), search: trimmed.slice(queryIndex) };
+}
+
+function catalogSegments(pathname) {
+  return pathname.split("/").filter(Boolean);
+}
+
+function isComposedStaffPath(pathname) {
+  const parts = catalogSegments(pathname);
+  if (parts[0] === "internal" && parts[1] === "commerce-reservations") return true;
+  if (parts[0] === "internal" && parts[1] === "users") return true;
+  if (parts[0] === "internal" && parts[1] === "reservations" && parts[3] === "transfer") return true;
+  if (parts[0] === "internal" && parts[1] === "nodes" && parts[3] === "deploy") return true;
+  if (parts[0] === "internal" && parts[1] === "nodes" && parts[3] === "reservation-access") return true;
+  return (
+    parts[0] === "internal" &&
+    parts[1] === "nodes" &&
+    parts[3] === "off-grid" &&
+    parts[4] === "resolve"
+  );
+}
+
+function canonicalStaffCatalogPath(pathname) {
+  const parts = catalogSegments(pathname);
+  if (parts[0] === "provisioning" && parts[1] === "operators") {
+    return `/internal/v1/operators${parts.length > 2 ? `/${parts.slice(2).join("/")}` : ""}`;
+  }
+  if (parts[0] === "provisioning" && parts[1] === "facilities") {
+    return `/internal/v1/facilities${parts.length > 2 ? `/${parts.slice(2).join("/")}` : ""}`;
+  }
+  if (parts[0] === "inventory") {
+    return `/internal/v1/listings${parts.length > 1 ? `/${parts.slice(1).join("/")}` : ""}`;
+  }
+  if (
+    parts[0] === "internal" &&
+    parts[1] === "reservations" &&
+    parts[3] !== "network-validation" &&
+    parts[3] !== "node-rollout" &&
+    !(parts[3] === "nodes" && parts[4] === "assign")
+  ) {
+    return `/internal/v1/reservations${parts.length > 2 ? `/${parts.slice(2).join("/")}` : ""}`;
+  }
+  if (parts[0] === "internal" && parts[1] === "bids") {
+    return `/internal/v1/bids${parts.length > 2 ? `/${parts.slice(2).join("/")}` : ""}`;
+  }
+  if (parts[0] === "internal" && parts[1] === "invoices") {
+    return `/internal/v1/invoices${parts.length > 2 ? `/${parts.slice(2).join("/")}` : ""}`;
+  }
+  if (parts[0] === "enrollment" && parts[1] === "tokens") {
+    return `/enrollment-tokens${parts.length > 2 ? `/${parts.slice(2).join("/")}` : ""}`;
+  }
+  if (parts[0] === "internal" && parts[1] === "enrollment-tokens") {
+    return `/enrollment-tokens${parts.length > 2 ? `/${parts.slice(2).join("/")}` : ""}`;
+  }
+  if (parts[0] === "internal" && parts[1] === "organizations" && parts.length === 3) {
+    return `/internal/v1/organizations/${parts[2]}`;
+  }
+  return pathname;
+}
+
+function mapStaffCatalogPath(path) {
+  const { pathname, search } = splitCatalogPath(path);
+  if (isComposedStaffPath(pathname)) {
+    return `/v1/staff${pathname}${search}`;
+  }
+  const canonical = canonicalStaffCatalogPath(pathname);
+  if (
+    canonical.startsWith("/internal/v1/") ||
+    canonical.startsWith("/commerce/") ||
+    canonical.startsWith("/v1/organizations/")
+  ) {
+    return `${canonical}${search}`;
+  }
+  if (canonical.startsWith("/v1/")) {
+    return `${canonical}${search}`;
+  }
+  return `/v1/orchestrator${canonical}${search}`;
+}
+
+function mapCustomerCatalogPath(path) {
+  const { pathname, search } = splitCatalogPath(path);
+  const parts = catalogSegments(pathname);
+  if (parts[0] === "inventory" || parts[0] === "listings" || parts[0] === "marketplace") {
+    return `/v1/workflows/commerce${pathname}${search}`;
+  }
+  if (pathname.startsWith("/v1/") || parts[0] === "commerce") {
+    return `${pathname}${search}`;
+  }
+  return `/v1/workflows/compute${pathname}${search}`;
+}
+
 function catalogFetch({ env, fetchImpl }) {
   return async (path, init) => {
     const method = init?.method ?? "GET";
@@ -97,14 +192,17 @@ function catalogFetch({ env, fetchImpl }) {
       path.startsWith("/internal") ||
       path.startsWith("/provisioning") ||
       path === "/inventory" ||
-      path.startsWith("/inventory/");
+      path.startsWith("/inventory/") ||
+      path === "/enrollment-tokens" ||
+      path.startsWith("/enrollment-tokens/") ||
+      path.startsWith("/enrollment/");
     const request = staffPath ? operatorRequest : cliRequest;
-    const requestPath = staffObservability ? path.slice(observabilityPrefix.length) : path;
+    const requestPath = staffPath ? mapStaffCatalogPath(path) : mapCustomerCatalogPath(path);
     if (init?.headers?.Accept === "text/event-stream") {
       const session = await loadRequiredSession({ env });
       const base = resolveApiBaseUrl({ env, session });
       const parsed = new URL(
-        staffObservability ? `/v1/cli/operator${requestPath}` : path,
+        requestPath,
         `${base.replace(/\/+$/, "")}/`,
       );
       const duration = Number(parsed.searchParams.get("duration") ?? "20") * 1000;