@ornncompute/cli 1.0.141 → 1.0.143

package/README.md

@@ -5,7 +5,7 @@ client for customer compute journeys and the explicit staff namespace. It
 sends browser and CLI traffic only through the API gateway.
 
 For the customer install and usage guide, see [`docs/cli.md`](../../docs/cli.md).
-The shared capability catalog in `packages/capabilities` is the authority for
+The [shared capability catalog](../../packages/capabilities/README.md) is the authority for
 command identity, role visibility, input schemas, help, and resource discovery.
 The CLI imports `@ornn/capabilities/cli`; packaging includes its dependencies,
 including `@ornn/api-client`, and excludes MCP-only catalog handlers. These

package/package.json

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

package/src/vm-commands.mjs

@@ -1,4 +1,9 @@
 import {
+  sshKeyListCapability,
+  sshKeyAddCapability,
+  sshKeyDeleteCapability,
+  sshKeyAssignmentListCapability,
+  sshKeyAssignmentAssignCapability,
   sshKeyAssignmentStatusCapability,
   sshKeyDeliveryStatus,
 } from "../vendor/capabilities/cli.js";
@@ -533,7 +538,7 @@ async function fetchOrganizationKeys(context) {
   const seen = new Set();
   let cursor = null;
   do {
-    const page = await gatewayApi.listAccountSshKeys(context.fetch, {
+    const page = await sshKeyListCapability.execute(context, {
       status: "active",
       limit: 500,
       ...(cursor ? { cursor } : {}),
@@ -668,11 +673,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 gatewayApi.createAccountSshKey(
-      context.fetch,
-      { label: text(plan.key.label), public_key: publicKey },
-      { headers: { "Idempotency-Key": idempotencyKey } }
-    )
+    await sshKeyAddCapability.execute(context, {
+      publicKey,
+      label: text(plan.key.label),
+      idempotencyKey,
+    })
   );
   if (!resourceId(created) || text(created.public_key) !== publicKey) {
     interaction.error("The saved SSH key did not match the reviewed public key.", {
@@ -684,7 +689,7 @@ export async function materializeKey(context, plan, interaction, idempotencyKey)
 
 async function fetchAssignedKeys(context, reservationId) {
   return activeKeys(
-    keysFromPayload(await orchestrator.listReservationSshKeys(context.fetch, reservationId))
+    keysFromPayload(await sshKeyAssignmentListCapability.execute(context, { reservationId }))
   );
 }
 
@@ -694,12 +699,11 @@ async function ensureAssignment(context, reservationId, key, idempotencyKey, int
   const existing = assigned.find((candidate) => resourceId(candidate) === keyId);
   if (existing) return { created: false, key: existing };
   const created = record(
-    await orchestrator.addReservationSshKey(
-      context.fetch,
+    await sshKeyAssignmentAssignCapability.execute(context, {
       reservationId,
-      { ssh_key_id: keyId },
-      { headers: { "Idempotency-Key": idempotencyKey } }
-    )
+      keyId,
+      idempotencyKey,
+    })
   );
   if (resourceId(created) !== keyId) {
     interaction.error("The SSH-key assignment did not match the reviewed key.", {
@@ -1665,7 +1669,7 @@ async function executeWorkspaceCapability(
       code: "workspace_capability_unavailable",
     });
   }
-  const execution = await capability.execute(
+  const execution = await (capability.cli?.execute ?? capability.execute)(
     workspaceStepContext(context, interaction, signal),
     input
   );
@@ -4302,7 +4306,7 @@ 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 payload = await gatewayApi.listAccountSshKeys(context.fetch, {
+    const payload = await sshKeyListCapability.execute(context, {
       status: "active",
       limit,
       ...(text(input.cursor) ? { cursor: input.cursor } : {}),
@@ -4396,8 +4400,9 @@ export async function executeSshKeyCommand(command, input, context, interaction)
         presentation: { lines: ["SSH-key deletion declined."] },
       });
     }
-    await gatewayApi.deleteAccountSshKey(context.fetch, resourceId(key), {
-      headers: { "Idempotency-Key": text(input.idempotencyKey) ?? interaction.idempotencyKey() },
+    await sshKeyDeleteCapability.execute(context, {
+      keyId: resourceId(key),
+      idempotencyKey: text(input.idempotencyKey) ?? interaction.idempotencyKey(),
     });
     return interaction.result({
       data: { ssh_key: projectKey(key) },

package/vendor/api-client/gateway.js

@@ -231,19 +231,6 @@ function deleteAccountSshKey(request, id, options) {
     method: "DELETE"
   });
 }
-function listClusterUserKeys(request, input) {
-  return request(`${compute}/nodes/organizations/me/cluster-users${query2(input)}`, {
-    method: "GET"
-  });
-}
-function createClusterUserKey(request, body) {
-  return request(`${compute}/nodes/organizations/me/cluster-users`, { method: "POST", body });
-}
-function deleteClusterUserKey(request, id) {
-  return request(`${compute}/nodes/organizations/me/cluster-users/${encodeURIComponent(id)}`, {
-    method: "DELETE"
-  });
-}
 
 // ../../packages/api-client/dist/gateway/staff.js
 function addStaffReservationKey(request, id, body) {
@@ -307,12 +294,10 @@ export {
   claimSupplierIntakeEditor,
   consoleMcpPath,
   createAccountSshKey,
-  createClusterUserKey,
   createPylonIssue,
   createStaffTestMember,
   createSupportThread,
   deleteAccountSshKey,
-  deleteClusterUserKey,
   deleteSupplierIntakeDocument,
   deployReservationStorage,
   deployStaffNode,
@@ -338,7 +323,6 @@ export {
   linkPylonAccount,
   linkPylonIssue,
   listAccountSshKeys,
-  listClusterUserKeys,
   listClusters,
   listGithubCommitPulls,
   listGithubCommits,

package/vendor/capabilities/cli.js

@@ -3359,19 +3359,6 @@ function deleteAccountSshKey(request, id, options) {
     method: "DELETE"
   });
 }
-function listClusterUserKeys(request, input) {
-  return request(`${compute}/nodes/organizations/me/cluster-users${query2(input)}`, {
-    method: "GET"
-  });
-}
-function createClusterUserKey(request, body2) {
-  return request(`${compute}/nodes/organizations/me/cluster-users`, { method: "POST", body: body2 });
-}
-function deleteClusterUserKey(request, id) {
-  return request(`${compute}/nodes/organizations/me/cluster-users/${encodeURIComponent(id)}`, {
-    method: "DELETE"
-  });
-}
 
 // ../../packages/api-client/dist/gateway/index.js
 function getCliStatus(request) {
@@ -3464,6 +3451,18 @@ var launchInput = z18.object({
   yes: z18.boolean().optional(),
   volume: z18.string().optional()
 }).strict();
+var pageInput = z18.object({
+  limit: z18.number().int().min(1).max(500).optional(),
+  cursor: z18.string().optional()
+});
+var publicKeyInput = z18.object({
+  publicKey: z18.string(),
+  label: z18.string().optional(),
+  confirm: z18.boolean().optional()
+});
+var keyIdInput = z18.object({ keyId: z18.string(), confirm: z18.boolean().optional() });
+var reservationKeyInput = publicKeyInput.extend({ reservationId: z18.string() });
+var ADDED_KEY_OUTCOME = "The response's outcome field says whether the key was created, was already_registered (returned unchanged, so the submitted label is not applied), or was reactivated from a revoked key.";
 var keyListInput = z18.object({
   $positionals: positionals2,
   cursor: z18.string().optional(),
@@ -3750,15 +3749,19 @@ var machineResetCapability = cliOnly({
   },
   execute: executeMachines("reset")
 });
-var sshKeyListCapability = cliOnly({
+var sshKeyListCapability = defineCapability({
   id: "access.ssh_keys.list",
   domain: "access",
   roles: ["user"],
   mutation: "read",
-  input: keyListInput,
-  description: "List organization SSH keys in a bounded page.",
+  input: pageInput.extend({ status: z18.enum(["active", "all"]).optional() }),
+  description: "List a page of account SSH keys. Pass next_cursor as cursor to continue.",
+  mcp: { name: "ssh_keys_list", aliases: ["cluster_users_list"], input: pageInput },
+  slack: false,
   cli: {
     command: ["ssh-keys", "list"],
+    input: keyListInput,
+    execute: executeSshKeys("list"),
     vnext: {
       arguments: "semantic",
       audience: "customer",
@@ -3771,17 +3774,28 @@ var sshKeyListCapability = cliOnly({
       related: ["ssh-keys add", "ssh-keys assignments list"]
     }
   },
-  execute: executeSshKeys("list")
+  execute: (context, input) => listAccountSshKeys(context.fetch, {
+    status: input.status ?? "all",
+    limit: input.limit ?? 25,
+    ...input.cursor ? { cursor: input.cursor } : {}
+  })
 });
-var sshKeyAddCapability = cliOnly({
+var sshKeyAddCapability = defineCapability({
   id: "access.ssh_keys.add",
   domain: "access",
   roles: ["user"],
   mutation: "preview-confirm",
-  input: keyMutationInput,
-  description: "Add or replay one organization SSH public key.",
+  input: publicKeyInput.extend({
+    label: z18.string().nullable().optional(),
+    idempotencyKey: z18.string().optional()
+  }),
+  description: `Add an SSH public key to the account. ${ADDED_KEY_OUTCOME}`,
+  mcp: { name: "ssh_keys_add", aliases: ["cluster_users_add"], input: publicKeyInput },
+  slack: false,
   cli: {
     command: ["ssh-keys", "add"],
+    input: keyMutationInput,
+    execute: executeSshKeys("add"),
     vnext: {
       arguments: "semantic",
       audience: "customer",
@@ -3795,17 +3809,21 @@ var sshKeyAddCapability = cliOnly({
       related: ["ssh-keys list", "ssh-keys assignments assign"]
     }
   },
-  execute: executeSshKeys("add")
+  execute: (context, input) => createAccountSshKey(context.fetch, { public_key: input.publicKey, label: input.label }, input.idempotencyKey ? { headers: { "Idempotency-Key": input.idempotencyKey } } : void 0)
 });
-var sshKeyDeleteCapability = cliOnly({
+var sshKeyDeleteCapability = defineCapability({
   id: "access.ssh_keys.delete",
   domain: "access",
   roles: ["user"],
   mutation: "preview-confirm",
-  input: keyMutationInput,
-  description: "Delete one exact organization SSH key after review.",
+  input: keyIdInput.extend({ idempotencyKey: z18.string().optional() }),
+  description: "Delete an SSH key from the account.",
+  mcp: { name: "ssh_keys_delete", aliases: ["cluster_users_revoke"], input: keyIdInput },
+  slack: false,
   cli: {
     command: ["ssh-keys", "delete"],
+    input: keyMutationInput,
+    execute: executeSshKeys("delete"),
     vnext: {
       arguments: "semantic",
       audience: "customer",
@@ -3823,17 +3841,21 @@ var sshKeyDeleteCapability = cliOnly({
       related: ["ssh-keys list"]
     }
   },
-  execute: executeSshKeys("delete")
+  execute: async (context, input) => await deleteAccountSshKey(context.fetch, input.keyId, input.idempotencyKey ? { headers: { "Idempotency-Key": input.idempotencyKey } } : void 0) ?? { deleted: true }
 });
-var sshKeyAssignmentListCapability = cliOnly({
+var sshKeyAssignmentListCapability = defineCapability({
   id: "access.ssh_key_assignments.list",
   domain: "access",
   roles: ["user"],
   mutation: "read",
-  input: keyListInput,
-  description: "List SSH keys assigned to one capacity reservation.",
+  input: z18.object({ reservationId: z18.string() }),
+  description: "List SSH keys registered for a reservation.",
+  mcp: { name: "access_keys_list" },
+  slack: false,
   cli: {
     command: ["ssh-keys", "assignments", "list"],
+    input: keyListInput,
+    execute: executeSshKeys("assignments.list"),
     vnext: {
       arguments: "semantic",
       audience: "customer",
@@ -3846,17 +3868,24 @@ var sshKeyAssignmentListCapability = cliOnly({
       related: ["ssh-keys assignments status"]
     }
   },
-  execute: executeSshKeys("assignments.list")
+  execute: (context, input) => listReservationSshKeys(context.fetch, input.reservationId)
 });
-var sshKeyAssignmentAssignCapability = cliOnly({
+var sshKeyAssignmentAssignCapability = defineCapability({
   id: "access.ssh_key_assignments.assign",
   domain: "access",
   roles: ["user"],
   mutation: "preview-confirm",
-  input: keyMutationInput,
-  description: "Assign one existing organization SSH key to one capacity reservation.",
+  input: z18.union([
+    reservationKeyInput.extend({ idempotencyKey: z18.string().optional() }),
+    keyIdInput.extend({ reservationId: z18.string(), idempotencyKey: z18.string().optional() })
+  ]),
+  description: `Add an SSH key to a reservation. ${ADDED_KEY_OUTCOME}`,
+  mcp: { name: "access_keys_add", input: reservationKeyInput },
+  slack: false,
   cli: {
     command: ["ssh-keys", "assignments", "assign"],
+    input: keyMutationInput,
+    execute: executeSshKeys("assignments.assign"),
     vnext: {
       arguments: "semantic",
       audience: "customer",
@@ -3875,7 +3904,7 @@ var sshKeyAssignmentAssignCapability = cliOnly({
       related: ["ssh-keys assignments status"]
     }
   },
-  execute: executeSshKeys("assignments.assign")
+  execute: (context, input) => addReservationSshKey(context.fetch, input.reservationId, "keyId" in input ? { ssh_key_id: input.keyId } : { public_key: input.publicKey, label: input.label ?? null }, input.idempotencyKey ? { headers: { "Idempotency-Key": input.idempotencyKey } } : void 0)
 });
 var sshKeyAssignmentSyncCapability = cliOnly({
   id: "access.ssh_key_assignments.sync",
@@ -3946,18 +3975,7 @@ var computeCapabilities = [
   sshKeyAssignmentSyncCapability,
   sshKeyAssignmentStatusCapability
 ];
-var pageInput = z18.object({
-  limit: z18.number().int().min(1).max(500).optional(),
-  cursor: z18.string().optional()
-});
-var publicKeyInput = z18.object({
-  publicKey: z18.string(),
-  label: z18.string().optional(),
-  confirm: z18.boolean().optional()
-});
-var keyIdInput = z18.object({ keyId: z18.string(), confirm: z18.boolean().optional() });
 var nodeIdInput = z18.object({ nodeId: z18.string(), confirm: z18.boolean().optional() });
-var ADDED_KEY_OUTCOME = "The response's outcome field says whether the key was created, was already_registered (returned unchanged, so the submitted label is not applied), or was reactivated from a revoked key.";
 function rebootMachine(mode) {
   return (ctx, input) => rebootNode(ctx.fetch, input.nodeId, { mode });
 }
@@ -4028,29 +4046,6 @@ var accessVerbCapabilities = [
       ssh_key_ids: input.sshKeyIds
     })
   }),
-  defineCapability({
-    id: "access.keys.list",
-    domain: "access",
-    roles: ["user"],
-    description: "List SSH keys registered for a reservation.",
-    mutation: "read",
-    input: z18.object({ reservationId: z18.string() }),
-    slack: false,
-    execute: (ctx, input) => listReservationSshKeys(ctx.fetch, input.reservationId)
-  }),
-  defineCapability({
-    id: "access.keys.add",
-    domain: "access",
-    roles: ["user"],
-    description: `Add an SSH key to a reservation. ${ADDED_KEY_OUTCOME}`,
-    mutation: "preview-confirm",
-    input: publicKeyInput.extend({ reservationId: z18.string() }),
-    slack: false,
-    execute: (ctx, input) => addReservationSshKey(ctx.fetch, input.reservationId, {
-      label: input.label ?? null,
-      public_key: input.publicKey
-    })
-  }),
   defineCapability({
     id: "machine.reboot",
     domain: "access",
@@ -4072,80 +4067,6 @@ var accessVerbCapabilities = [
     mcp: { name: "nodes_hard_reset" },
     slack: false,
     execute: rebootMachine("hard_reset")
-  }),
-  defineCapability({
-    id: "ssh_keys.list",
-    domain: "access",
-    roles: ["user"],
-    description: "List a page of account SSH keys. Pass next_cursor as cursor to continue.",
-    mutation: "read",
-    input: pageInput,
-    slack: false,
-    execute: (ctx, input) => listAccountSshKeys(ctx.fetch, {
-      status: "all",
-      limit: input.limit ?? 25,
-      ...input.cursor ? { cursor: input.cursor } : {}
-    })
-  }),
-  defineCapability({
-    id: "ssh_keys.add",
-    domain: "access",
-    roles: ["user"],
-    description: `Add an SSH public key to the account. ${ADDED_KEY_OUTCOME}`,
-    mutation: "preview-confirm",
-    input: publicKeyInput,
-    slack: false,
-    execute: (ctx, input) => createAccountSshKey(ctx.fetch, {
-      public_key: input.publicKey,
-      label: input.label
-    })
-  }),
-  defineCapability({
-    id: "ssh_keys.delete",
-    domain: "access",
-    roles: ["user"],
-    description: "Delete an SSH key from the account.",
-    mutation: "preview-confirm",
-    input: keyIdInput,
-    slack: false,
-    execute: async (ctx, input) => await deleteAccountSshKey(ctx.fetch, input.keyId) ?? { deleted: true }
-  }),
-  defineCapability({
-    id: "cluster_users.list",
-    domain: "access",
-    roles: ["user"],
-    description: "List a page of organization cluster-user SSH keys. Pass next_cursor as cursor to continue.",
-    mutation: "read",
-    input: pageInput,
-    slack: false,
-    execute: (ctx, input) => listClusterUserKeys(ctx.fetch, {
-      status: "all",
-      limit: input.limit ?? 25,
-      ...input.cursor ? { cursor: input.cursor } : {}
-    })
-  }),
-  defineCapability({
-    id: "cluster_users.add",
-    domain: "access",
-    roles: ["user"],
-    description: "Add a cluster-user SSH public key to the organization. Registers the same organization key as ssh_keys_add; a key already registered is returned as-is with its existing label.",
-    mutation: "preview-confirm",
-    input: publicKeyInput,
-    slack: false,
-    execute: (ctx, input) => createClusterUserKey(ctx.fetch, {
-      public_key: input.publicKey,
-      label: input.label
-    })
-  }),
-  defineCapability({
-    id: "cluster_users.revoke",
-    domain: "access",
-    roles: ["user"],
-    description: "Revoke a cluster-user SSH key from the organization.",
-    mutation: "preview-confirm",
-    input: keyIdInput,
-    slack: false,
-    execute: async (ctx, input) => await deleteClusterUserKey(ctx.fetch, input.keyId) ?? { deleted: true }
   })
 ];
 
@@ -7281,7 +7202,12 @@ export {
   metricsHistoryCapability,
   metricsSnapshotCapability,
   parseHardwareCatalog,
+  sshKeyAddCapability,
+  sshKeyAssignmentAssignCapability,
+  sshKeyAssignmentListCapability,
   sshKeyAssignmentStatusCapability,
+  sshKeyDeleteCapability,
   sshKeyDeliveryStatus,
+  sshKeyListCapability,
   volumeFilesListCapability
 };