@ornncompute/cli 1.0.138 → 1.0.139

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ornncompute/cli",
-  "version": "1.0.138",
+  "version": "1.0.139",
   "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/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 } },
@@ -4730,30 +4730,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 +4895,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
@@ -6444,6 +6521,50 @@ function storageCapability({ id, command, description, mutation, outcome, human,
     execute: async (context, input) => storageExecutor(context)(id, input)
   });
 }
+var filesListInput = z30.object({ driveId: z30.string(), prefix: z30.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 +6633,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"],
@@ -6778,46 +6889,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 +6901,7 @@ function canonicalCliCatalog(capabilities) {
     return {
       ...capability,
       cli: {
+        ...capability.cli,
         command: [...help3.command ?? capability.cli?.command ?? []],
         vnext: help3
       }
@@ -6859,7 +6931,6 @@ var catalog = [
       ...networkVerbCapabilities,
       ...accessVerbCapabilities,
       ...storageVerbCapabilities,
-      ...storageCompositionCapabilities,
       machinePushKeysCapability,
       ...machineMetricsCapabilities,
       ...billingCapabilities,
@@ -7137,11 +7208,15 @@ export {
   ADMIN_CLI_ROOTS,
   CLI_MIGRATION_GUIDE_URL,
   LEGACY_CLI_MIGRATIONS,
+  bucketDisconnectCapability,
+  bucketListCapability,
+  bucketShowCapability,
   byCliCommand,
   byMcpName,
   catalog,
   findLegacyCliMigration,
   forRole,
   gpuDisplay,
-  parseHardwareCatalog
+  parseHardwareCatalog,
+  volumeFilesListCapability
 };