@ornncompute/cli 1.0.113 → 1.0.114

package/package.json

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

package/src/catalog-shell.mjs

@@ -1,3 +1,4 @@
+import { getCliSession } from "../vendor/api-client/authorization.js";
 import { readFileSync } from "node:fs";
 
 import {
@@ -1009,7 +1010,9 @@ async function executeCapability(
           }
           if (capability.domain === "listings" && ownOrganizationId === undefined) {
             // Verify listing owner IDs before the request, never after a committed mutation.
-            const session = await customerCapabilityFetch(io, "/v1/cli/session", {}, authSnapshot);
+            const session = await getCliSession((path, init) =>
+              customerCapabilityFetch(io, path, init, authSnapshot)
+            );
             ownOrganizationId = session.selectedOrganization?.id ?? null;
           }
           return customerCapabilityFetch(io, path, init, authSnapshot);

package/src/device-auth.mjs

@@ -1,3 +1,7 @@
+import {
+  startCliDeviceAuthorization,
+  pollCliDeviceAuthorization,
+} from "../vendor/api-client/authorization.js";
 import { spawn } from "node:child_process";
 
 import { configuredAuthBaseUrl } from "./auth-store.mjs";
@@ -90,7 +94,7 @@ export async function openBrowser(url, { platform = process.platform, spawnImpl
 
 export async function startDeviceFlow({ apiBaseUrl, authBaseUrl, fetchImpl = fetch } = {}) {
   const requestBaseUrl = apiBaseUrl || authBaseUrl;
-  const data = await postJson(fetchImpl, `${requestBaseUrl}/v1/cli/device/start`, {});
+  const data = await startCliDeviceAuthorization(deviceRequest(fetchImpl, requestBaseUrl));
 
   const deviceCode = pickString(data, "deviceCode", "device_code");
   const userCode = pickString(data, "userCode", "user_code");
@@ -126,11 +130,10 @@ export async function pollDeviceFlow({
   signal,
 } = {}) {
   const requestBaseUrl = apiBaseUrl || authBaseUrl;
-  return postJson(
-    fetchImpl,
-    `${requestBaseUrl}/v1/cli/device/poll`,
+  return pollCliDeviceAuthorization(
+    deviceRequest(fetchImpl, requestBaseUrl),
     { device_code: deviceCode },
-    { signal }
+    signal
   );
 }
 
@@ -258,28 +261,31 @@ export async function waitForDeviceApproval({
   }
 }
 
-async function postJson(fetchImpl, url, body, { signal } = {}) {
-  const response = await fetchImpl(url, {
-    body: JSON.stringify(body),
-    headers: {
-      Accept: "application/json",
-      "Content-Type": "application/json",
-    },
-    method: "POST",
-    ...(signal ? { signal } : {}),
-  });
-  const text = await response.text();
-  const data = text ? parseJson(text, url) : {};
-
-  if (!response.ok) {
-    const detail = data.detail || data.error || response.statusText;
-    throw new DeviceAuthError(`Auth request failed: ${detail}`, {
-      detail: data,
-      status: response.status,
+function deviceRequest(fetchImpl, baseUrl) {
+  return async (path, { body, method, signal } = {}) => {
+    const url = `${baseUrl}${path}`;
+    const response = await fetchImpl(url, {
+      body: JSON.stringify(body),
+      headers: {
+        Accept: "application/json",
+        "Content-Type": "application/json",
+      },
+      method,
+      ...(signal ? { signal } : {}),
     });
-  }
+    const text = await response.text();
+    const data = text ? parseJson(text, url) : {};
 
-  return data;
+    if (!response.ok) {
+      const detail = data.detail || data.error || response.statusText;
+      throw new DeviceAuthError(`Auth request failed: ${detail}`, {
+        detail: data,
+        status: response.status,
+      });
+    }
+
+    return data;
+  };
 }
 
 function parseJson(text, url) {

package/src/machine-reference.mjs

@@ -1,3 +1,4 @@
+import { getCliSession } from "../vendor/api-client/authorization.js";
 import { listAllReservations } from "../vendor/api-client/commerce.js";
 import { gpuLabeler } from "./gpu-catalog.mjs";
 
@@ -114,7 +115,7 @@ function invalidGateway(interaction, message) {
 export async function listActiveReservations(context, interaction) {
   const session = context.cli?.session
     ? (await context.cli.session("context", {})).data
-    : await context.fetch("/v1/cli/session");
+    : await getCliSession(context.fetch);
   const customerId = text((session.selectedOrganization ?? session.selected_organization)?.id);
   if (!customerId) {
     interaction.usage("Select an organization before choosing a reservation.", {

package/src/registry-commands.mjs

@@ -1,4 +1,9 @@
-import { listApiKeys, createApiKey, revokeApiKey } from "../vendor/api-client/authorization.js";
+import {
+  listApiKeys,
+  createApiKey,
+  revokeApiKey,
+  getCliSession,
+} from "../vendor/api-client/authorization.js";
 import { spawn as spawnProcessDefault } from "node:child_process";
 import os from "node:os";
 
@@ -19,7 +24,7 @@ async function login({
   hostname = os.hostname(),
 }) {
   const registry = await fetch("/v1/orchestrator/registry");
-  const session = await fetch("/v1/cli/session");
+  const session = await getCliSession(fetch);
   const organizationId = (session?.selectedOrganization ?? session?.selected_organization)?.id;
   if (typeof organizationId !== "string" || !organizationId) {
     interaction.usage("Join an organization before logging in to its registry.", {

package/src/session-commands.mjs

@@ -1,3 +1,4 @@
+import { getCliSession, revokeCliSession } from "../vendor/api-client/authorization.js";
 import { CliApiError, cliRequest, resolveApiBaseUrl } from "./api-client.mjs";
 import {
   bindAuthUser,
@@ -143,13 +144,15 @@ async function context({ env, fetchImpl, sessionSnapshot }) {
     sessionSnapshot.current = localSession;
   }
   const data = sessionContext(
-    await cliRequest({
-      endpoint: "/v1/cli/session",
-      env,
-      fetchImpl,
-      method: "GET",
-      session: localSession,
-    })
+    await getCliSession((endpoint, init) =>
+      cliRequest({
+        ...init,
+        endpoint,
+        env,
+        fetchImpl,
+        session: localSession,
+      })
+    )
   );
   await bindAuthUser(data.user, {
     env,
@@ -291,14 +294,16 @@ async function logout(runtime) {
   try {
     if (!revocationError && session?.accessToken) {
       attempted = true;
-      await cliRequest({
-        endpoint: "/v1/cli/session",
-        env: runtime.env,
-        fetchImpl: runtime.fetchImpl,
-        method: "DELETE",
-        raw: true,
-        session,
-      });
+      await revokeCliSession((endpoint, init) =>
+        cliRequest({
+          ...init,
+          endpoint,
+          env: runtime.env,
+          fetchImpl: runtime.fetchImpl,
+          raw: true,
+          session,
+        })
+      );
     }
   } catch (error) {
     revocationError = error;

package/vendor/api-client/authorization.js

@@ -305,22 +305,137 @@ function createSupplierApplication(fetcher, body, query = {}) {
     body: JSON.stringify(body)
   });
 }
+
+// ../../packages/api-client/dist/authorization/sessions.js
+var browserSessionPath = "/v1/auth/session";
+var signInPath = "/v1/auth/sign-in";
+var inviteRedeemPath = "/v1/auth/invites/redeem";
+var unsubscribePath = "/v1/auth/unsubscribe";
+var post = (body, signal) => ({
+  method: "POST",
+  headers: { "Content-Type": "application/json" },
+  body: JSON.stringify(body),
+  ...signal ? { signal } : {}
+});
+function getBrowserSession(fetcher, query = {}, options = {}) {
+  return fetcher(withQuery(browserSessionPath, query), { ...options, method: "GET" });
+}
+function signOutBrowserSession(fetcher, next) {
+  return fetcher(withQuery("/v1/auth/sign-out", { next }), post({}));
+}
+function changeEmail(fetcher, body) {
+  return fetcher("/v1/auth/change-email", post(body));
+}
+function authorizeStaff(fetcher, body, signal) {
+  return fetcher("/v1/authorize", post(body, signal));
+}
+function createSlackSession(fetcher, body, signal) {
+  return fetcher("/v1/slack/session", post(body, signal));
+}
+function startCliDeviceAuthorization(request) {
+  return request("/v1/cli/device/start", {
+    method: "POST",
+    body: {}
+  });
+}
+function pollCliDeviceAuthorization(request, body, signal) {
+  return request("/v1/cli/device/poll", { method: "POST", body, signal });
+}
+function approveCliDeviceAuthorization(fetcher, body) {
+  return fetcher("/v1/cli/device/approve", post(body));
+}
+function getCliSession(request) {
+  return request("/v1/cli/session", { method: "GET" });
+}
+function revokeCliSession(request) {
+  return request("/v1/cli/session", { method: "DELETE" });
+}
+
+// ../../packages/api-client/dist/authorization/mcp.js
+function getMcpApplication(fetcher, clientId) {
+  return fetcher(`/v1/mcp/applications/${encodeURIComponent(clientId)}`, { method: "GET" });
+}
+function listMcpConnections(fetcher, userId) {
+  return fetcher(withQuery("/v1/mcp/connections", { user_id: userId }), { method: "GET" });
+}
+function revokeMcpConnection(fetcher, userId, clientId) {
+  return fetcher(withQuery(`/v1/mcp/connections/${encodeURIComponent(clientId)}`, { user_id: userId }), { method: "DELETE" });
+}
+function resolveMcpSession(fetcher, token) {
+  return fetcher("/v1/mcp/session", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ token })
+  });
+}
+function authorizeMcp(fetcher, body, signal) {
+  return fetcher("/v1/auth/mcp/authorize", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body),
+    signal
+  });
+}
+function consentMcp(fetcher, body, signal) {
+  return fetcher("/v1/auth/mcp/consent", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body),
+    signal
+  });
+}
+
+// ../../packages/api-client/dist/authorization/impersonation.js
+function getActiveImpersonationGrant(fetcher, staffUserId) {
+  return fetcher(`/v1/impersonation/active/${encodeURIComponent(staffUserId)}`, { method: "GET" });
+}
+function deleteImpersonationGrant(fetcher, staffUserId) {
+  return fetcher(`/v1/impersonation/${encodeURIComponent(staffUserId)}`, { method: "DELETE" });
+}
+function listImpersonationCustomers(request, query = {}, signal) {
+  return request(withQuery("/v1/staff/impersonation/customers", query), {
+    method: "GET",
+    signal
+  });
+}
+function startStaffImpersonation(fetcher, body) {
+  return fetcher("/v1/staff/impersonation/start", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body)
+  });
+}
+function stopStaffImpersonation(fetcher) {
+  return fetcher("/v1/staff/impersonation/stop", { method: "POST" });
+}
 export {
   acceptInvite,
   addStaffOrganizationMember,
+  approveCliDeviceAuthorization,
   approveSupplierApplicationFromSlack,
+  authorizeMcp,
+  authorizeStaff,
   bookOnboardingCall,
+  browserSessionPath,
   cancelOnboardingCall,
   cancelOrganizationFollowUp,
+  changeEmail,
+  consentMcp,
   countOrganizations,
   createApiKey,
   createInvite,
   createOrganization,
+  createSlackSession,
   createSshKey,
   createStaffInvite,
   createStaffOrganization,
   createSupplierApplication,
+  deleteImpersonationGrant,
+  getActiveImpersonationGrant,
+  getBrowserSession,
+  getCliSession,
   getInvite,
+  getMcpApplication,
   getNotificationPreferences,
   getOrganization,
   getOrganizationMembership,
@@ -328,10 +443,13 @@ export {
   getStaffOrganization,
   getUserPreferences,
   getUserProfile,
+  inviteRedeemPath,
   listAllSshKeys,
   listApiKeys,
   listAvailabilityAlerts,
+  listImpersonationCustomers,
   listInvites,
+  listMcpConnections,
   listOnboardingSlots,
   listOrganizationMembers,
   listOrganizations,
@@ -344,16 +462,26 @@ export {
   listSupplierOrganizations,
   organizationAvatarPath,
   personAvatarPath,
+  pollCliDeviceAuthorization,
   removeOrganizationMember,
   removeStaffOrganizationMember,
+  resolveMcpSession,
   revokeApiKey,
+  revokeCliSession,
   revokeInvite,
+  revokeMcpConnection,
   revokeSshKey,
   revokeStaffOrganizationInvite,
   searchStaffOrganizations,
   searchStaffPeople,
   setAvailabilityAlert,
+  signInPath,
+  signOutBrowserSession,
+  startCliDeviceAuthorization,
+  startStaffImpersonation,
+  stopStaffImpersonation,
   submitOnboardingIntake,
+  unsubscribePath,
   updateNotificationPreferences,
   updateOrganization,
   updateOrganizationApproval,

package/vendor/capabilities/cli.js

@@ -268,6 +268,11 @@ function createStaffInvite(request, body2) {
   return request("/v1/staff/invites", { method: "POST", body: body2 });
 }
 
+// ../../packages/api-client/dist/authorization/sessions.js
+function getCliSession(request) {
+  return request("/v1/cli/session", { method: "GET" });
+}
+
 // ../../packages/capabilities/dist/supplier-directory.js
 function listSupplierOrganizationPage(fetch, input) {
   return listOrganizations(fetch, {
@@ -5109,7 +5114,7 @@ var whoamiCapability = defineCapability({
   mutation: "read",
   http: { method: "GET", path: "/v1/cli/session" },
   input: emptyInput3,
-  execute: async (ctx) => ctx.fetch("/v1/cli/session", { method: "GET" })
+  execute: async (ctx) => getCliSession(ctx.fetch)
 });
 var statusCapability = defineCapability({
   id: "identity.status",