@ornncompute/cli 1.0.75 → 1.0.97

package/src/catalog-shell.mjs

@@ -818,13 +818,13 @@ function parseCapabilityInput(capability, rawInput) {
   });
 }
 
-// Commerce's market routes and Markets serve every caller on one path and
-// decide from the session what it may do; a staff session is an admin there.
-const ROLE_AWARE_PREFIXES = ["/commerce/v2/listings", "/commerce/reservations", "/v1/markets"];
+// Native Commerce and Markets routes authenticate the caller at the gateway.
+// Commerce's /internal/v1 routes additionally require staff.
+const DIRECT_GATEWAY_PREFIXES = ["/commerce", "/internal/v1", "/v1/markets"];
 
-function isRoleAwarePath(path) {
+function isDirectGatewayPath(path) {
   const pathname = String(path).split("?")[0];
-  return ROLE_AWARE_PREFIXES.some(
+  return DIRECT_GATEWAY_PREFIXES.some(
     (prefix) => pathname === prefix || pathname.startsWith(`${prefix}/`)
   );
 }
@@ -839,7 +839,7 @@ function adminFetch(io, path, init = {}) {
     ...(init.headers !== undefined ? { headers: init.headers } : {}),
     ...((init.signal ?? io.signal) !== undefined ? { signal: init.signal ?? io.signal } : {}),
   };
-  return isRoleAwarePath(path) || (path === "/v1/staff/invites" && request.method === "POST")
+  return isDirectGatewayPath(path) || (path === "/v1/staff/invites" && request.method === "POST")
     ? cliRequest(request)
     : operatorRequest(request);
 }

package/src/evidence-commands.mjs

@@ -264,15 +264,13 @@ function reachability(value) {
   if (explicit === true) return { state: "reachable", observed_at: null };
   if (explicit === false) return { state: "unreachable", observed_at: null };
   const candidate = record(source.reachability);
-  const offGrid = record(source.off_grid_reachability);
-  const state = stateToken(candidate.state ?? candidate.status ?? offGrid.state ?? offGrid.status);
-  const phase = stateToken(candidate.phase ?? offGrid.phase);
-  const observedAt =
-    text(candidate.observed_at) ?? text(candidate.checked_at) ?? text(offGrid.last_checked_at);
+  const state = stateToken(candidate.state ?? candidate.status);
+  const phase = stateToken(candidate.phase);
+  const observedAt = text(candidate.observed_at) ?? text(candidate.checked_at);
   if (["reachable", "live", "online"].includes(state) || phase === "ssh_ready")
     return { state: "reachable", observed_at: observedAt };
   if (
-    ["unreachable", "offline", "off_grid"].includes(state) ||
+    ["unreachable", "offline"].includes(state) ||
     ["ssh_unreachable", "unreachable"].includes(phase)
   )
     return { state: "unreachable", observed_at: observedAt };

package/src/external-bucket-commands.mjs

@@ -5,6 +5,7 @@ import { CliApiError, computeEndpoint } from "./api-client.mjs";
 import { isRecoverableWaitFailure } from "./interaction-runtime.mjs";
 import {
   codeOf,
+  detailOf,
   fetchDrives,
   fetchDrivePage,
   idempotencyHeaders,
@@ -83,6 +84,26 @@ function verificationCode(source) {
   return typeof code === "string" && /^[A-Za-z][A-Za-z0-9_.-]{0,127}$/.test(code) ? code : null;
 }
 
+const TRANSFER_ACCOUNT_PATTERN = /^[a-z][a-z0-9-]{4,28}[a-z0-9]@[a-z][a-z0-9-]{4,28}[a-z0-9]\.iam\.gserviceaccount\.com$/;
+
+function safeTransferAccount(value) {
+  return typeof value === "string" && TRANSFER_ACCOUNT_PATTERN.test(value) ? value : null;
+}
+
+function gcsGrantPresentation(safe) {
+  const account = safe.access.transfer_account;
+  if (safe.kind !== "gcs" || !account) return null;
+  const grant = (role) =>
+    `  gcloud storage buckets add-iam-policy-binding gs://${safe.location.bucket} --member=serviceAccount:${account} --role=${role}`;
+  return [
+    `Your organization's Ornn transfer account: ${account}`,
+    "Grant it read access to the bucket:",
+    grant("roles/storage.objectViewer"),
+    grant("roles/storage.legacyBucketReader"),
+    "Then deploy the volume to a reservation from the Ornn console.",
+  ];
+}
+
 function safeExternalBucket(drive, { forceUnverified = false } = {}) {
   const source = drive?.source ?? {};
   const kind = externalKind(drive);
@@ -110,6 +131,9 @@ function safeExternalBucket(drive, { forceUnverified = false } = {}) {
     access: {
       mode: source.read_only === false ? "read-write" : "read-only",
       credentials_configured: kind === "gcs" ? false : source.credentials_configured === true,
+      ...(kind === "gcs"
+        ? { transfer_account: safeTransferAccount(source.transfer_service_account) }
+        : {}),
     },
     verification: {
       phase,
@@ -448,13 +472,18 @@ function safeExternalError(error, fallback, { action, forcePartial = false } = {
   }
   const code = codeOf(error);
   const unavailable = error?.status === undefined || error?.status >= 500;
-  return new StorageCommandError(SAFE_EXTERNAL_ERRORS[code] ?? fallback, {
-    action,
-    code: code ?? (unavailable ? "service_unavailable" : "external_bucket_operation_failed"),
-    exitCode: forcePartial ? 4 : unavailable ? 6 : 1,
-    outcomeClass: forcePartial ? "partial" : unavailable ? "failed" : "failed",
-    retryable: forcePartial || unavailable,
-  });
+  const ownerMessage = detailOf(error)?.message;
+  return new StorageCommandError(
+    SAFE_EXTERNAL_ERRORS[code] ??
+      (typeof ownerMessage === "string" && ownerMessage.trim() ? ownerMessage : fallback),
+    {
+      action,
+      code: code ?? (unavailable ? "service_unavailable" : "external_bucket_operation_failed"),
+      exitCode: forcePartial ? 4 : unavailable ? 6 : 1,
+      outcomeClass: forcePartial ? "partial" : unavailable ? "failed" : "failed",
+      retryable: forcePartial || unavailable,
+    }
+  );
 }
 
 async function listBuckets(input, runtime) {
@@ -510,13 +539,20 @@ async function connectBucket(input, runtime) {
         class: safe.verification.phase === "failed" ? "failed" : "ready",
         phase: "replayed",
       },
-      presentation: {
-        lines: [
-          `External bucket connection replayed: ${safe.name} (${safe.id})`,
-          "Connection and verification are separate operations.",
-        ],
-        next: `ornn external-buckets verify ${safe.id}`,
-      },
+      presentation: gcsGrantPresentation(safe)
+        ? {
+            lines: [
+              `External bucket connection replayed: ${safe.name} (${safe.id})`,
+              ...gcsGrantPresentation(safe),
+            ],
+          }
+        : {
+            lines: [
+              `External bucket connection replayed: ${safe.name} (${safe.id})`,
+              "Connection and verification are separate operations.",
+            ],
+            next: `ornn external-buckets verify ${safe.id}`,
+          },
     });
   }
 
@@ -547,13 +583,20 @@ async function connectBucket(input, runtime) {
   return runtime.interaction.result({
     data: { external_bucket: safe, replayed: false, verification_required: true },
     outcome: { class: "ready", phase: "connected" },
-    presentation: {
-      lines: [
-        `External bucket connected: ${safe.name} (${safe.id})`,
-        "Connection recorded; access has not been verified.",
-      ],
-      next: `ornn external-buckets verify ${safe.id}`,
-    },
+    presentation: gcsGrantPresentation(safe)
+      ? {
+          lines: [
+            `External bucket connected: ${safe.name} (${safe.id})`,
+            ...gcsGrantPresentation(safe),
+          ],
+        }
+      : {
+          lines: [
+            `External bucket connected: ${safe.name} (${safe.id})`,
+            "Connection recorded; access has not been verified.",
+          ],
+          next: `ornn external-buckets verify ${safe.id}`,
+        },
   });
 }
 
@@ -1282,7 +1325,9 @@ export function writeExternalBucketResultHuman(stdout, stderr, capabilityId, exe
     }
     for (const bucket of rows) {
       stdout.write(
-        `${bucket.name}  ${bucket.kind}  ${bucket.verification.phase}  ${bucket.access.mode}  ${bucket.id}\n`
+        bucket.kind === "gcs"
+          ? `${bucket.name}  ${bucket.kind}  ${bucket.access.mode}  ${bucket.id}\n`
+          : `${bucket.name}  ${bucket.kind}  ${bucket.verification.phase}  ${bucket.access.mode}  ${bucket.id}\n`
       );
     }
     if (execution.page?.next_cursor) {
@@ -1300,7 +1345,10 @@ export function writeExternalBucketResultHuman(stdout, stderr, capabilityId, exe
     stdout.write(`Bucket: ${bucket.location.bucket}\n`);
     if (bucket.location.prefix) stdout.write(`Prefix: ${bucket.location.prefix}\n`);
     stdout.write(`Access: ${bucket.access.mode}\n`);
-    stdout.write(`Verification: ${bucket.verification.phase}\n`);
+    if (bucket.access.transfer_account) {
+      stdout.write(`Transfer account: ${bucket.access.transfer_account}\n`);
+    }
+    if (bucket.kind !== "gcs") stdout.write(`Verification: ${bucket.verification.phase}\n`);
   }
   for (const error of execution.errors ?? []) stderr.write(`${error.message}\n`);
 }

package/src/interaction-runtime.mjs

@@ -4,7 +4,9 @@ import { createInterface } from "node:readline/promises";
 import { resolveAuthBaseUrl } from "./device-auth.mjs";
 
 const BOOLEAN_OPTIONS = new Set([
+  "acknowledge-retained-os",
   "all-nodes",
+  "data-drives-sanitized",
   "erase-local-data",
   "force",
   "follow",
@@ -17,6 +19,7 @@ const BOOLEAN_OPTIONS = new Set([
   "read-only",
   "read-write",
   "recursive",
+  "tenant-access-revoked",
   "wait",
 ]);
 

package/src/kubernetes-commands.mjs

@@ -1,3 +1,4 @@
+import { getReservation } from "../vendor/api-client/commerce.js";
 import { createHash } from "node:crypto";
 
 import {
@@ -8,7 +9,7 @@ import {
 import { isRecoverableWaitFailure } from "./interaction-runtime.mjs";
 import { waitForGoal as waitForReadGoal } from "./wait-runtime.mjs";
 import { gpuLabeler } from "./gpu-catalog.mjs";
-import { reservationLabeler } from "./machine-reference.mjs";
+import { listActiveReservations, reservationLabeler } from "./machine-reference.mjs";
 import { keyInputShapePreflight, keyPlanFromInput, materializeKey } from "./vm-commands.mjs";
 
 const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
@@ -51,8 +52,7 @@ function clusterNativeAccess(accessMode) {
   return accessMode === "slurm" ? "SSH login" : "kubeconfig";
 }
 function reservationAccessMode(value) {
-  const mode = cleanState(record(value).access_mode ?? record(value).accessMode);
-  return mode === "virtual-machine" ? "vm" : mode;
+  return text(record(value).provisioningType);
 }
 
 function clusterConnectCommand(cluster) {
@@ -736,17 +736,13 @@ async function waitForClusterGoal({
 }
 
 async function fetchReservation(fetch, runtime, reservationId, accessMode = "kubernetes") {
-  const reservation = record(
-    await fetch(`/v1/workflows/commerce/reservations/${encodeURIComponent(reservationId)}`, {
-      method: "GET",
-    })
-  );
-  if (text(reservation.id) !== reservationId) {
+  const reservation = record(await getReservation(fetch, reservationId));
+  if (text(reservation.reservationId) !== reservationId) {
     runtime.error("The gateway returned a different capacity reservation.", {
       code: "reservation_identity_changed",
     });
   }
-  const status = cleanState(reservation.status ?? reservation.state);
+  const status = cleanState(reservation.status);
   if (reservationAccessMode(reservation) !== accessMode) {
     runtime.error(
       `The selected capacity reservation is not reserved for ${clusterModeLabel(accessMode)}.`,
@@ -766,50 +762,6 @@ async function fetchReservation(fetch, runtime, reservationId, accessMode = "kub
   return reservation;
 }
 
-async function fetchActiveReservations(fetch, runtime) {
-  const reservations = [];
-  const seen = new Set();
-  let cursor;
-  for (let page = 0; page < 20; page += 1) {
-    const query = new URLSearchParams({ limit: "500", state: "active" });
-    if (cursor) query.set("cursor", cursor);
-    const payload = await fetch(`/v1/workflows/commerce/reservations?${query}`, {
-      method: "GET",
-    });
-    const source = record(payload);
-    const rows = Array.isArray(payload)
-      ? payload
-      : Array.isArray(source.reservations)
-        ? source.reservations
-        : null;
-    if (!rows) {
-      runtime.error("Capacity reservations returned an unsafe response.", {
-        code: "reservation_projection_invalid",
-      });
-    }
-    reservations.push(
-      ...rows.filter((value) => {
-        const reservation = record(value);
-        return (
-          UUID.test(text(reservation.id) ?? "") &&
-          cleanState(reservation.status ?? reservation.state) === "active"
-        );
-      })
-    );
-    const next = text(source.next_cursor);
-    if (!next) return reservations;
-    if (seen.has(next))
-      runtime.error("Capacity-reservation pagination did not advance.", {
-        code: "reservation_pagination_invalid",
-      });
-    seen.add(next);
-    cursor = next;
-  }
-  runtime.error("Capacity-reservation pagination exceeded its safety bound.", {
-    code: "reservation_pagination_invalid",
-  });
-}
-
 async function resolveLaunchReservation(context, runtime, input, accessMode) {
   const positionals = input.$positionals ?? [];
   if (positionals.length > 1) {
@@ -838,7 +790,7 @@ async function resolveLaunchReservation(context, runtime, input, accessMode) {
       field: "reservation",
     });
   }
-  const active = (await fetchActiveReservations(context.fetch, runtime)).filter(
+  const active = (await listActiveReservations(context, runtime)).filter(
     (reservation) => reservationAccessMode(reservation) === accessMode
   );
   if (active.length === 0) {
@@ -850,14 +802,14 @@ async function resolveLaunchReservation(context, runtime, input, accessMode) {
     );
   }
   if (active.length === 1) {
-    return fetchReservation(context.fetch, runtime, text(record(active[0]).id), accessMode);
+    return fetchReservation(context.fetch, runtime, text(active[0].reservationId), accessMode);
   }
   const reservationLabel = await reservationLabeler(context.fetch);
   const selected = await runtime.ask({
     label: "Capacity reservation",
     choices: active.flatMap((value) => {
       const reservation = record(value);
-      const id = text(reservation.id);
+      const id = text(reservation.reservationId);
       return id ? [{ label: reservationLabel(reservation), value: id }] : [];
     }),
   });
@@ -1124,7 +1076,7 @@ export async function launchClusterMode(
   const organization = await selectedOrganization(context, runtime);
   const keyPlan = accessMode === "slurm" ? await keyPlanFromInput(context, input, runtime) : null;
   const reservation = await resolveLaunchReservation(context, runtime, input, accessMode);
-  const reservationId = text(reservation.id);
+  const reservationId = text(reservation.reservationId);
   const initialExisting = await existingReservationCluster(
     context.fetch,
     runtime,
@@ -1810,44 +1762,25 @@ export async function executeKubernetesClusterCommand(command, input, deps) {
   return handler(input, deps);
 }
 
-function projectReservationFacts(value, expectedId, runtime) {
-  const reservation = record(value);
-  const id = text(reservation.id);
-  if (id !== expectedId) {
+export async function reservationFactsForCluster(fetch, runtime, cluster) {
+  const reservation = await getReservation(fetch, cluster.reservation_id);
+  if (reservation.reservationId !== cluster.reservation_id) {
     runtime.error("The gateway returned facts for a different capacity reservation.", {
       code: "reservation_identity_changed",
     });
   }
-  return {
-    id,
-    facility:
-      text(reservation.facility_name) ??
-      text(reservation.site_nickname) ??
-      text(reservation.facility),
-    hardware: text(reservation.gpu_type) ?? text(reservation.hardware),
-    machine_count: integer(reservation.node_count) ?? integer(reservation.machines),
-    region: text(reservation.region),
-  };
-}
-
-export async function reservationFactsForCluster(fetch, runtime, cluster) {
-  const payload = await fetch(
-    `/v1/workflows/commerce/reservations/${encodeURIComponent(cluster.reservation_id)}`,
-    { method: "GET" }
-  );
-  return projectReservationFacts(payload, cluster.reservation_id, runtime);
+  return reservation;
 }
 
 export function clusterFactLabel(cluster, reservation, gpuLabel) {
-  const location = reservation.facility ?? reservation.region ?? "location unknown";
-  const gpu = reservation.hardware ?? cluster.gpu_type;
+  const gpu = reservation.gpuSlug ?? (reservation.reservedGpuCount === 0 ? "cpu" : null);
   const hardware = gpu ? gpuLabel(gpu) : "hardware unknown";
   const nodeCount =
     integer(cluster.membership_count) ??
     integer(cluster.node_count) ??
     (Array.isArray(cluster.machines) ? cluster.machines.length : 0);
   const lifecycle = text(record(cluster.lifecycle).class) ?? text(cluster.state) ?? "unknown";
-  return `${location} · ${clusterModeLabel(cluster.access_mode)} · ${hardware} · ${nodeCount} nodes · ${lifecycle}`;
+  return `${clusterModeLabel(cluster.access_mode)} · ${hardware} · ${nodeCount} nodes · ${lifecycle}`;
 }
 const clusterConnectCandidatesCache = new WeakMap();
 

package/src/machine-reference.mjs

@@ -1,8 +1,7 @@
+import { listAllReservations } from "../vendor/api-client/commerce.js";
 import { gpuLabeler } from "./gpu-catalog.mjs";
 
 const CANONICAL_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-const PAGE_SIZE = 500;
-const MAX_RESERVATION_PAGES = 20;
 const TERMINAL_MACHINE_STATES = new Set([
   "canceled",
   "cancelled",
@@ -31,18 +30,12 @@ function rows(payload, field) {
 }
 
 function reservationId(value) {
-  const source = record(value);
-  return (
-    text(source.id) ??
-    text(source.ref) ??
-    text(source.reservation_id) ??
-    text(source.commerce_reservation_id)
-  );
+  return text(value.reservationId);
 }
 
 function reservationMode(value) {
   const source = record(value);
-  const mode = text(source.access_mode) ?? text(source.accessMode);
+  const mode = text(source.provisioningType);
   return mode?.toLowerCase() === "virtual-machine" ? "vm" : (mode?.toLowerCase() ?? null);
 }
 
@@ -63,21 +56,16 @@ function reservationModeLabel(value) {
 
 export function reservationChoiceLabel(value, gpuLabel) {
   const reservation = record(value);
-  const gpu = text(reservation.gpu_type);
-  const hardware = gpu ? gpuLabel(gpu) : (text(reservation.hardware) ?? "GPU capacity");
-  const quantity = Number(reservation.node_count ?? reservation.machine_count ?? 1);
+  // CPU capacity has no GPU type and no GPUs; the labeler names it CPU.
+  const gpu = text(reservation.gpuSlug) ?? (reservation.reservedGpuCount === 0 ? "cpu" : null);
+  const hardware = gpu ? gpuLabel(gpu) : "GPU capacity";
+  const quantity = reservation.reservedNodeCount;
   const machines = Number.isInteger(quantity) && quantity > 0 ? quantity : 1;
-  const location =
-    text(reservation.site_nickname) ??
-    text(reservation.facility) ??
-    text(reservation.location) ??
-    text(reservation.region) ??
-    "location unreported";
-  const start = text(reservation.start_at) ?? text(reservation.start_date);
-  const end = text(reservation.end_at) ?? text(reservation.end_date);
-  const createdAt = text(reservation.created_at);
+  const start = text(reservation.startsAt);
+  const end = text(reservation.endsAt);
+  const createdAt = text(reservation.createdAt);
   return [
-    `${hardware}, ${machines} machine${machines === 1 ? "" : "s"}, ${location}`,
+    `${hardware}, ${machines} machine${machines === 1 ? "" : "s"}`,
     reservationModeLabel(reservation),
     start && end ? `${start} to ${end}` : null,
     createdAt ? `reserved ${createdAt}` : null,
@@ -91,13 +79,6 @@ export async function reservationLabeler(fetch) {
   return (reservation) => reservationChoiceLabel(reservation, gpuLabel);
 }
 
-function isActiveDirectReservation(value) {
-  const source = record(value);
-  const status = (text(source.status) ?? text(source.state) ?? "").toLowerCase();
-  const mode = reservationMode(source);
-  return status === "active" && (!mode || mode === "vm" || mode === "bare-metal");
-}
-
 export function canonicalMachineId(value) {
   const source = record(value);
   return (
@@ -130,35 +111,31 @@ function invalidGateway(interaction, message) {
   });
 }
 
-export async function listActiveDirectReservations(context, interaction) {
-  const reservations = [];
-  const seen = new Set();
-  let cursor = null;
-  for (let page = 0; page < MAX_RESERVATION_PAGES; page += 1) {
-    const query = new URLSearchParams({ limit: String(PAGE_SIZE), status: "active" });
-    if (cursor) query.set("cursor", cursor);
-    const payload = await context.fetch(`/v1/workflows/commerce/reservations?${query}`, {
-      method: "GET",
+export async function listActiveReservations(context, interaction) {
+  const session = context.cli?.session
+    ? (await context.cli.session("context", {})).data
+    : await context.fetch("/v1/cli/session");
+  const customerId = text((session.selectedOrganization ?? session.selected_organization)?.id);
+  if (!customerId) {
+    interaction.usage("Select an organization before choosing a reservation.", {
+      code: "organization_required",
+      field: "organization",
     });
-    const pageRows = rows(payload, "reservations");
-    if (!pageRows)
-      invalidGateway(interaction, "The gateway returned an invalid capacity-reservation page.");
-    reservations.push(...pageRows.map(record).filter(isActiveDirectReservation));
-
-    const source = record(payload);
-    const next = text(source.next_cursor) ?? text(source.nextCursor);
-    if (!next || Array.isArray(payload)) return reservations;
-    if (seen.has(next)) {
-      invalidGateway(interaction, "Capacity-reservation pagination repeated a cursor.");
-    }
-    seen.add(next);
-    cursor = next;
   }
-  interaction.error("Machine resolution exceeded its bounded capacity-reservation search.", {
-    code: "resource_search_incomplete",
-    exitCode: 6,
-    retryable: true,
+  // Native Commerce permits staff to read all organizations. Customer pickers
+  // retain the selected-organization scope of the published CLI workflow.
+  const { reservations } = await listAllReservations(context.fetch, {
+    customerId,
+    status: "active",
   });
+  return reservations.filter((reservation) => reservation.status === "active");
+}
+
+export async function listActiveDirectReservations(context, interaction) {
+  return (await listActiveReservations(context, interaction)).filter(
+    ({ provisioningType }) =>
+      provisioningType === "virtual-machine" || provisioningType === "bare-metal"
+  );
 }
 
 export async function listOwnedActiveMachines(context, interaction) {

package/src/slurm-commands.mjs

@@ -33,6 +33,17 @@ function commandText(invocation) {
   return [invocation.command, ...invocation.args].map(shellQuote).join(" ");
 }
 
+// Preserve the CLI result's summary; reads and picker state use Commerce JSON.
+function reservationSummary(reservation) {
+  return {
+    id: reservation.reservationId,
+    facility: null,
+    hardware: reservation.gpuSlug ?? (reservation.reservedGpuCount === 0 ? "cpu" : null),
+    machine_count: reservation.reservedNodeCount,
+    region: null,
+  };
+}
+
 function safeLogin(runtime, credentials, input) {
   const credentialType = text(credentials.credential_type);
   if (credentialType && credentialType !== "login-ssh") {
@@ -159,7 +170,7 @@ export function createSlurmConnectModeHandler({ spawnProcess = spawnProcessDefau
         return {
           action: retryConnectAction(prepared.cluster),
           data: {
-            capacity_reservation: prepared.capacityReservation,
+            capacity_reservation: reservationSummary(prepared.capacityReservation),
             cluster: prepared.cluster,
             private_transport: transport,
             ssh: null,
@@ -198,7 +209,7 @@ export function createSlurmConnectModeHandler({ spawnProcess = spawnProcessDefau
         user: login.user,
       };
       const data = {
-        capacity_reservation: prepared.capacityReservation,
+        capacity_reservation: reservationSummary(prepared.capacityReservation),
         cluster: prepared.cluster,
         private_transport: transport,
         ssh,