@ornncompute/cli 1.0.141 → 1.0.142

package/package.json

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

package/src/vm-commands.mjs

@@ -1,4 +1,7 @@
 import {
+  sshKeyListCapability,
+  sshKeyAddCapability,
+  sshKeyDeleteCapability,
   sshKeyAssignmentStatusCapability,
   sshKeyDeliveryStatus,
 } from "../vendor/capabilities/cli.js";
@@ -533,7 +536,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 +671,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.", {
@@ -4302,7 +4305,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 +4399,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/capabilities/cli.js

@@ -3464,6 +3464,17 @@ 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 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 +3761,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", input: pageInput },
+  slack: false,
   cli: {
     command: ["ssh-keys", "list"],
+    input: keyListInput,
+    execute: executeSshKeys("list"),
     vnext: {
       arguments: "semantic",
       audience: "customer",
@@ -3771,17 +3786,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", input: publicKeyInput },
+  slack: false,
   cli: {
     command: ["ssh-keys", "add"],
+    input: keyMutationInput,
+    execute: executeSshKeys("add"),
     vnext: {
       arguments: "semantic",
       audience: "customer",
@@ -3795,17 +3821,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", input: keyIdInput },
+  slack: false,
   cli: {
     command: ["ssh-keys", "delete"],
+    input: keyMutationInput,
+    execute: executeSshKeys("delete"),
     vnext: {
       arguments: "semantic",
       audience: "customer",
@@ -3823,7 +3853,7 @@ 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({
   id: "access.ssh_key_assignments.list",
@@ -3946,18 +3976,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 });
 }
@@ -4073,43 +4092,6 @@ var accessVerbCapabilities = [
     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",
@@ -7281,7 +7263,10 @@ export {
   metricsHistoryCapability,
   metricsSnapshotCapability,
   parseHardwareCatalog,
+  sshKeyAddCapability,
   sshKeyAssignmentStatusCapability,
+  sshKeyDeleteCapability,
   sshKeyDeliveryStatus,
+  sshKeyListCapability,
   volumeFilesListCapability
 };