@ornncompute/cli 1.0.138 → 1.0.140

package/package.json

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

package/src/catalog-shell.mjs

@@ -814,7 +814,7 @@ function assertCustomerResultSafe(value, ownOrganizationId) {
 }
 
 function parseCapabilityInput(capability, rawInput) {
-  const parsed = capability.input.safeParse(rawInput);
+  const parsed = (capability.cli?.input ?? capability.input).safeParse(rawInput);
   if (parsed.success) return parsed.data;
   const issue = parsed.error.issues[0];
   if (issue?.path?.[0] === "$positionals") {
@@ -992,7 +992,7 @@ async function executeCapability(
   let ownOrganizationId;
   let data;
   try {
-    data = await capability.execute(
+    data = await (capability.cli?.execute ?? capability.execute)(
       {
         actor: "",
         confirmed,

package/src/evidence-commands.mjs

@@ -1,3 +1,4 @@
+import { metricsSnapshotCapability, metricsHistoryCapability } from "../vendor/capabilities/cli.js";
 import * as gatewayApi from "../vendor/api-client/gateway.js";
 import { gpuLabeler } from "./gpu-catalog.mjs";
 import { clusterFactLabel, reservationFactsForCluster } from "./kubernetes-commands.mjs";
@@ -777,19 +778,20 @@ function invalidEvidenceResponse(code) {
 async function metricSource(machine, reservation, window, maximum, deps, deadline, signal, live) {
   const response = await fetchEvidence(
     async (requestSignal) => {
+      const context = {
+        actor: "",
+        role: "user",
+        fetch: (path, init) => deps.fetch(path, { ...init, signal: requestSignal }),
+      };
+      const input = { reservationId: reservation, machineId: machine.id };
       const payload = live
-        ? await gatewayApi.getReservationLiveMetrics(
-            deps.fetch,
-            reservation,
-            { machine_id: machine.id },
-            requestSignal
-          )
-        : await gatewayApi.getReservationTelemetryHistory(
-            deps.fetch,
-            reservation,
-            { machine_id: machine.id, start: window.start, end: window.end, max_points: maximum },
-            requestSignal
-          );
+        ? (await metricsSnapshotCapability.execute(context, input))[0]
+        : await metricsHistoryCapability.execute(context, {
+            ...input,
+            start: window.start,
+            end: window.end,
+            maxPoints: maximum,
+          });
       const points = metricPoints(payload, maximum, window);
       if (points === null) throw invalidEvidenceResponse("invalid_metrics_response");
       return points;

package/src/external-bucket-commands.mjs

@@ -1,5 +1,6 @@
 import * as storageApi from "../vendor/api-client/orchestrator.js";
 import * as gatewayApi from "../vendor/api-client/gateway.js";
+import { bucketShowCapability, bucketDisconnectCapability } from "../vendor/capabilities/cli.js";
 import { createHash } from "node:crypto";
 import { readFile } from "node:fs/promises";
 
@@ -479,7 +480,11 @@ async function listBuckets(input, runtime) {
 
 async function showBucket(input, runtime) {
   const [reference] = positions(input, 1, "ornn external-buckets show <external-bucket>");
-  const bucket = resolveExternalBucket(await fetchDrives(runtime), reference);
+  const source = resolveExternalBucket(await fetchDrives(runtime), reference);
+  const bucket = await bucketShowCapability.execute(
+    { actor: "", role: "user", fetch: runtime.fetch },
+    { driveId: source.id }
+  );
   return runtime.interaction.result({ data: { external_bucket: safeExternalBucket(bucket) } });
 }
 
@@ -692,11 +697,20 @@ async function disconnectBucket(input, runtime) {
     );
   }
   try {
-    await storageApi.deleteDrive(
-      runtime.fetch,
-      safe.id,
-      {},
-      { headers: idempotencyHeaders(input) }
+    await bucketDisconnectCapability.execute(
+      {
+        actor: "",
+        role: "user",
+        confirmed: true,
+        fetch: (path, init) =>
+          runtime.fetch(path, {
+            ...init,
+            ...(init?.method === "DELETE"
+              ? { headers: { ...init.headers, ...idempotencyHeaders(input) } }
+              : {}),
+          }),
+      },
+      { driveId: safe.id }
     );
   } catch (error) {
     throw safeExternalError(error, "The external bucket could not be disconnected safely.");

package/src/storage-commands.mjs

@@ -1,4 +1,5 @@
 import * as storageApi from "../vendor/api-client/orchestrator.js";
+import { bucketListCapability, volumeFilesListCapability } from "../vendor/capabilities/cli.js";
 import { createHash } from "node:crypto";
 import { createReadStream } from "node:fs";
 import { stat } from "node:fs/promises";
@@ -292,11 +293,14 @@ export async function fetchDrivePage(runtime, { limit = 25, cursor, scope = "all
     usage("--limit must be an integer from 1 through 100.", "limit");
   }
   try {
-    const payload = await storageApi.listDrives(runtime.fetch, {
-      limit: Number(limit),
-      scope,
-      ...(cursor ? { cursor } : {}),
-    });
+    const input = { limit: Number(limit), ...(cursor ? { cursor } : {}) };
+    const payload =
+      scope === "external"
+        ? await bucketListCapability.execute(
+            { actor: "", role: "user", fetch: runtime.fetch },
+            input
+          )
+        : await storageApi.listDrives(runtime.fetch, { ...input, scope });
     return { drives: volumeRows(payload), next_cursor: payload?.next_cursor ?? null };
   } catch (error) {
     throw safeStorageError(error, "Volumes could not be loaded safely.");
@@ -552,33 +556,21 @@ function shellQuote(value) {
 }
 
 async function fetchFileRows(runtime, drive, prefix) {
-  const folder = prefix.includes("/") ? prefix.slice(0, prefix.lastIndexOf("/")) : "";
   const entries = [];
-  let cursor = 0;
-  while (cursor !== null) {
-    let page;
-    try {
-      page = await storageApi.listDriveContents(runtime.fetch, String(drive.id), {
-        recursive: true,
-        ...(folder ? { path: folder } : {}),
-        ...(cursor ? { cursor } : {}),
-      });
-    } catch (error) {
-      throw safeStorageError(error, "Volume files could not be listed safely.");
-    }
-    entries.push(...(Array.isArray(page?.entries) ? page.entries : []));
-    const next = page?.next_cursor;
-    cursor = Number.isInteger(next) || (typeof next === "string" && next) ? next : null;
-  }
-  return entries
-    .filter((entry) => entry?.kind === "file")
-    .map(safeFile)
-    .filter((entry) => entry.path && entry.path.startsWith(prefix))
-    .sort(
-      (left, right) =>
-        (Date.parse(right.updated_at ?? "") || 0) - (Date.parse(left.updated_at ?? "") || 0) ||
-        left.path.localeCompare(right.path)
+  try {
+    const files = await volumeFilesListCapability.execute(
+      { actor: "", role: "user", fetch: runtime.fetch },
+      { driveId: drive.id, prefix }
     );
+    for await (const entry of files) entries.push(safeFile(entry));
+  } catch (error) {
+    throw safeStorageError(error, "Volume files could not be listed safely.");
+  }
+  return entries.sort(
+    (left, right) =>
+      (Date.parse(right.updated_at ?? "") || 0) - (Date.parse(left.updated_at ?? "") || 0) ||
+      left.path.localeCompare(right.path)
+  );
 }
 
 async function listFiles(input, runtime) {

package/vendor/capabilities/cli.js

@@ -333,8 +333,8 @@ function defineCapability(spec) {
     ...rest,
     ...cli !== false && cli !== void 0 ? {
       cli: {
-        command: cli.command ?? names.cli,
-        ...cli.vnext ? { vnext: cli.vnext } : {}
+        ...cli,
+        command: cli.command ?? names.cli
       }
     } : {},
     ...mcp === false ? {} : { mcp: { name: mcp?.name ?? names.mcp } },
@@ -4105,43 +4105,6 @@ var machinePushKeysCapability = defineCapability({
     ssh_key_ids: input.sshKeyIds
   })
 });
-var machineMetricsCapabilities = [
-  defineCapability({
-    id: "machine.live_metrics",
-    domain: "access",
-    roles: ["user"],
-    description: "Fetch a live metrics snapshot for one reservation machine.",
-    mutation: "read",
-    input: z17.object({ reservationId: z17.string(), machineId: z17.string() }),
-    mcp: false,
-    slack: false,
-    execute: (ctx, input) => getReservationLiveMetrics(ctx.fetch, input.reservationId, {
-      machine_id: input.machineId
-    })
-  }),
-  defineCapability({
-    id: "machine.telemetry_history",
-    domain: "access",
-    roles: ["user"],
-    description: "Fetch historical telemetry for one reservation machine over a time range.",
-    mutation: "read",
-    input: z17.object({
-      reservationId: z17.string(),
-      machineId: z17.string(),
-      start: z17.string().optional(),
-      end: z17.string().optional(),
-      maxPoints: z17.number().int().positive().optional()
-    }),
-    mcp: false,
-    slack: false,
-    execute: (ctx, input) => getReservationTelemetryHistory(ctx.fetch, input.reservationId, {
-      machine_id: input.machineId,
-      start: input.start || void 0,
-      end: input.end || void 0,
-      max_points: input.maxPoints
-    })
-  })
-];
 
 // ../../packages/capabilities/dist/capabilities/credits.js
 import { z as z18 } from "zod";
@@ -4730,30 +4693,119 @@ function externalBucketCapability({ acceptedReferences = [], automation, command
   });
 }
 var gcsImportGuidance = "GCS requires bucket-level read access for your organization's Ornn transfer account. Connecting prints the account and the two gcloud grants (roles/storage.objectViewer and roles/storage.legacyBucketReader). After granting, deploy the volume from the Ornn console; CLI 1.x import still requires verification, which GCS does not support. Steps: https://docs.ornn.com/cli#gcs-imports-and-storage-transfer-service";
-var externalBucketCapabilities = [
-  externalBucketCapability({
-    id: "storage.external-buckets.list",
+function isExternalBucket(drive) {
+  const source = drive.source;
+  if (!source || source.managed === true || source.provider === "ornn_object")
+    return false;
+  return ["external_gcs", "s3", "r2", "cloudflare_r2"].includes(source.provider ?? "") || Boolean(source.bucket);
+}
+var bucketInput = z21.object({ driveId: z21.string() });
+var bucketListCapability = defineCapability({
+  id: "storage.external-buckets.list",
+  domain: "storage",
+  roles: ["user"],
+  description: "List a page of connected external buckets. Pass next_cursor as cursor to continue.",
+  mutation: "read",
+  input: z21.object({
+    limit: z21.number().int().min(1).max(100).optional(),
+    cursor: z21.string().optional()
+  }),
+  mcp: { name: "storage_buckets_list" },
+  slack: false,
+  execute: async (context, input) => {
+    const page = await listDrives(context.fetch, {
+      limit: input.limit ?? 25,
+      scope: "external",
+      ...input.cursor ? { cursor: input.cursor } : {}
+    });
+    return { ...page, drives: page.drives.filter(isExternalBucket) };
+  },
+  cli: {
     command: ["external-buckets", "list"],
-    description: "List connected GCS, S3, and R2 buckets in one bounded page.",
-    mutation: "read",
     input: pageInput2,
-    outcome: "List external bucket connections without exposing stored credentials.",
-    human: "ornn external-buckets list [--limit <1-100>] [--cursor <cursor>]",
-    automation: "ornn external-buckets list --limit 50 --format json",
-    related: ["external-buckets show", "external-buckets connect"]
-  }),
-  externalBucketCapability({
-    id: "storage.external-buckets.show",
+    execute: (context, input) => externalBucketExecutor(context)("storage.external-buckets.list", input),
+    vnext: {
+      arguments: "semantic",
+      audience: "customer",
+      category: "resource",
+      outcome: "List external bucket connections without exposing stored credentials.",
+      human: "ornn external-buckets list [--limit <1-100>] [--cursor <cursor>]",
+      automation: "ornn external-buckets list --limit 50 --format json",
+      acceptedReferences: [],
+      related: ["external-buckets show", "external-buckets connect"],
+      resumableStates: []
+    }
+  }
+});
+var bucketShowCapability = defineCapability({
+  id: "storage.external-buckets.show",
+  domain: "storage",
+  roles: ["user"],
+  description: "Show a single connected external bucket by drive id.",
+  mutation: "read",
+  input: bucketInput,
+  mcp: { name: "storage_buckets_show" },
+  slack: false,
+  execute: async (context, input) => {
+    const bucket = await getDrive(context.fetch, input.driveId);
+    if (!isExternalBucket(bucket))
+      throw new Error(`Storage bucket not found: ${input.driveId}`);
+    return bucket;
+  },
+  cli: {
     command: ["external-buckets", "show"],
-    description: "Inspect one connected external bucket by canonical ID or exact unique name.",
-    mutation: "read",
     input: showInput,
-    outcome: "Inspect one credential-safe external bucket connection.",
-    human: "ornn external-buckets show <external-bucket>",
-    automation: "ornn external-buckets show <external-bucket-id> --format json",
-    acceptedReferences: ["canonical external bucket ID", "exact unique external bucket name"],
-    related: ["external-buckets verify", "external-buckets import"]
-  }),
+    execute: (context, input) => externalBucketExecutor(context)("storage.external-buckets.show", input),
+    vnext: {
+      arguments: "semantic",
+      audience: "customer",
+      category: "resource",
+      outcome: "Inspect one credential-safe external bucket connection.",
+      human: "ornn external-buckets show <external-bucket>",
+      automation: "ornn external-buckets show <external-bucket-id> --format json",
+      acceptedReferences: ["canonical external bucket ID", "exact unique external bucket name"],
+      related: ["external-buckets verify", "external-buckets import"],
+      resumableStates: []
+    }
+  }
+});
+var bucketDisconnectCapability = defineCapability({
+  id: "storage.external-buckets.disconnect",
+  domain: "storage",
+  roles: ["user"],
+  description: "Disconnect a connected external bucket (deletes the backing drive record).",
+  mutation: "preview-confirm",
+  input: bucketInput,
+  mcp: { name: "storage_buckets_disconnect" },
+  slack: false,
+  execute: async (context, input) => {
+    if (!context.confirmed)
+      return preview("storage.external-buckets.disconnect", input);
+    await bucketShowCapability.execute(context, input);
+    await deleteDrive(context.fetch, input.driveId);
+    return { disconnected: true, drive_id: input.driveId };
+  },
+  cli: {
+    command: ["external-buckets", "disconnect"],
+    input: disconnectInput,
+    execute: (context, input) => externalBucketExecutor(context)("storage.external-buckets.disconnect", input),
+    vnext: {
+      arguments: "semantic",
+      audience: "customer",
+      category: "resource",
+      outcome: "Remove one external source connection without writing to its source bucket.",
+      human: "ornn external-buckets disconnect <external-bucket>",
+      automation: "ornn external-buckets disconnect <external-bucket-id>  --idempotency-key <key> --format json",
+      acceptedReferences: ["canonical external bucket ID", "exact unique external bucket name"],
+      review: "Disconnecting reduces access to the source and is blocked while mounts remain.",
+      related: ["storage detach", "external-buckets show"],
+      resumableStates: []
+    }
+  }
+});
+var externalBucketCapabilities = [
+  bucketListCapability,
+  bucketShowCapability,
   externalBucketCapability({
     id: "storage.external-buckets.connect",
     command: ["external-buckets", "connect"],
@@ -4806,19 +4858,7 @@ var externalBucketCapabilities = [
     resumableStates: ["pending", "working", "partial", "failed", "interrupted"],
     related: ["external-buckets show", "storage status", "volumes files list"]
   }),
-  externalBucketCapability({
-    id: "storage.external-buckets.disconnect",
-    command: ["external-buckets", "disconnect"],
-    description: "Disconnect an external bucket record after its working volume is detached.",
-    mutation: "preview-confirm",
-    input: disconnectInput,
-    outcome: "Remove one external source connection without writing to its source bucket.",
-    human: "ornn external-buckets disconnect <external-bucket>",
-    automation: "ornn external-buckets disconnect <external-bucket-id>  --idempotency-key <key> --format json",
-    acceptedReferences: ["canonical external bucket ID", "exact unique external bucket name"],
-    review: "Disconnecting reduces access to the source and is blocked while mounts remain.",
-    related: ["storage detach", "external-buckets show"]
-  })
+  bucketDisconnectCapability
 ];
 
 // ../../packages/capabilities/dist/capabilities/evidence.js
@@ -4965,19 +5005,74 @@ var evidenceCapabilities = [
   clusterLogsCapability
 ];
 
-// ../../packages/capabilities/dist/capabilities/mounts.js
+// ../../packages/capabilities/dist/capabilities/metrics.js
 import { z as z23 } from "zod";
-var mountInput = z23.object({
-  $positionals: z23.array(z23.string()).default([]),
-  access: z23.string().optional(),
-  cursor: z23.string().optional(),
-  idempotencyKey: z23.string().optional(),
-  limit: z23.union([z23.string(), z23.number()]).optional(),
-  noWait: z23.boolean().optional(),
-  timeout: z23.string().optional(),
-  volume: z23.string().optional(),
-  wait: z23.boolean().optional(),
-  yes: z23.boolean().optional()
+var metricInput = z23.object({ reservationId: z23.string(), machineId: z23.string().optional() });
+async function nodeIds(context, input) {
+  if (input.machineId)
+    return [input.machineId];
+  const { nodes: nodes2 } = await listNodes(context.fetch, {
+    reservation_id: input.reservationId
+  });
+  if (!nodes2.length)
+    throw new Error("No machines were found for this reservation.");
+  return nodes2.map((node) => node.node_id);
+}
+var metricsSnapshotCapability = defineCapability({
+  id: "metrics.snapshot",
+  domain: "access",
+  roles: ["user"],
+  mutation: "read",
+  description: "Fetch a live metrics snapshot for a reservation's machine(s) (GPU/CPU/memory utilization, etc). machineId is optional: omit it to resolve every active machine on the reservation, or pass it to scope to one.",
+  input: metricInput,
+  slack: false,
+  execute: async (context, input) => {
+    const snapshots = [];
+    for (const nodeId3 of await nodeIds(context, input)) {
+      snapshots.push(await getReservationLiveMetrics(context.fetch, input.reservationId, {
+        machine_id: nodeId3
+      }));
+    }
+    return snapshots;
+  }
+});
+var metricsHistoryCapability = defineCapability({
+  id: "metrics.history",
+  domain: "access",
+  roles: ["user"],
+  mutation: "read",
+  description: "Fetch historical telemetry for a reservation's machine over a time range. machineId is optional: omit it to use the first active machine on the reservation.",
+  input: metricInput.extend({
+    start: z23.string().optional(),
+    end: z23.string().optional(),
+    maxPoints: z23.number().int().positive().optional()
+  }),
+  slack: false,
+  execute: async (context, input) => {
+    const [nodeId3] = await nodeIds(context, input);
+    return getReservationTelemetryHistory(context.fetch, input.reservationId, {
+      machine_id: nodeId3,
+      start: input.start || void 0,
+      end: input.end || void 0,
+      max_points: input.maxPoints
+    });
+  }
+});
+var metricsCapabilities = [metricsSnapshotCapability, metricsHistoryCapability];
+
+// ../../packages/capabilities/dist/capabilities/mounts.js
+import { z as z24 } from "zod";
+var mountInput = z24.object({
+  $positionals: z24.array(z24.string()).default([]),
+  access: z24.string().optional(),
+  cursor: z24.string().optional(),
+  idempotencyKey: z24.string().optional(),
+  limit: z24.union([z24.string(), z24.number()]).optional(),
+  noWait: z24.boolean().optional(),
+  timeout: z24.string().optional(),
+  volume: z24.string().optional(),
+  wait: z24.boolean().optional(),
+  yes: z24.boolean().optional()
 }).strict();
 function mountExecutor(context) {
   const interaction = context.cli?.interaction;
@@ -5086,13 +5181,13 @@ var mountCapabilities = [
 ];
 
 // ../../packages/capabilities/dist/capabilities/identity.js
-import { z as z24 } from "zod";
-var emptyInput3 = z24.object({});
-var loginInput = z24.object({
-  authBase: z24.string().min(1).optional(),
-  noBrowser: z24.boolean().optional(),
-  pollInterval: z24.number().positive().optional(),
-  timeout: z24.number().positive().optional()
+import { z as z25 } from "zod";
+var emptyInput3 = z25.object({});
+var loginInput = z25.object({
+  authBase: z25.string().min(1).optional(),
+  noBrowser: z25.boolean().optional(),
+  pollInterval: z25.number().positive().optional(),
+  timeout: z25.number().positive().optional()
 });
 function executeSession(context, command, input) {
   if (!context.cli?.session) {
@@ -5211,50 +5306,50 @@ var identityCapabilities = [
 ];
 
 // ../../packages/capabilities/dist/capabilities/listings.js
-import { z as z25 } from "zod";
-var listingCreateInput = z25.object({
-  organizationId: z25.string().optional(),
-  organization_id: z25.string().optional(),
-  facilityId: z25.string().optional(),
-  facility_id: z25.string().optional(),
-  kind: z25.enum(["gpu", "cpu", "node", "link"]).optional(),
-  gpu: z25.string().optional(),
-  cpu: z25.string().optional(),
-  site: z25.string().optional(),
-  fabric: z25.string().optional(),
-  min_nodes: z25.number().int().optional(),
-  starts_after: z25.string().optional(),
-  starts_before: z25.string().optional(),
-  ends_after: z25.string().optional(),
-  ends_before: z25.string().optional(),
-  gpu_type: z25.string().optional(),
-  node_model: z25.string().optional(),
-  fabric_type: z25.string().optional(),
-  node_count: z25.number().int().optional(),
-  gpus_per_node: z25.number().int().optional(),
-  cores_per_node: z25.number().int().optional().describe('CPU listings: cores per node (2 vCPUs each), at least 1, priced per vCPU-hour. Omit gpu_type or set it to "cpu".'),
-  site_nickname: z25.string().optional().describe("A state, city, address, or catalog region such as us-west-3."),
-  site_supplier: z25.string().optional(),
-  ram: z25.string().optional(),
-  storage: z25.string().optional(),
-  internet: z25.string().optional(),
-  network_hardware: z25.string().optional(),
-  available_start_at: z25.string().optional().describe("Start of the availability window. YYYY-MM-DD or RFC3339."),
-  available_end_at: z25.string().optional().describe("End of the availability window. YYYY-MM-DD or RFC3339."),
-  available_from: z25.string().optional().describe("Alias for available_start_at."),
-  available_to: z25.string().optional().describe("Alias for available_end_at."),
-  buy_now_price_per_gpu_hour: z25.number().optional().describe("Price buyers pay, USD per GPU-hour (per vCPU-hour on CPU listings)."),
-  deposit_percent: z25.number().optional(),
-  down_payment_cents: z25.number().int().nonnegative().optional(),
-  access_mode: z25.enum(["bare-metal", "virtual-machine"]).optional(),
-  state: z25.enum(["available", "draft"]).optional(),
-  price_omitted: z25.boolean().optional(),
-  announce: z25.boolean().optional(),
-  text: z25.string().optional(),
-  confirm: z25.boolean().optional(),
-  idempotencyKey: z25.string().min(1).max(200).optional()
-});
-var catalogTermsInput = z25.object({ kind: z25.enum(["gpu", "cpu", "node", "link"]).optional() });
+import { z as z26 } from "zod";
+var listingCreateInput = z26.object({
+  organizationId: z26.string().optional(),
+  organization_id: z26.string().optional(),
+  facilityId: z26.string().optional(),
+  facility_id: z26.string().optional(),
+  kind: z26.enum(["gpu", "cpu", "node", "link"]).optional(),
+  gpu: z26.string().optional(),
+  cpu: z26.string().optional(),
+  site: z26.string().optional(),
+  fabric: z26.string().optional(),
+  min_nodes: z26.number().int().optional(),
+  starts_after: z26.string().optional(),
+  starts_before: z26.string().optional(),
+  ends_after: z26.string().optional(),
+  ends_before: z26.string().optional(),
+  gpu_type: z26.string().optional(),
+  node_model: z26.string().optional(),
+  fabric_type: z26.string().optional(),
+  node_count: z26.number().int().optional(),
+  gpus_per_node: z26.number().int().optional(),
+  cores_per_node: z26.number().int().optional().describe('CPU listings: cores per node (2 vCPUs each), at least 1, priced per vCPU-hour. Omit gpu_type or set it to "cpu".'),
+  site_nickname: z26.string().optional().describe("A state, city, address, or catalog region such as us-west-3."),
+  site_supplier: z26.string().optional(),
+  ram: z26.string().optional(),
+  storage: z26.string().optional(),
+  internet: z26.string().optional(),
+  network_hardware: z26.string().optional(),
+  available_start_at: z26.string().optional().describe("Start of the availability window. YYYY-MM-DD or RFC3339."),
+  available_end_at: z26.string().optional().describe("End of the availability window. YYYY-MM-DD or RFC3339."),
+  available_from: z26.string().optional().describe("Alias for available_start_at."),
+  available_to: z26.string().optional().describe("Alias for available_end_at."),
+  buy_now_price_per_gpu_hour: z26.number().optional().describe("Price buyers pay, USD per GPU-hour (per vCPU-hour on CPU listings)."),
+  deposit_percent: z26.number().optional(),
+  down_payment_cents: z26.number().int().nonnegative().optional(),
+  access_mode: z26.enum(["bare-metal", "virtual-machine"]).optional(),
+  state: z26.enum(["available", "draft"]).optional(),
+  price_omitted: z26.boolean().optional(),
+  announce: z26.boolean().optional(),
+  text: z26.string().optional(),
+  confirm: z26.boolean().optional(),
+  idempotencyKey: z26.string().min(1).max(200).optional()
+});
+var catalogTermsInput = z26.object({ kind: z26.enum(["gpu", "cpu", "node", "link"]).optional() });
 var slackListingCreateParams = {
   type: "object",
   properties: {
@@ -5552,12 +5647,12 @@ var listingCapabilities = [
 ];
 
 // ../../packages/capabilities/dist/capabilities/organization-invites.js
-import { z as z26 } from "zod";
-var organizationInviteInput = z26.object({
-  organization_id: z26.uuid().optional(),
-  email: z26.string().trim().toLowerCase().pipe(z26.email()),
-  organization_role: z26.enum(["consumer", "supplier"]).optional(),
-  send_email: z26.boolean().optional().describe("Defaults to true for an existing organization; false returns a link. Signup invites cannot be emailed.")
+import { z as z27 } from "zod";
+var organizationInviteInput = z27.object({
+  organization_id: z27.uuid().optional(),
+  email: z27.string().trim().toLowerCase().pipe(z27.email()),
+  organization_role: z27.enum(["consumer", "supplier"]).optional(),
+  send_email: z27.boolean().optional().describe("Defaults to true for an existing organization; false returns a link. Signup invites cannot be emailed.")
 }).superRefine((input, ctx) => {
   if (!input.organization_id && input.send_email === true) {
     ctx.addIssue({
@@ -5617,33 +5712,33 @@ var organizationInviteCapability = defineCapability({
 });
 
 // ../../packages/capabilities/dist/capabilities/networks.js
-import { z as z27 } from "zod";
+import { z as z28 } from "zod";
 var globalInput = {
-  $positionals: z27.array(z27.string()).optional(),
-  guided: z27.boolean().optional(),
-  idempotencyKey: z27.string().optional(),
-  noBrowser: z27.boolean().optional(),
-  noWait: z27.boolean().optional(),
-  overwrite: z27.boolean().optional(),
-  print: z27.boolean().optional(),
-  wait: z27.boolean().optional(),
-  yes: z27.boolean().optional()
+  $positionals: z28.array(z28.string()).optional(),
+  guided: z28.boolean().optional(),
+  idempotencyKey: z28.string().optional(),
+  noBrowser: z28.boolean().optional(),
+  noWait: z28.boolean().optional(),
+  overwrite: z28.boolean().optional(),
+  print: z28.boolean().optional(),
+  wait: z28.boolean().optional(),
+  yes: z28.boolean().optional()
 };
-var noOptionsInput = z27.object(globalInput).strict();
-var connectInput2 = z27.object({
+var noOptionsInput = z28.object(globalInput).strict();
+var connectInput2 = z28.object({
   ...globalInput,
-  identityFile: z27.string().optional(),
-  output: z27.string().optional(),
-  user: z27.string().optional()
+  identityFile: z28.string().optional(),
+  output: z28.string().optional(),
+  user: z28.string().optional()
 }).strict();
-var listInput = z27.object({ ...globalInput, cursor: z27.string().optional(), limit: z27.string().optional() }).strict();
-var networkCreateInput = z27.object({ ...globalInput, cidr: z27.string().optional(), name: z27.string().optional() }).strict();
-var networkUpdateInput = z27.object({ ...globalInput, name: z27.string().optional() }).strict();
-var vpnConfigureInput = z27.object({
+var listInput = z28.object({ ...globalInput, cursor: z28.string().optional(), limit: z28.string().optional() }).strict();
+var networkCreateInput = z28.object({ ...globalInput, cidr: z28.string().optional(), name: z28.string().optional() }).strict();
+var networkUpdateInput = z28.object({ ...globalInput, name: z28.string().optional() }).strict();
+var vpnConfigureInput = z28.object({
   ...globalInput,
-  name: z27.string().optional(),
-  output: z27.string().optional(),
-  privateKey: z27.string().optional()
+  name: z28.string().optional(),
+  output: z28.string().optional(),
+  privateKey: z28.string().optional()
 }).strict();
 function networkExecutor(context) {
   const runtime3 = context.cli?.interaction;
@@ -5888,12 +5983,12 @@ var networkCapabilities = [
   vpnConnectionDisconnectCapability,
   connectCapability
 ];
-var networkUpdateFields = z27.object({
-  networkId: z27.string(),
-  name: z27.string().optional(),
-  description: z27.string().optional(),
-  clearDescription: z27.boolean().optional(),
-  confirm: z27.boolean().optional()
+var networkUpdateFields = z28.object({
+  networkId: z28.string(),
+  name: z28.string().optional(),
+  description: z28.string().optional(),
+  clearDescription: z28.boolean().optional(),
+  confirm: z28.boolean().optional()
 }).refine((input) => !(input.clearDescription && input.description !== void 0), {
   message: "Use either description or clearDescription, not both."
 }).refine((input) => input.name !== void 0 || input.description !== void 0 || input.clearDescription, { message: "Provide name, description, or clearDescription." });
@@ -5904,7 +5999,7 @@ var networkVerbCapabilities = [
     roles: ["user"],
     description: "List this tenant's private networks.",
     mutation: "read",
-    input: z27.object({}),
+    input: z28.object({}),
     mcp: { name: "networks_list" },
     slack: false,
     execute: (ctx) => listNetworks(ctx.fetch)
@@ -5915,7 +6010,7 @@ var networkVerbCapabilities = [
     roles: ["user"],
     description: "Show a single private network by id.",
     mutation: "read",
-    input: z27.object({ networkId: z27.string() }),
+    input: z28.object({ networkId: z28.string() }),
     mcp: { name: "networks_show" },
     slack: false,
     execute: (ctx, input) => getNetwork(ctx.fetch, input.networkId)
@@ -5926,11 +6021,11 @@ var networkVerbCapabilities = [
     roles: ["user"],
     description: "Create a private network.",
     mutation: "preview-confirm",
-    input: z27.object({
-      name: z27.string(),
-      cidr: z27.string().optional(),
-      description: z27.string().optional(),
-      confirm: z27.boolean().optional()
+    input: z28.object({
+      name: z28.string(),
+      cidr: z28.string().optional(),
+      description: z28.string().optional(),
+      confirm: z28.boolean().optional()
     }),
     mcp: { name: "networks_create" },
     slack: false,
@@ -5960,7 +6055,7 @@ var networkVerbCapabilities = [
     roles: ["user"],
     description: "Delete a private network.",
     mutation: "preview-confirm",
-    input: z27.object({ networkId: z27.string(), confirm: z27.boolean().optional() }),
+    input: z28.object({ networkId: z28.string(), confirm: z28.boolean().optional() }),
     mcp: { name: "networks_delete" },
     slack: false,
     // The route answers 204, so report which network went.
@@ -5975,7 +6070,7 @@ var networkVerbCapabilities = [
     roles: ["user"],
     description: "List WireGuard VPN peers registered on a reservation.",
     mutation: "read",
-    input: z27.object({ reservationId: z27.string() }),
+    input: z28.object({ reservationId: z28.string() }),
     mcp: { name: "vpn_peers_list" },
     slack: false,
     execute: (ctx) => listNetworkPeerConfigs(ctx.fetch, "shared")
@@ -5986,11 +6081,11 @@ var networkVerbCapabilities = [
     roles: ["user"],
     description: "Register a WireGuard VPN peer public key on a reservation.",
     mutation: "preview-confirm",
-    input: z27.object({
-      reservationId: z27.string(),
-      publicKey: z27.string(),
-      label: z27.string().optional(),
-      confirm: z27.boolean().optional()
+    input: z28.object({
+      reservationId: z28.string(),
+      publicKey: z28.string(),
+      label: z28.string().optional(),
+      confirm: z28.boolean().optional()
     }),
     mcp: { name: "vpn_peers_create" },
     slack: false,
@@ -6005,10 +6100,10 @@ var networkVerbCapabilities = [
     roles: ["user"],
     description: "Revoke a WireGuard VPN peer from a reservation.",
     mutation: "preview-confirm",
-    input: z27.object({
-      reservationId: z27.string(),
-      peerId: z27.string(),
-      confirm: z27.boolean().optional()
+    input: z28.object({
+      reservationId: z28.string(),
+      peerId: z28.string(),
+      confirm: z28.boolean().optional()
     }),
     mcp: { name: "vpn_peers_delete" },
     slack: false,
@@ -6017,20 +6112,20 @@ var networkVerbCapabilities = [
 ];
 
 // ../../packages/capabilities/dist/capabilities/registry.js
-import { z as z28 } from "zod";
+import { z as z29 } from "zod";
 var globalInput2 = {
-  $positionals: z28.array(z28.string()).default([]),
-  yes: z28.boolean().optional()
+  $positionals: z29.array(z29.string()).default([]),
+  yes: z29.boolean().optional()
 };
-var emptyInput4 = z28.object(globalInput2).strict();
-var repositoryInput = z28.object({
+var emptyInput4 = z29.object(globalInput2).strict();
+var repositoryInput = z29.object({
   ...globalInput2,
-  repository: z28.string().optional().describe("Repository name, with or without your organization's namespace.")
+  repository: z29.string().optional().describe("Repository name, with or without your organization's namespace.")
 }).strict();
-var tagInput = z28.object({
+var tagInput = z29.object({
   ...globalInput2,
-  repository: z28.string().optional().describe("Repository name, with or without your organization's namespace."),
-  tag: z28.string().optional().describe("Tag to delete, such as v1.")
+  repository: z29.string().optional().describe("Repository name, with or without your organization's namespace."),
+  tag: z29.string().optional().describe("Tag to delete, such as v1.")
 }).strict();
 function cliInteraction(context) {
   return context.cli?.interaction;
@@ -6337,14 +6432,14 @@ var registryCapabilities = [
 ];
 
 // ../../packages/capabilities/dist/capabilities/reservation-list.js
-import { z as z29 } from "zod";
-var reservationListInput = z29.object({
-  customerId: z29.string().uuid().optional(),
-  listingId: z29.string().uuid().optional(),
-  listingTermId: z29.string().uuid().optional(),
-  status: z29.enum(["confirmed", "active", "completed", "cancelled"]).optional(),
-  cursor: z29.string().optional(),
-  limit: z29.number().int().min(1).max(100).optional()
+import { z as z30 } from "zod";
+var reservationListInput = z30.object({
+  customerId: z30.string().uuid().optional(),
+  listingId: z30.string().uuid().optional(),
+  listingTermId: z30.string().uuid().optional(),
+  status: z30.enum(["confirmed", "active", "completed", "cancelled"]).optional(),
+  cursor: z30.string().optional(),
+  limit: z30.number().int().min(1).max(100).optional()
 });
 var reservationListCapability = defineCapability({
   id: "reservation.list",
@@ -6395,20 +6490,20 @@ var reservationListCapability = defineCapability({
 });
 
 // ../../packages/capabilities/dist/capabilities/volumes.js
-import { z as z30 } from "zod";
-var storageCliInput = z30.object({
-  $positionals: z30.array(z30.string()).optional(),
-  contentType: z30.string().optional(),
-  cursor: z30.string().optional(),
-  idempotencyKey: z30.string().optional(),
-  limit: z30.union([z30.string(), z30.number()]).optional(),
-  name: z30.string().optional(),
-  output: z30.string().optional(),
-  overwrite: z30.boolean().optional(),
-  path: z30.string().optional(),
-  prefix: z30.string().optional(),
-  source: z30.string().optional(),
-  yes: z30.boolean().optional()
+import { z as z31 } from "zod";
+var storageCliInput = z31.object({
+  $positionals: z31.array(z31.string()).optional(),
+  contentType: z31.string().optional(),
+  cursor: z31.string().optional(),
+  idempotencyKey: z31.string().optional(),
+  limit: z31.union([z31.string(), z31.number()]).optional(),
+  name: z31.string().optional(),
+  output: z31.string().optional(),
+  overwrite: z31.boolean().optional(),
+  path: z31.string().optional(),
+  prefix: z31.string().optional(),
+  source: z31.string().optional(),
+  yes: z31.boolean().optional()
 }).strict();
 function storageExecutor(context) {
   const interaction = context.cli?.interaction;
@@ -6444,6 +6539,50 @@ function storageCapability({ id, command, description, mutation, outcome, human,
     execute: async (context, input) => storageExecutor(context)(id, input)
   });
 }
+var filesListInput = z31.object({ driveId: z31.string(), prefix: z31.string().optional() });
+async function* listFiles(context, input) {
+  const prefix = input.prefix ?? "";
+  const folder = prefix.includes("/") ? prefix.slice(0, prefix.lastIndexOf("/")) : "";
+  let cursor = 0;
+  while (cursor !== null) {
+    const page = await listDriveContents(context.fetch, input.driveId, {
+      recursive: true,
+      ...folder ? { path: folder } : {},
+      ...cursor ? { cursor } : {}
+    });
+    for (const entry of page.entries) {
+      if (entry.kind === "file" && entry.path.startsWith(prefix))
+        yield entry;
+    }
+    cursor = page.next_cursor ?? null;
+  }
+}
+var volumeFilesListCapability = defineCapability({
+  id: "storage.volumes.files.list",
+  domain: "storage",
+  roles: ["user"],
+  description: "List files on a storage volume (drive). Optional prefix filters paths. This is a listing only -- it does not download bytes.",
+  mutation: "read",
+  input: filesListInput,
+  mcp: { name: "storage_files_ls" },
+  slack: false,
+  execute: async (context, input) => listFiles(context, input),
+  cli: {
+    command: ["volumes", "files", "list"],
+    input: storageCliInput,
+    execute: (context, input) => storageExecutor(context)("storage.volumes.files.list", input),
+    vnext: {
+      arguments: "semantic",
+      audience: "customer",
+      category: "resource",
+      outcome: "List nested volume files by semantic remote path.",
+      human: "ornn volumes files list <volume> [--prefix <remote-path>] [--limit <1-500>] [--cursor <cursor>]",
+      automation: "ornn volumes files list <volume-id> --limit 50 --format json",
+      acceptedReferences: ["canonical volume ID", "exact unique volume name"],
+      related: ["volumes files upload", "volumes files download"]
+    }
+  }
+});
 var volumeCapabilities = [
   storageCapability({
     id: "storage.volumes.list",
@@ -6512,17 +6651,7 @@ var volumeCapabilities = [
     review: "The volume and all of its data are permanently deleted.",
     related: ["volume-mounts detach", "volumes show"]
   }),
-  storageCapability({
-    id: "storage.volumes.files.list",
-    command: ["volumes", "files", "list"],
-    description: "List nested files in one volume in a bounded page.",
-    mutation: "read",
-    outcome: "List nested volume files by semantic remote path.",
-    human: "ornn volumes files list <volume> [--prefix <remote-path>] [--limit <1-500>] [--cursor <cursor>]",
-    automation: "ornn volumes files list <volume-id> --limit 50 --format json",
-    acceptedReferences: ["canonical volume ID", "exact unique volume name"],
-    related: ["volumes files upload", "volumes files download"]
-  }),
+  volumeFilesListCapability,
   storageCapability({
     id: "storage.volumes.files.upload",
     command: ["volumes", "files", "upload"],
@@ -6570,22 +6699,22 @@ var volumeCapabilities = [
     related: ["volumes files list"]
   })
 ];
-var reservationInput = z30.object({ reservationId: z30.string() });
-var reservationWrite = reservationInput.extend({ confirm: z30.boolean().optional() });
-var driveInput = z30.object({ driveId: z30.string() });
-var driveWrite = driveInput.extend({ confirm: z30.boolean().optional() });
-var bucketConnectInput = z30.object({
-  provider: z30.enum(["gcs", "s3", "r2"]),
-  bucket: z30.string(),
-  name: z30.string().optional(),
-  prefix: z30.string().optional(),
-  region: z30.string().optional(),
-  endpointUrl: z30.string().optional(),
-  accountId: z30.string().optional(),
-  accessKeyId: z30.string().optional(),
-  secretAccessKey: z30.string().optional(),
-  readOnly: z30.boolean().optional(),
-  confirm: z30.boolean().optional()
+var reservationInput = z31.object({ reservationId: z31.string() });
+var reservationWrite = reservationInput.extend({ confirm: z31.boolean().optional() });
+var driveInput = z31.object({ driveId: z31.string() });
+var driveWrite = driveInput.extend({ confirm: z31.boolean().optional() });
+var bucketConnectInput = z31.object({
+  provider: z31.enum(["gcs", "s3", "r2"]),
+  bucket: z31.string(),
+  name: z31.string().optional(),
+  prefix: z31.string().optional(),
+  region: z31.string().optional(),
+  endpointUrl: z31.string().optional(),
+  accountId: z31.string().optional(),
+  accessKeyId: z31.string().optional(),
+  secretAccessKey: z31.string().optional(),
+  readOnly: z31.boolean().optional(),
+  confirm: z31.boolean().optional()
 }).refine((input) => !(input.provider === "gcs" && (input.accessKeyId || input.secretAccessKey)), {
   message: "Access key credentials are only supported for S3-compatible buckets."
 }).refine((input) => Boolean(input.accessKeyId) === Boolean(input.secretAccessKey), {
@@ -6600,7 +6729,7 @@ var storageVerbCapabilities = [
     roles: ["user"],
     description: "Attach an existing storage volume (drive) to a reservation -- the inverse of storage_undeploy. Always mounts at the platform path /home/tenant/volume (fuse). There is no customer mount-path override.",
     mutation: "preview-confirm",
-    input: reservationWrite.extend({ driveId: z30.string(), readOnly: z30.boolean().optional() }),
+    input: reservationWrite.extend({ driveId: z31.string(), readOnly: z31.boolean().optional() }),
     slack: false,
     execute: (ctx, input) => deployReservationStorage(ctx.fetch, input.reservationId, {
       drive_id: input.driveId,
@@ -6633,7 +6762,7 @@ var storageVerbCapabilities = [
     roles: ["user"],
     description: "List reservations that can receive a storage deploy, grouped the same way as the console picker.",
     mutation: "read",
-    input: z30.object({}),
+    input: z31.object({}),
     slack: false,
     execute: (ctx) => listStorageTargets(ctx.fetch)
   }),
@@ -6643,9 +6772,9 @@ var storageVerbCapabilities = [
     roles: ["user"],
     description: "List a page of storage volumes, newest updated first. Pass next_cursor as cursor to continue.",
     mutation: "read",
-    input: z30.object({
-      limit: z30.number().int().min(1).max(100).optional(),
-      cursor: z30.string().optional()
+    input: z31.object({
+      limit: z31.number().int().min(1).max(100).optional(),
+      cursor: z31.string().optional()
     }),
     mcp: { name: "storage_volumes_list" },
     slack: false,
@@ -6671,10 +6800,10 @@ var storageVerbCapabilities = [
     roles: ["user"],
     description: "Create a storage volume (drive), optionally cloned from an existing source drive.",
     mutation: "preview-confirm",
-    input: z30.object({
-      name: z30.string(),
-      sourceDriveId: z30.string().optional(),
-      confirm: z30.boolean().optional()
+    input: z31.object({
+      name: z31.string(),
+      sourceDriveId: z31.string().optional(),
+      confirm: z31.boolean().optional()
     }),
     mcp: { name: "storage_volumes_create" },
     slack: false,
@@ -6767,7 +6896,7 @@ var storageVerbCapabilities = [
     roles: ["user"],
     description: "Update a connected S3-compatible bucket's access key credentials.",
     mutation: "preview-confirm",
-    input: driveWrite.extend({ accessKeyId: z30.string(), secretAccessKey: z30.string() }),
+    input: driveWrite.extend({ accessKeyId: z31.string(), secretAccessKey: z31.string() }),
     mcp: { name: "storage_buckets_update_credentials" },
     slack: false,
     execute: (ctx, input) => updateDrive(ctx.fetch, input.driveId, {
@@ -6778,46 +6907,6 @@ var storageVerbCapabilities = [
     })
   })
 ];
-var bucketListCapability = defineCapability({
-  id: "bucket.list",
-  domain: "storage",
-  roles: ["user"],
-  description: "List a page of connected external buckets. Pass next_cursor as cursor to continue.",
-  mutation: "read",
-  input: z30.object({
-    limit: z30.number().int().min(1).max(100).optional(),
-    cursor: z30.string().optional()
-  }),
-  mcp: { name: "storage_buckets_list" },
-  slack: false,
-  execute: (ctx, input) => listDrives(ctx.fetch, {
-    limit: input.limit ?? 25,
-    scope: "external",
-    ...input.cursor ? { cursor: input.cursor } : {}
-  })
-});
-var storageCompositionCapabilities = [
-  bucketListCapability,
-  defineCapability({
-    id: "volume.contents",
-    domain: "storage",
-    roles: ["user"],
-    description: "List one page of a storage volume's contents.",
-    mutation: "read",
-    input: z30.object({
-      driveId: z30.string(),
-      path: z30.string().optional(),
-      cursor: z30.union([z30.string(), z30.number()]).optional()
-    }),
-    mcp: false,
-    slack: false,
-    execute: (ctx, input) => listDriveContents(ctx.fetch, input.driveId, {
-      recursive: true,
-      ...input.path ? { path: input.path } : {},
-      ...input.cursor ? { cursor: input.cursor } : {}
-    })
-  })
-];
 
 // ../../packages/capabilities/dist/cli-catalog.js
 function canonicalCliCatalog(capabilities) {
@@ -6830,6 +6919,7 @@ function canonicalCliCatalog(capabilities) {
     return {
       ...capability,
       cli: {
+        ...capability.cli,
         command: [...help3.command ?? capability.cli?.command ?? []],
         vnext: help3
       }
@@ -6859,9 +6949,8 @@ var catalog = [
       ...networkVerbCapabilities,
       ...accessVerbCapabilities,
       ...storageVerbCapabilities,
-      ...storageCompositionCapabilities,
       machinePushKeysCapability,
-      ...machineMetricsCapabilities,
+      ...metricsCapabilities,
       ...billingCapabilities,
       ...registryCapabilities,
       ...adminNodeLifecycleCapabilities
@@ -7137,11 +7226,17 @@ export {
   ADMIN_CLI_ROOTS,
   CLI_MIGRATION_GUIDE_URL,
   LEGACY_CLI_MIGRATIONS,
+  bucketDisconnectCapability,
+  bucketListCapability,
+  bucketShowCapability,
   byCliCommand,
   byMcpName,
   catalog,
   findLegacyCliMigration,
   forRole,
   gpuDisplay,
-  parseHardwareCatalog
+  metricsHistoryCapability,
+  metricsSnapshotCapability,
+  parseHardwareCatalog,
+  volumeFilesListCapability
 };