@ornncompute/cli 1.0.121 → 1.0.122

package/package.json

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

package/src/external-bucket-commands.mjs

@@ -1,8 +1,9 @@
+import * as storageApi from "../vendor/api-client/orchestrator.js";
 import * as gatewayApi from "../vendor/api-client/gateway.js";
 import { createHash } from "node:crypto";
 import { readFile } from "node:fs/promises";
 
-import { CliApiError, computeEndpoint } from "./api-client.mjs";
+import { CliApiError } from "./api-client.mjs";
 import { isRecoverableWaitFailure } from "./interaction-runtime.mjs";
 import {
   codeOf,
@@ -18,7 +19,6 @@ import {
 
 const IMPORT_POLL_INTERVAL_MS = 10_000;
 const DEFAULT_IMPORT_TIMEOUT_MS = 30 * 60 * 1_000;
-const STORAGE_PREFIX = "/nodes/storage-drives";
 const PROVIDERS = new Set(["gcs", "s3", "r2"]);
 
 function usage(message, field, code = "usage_error") {
@@ -438,27 +438,6 @@ function requireMutationPreflight(input, runtime) {
   }
 }
 
-const SAFE_EXTERNAL_ERRORS = {
-  external_bucket_required: "The external bucket record is incomplete.",
-  external_endpoint_url_invalid: "The Cloudflare R2 endpoint is invalid.",
-  external_endpoint_url_required: "Cloudflare R2 requires an account endpoint.",
-  external_s3_credentials_required: "Current S3-compatible credentials are required.",
-  storage_drive_attached_elsewhere:
-    "This working volume is already attached to a different reservation.",
-  storage_drive_attached_to_reservation:
-    "Detach the working volume from every reservation before disconnecting the source.",
-  storage_location_unavailable:
-    "No managed destination is available for this reservation. The source bucket was not changed.",
-  storage_regional_bucket_unconfigured:
-    "Managed destination storage is temporarily unavailable. The source bucket was not changed.",
-  storage_reservation_node_offline:
-    "A reservation machine is offline, so the import destination was not changed.",
-  storage_source_client_unavailable: "The external bucket client is temporarily unavailable.",
-  storage_source_list_failed: "Ornn could not read the external bucket.",
-  storage_source_not_verified: "Verify this external bucket before importing it.",
-  storage_source_verification_unsupported: "This external bucket kind cannot be verified.",
-};
-
 function safeExternalError(error, fallback, { action, forcePartial = false } = {}) {
   if (error instanceof StorageCommandError) return error;
   if (error instanceof CliApiError && (error.status === 401 || error.status === 403)) {
@@ -476,8 +455,7 @@ function safeExternalError(error, fallback, { action, forcePartial = false } = {
   const unavailable = error?.status === undefined || error?.status >= 500;
   const ownerMessage = detailOf(error)?.message;
   return new StorageCommandError(
-    SAFE_EXTERNAL_ERRORS[code] ??
-      (typeof ownerMessage === "string" && ownerMessage.trim() ? ownerMessage : fallback),
+    typeof ownerMessage === "string" && ownerMessage.trim() ? ownerMessage : fallback,
     {
       action,
       code: code ?? (unavailable ? "service_unavailable" : "external_bucket_operation_failed"),
@@ -560,8 +538,9 @@ async function connectBucket(input, runtime) {
 
   let created;
   try {
-    created = await runtime.fetch(computeEndpoint(STORAGE_PREFIX), {
-      body: {
+    created = await storageApi.createDrive(
+      runtime.fetch,
+      {
         name: intent.name,
         provider: "ornn_volume",
         source_provider: intent.kind === "gcs" ? "external_gcs" : "s3",
@@ -575,9 +554,8 @@ async function connectBucket(input, runtime) {
         ...(intent.accessKeyId ? { external_access_key_id: intent.accessKeyId } : {}),
         ...(intent.secretAccessKey ? { external_secret_access_key: intent.secretAccessKey } : {}),
       },
-      headers: idempotencyHeaders(input),
-      method: "POST",
-    });
+      { headers: idempotencyHeaders(input) }
+    );
   } catch (error) {
     throw safeExternalError(error, "The external bucket could not be connected safely.");
   }
@@ -609,12 +587,11 @@ async function verifyBucket(input, runtime) {
   const id = safeIdentifier(source.id);
   let verified;
   try {
-    verified = await runtime.fetch(
-      computeEndpoint(`${STORAGE_PREFIX}/${encodeURIComponent(id)}/verify-source`),
-      {
-        headers: idempotencyHeaders(input),
-        method: "POST",
-      }
+    verified = await storageApi.updateDrive(
+      runtime.fetch,
+      id,
+      { verify_source: true },
+      { headers: idempotencyHeaders(input) }
     );
   } catch (error) {
     throw safeExternalError(error, "External bucket verification could not be completed safely.");
@@ -668,16 +645,16 @@ async function updateCredentials(input, runtime) {
   const id = safeIdentifier(source.id);
   let updated;
   try {
-    updated = await runtime.fetch(
-      computeEndpoint(`${STORAGE_PREFIX}/${encodeURIComponent(id)}/source-credentials`),
+    updated = await storageApi.updateDrive(
+      runtime.fetch,
+      id,
       {
-        body: {
+        source_credentials: {
           external_access_key_id: accessKeyId,
           external_secret_access_key: secret,
         },
-        headers: idempotencyHeaders(input),
-        method: "PATCH",
-      }
+      },
+      { headers: idempotencyHeaders(input) }
     );
   } catch (error) {
     throw safeExternalError(error, "External bucket credentials could not be updated safely.");
@@ -715,10 +692,12 @@ async function disconnectBucket(input, runtime) {
     );
   }
   try {
-    await runtime.fetch(computeEndpoint(`${STORAGE_PREFIX}/${encodeURIComponent(safe.id)}`), {
-      headers: idempotencyHeaders(input),
-      method: "DELETE",
-    });
+    await storageApi.deleteDrive(
+      runtime.fetch,
+      safe.id,
+      {},
+      { headers: idempotencyHeaders(input) }
+    );
   } catch (error) {
     throw safeExternalError(error, "The external bucket could not be disconnected safely.");
   }

package/src/mount-commands.mjs

@@ -1,3 +1,4 @@
+import * as storageApi from "../vendor/api-client/orchestrator.js";
 import * as gatewayApi from "../vendor/api-client/gateway.js";
 import { CliApiError } from "./api-client.mjs";
 import { isRecoverableWaitFailure } from "./interaction-runtime.mjs";
@@ -314,12 +315,7 @@ async function reservationMachineCount(runtime, reservationId, signal) {
   if (cache.has(reservationId)) return cache.get(reservationId);
   let count = 0;
   try {
-    const rows = candidateRows(
-      await runtime.fetch("/v1/orchestrator/storage-targets", {
-        method: "GET",
-        ...(signal ? { signal } : {}),
-      })
-    );
+    const rows = candidateRows(await storageApi.listStorageTargets(runtime.fetch, signal));
     const row = rows.find(
       (candidate) =>
         candidate.id === reservationId || candidate.reservation_ids.includes(reservationId)
@@ -560,9 +556,7 @@ async function candidates(input, runtime) {
     "ornn volume-mounts candidates [--limit <1-500>] [--cursor <cursor>]",
     runtime.interaction
   );
-  const rows = candidateRows(
-    await runtime.fetch("/v1/orchestrator/storage-targets", { method: "GET" })
-  );
+  const rows = candidateRows(await storageApi.listStorageTargets(runtime.fetch));
   const offset = cursorOffset(input.cursor, runtime.interaction);
   const limit = pageLimit(input.limit, runtime.interaction);
   if (offset > rows.length) {

package/src/storage-commands.mjs

@@ -1,3 +1,4 @@
+import * as storageApi from "../vendor/api-client/orchestrator.js";
 import { createHash } from "node:crypto";
 import { createReadStream } from "node:fs";
 import { stat } from "node:fs/promises";
@@ -6,7 +7,6 @@ import { Readable } from "node:stream";
 
 import {
   CliApiError,
-  computeEndpoint,
   loadRequiredSession,
   raiseForFailedResponse,
   resolveApiBaseUrl,
@@ -20,7 +20,6 @@ import {
 
 const DEFAULT_PAGE_LIMIT = 50;
 const MAX_PAGE_LIMIT = 500;
-const STORAGE_PREFIX = "/nodes/storage-drives";
 
 /**
  * Narrow CLI adapter expected by executeStorageCommand:
@@ -143,13 +142,6 @@ function normalizeRemotePath(value, { allowEmpty = false, field = "path" } = {})
   return segments.join("/");
 }
 
-function encodedRemotePath(path) {
-  return path
-    .split("/")
-    .map((segment) => encodeURIComponent(segment))
-    .join("/");
-}
-
 function isManagedVolume(drive) {
   const provider = String(drive?.provider ?? "").toLocaleLowerCase("en-US");
   const sourceProvider = String(
@@ -255,19 +247,6 @@ export function codeOf(error) {
   return nested && /^[a-z][a-z0-9_]*$/.test(nested) ? nested : null;
 }
 
-const SAFE_ERROR_MESSAGES = {
-  storage_content_busy: "The volume content is still changing. Inspect the volume and try again.",
-  storage_drive_attached_to_reservation:
-    "This volume still has a reservation relationship. Detach every volume mount before deleting it.",
-  storage_drive_mounted: "This volume is mounted. Detach it before changing its files.",
-  storage_drive_not_found: "The requested volume was not found.",
-  storage_file_not_found: "The requested volume file was not found.",
-  storage_folder_not_found: "The requested volume folder was not found.",
-  storage_object_file_api_unsupported: "This volume does not support nested file operations.",
-  storage_pending_uploads:
-    "This volume has an upload still being finalized. Inspect it and try again.",
-};
-
 function safeStorageError(error, fallback, { action } = {}) {
   if (error instanceof StorageCommandError) return error;
   if (error instanceof AtomicOutputExistsError) {
@@ -285,8 +264,7 @@ function safeStorageError(error, fallback, { action } = {}) {
   const unavailable = code === "service_unavailable";
   const ownerMessage = detailOf(error)?.message;
   return new StorageCommandError(
-    SAFE_ERROR_MESSAGES[code] ??
-      (typeof ownerMessage === "string" && ownerMessage.trim() ? ownerMessage : fallback),
+    typeof ownerMessage === "string" && ownerMessage.trim() ? ownerMessage : fallback,
     {
       action,
       code,
@@ -313,11 +291,11 @@ export async function fetchDrivePage(runtime, { limit = 25, cursor, scope = "all
   if (!Number.isInteger(Number(limit)) || Number(limit) < 1 || Number(limit) > 100) {
     usage("--limit must be an integer from 1 through 100.", "limit");
   }
-  const params = new URLSearchParams({ limit: String(limit), scope });
-  if (cursor) params.set("cursor", cursor);
   try {
-    const payload = await runtime.fetch(computeEndpoint(`${STORAGE_PREFIX}?${params}`), {
-      method: "GET",
+    const payload = await storageApi.listDrives(runtime.fetch, {
+      limit: Number(limit),
+      scope,
+      ...(cursor ? { cursor } : {}),
     });
     return { drives: volumeRows(payload), next_cursor: payload?.next_cursor ?? null };
   } catch (error) {
@@ -367,10 +345,7 @@ function resolveFromRows(rows, reference, { source = false } = {}) {
 
 export async function resolveVolume(runtime, reference) {
   if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(reference)) {
-    const drive = await runtime.fetch(
-      computeEndpoint(`${STORAGE_PREFIX}/${encodeURIComponent(reference)}`),
-      { method: "GET" }
-    );
+    const drive = await storageApi.getDrive(runtime.fetch, reference);
     return resolveFromRows([drive], reference);
   }
   return resolveFromRows(await fetchDrives(runtime), reference);
@@ -418,10 +393,8 @@ async function createVolume(input, runtime) {
 
   const body = { name, source_drive_id: source ? String(source.id) : null };
   try {
-    const created = await runtime.fetch(computeEndpoint(STORAGE_PREFIX), {
-      body,
+    const created = await storageApi.createDrive(runtime.fetch, body, {
       headers: idempotencyHeaders(input),
-      method: "POST",
     });
     return runtime.interaction.result({
       data: { effective_input: effective, replayed: false, volume: safeVolume(created) },
@@ -477,10 +450,7 @@ async function showVolume(input, runtime, { refresh = false } = {}) {
     return runtime.interaction.result({ data: { volume: safeVolume(drive) } });
   }
   try {
-    const refreshed = await runtime.fetch(
-      computeEndpoint(`${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}/refresh`),
-      { method: "POST" }
-    );
+    const refreshed = await storageApi.getDrive(runtime.fetch, String(drive.id), { refresh: true });
     return runtime.interaction.result({
       data: { volume: safeVolume(refreshed) },
       outcome: { class: "ready", phase: "refreshed" },
@@ -495,10 +465,7 @@ async function clearVolume(input, runtime) {
   const [reference] = positionals(input, 1, "Usage: ornn volumes clear <volume>");
   const drive = await resolveVolume(runtime, reference);
   try {
-    const payload = await runtime.fetch(
-      computeEndpoint(`${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}/contents`),
-      { method: "DELETE" }
-    );
+    const payload = await storageApi.clearDriveContents(runtime.fetch, String(drive.id));
     return runtime.interaction.result({
       data: {
         cleared: true,
@@ -533,12 +500,11 @@ async function deleteVolume(input, runtime) {
   requireMachineMutationKey(input, runtime);
   const drive = await resolveVolume(runtime, reference);
   try {
-    await runtime.fetch(
-      computeEndpoint(`${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}`),
-      {
-        headers: idempotencyHeaders(input),
-        method: "DELETE",
-      }
+    await storageApi.deleteDrive(
+      runtime.fetch,
+      String(drive.id),
+      {},
+      { headers: idempotencyHeaders(input) }
     );
     return runtime.interaction.result({
       data: { deleted: true, volume: safeVolume(drive) },
@@ -590,17 +556,13 @@ async function fetchFileRows(runtime, drive, prefix) {
   const entries = [];
   let cursor = 0;
   while (cursor !== null) {
-    const query = new URLSearchParams({ recursive: "true" });
-    if (folder) query.set("path", folder);
-    if (cursor) query.set("cursor", String(cursor));
     let page;
     try {
-      page = await runtime.fetch(
-        computeEndpoint(
-          `${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}/contents?${query}`
-        ),
-        { method: "GET" }
-      );
+      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.");
     }
@@ -719,12 +681,7 @@ async function putSignedUpload({
 
 async function cancelUpload(runtime, driveId, uploadId) {
   try {
-    await runtime.fetch(
-      computeEndpoint(
-        `${STORAGE_PREFIX}/${encodeURIComponent(driveId)}/file-uploads/${encodeURIComponent(uploadId)}`
-      ),
-      { method: "DELETE" }
-    );
+    await storageApi.cancelDriveUpload(runtime.fetch, driveId, uploadId);
   } catch {
     // Preserve the transfer error. Finalizing sessions are owner-reconciled.
   }
@@ -762,13 +719,11 @@ async function uploadFile(input, runtime) {
   const sha256 = requestHash.digest("hex");
   let session;
   try {
-    session = await runtime.fetch(
-      computeEndpoint(`${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}/file-upload-url`),
-      {
-        body: { content_type: contentType, path: remotePath, size_bytes: fileInfo.size, sha256 },
-        headers: idempotencyHeaders(input),
-        method: "POST",
-      }
+    session = await storageApi.startDriveUpload(
+      runtime.fetch,
+      String(drive.id),
+      { content_type: contentType, path: remotePath, size_bytes: fileInfo.size, sha256 },
+      { headers: idempotencyHeaders(input) }
     );
   } catch (error) {
     throw safeStorageError(error, "The upload could not be staged safely.");
@@ -803,24 +758,25 @@ async function uploadFile(input, runtime) {
       sizeBytes: fileInfo.size,
       uploadUrl: session.upload_url,
     });
-    const completionPath = computeEndpoint(
-      `${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}/file-uploads/${encodeURIComponent(uploadId)}/complete`
-    );
     let completed;
     try {
-      completed = await runtime.fetch(completionPath, {
-        body: { uploaded_generation: uploaded.generation },
-        headers: idempotencyHeaders(input),
-        method: "POST",
-      });
+      completed = await storageApi.completeDriveUpload(
+        runtime.fetch,
+        String(drive.id),
+        uploadId,
+        { uploaded_generation: uploaded.generation },
+        { headers: idempotencyHeaders(input) }
+      );
     } catch (error) {
       if (!(error instanceof CliApiError) || (error.status !== undefined && error.status < 500))
         throw error;
-      completed = await runtime.fetch(completionPath, {
-        body: { uploaded_generation: uploaded.generation },
-        headers: idempotencyHeaders(input),
-        method: "POST",
-      });
+      completed = await storageApi.completeDriveUpload(
+        runtime.fetch,
+        String(drive.id),
+        uploadId,
+        { uploaded_generation: uploaded.generation },
+        { headers: idempotencyHeaders(input) }
+      );
     }
     const file = safeFile(completed?.file ?? { path: remotePath, size_bytes: fileInfo.size });
     return runtime.interaction.result({
@@ -888,16 +844,19 @@ async function downloadFile(input, runtime) {
   const drive = await resolveVolume(runtime, reference);
   const session = await loadRequiredSession({ env: runtime.env });
   const baseUrl = resolveApiBaseUrl({ env: runtime.env, session });
-  const endpoint = computeEndpoint(
-    `${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}/files/${encodedRemotePath(remotePath)}`
-  );
+  const endpoint = storageApi.driveFilePath(String(drive.id), remotePath);
   const url = new URL(endpoint, `${baseUrl}/`);
   let response;
   try {
-    response = await runtime.fetchImpl(url, {
-      headers: userCredentialHeaders(session),
-      method: "GET",
-    });
+    response = await storageApi.downloadDriveFile(
+      (path, init) =>
+        runtime.fetchImpl(new URL(path, `${baseUrl}/`), {
+          ...init,
+          headers: userCredentialHeaders(session),
+        }),
+      String(drive.id),
+      remotePath
+    );
   } catch {
     throw new StorageCommandError("The volume file could not be downloaded safely.", {
       code: "service_unavailable",
@@ -950,11 +909,11 @@ async function deleteContent(command, input, runtime) {
   );
   const remotePath = normalizeRemotePath(rawRemotePath);
   const drive = await resolveVolume(runtime, reference);
-  const endpoint = computeEndpoint(
-    `${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}/${kind}s/${encodedRemotePath(remotePath)}`
-  );
+
   try {
-    const payload = await runtime.fetch(endpoint, { method: "DELETE" });
+    const payload = await (
+      kind === "file" ? storageApi.deleteDriveFile : storageApi.deleteDriveFolder
+    )(runtime.fetch, String(drive.id), remotePath);
     return runtime.interaction.result({
       data: {
         deleted: true,

package/vendor/api-client/commerce.js

@@ -370,6 +370,97 @@ function deleteComputeDealAddOn(request, id2, addOnId, body) {
   });
 }
 
+// ../../packages/api-client/dist/commerce/compute-contracts.js
+var contracts = "/internal/v1/gtm/compute-contracts";
+var contractPath = (id2) => `${contracts}/${encodeURIComponent(id2)}`;
+var documents = (id2) => `${contractPath(id2)}/documents`;
+var lines = (id2) => `${contractPath(id2)}/lines`;
+var delayPenalties = (id2) => `${contractPath(id2)}/delay-penalties`;
+function listComputeContracts(request, input = {}, signal) {
+  return request(contracts + queryString(input), { method: "GET", signal });
+}
+async function listAllComputeContracts(request, filter = {}, signal) {
+  const contracts2 = [];
+  const seen = /* @__PURE__ */ new Set();
+  let after;
+  for (; ; ) {
+    const page = await listComputeContracts(request, { ...filter, after }, signal);
+    contracts2.push(...page.contracts);
+    if (!page.nextCursor)
+      return { ...page, contracts: contracts2 };
+    if (seen.has(page.nextCursor))
+      throw new Error("Compute contracts returned an incomplete list.");
+    seen.add(page.nextCursor);
+    after = page.nextCursor;
+  }
+}
+function getComputeContract(request, id2, signal) {
+  return request(contractPath(id2), { method: "GET", signal });
+}
+function createComputeContract(request, body) {
+  return request(contracts, { method: "POST", body });
+}
+function updateComputeContract(request, id2, body) {
+  return request(contractPath(id2), { method: "PUT", body });
+}
+function deleteComputeContract(request, id2, body) {
+  return request(contractPath(id2), { method: "DELETE", body });
+}
+function listComputeContractDocuments(request, id2, signal) {
+  return request(documents(id2), { method: "GET", signal });
+}
+function createComputeContractDocument(request, id2, body) {
+  return request(documents(id2), { method: "POST", body });
+}
+function updateComputeContractDocument(request, id2, documentId, body) {
+  return request(`${documents(id2)}/${encodeURIComponent(documentId)}`, {
+    method: "PUT",
+    body
+  });
+}
+function deleteComputeContractDocument(request, id2, documentId, body) {
+  return request(`${documents(id2)}/${encodeURIComponent(documentId)}`, {
+    method: "DELETE",
+    body
+  });
+}
+function listComputeContractLines(request, id2, signal) {
+  return request(lines(id2), { method: "GET", signal });
+}
+function createComputeContractLine(request, id2, body) {
+  return request(lines(id2), { method: "POST", body });
+}
+function updateComputeContractLine(request, id2, lineId, body) {
+  return request(`${lines(id2)}/${encodeURIComponent(lineId)}`, {
+    method: "PUT",
+    body
+  });
+}
+function deleteComputeContractLine(request, id2, lineId, body) {
+  return request(`${lines(id2)}/${encodeURIComponent(lineId)}`, {
+    method: "DELETE",
+    body
+  });
+}
+function listComputeContractDelayPenalties(request, id2, signal) {
+  return request(delayPenalties(id2), { method: "GET", signal });
+}
+function createComputeContractDelayPenalty(request, id2, body) {
+  return request(delayPenalties(id2), { method: "POST", body });
+}
+function updateComputeContractDelayPenalty(request, id2, penaltyId, body) {
+  return request(`${delayPenalties(id2)}/${encodeURIComponent(penaltyId)}`, {
+    method: "PUT",
+    body
+  });
+}
+function deleteComputeContractDelayPenalty(request, id2, penaltyId, body) {
+  return request(`${delayPenalties(id2)}/${encodeURIComponent(penaltyId)}`, {
+    method: "DELETE",
+    body
+  });
+}
+
 // ../../packages/api-client/dist/commerce/contract-extractions.js
 var extractions = "/internal/v1/gtm/contract-extractions";
 var extractionPath = (id2) => `${extractions}/${encodeURIComponent(id2)}`;
@@ -746,6 +837,10 @@ export {
   completeReservation,
   createBillingSetupIntent,
   createCapacityListing,
+  createComputeContract,
+  createComputeContractDelayPenalty,
+  createComputeContractDocument,
+  createComputeContractLine,
   createComputeDeal,
   createComputeDealAddOn,
   createContractExtraction,
@@ -763,6 +858,10 @@ export {
   createSupplierIntakeLink,
   createSupplierPaymentAccount,
   deleteCapacityTerms,
+  deleteComputeContract,
+  deleteComputeContractDelayPenalty,
+  deleteComputeContractDocument,
+  deleteComputeContractLine,
   deleteComputeDeal,
   deleteComputeDealAddOn,
   deleteContractExtraction,
@@ -782,6 +881,7 @@ export {
   getCapacityListingImage,
   getCapacityListingSpecPdf,
   getCommerceOrganization,
+  getComputeContract,
   getContractExtraction,
   getContractFile,
   getControlplaneLicense,
@@ -803,6 +903,7 @@ export {
   getSupplierPaymentAccount,
   listAdminInvoices,
   listAllCapacityListings,
+  listAllComputeContracts,
   listAllComputeDeals,
   listAllContractExtractions,
   listAllContractFiles,
@@ -814,8 +915,12 @@ export {
   listCapacityNodes,
   listCapacityTerms,
   listCapacityTermsBatch,
+  listComputeContractDelayPenalties,
+  listComputeContractDocuments,
   listComputeContractLineCapacity,
   listComputeContractLineMatches,
+  listComputeContractLines,
+  listComputeContracts,
   listComputeDealAddOns,
   listComputeDeals,
   listContractExtractions,
@@ -852,6 +957,10 @@ export {
   setReservationDisk,
   stopReservation,
   transferReservation,
+  updateComputeContract,
+  updateComputeContractDelayPenalty,
+  updateComputeContractDocument,
+  updateComputeContractLine,
   updateComputeDeal,
   updateComputeDealAddOn,
   updateContractExtractionField,

package/vendor/api-client/orchestrator.js

@@ -150,35 +150,241 @@ function closeShellSession(fetcher, id) {
 function shellSessionAttachPath(id) {
   return `${sessionsPath}/${encodeURIComponent(id)}/attach`;
 }
+
+// ../../packages/api-client/dist/orchestrator/drives.js
+function queryPath(path, query) {
+  const params = new URLSearchParams();
+  for (const [key, value] of Object.entries(query)) {
+    if (value !== void 0 && value !== null)
+      params.set(key, String(value));
+  }
+  return `${path}${params.size ? `?${params}` : ""}`;
+}
+function listDrives(request, query = {}, signal) {
+  return request(queryPath("/v1/orchestrator/drives", query), {
+    method: "GET",
+    ...signal ? { signal } : {}
+  });
+}
+function getDrive(request, id, query = {}, options = {}) {
+  return request(queryPath(`/v1/orchestrator/drives/${encodeURIComponent(id)}`, query), {
+    method: "GET",
+    ...options
+  });
+}
+function createDrive(request, body, options = {}) {
+  return request("/v1/orchestrator/drives", {
+    method: "POST",
+    body,
+    ...options
+  });
+}
+function updateDrive(request, id, body, options = {}) {
+  return request(`/v1/orchestrator/drives/${encodeURIComponent(id)}`, {
+    method: "PATCH",
+    body,
+    ...options
+  });
+}
+function deleteDrive(request, id, query = {}, options = {}) {
+  return request(queryPath(`/v1/orchestrator/drives/${encodeURIComponent(id)}`, query), {
+    method: "DELETE",
+    ...options
+  });
+}
+function listStorageTargets(request, signal) {
+  return request("/v1/orchestrator/storage-targets", {
+    method: "GET",
+    ...signal ? { signal } : {}
+  });
+}
+
+// ../../packages/api-client/dist/orchestrator/drive-files.js
+function drivePath(id) {
+  return `/v1/orchestrator/drives/${encodeURIComponent(id)}`;
+}
+function filePath(path) {
+  return path.replace(/\\/g, "/").split("/").filter(Boolean).map(encodeURIComponent).join("/");
+}
+function driveFilePath(id, path) {
+  return `${drivePath(id)}/files/${filePath(path)}`;
+}
+function driveArchivePath(id) {
+  return `${drivePath(id)}/archive`;
+}
+function driveFolderArchivePath(id, path) {
+  return `${drivePath(id)}/folders/${filePath(path)}/archive`;
+}
+function downloadDriveFile(fetch, id, path, signal) {
+  return fetch(driveFilePath(id, path), { method: "GET", ...signal ? { signal } : {} });
+}
+function listDriveContents(request, id, query = {}, signal) {
+  const params = new URLSearchParams();
+  for (const [key, value] of Object.entries(query)) {
+    if (value !== void 0)
+      params.set(key, String(value));
+  }
+  return request(`${drivePath(id)}/contents${params.size ? `?${params}` : ""}`, {
+    method: "GET",
+    ...signal ? { signal } : {}
+  });
+}
+function deleteDriveFile(request, id, path) {
+  return request(driveFilePath(id, path), { method: "DELETE" });
+}
+function deleteDriveFolder(request, id, path) {
+  return request(`${drivePath(id)}/folders/${filePath(path)}`, { method: "DELETE" });
+}
+function clearDriveContents(request, id) {
+  return request(`${drivePath(id)}/contents`, { method: "DELETE" });
+}
+function startDriveUpload(request, id, body, options = {}) {
+  return request(`${drivePath(id)}/uploads`, { method: "POST", body, ...options });
+}
+function completeDriveUpload(request, id, uploadId, body, options = {}) {
+  return request(`${drivePath(id)}/uploads/${encodeURIComponent(uploadId)}`, {
+    method: "POST",
+    body,
+    ...options
+  });
+}
+function cancelDriveUpload(request, id, uploadId, signal) {
+  return request(`${drivePath(id)}/uploads/${encodeURIComponent(uploadId)}`, {
+    method: "DELETE",
+    ...signal ? { signal } : {}
+  });
+}
+function keepDriveUploadsAlive(request, id) {
+  return request(`${drivePath(id)}/uploads`, { method: "PATCH" });
+}
+
+// ../../packages/api-client/dist/orchestrator/storage-types.js
+var storageEventsPath = "/v1/orchestrator/storage/ws";
+
+// ../../packages/api-client/dist/orchestrator/storage-usage.js
+function queryPath2(path, query) {
+  const params = new URLSearchParams();
+  for (const [key, value] of Object.entries(query)) {
+    if (value !== void 0)
+      params.set(key, String(value));
+  }
+  return `${path}${params.size ? `?${params}` : ""}`;
+}
+function listStorageInventory(request, query = {}, signal) {
+  return request(queryPath2("/v1/staff/storage/volumes", query), {
+    method: "GET",
+    ...signal ? { signal } : {}
+  });
+}
+function getStorageUsage(request, driveId, query, signal) {
+  return request(queryPath2(`/v1/staff/storage/volumes/${encodeURIComponent(driveId)}/usage`, query), {
+    method: "GET",
+    ...signal ? { signal } : {}
+  });
+}
+function getOrganizationStorageUsage(request, organizationId, query, signal) {
+  return request(queryPath2(`/v1/staff/storage/organizations/${encodeURIComponent(organizationId)}/usage`, query), {
+    method: "GET",
+    ...signal ? { signal } : {}
+  });
+}
+
+// ../../packages/api-client/dist/orchestrator/github.js
+var connections = "/v1/orchestrator/github/connections";
+function listGitHubConnections(request) {
+  return request(connections, { method: "GET" });
+}
+function startGitHubConnection(request, query = {}) {
+  const params = new URLSearchParams();
+  if (query.page !== void 0)
+    params.set("page", query.page);
+  return request(`${connections}${params.size ? `?${params}` : ""}`, {
+    method: "POST"
+  });
+}
+function completeGitHubConnection(request, body) {
+  return request(`${connections}/complete`, { method: "POST", body });
+}
+function deleteGitHubConnection(request, id) {
+  return request(`${connections}/${encodeURIComponent(id)}`, { method: "DELETE" });
+}
+function listGitHubRepositories(request, connectionId) {
+  return request(`${connections}/${encodeURIComponent(connectionId)}/repositories`, {
+    method: "GET"
+  });
+}
+function listGitHubBranches(request, connectionId, repositoryId, query) {
+  const params = new URLSearchParams({ full_name: query.full_name, page: String(query.page) });
+  return request(`${connections}/${encodeURIComponent(connectionId)}/repositories/${repositoryId}/branches?${params}`, { method: "GET" });
+}
+function pullGitHubRepository(request, driveId, body) {
+  return request(`/v1/orchestrator/drives/${encodeURIComponent(driveId)}/github`, {
+    method: "POST",
+    body
+  });
+}
+function syncGitHubRepository(request, driveId, folder) {
+  return request(`/v1/orchestrator/drives/${encodeURIComponent(driveId)}/github/${encodeURIComponent(folder)}/sync`, { method: "POST" });
+}
 export {
+  cancelDriveUpload,
+  clearDriveContents,
   closeShellSession,
   completeDiskUpload,
+  completeDriveUpload,
+  completeGitHubConnection,
   completeImageUpload,
   createDisk,
+  createDrive,
   createShellSession,
   deleteDisk,
+  deleteDrive,
+  deleteDriveFile,
+  deleteDriveFolder,
+  deleteGitHubConnection,
   deleteImage,
   deleteRegistryTag,
   disksSocketPath,
+  downloadDriveFile,
+  driveArchivePath,
+  driveFilePath,
+  driveFolderArchivePath,
   geolocate,
   getContainerRegistry,
   getCurrentShellSession,
+  getDrive,
   getHardwareCatalog,
+  getOrganizationStorageUsage,
   getRegistryUsage,
   getSoftwareCatalog,
+  getStorageUsage,
   hardwareCatalogPath,
   importDisk,
+  keepDriveUploadsAlive,
   listCatalogImages,
   listDisks,
+  listDriveContents,
+  listDrives,
+  listGitHubBranches,
+  listGitHubConnections,
+  listGitHubRepositories,
   listLocalityRegions,
   listRegistryCaches,
   listRegistryRepositories,
   listRegistryTags,
+  listStorageInventory,
+  listStorageTargets,
   localityGeolocatePath,
   postDiskObject,
   postImageObject,
+  pullGitHubRepository,
   shellSessionAttachPath,
   startDiskUpload,
+  startDriveUpload,
+  startGitHubConnection,
   startImageUpload,
-  updateDisk
+  storageEventsPath,
+  syncGitHubRepository,
+  updateDisk,
+  updateDrive
 };

package/vendor/capabilities/cli.js

@@ -1368,6 +1368,73 @@ function deleteRegistryTag(request, repository, tag) {
   });
 }
 
+// ../../packages/api-client/dist/orchestrator/drives.js
+function queryPath3(path, query3) {
+  const params = new URLSearchParams();
+  for (const [key, value] of Object.entries(query3)) {
+    if (value !== void 0 && value !== null)
+      params.set(key, String(value));
+  }
+  return `${path}${params.size ? `?${params}` : ""}`;
+}
+function listDrives(request, query3 = {}, signal) {
+  return request(queryPath3("/v1/orchestrator/drives", query3), {
+    method: "GET",
+    ...signal ? { signal } : {}
+  });
+}
+function getDrive(request, id, query3 = {}, options = {}) {
+  return request(queryPath3(`/v1/orchestrator/drives/${encodeURIComponent(id)}`, query3), {
+    method: "GET",
+    ...options
+  });
+}
+function createDrive(request, body2, options = {}) {
+  return request("/v1/orchestrator/drives", {
+    method: "POST",
+    body: body2,
+    ...options
+  });
+}
+function updateDrive(request, id, body2, options = {}) {
+  return request(`/v1/orchestrator/drives/${encodeURIComponent(id)}`, {
+    method: "PATCH",
+    body: body2,
+    ...options
+  });
+}
+function deleteDrive(request, id, query3 = {}, options = {}) {
+  return request(queryPath3(`/v1/orchestrator/drives/${encodeURIComponent(id)}`, query3), {
+    method: "DELETE",
+    ...options
+  });
+}
+function listStorageTargets(request, signal) {
+  return request("/v1/orchestrator/storage-targets", {
+    method: "GET",
+    ...signal ? { signal } : {}
+  });
+}
+
+// ../../packages/api-client/dist/orchestrator/drive-files.js
+function drivePath(id) {
+  return `/v1/orchestrator/drives/${encodeURIComponent(id)}`;
+}
+function listDriveContents(request, id, query3 = {}, signal) {
+  const params = new URLSearchParams();
+  for (const [key, value] of Object.entries(query3)) {
+    if (value !== void 0)
+      params.set(key, String(value));
+  }
+  return request(`${drivePath(id)}/contents${params.size ? `?${params}` : ""}`, {
+    method: "GET",
+    ...signal ? { signal } : {}
+  });
+}
+function clearDriveContents(request, id) {
+  return request(`${drivePath(id)}/contents`, { method: "DELETE" });
+}
+
 // ../../packages/capabilities/dist/capabilities/staff-shared.js
 function statusOf(error) {
   if (error && typeof error === "object" && "status" in error) {
@@ -7508,13 +7575,6 @@ var volumeCapabilities = [
   })
 ];
 var DRIVES_ROUTE = "/v1/orchestrator/drives";
-function drivePath(driveId) {
-  return `${DRIVES_ROUTE}/${encodeURIComponent(driveId)}`;
-}
-var STORAGE_DRIVES_ROUTE = "/v1/workflows/compute/nodes/storage-drives";
-function storageDrivePath(driveId, action) {
-  return `${STORAGE_DRIVES_ROUTE}/${encodeURIComponent(driveId)}/${action}`;
-}
 var reservationInput = z30.object({ reservationId: z30.string() });
 var reservationWrite = reservationInput.extend({ confirm: z30.boolean().optional() });
 var driveInput = z30.object({ driveId: z30.string() });
@@ -7593,7 +7653,7 @@ var storageVerbCapabilities = [
     http: { method: "GET", path: "/v1/orchestrator/storage-targets" },
     input: z30.object({}),
     slack: false,
-    execute: (ctx) => ctx.fetch("/v1/orchestrator/storage-targets", { method: "GET" })
+    execute: (ctx) => listStorageTargets(ctx.fetch)
   }),
   defineCapability({
     id: "volume.list",
@@ -7608,12 +7668,10 @@ var storageVerbCapabilities = [
     }),
     mcp: { name: "storage_volumes_list" },
     slack: false,
-    execute: (ctx, input) => {
-      const query3 = new URLSearchParams({ limit: String(input.limit ?? 25) });
-      if (input.cursor)
-        query3.set("cursor", input.cursor);
-      return ctx.fetch(`${DRIVES_ROUTE}?${query3}`, { method: "GET" });
-    }
+    execute: (ctx, input) => listDrives(ctx.fetch, {
+      limit: input.limit ?? 25,
+      ...input.cursor ? { cursor: input.cursor } : {}
+    })
   }),
   defineCapability({
     id: "volume.show",
@@ -7625,7 +7683,7 @@ var storageVerbCapabilities = [
     input: driveInput,
     mcp: { name: "storage_volumes_show" },
     slack: false,
-    execute: (ctx, input) => ctx.fetch(drivePath(input.driveId), { method: "GET" })
+    execute: (ctx, input) => getDrive(ctx.fetch, input.driveId)
   }),
   defineCapability({
     id: "volume.create",
@@ -7641,9 +7699,9 @@ var storageVerbCapabilities = [
     }),
     mcp: { name: "storage_volumes_create" },
     slack: false,
-    execute: (ctx, input) => ctx.fetch(DRIVES_ROUTE, {
-      method: "POST",
-      body: { name: input.name, source_drive_id: input.sourceDriveId ?? null }
+    execute: (ctx, input) => createDrive(ctx.fetch, {
+      name: input.name,
+      source_drive_id: input.sourceDriveId ?? null
     })
   }),
   defineCapability({
@@ -7652,11 +7710,11 @@ var storageVerbCapabilities = [
     roles: ["user"],
     description: "Refresh a storage volume's (drive's) reported usage/state.",
     mutation: "preview-confirm",
-    http: { method: "POST", path: `${STORAGE_DRIVES_ROUTE}/{driveId}/refresh` },
+    http: { method: "GET", path: `${DRIVES_ROUTE}/{driveId}` },
     input: driveWrite,
     mcp: { name: "storage_volumes_refresh" },
     slack: false,
-    execute: (ctx, input) => ctx.fetch(storageDrivePath(input.driveId, "refresh"), { method: "POST" })
+    execute: (ctx, input) => getDrive(ctx.fetch, input.driveId, { refresh: true })
   }),
   defineCapability({
     id: "volume.clear",
@@ -7670,7 +7728,7 @@ var storageVerbCapabilities = [
     slack: false,
     // The route answers 204, so report which volume was cleared.
     execute: async (ctx, input) => {
-      await ctx.fetch(`${drivePath(input.driveId)}/contents`, { method: "DELETE" });
+      await clearDriveContents(ctx.fetch, input.driveId);
       return { cleared: true, drive_id: input.driveId };
     }
   }),
@@ -7685,7 +7743,7 @@ var storageVerbCapabilities = [
     mcp: { name: "storage_volumes_delete" },
     slack: false,
     execute: async (ctx, input) => {
-      await ctx.fetch(drivePath(input.driveId), { method: "DELETE" });
+      await deleteDrive(ctx.fetch, input.driveId);
       return { deleted: true, drive_id: input.driveId };
     }
   }),
@@ -7701,22 +7759,19 @@ var storageVerbCapabilities = [
     slack: false,
     execute: (ctx, input) => {
       const endpoint = input.endpointUrl ?? (input.provider === "r2" && input.accountId ? `https://${input.accountId}.r2.cloudflarestorage.com` : void 0);
-      return ctx.fetch(DRIVES_ROUTE, {
-        method: "POST",
-        body: {
-          name: input.name ?? input.bucket,
-          provider: "ornn_volume",
-          source_provider: input.provider === "gcs" ? "external_gcs" : "s3",
-          external_bucket: input.bucket,
-          external_prefix: input.prefix ?? null,
-          external_region: input.region ?? (input.provider === "r2" ? "auto" : null),
-          external_read_only: input.readOnly !== false,
-          ...input.provider === "r2" ? { external_s3_provider: "cloudflare_r2" } : {},
-          ...input.provider === "s3" ? { external_s3_provider: "aws_s3" } : {},
-          ...endpoint ? { external_endpoint_url: endpoint } : {},
-          ...input.accessKeyId ? { external_access_key_id: input.accessKeyId } : {},
-          ...input.secretAccessKey ? { external_secret_access_key: input.secretAccessKey } : {}
-        }
+      return createDrive(ctx.fetch, {
+        name: input.name ?? input.bucket,
+        provider: "ornn_volume",
+        source_provider: input.provider === "gcs" ? "external_gcs" : "s3",
+        external_bucket: input.bucket,
+        external_prefix: input.prefix ?? null,
+        external_region: input.region ?? (input.provider === "r2" ? "auto" : null),
+        external_read_only: input.readOnly !== false,
+        ...input.provider === "r2" ? { external_s3_provider: "cloudflare_r2" } : {},
+        ...input.provider === "s3" ? { external_s3_provider: "aws_s3" } : {},
+        ...endpoint ? { external_endpoint_url: endpoint } : {},
+        ...input.accessKeyId ? { external_access_key_id: input.accessKeyId } : {},
+        ...input.secretAccessKey ? { external_secret_access_key: input.secretAccessKey } : {}
       });
     }
   }),
@@ -7726,11 +7781,11 @@ var storageVerbCapabilities = [
     roles: ["user"],
     description: "Verify a connected S3-compatible bucket's source credentials/connectivity.",
     mutation: "preview-confirm",
-    http: { method: "POST", path: `${STORAGE_DRIVES_ROUTE}/{driveId}/verify-source` },
+    http: { method: "PATCH", path: `${DRIVES_ROUTE}/{driveId}` },
     input: driveWrite,
     mcp: { name: "storage_buckets_verify" },
     slack: false,
-    execute: (ctx, input) => ctx.fetch(storageDrivePath(input.driveId, "verify-source"), { method: "POST" })
+    execute: (ctx, input) => updateDrive(ctx.fetch, input.driveId, { verify_source: true })
   }),
   defineCapability({
     id: "bucket.update_credentials",
@@ -7738,13 +7793,12 @@ var storageVerbCapabilities = [
     roles: ["user"],
     description: "Update a connected S3-compatible bucket's access key credentials.",
     mutation: "preview-confirm",
-    http: { method: "PATCH", path: `${STORAGE_DRIVES_ROUTE}/{driveId}/source-credentials` },
+    http: { method: "PATCH", path: `${DRIVES_ROUTE}/{driveId}` },
     input: driveWrite.extend({ accessKeyId: z30.string(), secretAccessKey: z30.string() }),
     mcp: { name: "storage_buckets_update_credentials" },
     slack: false,
-    execute: (ctx, input) => ctx.fetch(storageDrivePath(input.driveId, "source-credentials"), {
-      method: "PATCH",
-      body: {
+    execute: (ctx, input) => updateDrive(ctx.fetch, input.driveId, {
+      source_credentials: {
         external_access_key_id: input.accessKeyId,
         external_secret_access_key: input.secretAccessKey
       }
@@ -7765,12 +7819,11 @@ var storageCompositionCapabilities = [
     }),
     mcp: false,
     slack: false,
-    execute: (ctx, input) => {
-      const query3 = new URLSearchParams({ limit: String(input.limit ?? 25), scope: "external" });
-      if (input.cursor)
-        query3.set("cursor", input.cursor);
-      return ctx.fetch(`${DRIVES_ROUTE}?${query3}`, { method: "GET" });
-    }
+    execute: (ctx, input) => listDrives(ctx.fetch, {
+      limit: input.limit ?? 25,
+      scope: "external",
+      ...input.cursor ? { cursor: input.cursor } : {}
+    })
   }),
   defineCapability({
     id: "volume.contents",
@@ -7786,14 +7839,11 @@ var storageCompositionCapabilities = [
     }),
     mcp: false,
     slack: false,
-    execute: (ctx, input) => {
-      const query3 = new URLSearchParams({ recursive: "true" });
-      if (input.path)
-        query3.set("path", input.path);
-      if (input.cursor)
-        query3.set("cursor", String(input.cursor));
-      return ctx.fetch(`${drivePath(input.driveId)}/contents?${query3}`, { method: "GET" });
-    }
+    execute: (ctx, input) => listDriveContents(ctx.fetch, input.driveId, {
+      recursive: true,
+      ...input.path ? { path: input.path } : {},
+      ...input.cursor ? { cursor: input.cursor } : {}
+    })
   })
 ];