@ornncompute/cli 1.0.112 → 1.0.113

package/package.json

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

package/src/registry-commands.mjs

@@ -1,3 +1,4 @@
+import { listApiKeys, createApiKey, revokeApiKey } from "../vendor/api-client/authorization.js";
 import { spawn as spawnProcessDefault } from "node:child_process";
 import os from "node:os";
 
@@ -26,25 +27,21 @@ async function login({
       field: "organization",
     });
   }
-  const keysPath = `/v1/organizations/${encodeURIComponent(organizationId)}/api-keys`;
   const name = `${KEY_NAME_PREFIX}${hostname}`.slice(0, 100);
 
-  const existing = await fetch(keysPath);
+  const existing = await listApiKeys(fetch, organizationId);
   for (const key of existing?.api_keys ?? []) {
     if (key?.name === name && typeof key.id === "string") {
-      await fetch(`${keysPath}/${encodeURIComponent(key.id)}`, { method: "DELETE" });
+      await revokeApiKey(fetch, organizationId, key.id);
     }
   }
-  const created = await fetch(keysPath, {
-    method: "POST",
-    body: { name, access: "read_write" },
-  });
+  const created = await createApiKey(fetch, organizationId, { name, access: "read_write" });
 
   let exit;
   try {
     exit = await dockerLogin(spawnProcess, registry.host, created.token);
   } catch (error) {
-    await fetch(`${keysPath}/${encodeURIComponent(created.id)}`, { method: "DELETE" });
+    await revokeApiKey(fetch, organizationId, created.id);
     const missing = error?.code === "ENOENT";
     interaction.error(
       missing
@@ -54,7 +51,7 @@ async function login({
     );
   }
   if (exit.code !== 0) {
-    await fetch(`${keysPath}/${encodeURIComponent(created.id)}`, { method: "DELETE" });
+    await revokeApiKey(fetch, organizationId, created.id);
     interaction.error(`docker login ${registry.host} failed; no key was kept.`, {
       code: "docker_login_failed",
       exitCode: 1,

package/vendor/api-client/authorization.js

@@ -0,0 +1,363 @@
+// ../../packages/api-client/dist/authorization/paths.js
+var organizationPath = (id) => `/v1/organizations/${encodeURIComponent(id)}`;
+var personPath = (id) => `/v1/people/${encodeURIComponent(id)}`;
+function withQuery(path, values) {
+  const query = new URLSearchParams();
+  for (const [key, value] of Object.entries(values)) {
+    if (value !== void 0 && value !== null && value !== "")
+      query.set(key, Array.isArray(value) ? value.join(",") : String(value));
+  }
+  return query.size ? `${path}?${query}` : path;
+}
+
+// ../../packages/api-client/dist/authorization/organizations.js
+function listOrganizations(request, query = {}, signal) {
+  return request(withQuery("/v1/organizations", query), { method: "GET", signal });
+}
+async function listSupplierOrganizations(request, signal) {
+  const rows = [];
+  for (let offset = 0; offset < 5e4; offset += 1e3) {
+    const page = await listOrganizations(request, { role: "supplier", limit: 1e3, offset, sort: "created_at", direction: "asc" }, signal);
+    if (!Array.isArray(page))
+      throw new Error("Invalid supplier directory response.");
+    rows.push(...page);
+    if (page.length < 1e3)
+      return rows;
+  }
+  throw new Error("The supplier directory is too large to load completely.");
+}
+async function listOrganizationsByIds(request, ids, signal) {
+  const unique = [
+    ...new Set(ids.map((id) => id?.trim()).filter((id) => Boolean(id)))
+  ];
+  const chunks = [];
+  for (let start = 0; start < unique.length; start += 100)
+    chunks.push(unique.slice(start, start + 100));
+  const pages = await Promise.all(chunks.map(async (chunk, index) => {
+    if (index > 0)
+      await new Promise((resolve) => setTimeout(resolve, Math.random() * 40));
+    return listOrganizations(request, { ids: chunk, limit: chunk.length }, signal);
+  }));
+  return pages.flat();
+}
+function countOrganizations(request, query = {}, signal) {
+  return request(withQuery("/v1/staff/v1/organizations/count", query), {
+    method: "GET",
+    signal
+  });
+}
+function getOrganization(request, id, signal) {
+  return request(organizationPath(id), { method: "GET", signal });
+}
+function listOrganizationsForUser(request, query, signal) {
+  return request(withQuery("/v1/organizations/by-user", query), {
+    method: "GET",
+    signal
+  });
+}
+function createOrganization(request, body, signal) {
+  return request("/v1/organizations", { method: "POST", body, signal });
+}
+function updateOrganization(request, id, body) {
+  return request(organizationPath(id), { method: "PATCH", body });
+}
+function listOrganizationMembers(request, id, signal) {
+  return request(`${organizationPath(id)}/members`, { method: "GET", signal });
+}
+function getOrganizationMembership(request, id, email) {
+  return request(`${organizationPath(id)}/members/${encodeURIComponent(email)}`, {
+    method: "GET"
+  });
+}
+function removeOrganizationMember(request, id, email) {
+  return request(`${organizationPath(id)}/members/${encodeURIComponent(email)}`, {
+    method: "DELETE"
+  });
+}
+
+// ../../packages/api-client/dist/authorization/account.js
+function getUserProfile(request, id, signal) {
+  return request(`${personPath(id)}/profile`, {
+    method: "GET",
+    signal
+  });
+}
+function updateUserProfile(request, id, body) {
+  return request(`${personPath(id)}/profile`, {
+    method: "PATCH",
+    body
+  });
+}
+function getUserPreferences(request, id, signal) {
+  return request(`${personPath(id)}/preferences`, {
+    method: "GET",
+    signal
+  });
+}
+function updateUserPreferences(request, id, body) {
+  return request(`${personPath(id)}/preferences`, {
+    method: "PATCH",
+    body
+  });
+}
+function getNotificationPreferences(request, id, signal) {
+  return request(`${organizationPath(id)}/notification-preferences`, {
+    method: "GET",
+    signal
+  });
+}
+function updateNotificationPreferences(request, id, body) {
+  return request(`${organizationPath(id)}/notification-preferences`, {
+    method: "PATCH",
+    body
+  });
+}
+function listApiKeys(request, id, signal) {
+  return request(`${organizationPath(id)}/api-keys`, {
+    method: "GET",
+    signal
+  });
+}
+function createApiKey(request, id, body) {
+  return request(`${organizationPath(id)}/api-keys`, {
+    method: "POST",
+    body
+  });
+}
+function revokeApiKey(request, id, keyId) {
+  return request(`${organizationPath(id)}/api-keys/${encodeURIComponent(keyId)}`, {
+    method: "DELETE"
+  });
+}
+function listAvailabilityAlerts(request, id, signal) {
+  return request(`${personPath(id)}/availability-alerts`, { method: "GET", signal });
+}
+function setAvailabilityAlert(request, id, alert) {
+  return request(`${personPath(id)}/availability-alerts/${encodeURIComponent(alert.gpu_slug)}/${encodeURIComponent(alert.sale_type)}`, { method: "PUT", body: { enabled: alert.enabled } });
+}
+var personAvatarPath = (id) => `${personPath(id)}/avatar`;
+var organizationAvatarPath = (id) => `${organizationPath(id)}/avatar`;
+function getPersonAvatar(fetcher, id) {
+  return fetcher(personAvatarPath(id), { method: "GET" });
+}
+
+// ../../packages/api-client/dist/authorization/invites.js
+var invitePath = (id) => `/v1/invites/${encodeURIComponent(id)}`;
+function listInvites(request, organizationId, signal) {
+  return request(withQuery("/v1/invites", { organization_id: organizationId }), {
+    method: "GET",
+    signal
+  });
+}
+function getInvite(request, id) {
+  return request(invitePath(id), { method: "GET" });
+}
+function createInvite(request, body) {
+  return request("/v1/invites", { method: "POST", body });
+}
+function revokeInvite(request, organizationId, id) {
+  return request(withQuery(invitePath(id), { organization_id: organizationId }), {
+    method: "DELETE"
+  });
+}
+function acceptInvite(request, id, body = {}) {
+  return request(`${invitePath(id)}/accept`, { method: "POST", body });
+}
+
+// ../../packages/api-client/dist/authorization/ssh-keys.js
+function listSshKeys(request, id, query = {}, signal) {
+  return request(withQuery(`${organizationPath(id)}/ssh-keys`, query), {
+    method: "GET",
+    signal
+  });
+}
+async function listAllSshKeys(request, id, signal) {
+  const ssh_keys = [];
+  const seen = /* @__PURE__ */ new Set();
+  let cursor = null;
+  let has_revoked = false;
+  do {
+    const page = await listSshKeys(request, id, { status: "all", limit: 500, cursor }, signal);
+    ssh_keys.push(...page.ssh_keys);
+    has_revoked ||= page.has_revoked === true;
+    cursor = page.next_cursor ?? null;
+    if (cursor && seen.has(cursor))
+      throw new Error("SSH key pagination did not advance.");
+    if (cursor)
+      seen.add(cursor);
+  } while (cursor);
+  return { ssh_keys, next_cursor: null, has_revoked };
+}
+function createSshKey(request, id, body, query = {}) {
+  return request(withQuery(`${organizationPath(id)}/ssh-keys`, query), {
+    method: "POST",
+    body
+  });
+}
+function revokeSshKey(request, id, keyId, query = {}) {
+  return request(withQuery(`${organizationPath(id)}/ssh-keys/${encodeURIComponent(keyId)}`, query), { method: "DELETE" });
+}
+
+// ../../packages/api-client/dist/authorization/staff.js
+var staffOrganizationPath = (id) => `/v1/staff/organizations/${encodeURIComponent(id)}`;
+function searchStaffPeople(request, query, signal) {
+  return request(withQuery("/v1/staff/people", query), { method: "GET", signal });
+}
+function searchStaffOrganizations(request, query, signal) {
+  return request(withQuery("/v1/staff/organizations", query), {
+    method: "GET",
+    signal
+  });
+}
+function getStaffOrganization(request, id, signal) {
+  return request(staffOrganizationPath(id), {
+    method: "GET",
+    signal
+  });
+}
+function createStaffOrganization(request, body) {
+  return request("/v1/staff/organizations", {
+    method: "POST",
+    body
+  });
+}
+function listStaffOrganizationMembers(request, id, signal) {
+  return request(`${staffOrganizationPath(id)}/members`, { method: "GET", signal });
+}
+function addStaffOrganizationMember(request, id, body) {
+  return request(`${staffOrganizationPath(id)}/members`, {
+    method: "POST",
+    body
+  });
+}
+function removeStaffOrganizationMember(request, id, email) {
+  return request(`${staffOrganizationPath(id)}/members/${encodeURIComponent(email)}`, {
+    method: "DELETE"
+  });
+}
+function listStaffOrganizationInvites(request, id, signal) {
+  return request(`${staffOrganizationPath(id)}/invites`, { method: "GET", signal });
+}
+function revokeStaffOrganizationInvite(request, id, inviteId) {
+  return request(`${staffOrganizationPath(id)}/invites/${encodeURIComponent(inviteId)}`, {
+    method: "DELETE"
+  });
+}
+function createStaffInvite(request, body) {
+  return request("/v1/staff/invites", { method: "POST", body });
+}
+function updateOrganizationApproval(request, id, body) {
+  return request(`${organizationPath(id)}/approval`, { method: "POST", body });
+}
+function cancelOrganizationFollowUp(request, id) {
+  return request(`${organizationPath(id)}/follow-up/cancel`, {
+    method: "POST",
+    body: {}
+  });
+}
+function listSupplierApplications(request, query = {}, signal) {
+  return request(withQuery("/v1/supplier-applications", query), {
+    method: "GET",
+    signal
+  });
+}
+function updateSupplierApplication(request, id, body) {
+  return request(`/v1/supplier-applications/${encodeURIComponent(id)}`, {
+    method: "PATCH",
+    body
+  });
+}
+function approveSupplierApplicationFromSlack(fetcher, id, actorEmail) {
+  return fetcher(`/v1/staff/v1/supplier-applications/${encodeURIComponent(id)}`, {
+    method: "PATCH",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ approve_pending: true, actor_email: actorEmail })
+  });
+}
+
+// ../../packages/api-client/dist/authorization/onboarding.js
+function submitOnboardingIntake(fetcher, body) {
+  return fetcher("/v1/onboarding/intake", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body)
+  });
+}
+function listOnboardingSlots(fetcher, id, query) {
+  return fetcher(withQuery(`${organizationPath(id)}/onboarding-booking/slots`, query), {
+    method: "GET"
+  });
+}
+function bookOnboardingCall(fetcher, id, body) {
+  return fetcher(`${organizationPath(id)}/onboarding-booking`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body)
+  });
+}
+function cancelOnboardingCall(fetcher, id) {
+  return fetcher(`${organizationPath(id)}/onboarding-booking`, { method: "DELETE" });
+}
+function createSupplierApplication(fetcher, body, query = {}) {
+  return fetcher(withQuery("/v1/supplier-applications", query), {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body)
+  });
+}
+export {
+  acceptInvite,
+  addStaffOrganizationMember,
+  approveSupplierApplicationFromSlack,
+  bookOnboardingCall,
+  cancelOnboardingCall,
+  cancelOrganizationFollowUp,
+  countOrganizations,
+  createApiKey,
+  createInvite,
+  createOrganization,
+  createSshKey,
+  createStaffInvite,
+  createStaffOrganization,
+  createSupplierApplication,
+  getInvite,
+  getNotificationPreferences,
+  getOrganization,
+  getOrganizationMembership,
+  getPersonAvatar,
+  getStaffOrganization,
+  getUserPreferences,
+  getUserProfile,
+  listAllSshKeys,
+  listApiKeys,
+  listAvailabilityAlerts,
+  listInvites,
+  listOnboardingSlots,
+  listOrganizationMembers,
+  listOrganizations,
+  listOrganizationsByIds,
+  listOrganizationsForUser,
+  listSshKeys,
+  listStaffOrganizationInvites,
+  listStaffOrganizationMembers,
+  listSupplierApplications,
+  listSupplierOrganizations,
+  organizationAvatarPath,
+  personAvatarPath,
+  removeOrganizationMember,
+  removeStaffOrganizationMember,
+  revokeApiKey,
+  revokeInvite,
+  revokeSshKey,
+  revokeStaffOrganizationInvite,
+  searchStaffOrganizations,
+  searchStaffPeople,
+  setAvailabilityAlert,
+  submitOnboardingIntake,
+  updateNotificationPreferences,
+  updateOrganization,
+  updateOrganizationApproval,
+  updateSupplierApplication,
+  updateUserPreferences,
+  updateUserProfile
+};

package/vendor/capabilities/cli.js

@@ -236,25 +236,50 @@ function ensureFacility(request, body2) {
   });
 }
 
-// ../../packages/capabilities/dist/supplier-directory.js
-async function listSupplierOrganizationPage(fetch, input) {
-  const params = `role=supplier&limit=${input.limit}&offset=${input.offset}&sort=created_at&direction=asc` + (input.q?.trim() ? `&q=${encodeURIComponent(input.q.trim())}` : "");
-  const page2 = await fetch(`/v1/organizations?${params}`, { method: "GET" });
-  if (!Array.isArray(page2))
-    throw new Error("Invalid supplier directory response.");
-  return page2;
-}
-async function listSupplierOrganizations(fetch) {
+// ../../packages/api-client/dist/authorization/paths.js
+function withQuery(path, values) {
+  const query2 = new URLSearchParams();
+  for (const [key, value] of Object.entries(values)) {
+    if (value !== void 0 && value !== null && value !== "")
+      query2.set(key, Array.isArray(value) ? value.join(",") : String(value));
+  }
+  return query2.size ? `${path}?${query2}` : path;
+}
+
+// ../../packages/api-client/dist/authorization/organizations.js
+function listOrganizations(request, query2 = {}, signal) {
+  return request(withQuery("/v1/organizations", query2), { method: "GET", signal });
+}
+async function listSupplierOrganizations(request, signal) {
   const rows = [];
   for (let offset = 0; offset < 5e4; offset += 1e3) {
-    const page2 = await listSupplierOrganizationPage(fetch, { limit: 1e3, offset });
+    const page2 = await listOrganizations(request, { role: "supplier", limit: 1e3, offset, sort: "created_at", direction: "asc" }, signal);
+    if (!Array.isArray(page2))
+      throw new Error("Invalid supplier directory response.");
     rows.push(...page2);
     if (page2.length < 1e3)
       return rows;
   }
-  throw new Error("Supplier directory exceeded 50 pages; refusing a partial catalog.");
+  throw new Error("The supplier directory is too large to load completely.");
+}
+
+// ../../packages/api-client/dist/authorization/staff.js
+function createStaffInvite(request, body2) {
+  return request("/v1/staff/invites", { method: "POST", body: body2 });
 }
 
+// ../../packages/capabilities/dist/supplier-directory.js
+function listSupplierOrganizationPage(fetch, input) {
+  return listOrganizations(fetch, {
+    role: "supplier",
+    ...input,
+    q: input.q?.trim() || void 0,
+    sort: "created_at",
+    direction: "asc"
+  });
+}
+var listSupplierOrganizations2 = listSupplierOrganizations;
+
 // ../../packages/capabilities/dist/capabilities/fleet.js
 import { z as z2 } from "zod";
 function queryPath(path, params) {
@@ -311,7 +336,6 @@ var listSuppliersCapability = defineCapability({
   roles: ["admin"],
   description: "List supplier organizations (id, name). Resolve supplier names to organization_id with this before nodes.list or facilities.list. When next_offset is present, pass it back as offset for the next page.",
   mutation: "read",
-  http: { method: "GET", path: "/v1/organizations" },
   slack: {
     parameters: {
       type: "object",
@@ -328,7 +352,7 @@ var listSuppliersCapability = defineCapability({
     const paged = parsed.limit !== void 0 || parsed.offset !== void 0 || parsed.q !== void 0;
     const limit = parsed.limit ?? 25;
     const offset = parsed.offset ?? 0;
-    const rows = paged ? await listSupplierOrganizationPage(ctx.fetch, { ...parsed, limit, offset }) : await listSupplierOrganizations(ctx.fetch);
+    const rows = paged ? await listSupplierOrganizationPage(ctx.fetch, { ...parsed, limit, offset }) : await listSupplierOrganizations2(ctx.fetch);
     return {
       suppliers: rows.map((org) => ({ id: org.id, name: org.name })),
       ...paged && rows.length === limit ? { next_offset: offset + rows.length } : {}
@@ -997,19 +1021,6 @@ var usersListInput = z5.object({
   limit: directoryLimit,
   offset: directoryOffset
 });
-function directoryPath(input) {
-  const params = [`limit=${input.limit}`, `offset=${input.offset}`, "sort=name", "direction=asc"];
-  if (input.q)
-    params.push(`q=${encodeURIComponent(input.q)}`);
-  if (input.role)
-    params.push(`role=${encodeURIComponent(input.role)}`);
-  if (input.approved !== void 0) {
-    params.push(`approved=${input.approved}`);
-  }
-  if (input.ids)
-    params.push(`ids=${encodeURIComponent(input.ids.join(","))}`);
-  return `/v1/organizations?${params.join("&")}`;
-}
 function directoryMembers(organization) {
   return organization.members ?? [];
 }
@@ -1027,7 +1038,6 @@ var organizationListCapability = defineCapability({
   roles: ["admin"],
   description: "List organizations from the Authorization directory. Search by company name, contact/member name, or email; filter by role, approval, or UUIDs. When next_offset is present, pass it back as offset for the next page. Use the organization id as organizationId when recording downtime, and ask the user to choose if matches are ambiguous.",
   mutation: "read",
-  http: { method: "GET", path: "/v1/organizations" },
   slack: {
     parameters: {
       type: "object",
@@ -1054,8 +1064,12 @@ var organizationListCapability = defineCapability({
     const parsed = organizationListInput.parse(input);
     const limit = parsed.limit;
     const offset = parsed.offset ?? 0;
-    const rows = await ctx.fetch(directoryPath({ ...parsed, limit, offset }), {
-      method: "GET"
+    const rows = await listOrganizations(ctx.fetch, {
+      ...parsed,
+      limit,
+      offset,
+      sort: "name",
+      direction: "asc"
     });
     return {
       organizations: rows.map((organization) => ({
@@ -1079,7 +1093,6 @@ var usersListCapability = defineCapability({
   roles: ["admin"],
   description: "List users who belong to an organization, from the Authorization directory. Search by person name, email, or company name; use organization_id to restrict results to one organization. When next_offset is present, pass it back as offset for the next page.",
   mutation: "read",
-  http: { method: "GET", path: "/v1/organizations" },
   slack: {
     parameters: {
       type: "object",
@@ -1102,12 +1115,14 @@ var usersListCapability = defineCapability({
     const parsed = usersListInput.parse(input);
     const limit = parsed.limit;
     const offset = parsed.offset ?? 0;
-    const rows = await ctx.fetch(directoryPath({
+    const rows = await listOrganizations(ctx.fetch, {
       limit,
       offset,
       q: parsed.q,
-      ids: parsed.organization_id ? [parsed.organization_id] : void 0
-    }), { method: "GET" });
+      ids: parsed.organization_id ? [parsed.organization_id] : void 0,
+      sort: "name",
+      direction: "asc"
+    });
     const q = parsed.q?.toLowerCase();
     const users = rows.flatMap((organization) => {
       const members = directoryMembers(organization);
@@ -5349,7 +5364,7 @@ var createListingCapability = defineCapability({
     const supplierQuery = (parsed.site_supplier ?? "").trim().toLowerCase();
     const place = (parsed.site_nickname ?? parsed.site ?? "").trim();
     if (!organizationId && supplierQuery) {
-      const matches = (await listSupplierOrganizations(ctx.fetch)).filter((org) => org.id.toLowerCase() === supplierQuery || org.name.toLowerCase() === supplierQuery);
+      const matches = (await listSupplierOrganizations2(ctx.fetch)).filter((org) => org.id.toLowerCase() === supplierQuery || org.name.toLowerCase() === supplierQuery);
       if (matches.length !== 1) {
         return { ok: false, error: matches.length ? "ambiguous_supplier" : "supplier_not_found" };
       }
@@ -5493,7 +5508,6 @@ var organizationInviteCapability = defineCapability({
   roles: ["admin"],
   description: "Invite a person to an existing organization (emails by default; send_email=false returns a join link), or omit organization_id to create a signup link with organization_role=consumer or supplier. Resolve organization UUIDs first; ask if ambiguous. Executes immediately. Keep invitation links secret.",
   mutation: "immediate",
-  http: { method: "POST", path: "/v1/staff/invites" },
   cli: {
     command: ["admin", "organizations", "invite"],
     vnext: {
@@ -5528,9 +5542,9 @@ var organizationInviteCapability = defineCapability({
   input: organizationInviteInput,
   execute: async (ctx, input) => {
     const parsed = organizationInviteInput.parse(input);
-    return ctx.fetch("/v1/staff/invites", {
-      method: "POST",
-      body: { ...parsed, send_email: parsed.send_email ?? parsed.organization_id !== void 0 }
+    return createStaffInvite(ctx.fetch, {
+      ...parsed,
+      send_email: parsed.send_email ?? parsed.organization_id !== void 0
     });
   }
 });