@shelby-protocol/cli 0.0.12 → 0.0.14

package/bin/entry.js

@@ -4,12 +4,73 @@
 import { Command } from "commander";
 
 // package.json
-var version = "0.0.12";
+var version = "0.0.14";
 
 // src/commands/account.tsx
 import readline from "readline";
 import { Account as Account3, AptosApiError as AptosApiError2, Ed25519PrivateKey as Ed25519PrivateKey4 } from "@aptos-labs/ts-sdk";
 
+// ../../packages/sdk/dist/chunk-RBFWGDMY.mjs
+import { AptosConfig, Network } from "@aptos-labs/ts-sdk";
+var getAptosConfig = (config) => {
+  if (config.aptos) {
+    return new AptosConfig(config.aptos);
+  }
+  let aptosConfig;
+  switch (config.network) {
+    case "local":
+      aptosConfig = new AptosConfig({
+        network: Network.LOCAL
+      });
+      break;
+    case "shelbynet":
+      aptosConfig = new AptosConfig({
+        network: Network.SHELBYNET,
+        clientConfig: {
+          API_KEY: config.apiKey
+        }
+      });
+      break;
+    default:
+      throw new Error(`Unsupported network: ${config.network}`);
+  }
+  return aptosConfig;
+};
+
+// ../../packages/sdk/dist/chunk-SEXQTDX6.mjs
+import { Network as Network2 } from "@aptos-labs/ts-sdk";
+var NetworkToShelbyRPCBaseUrl = {
+  [Network2.SHELBYNET]: "https://api.shelbynet.shelby.xyz/shelby",
+  [Network2.DEVNET]: void 0,
+  [Network2.TESTNET]: void 0,
+  [Network2.MAINNET]: void 0,
+  [Network2.LOCAL]: void 0,
+  [Network2.CUSTOM]: void 0
+};
+var NetworkToShelbyBlobIndexerBaseUrl = {
+  [Network2.SHELBYNET]: "https://api.shelbynet.aptoslabs.com/nocode/v1/public/cmforrguw0042s601fn71f9l2/v1/graphql",
+  [Network2.DEVNET]: void 0,
+  [Network2.TESTNET]: void 0,
+  [Network2.MAINNET]: void 0,
+  [Network2.LOCAL]: void 0,
+  [Network2.CUSTOM]: void 0
+};
+var SHELBY_DEPLOYER = "0xc63d6a5efb0080a6029403131715bd4971e1149f7cc099aac69bb0069b3ddbf5";
+var SHELBYUSD_TOKEN_NAME = "ShelbyUSD";
+var SHELBYUSD_FA_METADATA_ADDRESS = "0x1b18363a9f1fe5e6ebf247daba5cc1c18052bb232efdc4c50f556053922d98e1";
+
+// ../../packages/sdk/dist/chunk-CTGCK3H2.mjs
+import {
+  AccountAddress,
+  Aptos,
+  Hex
+} from "@aptos-labs/ts-sdk";
+
+// ../../packages/sdk/dist/chunk-I6NG5GNL.mjs
+function sleep(ms) {
+  return new Promise((resolve3) => setTimeout(resolve3, ms));
+}
+
 // ../../node_modules/.pnpm/tslib@2.8.1/node_modules/tslib/tslib.es6.mjs
 var __assign = function() {
   __assign = Object.assign || function __assign2(t) {
@@ -3209,7 +3270,7 @@ var extras = {
 gql["default"] = gql;
 var lib_default = gql;
 
-// ../../packages/sdk/dist/chunk-DLMDDEWF.mjs
+// ../../packages/sdk/dist/chunk-WJKSPJSS.mjs
 var GetBlobsDocument = lib_default`
     query getBlobs($where: blobs_bool_exp, $orderBy: [blobs_order_by!], $limit: Int, $offset: Int) {
   blobs(where: $where, order_by: $orderBy, limit: $limit, offset: $offset) {
@@ -3245,6 +3306,24 @@ var GetBlobActivitiesDocument = lib_default`
   }
 }
     `;
+var GetBlobsCountDocument = lib_default`
+    query getBlobsCount($where: blobs_bool_exp) {
+  blobs_aggregate(where: $where) {
+    aggregate {
+      count
+    }
+  }
+}
+    `;
+var GetBlobActivitiesCountDocument = lib_default`
+    query getBlobActivitiesCount($where: blob_activities_bool_exp) {
+  blob_activities_aggregate(where: $where) {
+    aggregate {
+      count
+    }
+  }
+}
+    `;
 var defaultWrapper = (action, _operationName, _operationType, _variables) => action();
 function getSdk(client, withWrapper = defaultWrapper) {
   return {
@@ -3253,60 +3332,17 @@ function getSdk(client, withWrapper = defaultWrapper) {
     },
     getBlobActivities(variables, requestHeaders, signal) {
       return withWrapper((wrappedRequestHeaders) => client.request({ document: GetBlobActivitiesDocument, variables, requestHeaders: { ...requestHeaders, ...wrappedRequestHeaders }, signal }), "getBlobActivities", "query", variables);
+    },
+    getBlobsCount(variables, requestHeaders, signal) {
+      return withWrapper((wrappedRequestHeaders) => client.request({ document: GetBlobsCountDocument, variables, requestHeaders: { ...requestHeaders, ...wrappedRequestHeaders }, signal }), "getBlobsCount", "query", variables);
+    },
+    getBlobActivitiesCount(variables, requestHeaders, signal) {
+      return withWrapper((wrappedRequestHeaders) => client.request({ document: GetBlobActivitiesCountDocument, variables, requestHeaders: { ...requestHeaders, ...wrappedRequestHeaders }, signal }), "getBlobActivitiesCount", "query", variables);
     }
   };
 }
 
-// ../../packages/sdk/dist/chunk-RBFWGDMY.mjs
-import { AptosConfig, Network } from "@aptos-labs/ts-sdk";
-var getAptosConfig = (config) => {
-  if (config.aptos) {
-    return new AptosConfig(config.aptos);
-  }
-  let aptosConfig;
-  switch (config.network) {
-    case "local":
-      aptosConfig = new AptosConfig({
-        network: Network.LOCAL
-      });
-      break;
-    case "shelbynet":
-      aptosConfig = new AptosConfig({
-        network: Network.SHELBYNET,
-        clientConfig: {
-          API_KEY: config.apiKey
-        }
-      });
-      break;
-    default:
-      throw new Error(`Unsupported network: ${config.network}`);
-  }
-  return aptosConfig;
-};
-
-// ../../packages/sdk/dist/chunk-SEXQTDX6.mjs
-import { Network as Network2 } from "@aptos-labs/ts-sdk";
-var NetworkToShelbyRPCBaseUrl = {
-  [Network2.SHELBYNET]: "https://api.shelbynet.shelby.xyz/shelby",
-  [Network2.DEVNET]: void 0,
-  [Network2.TESTNET]: void 0,
-  [Network2.MAINNET]: void 0,
-  [Network2.LOCAL]: void 0,
-  [Network2.CUSTOM]: void 0
-};
-var NetworkToShelbyBlobIndexerBaseUrl = {
-  [Network2.SHELBYNET]: "https://api.shelbynet.aptoslabs.com/nocode/v1/public/cmforrguw0042s601fn71f9l2/v1/graphql",
-  [Network2.DEVNET]: void 0,
-  [Network2.TESTNET]: void 0,
-  [Network2.MAINNET]: void 0,
-  [Network2.LOCAL]: void 0,
-  [Network2.CUSTOM]: void 0
-};
-var SHELBY_DEPLOYER = "0xc63d6a5efb0080a6029403131715bd4971e1149f7cc099aac69bb0069b3ddbf5";
-var SHELBYUSD_TOKEN_NAME = "ShelbyUSD";
-var SHELBYUSD_FA_METADATA_ADDRESS = "0x1b18363a9f1fe5e6ebf247daba5cc1c18052bb232efdc4c50f556053922d98e1";
-
-// ../../packages/sdk/dist/chunk-VPT45MTZ.mjs
+// ../../packages/sdk/dist/chunk-T6TVHFJO.mjs
 import { Network as Network3 } from "@aptos-labs/ts-sdk";
 
 // ../../node_modules/.pnpm/graphql-request@7.2.0_graphql@16.11.0/node_modules/graphql-request/build/legacy/classes/ClientError.js
@@ -3821,7 +3857,7 @@ var parseRequestArgs = (documentOrOptions, variables, requestHeaders) => {
   };
 };
 
-// ../../packages/sdk/dist/chunk-VPT45MTZ.mjs
+// ../../packages/sdk/dist/chunk-T6TVHFJO.mjs
 function createShelbyIndexerClient(baseUrl, options) {
   const graphqlClient = new GraphQLClient(baseUrl, options);
   return getSdk(graphqlClient);
@@ -3854,14 +3890,8 @@ function getShelbyIndexerClient(config) {
   });
 }
 
-// ../../packages/sdk/dist/chunk-OTBLZL2S.mjs
-import { AccountAddress } from "@aptos-labs/ts-sdk";
-var createBlobKey = (params) => {
-  return `@${AccountAddress.from(params.account).toStringLongWithoutPrefix()}/${params.blobName}`;
-};
-
-// ../../packages/sdk/dist/chunk-KBUWZXFA.mjs
-import { Hex } from "@aptos-labs/ts-sdk";
+// ../../packages/sdk/dist/chunk-4JZO2D7T.mjs
+import { Hex as Hex2 } from "@aptos-labs/ts-sdk";
 async function* readInChunks(input, chunkSize) {
   let idx = 0;
   if (isReadableStream(input)) {
@@ -3921,7 +3951,7 @@ function zeroPadBytes(buffer, desiredLength) {
   return paddedBuffer;
 }
 async function concatHashes(parts) {
-  const chunks = parts.map((part) => Hex.fromHexInput(part).toUint8Array());
+  const chunks = parts.map((part) => Hex2.fromHexInput(part).toUint8Array());
   const totalLength = chunks.reduce((sum, chunk) => sum + chunk.byteLength, 0);
   const combined = new Uint8Array(totalLength);
   let offset = 0;
@@ -3929,7 +3959,7 @@ async function concatHashes(parts) {
     combined.set(chunk, offset);
     offset += chunk.byteLength;
   }
-  return Hex.fromHexInput(
+  return Hex2.fromHexInput(
     new Uint8Array(await crypto.subtle.digest("SHA-256", combined))
   );
 }
@@ -3945,6 +3975,10 @@ function buildRequestUrl(path6, baseUrl) {
   const safePath = path6.replace(/^\/+/, "");
   return new URL(safePath, safeBase);
 }
+function getBlobNameSuffix(blobName) {
+  const parts = blobName.split("/");
+  return parts.slice(1).join("/") || "";
+}
 
 // ../../packages/sdk/dist/chunk-ZPW742E7.mjs
 var ERASURE_CODE_PARAMS = {
@@ -4125,143 +4159,420 @@ function buildClayConfig(input) {
   };
 }
 
-// ../../packages/sdk/dist/chunk-LTV26KU4.mjs
+// ../../packages/sdk/dist/chunk-FIFKKWXV.mjs
+import { AccountAddress as AccountAddress2 } from "@aptos-labs/ts-sdk";
 import { z } from "zod";
-var ChunksetCommitmentSchema = z.object({
-  // Chunkset root (vector commitment of child chunks)
-  chunkset_root: z.string().nullable(),
-  // the size is known statically from the current configuration
-  chunk_commitments: z.array(z.string())
-}).refine(
-  (data) => {
-    return data.chunk_commitments.length === DEFAULT_ERASURE_K + DEFAULT_ERASURE_M;
-  },
-  {
-    message: `Chunkset must have exactly ${DEFAULT_ERASURE_K + DEFAULT_ERASURE_M} chunks (ERASURE_K + ERASURE_M = ${DEFAULT_ERASURE_K} + ${DEFAULT_ERASURE_M})`,
-    path: ["chunk_commitments"]
-  }
-);
-function expectedTotalChunksets(rawSize, chunksetSize = DEFAULT_CHUNKSET_SIZE_BYTES) {
-  if (chunksetSize <= 0) {
-    throw new Error("chunksetSize must be positive");
-  }
-  if (rawSize === 0) return 1;
-  return Math.ceil(rawSize / chunksetSize);
-}
-var BlobCommitmentsSchema = z.object({
-  schema_version: z.string(),
-  raw_data_size: z.number(),
-  // FIXME I am not sure about this being here, or if it should be somewhere else
-  blob_merkle_root: z.string(),
-  chunkset_commitments: z.array(ChunksetCommitmentSchema)
-}).refine(
-  (data) => {
-    return expectedTotalChunksets(data.raw_data_size) === data.chunkset_commitments.length;
-  },
-  {
-    message: "Total chunkset count mismatches with raw data size",
-    // FIXME put more details in here
-    path: ["chunkset_commitments"]
-  }
-);
-async function generateChunksetCommitments(shouldPad, chunksetIdx, chunksetData, expectedChunksetSize, provider, onChunk) {
-  const { erasure_n } = provider.config;
-  const chunkCommitments = [];
-  const chunksetPayload = shouldPad ? zeroPadBytes(chunksetData, expectedChunksetSize) : validatePrePaddedChunkset(
-    chunksetData,
-    expectedChunksetSize,
-    chunksetIdx
-  );
-  const { chunks } = provider.encode(chunksetPayload);
-  if (chunks.length !== erasure_n) {
-    throw new Error(
-      `Erasure provider produced ${chunks.length} chunks, expected ${erasure_n}.`
-    );
-  }
-  let chunkIdx = 0;
-  for (const chunkData of chunks) {
-    if (onChunk !== void 0) {
-      await onChunk(chunksetIdx, chunkIdx, chunkData);
-    }
-    const chunkHash = await concatHashes([chunkData]);
-    chunkCommitments.push(chunkHash);
-    chunkIdx += 1;
-  }
-  const h = await concatHashes(
-    chunkCommitments.map((chunk) => chunk.toUint8Array())
-  );
-  const entry = {
-    chunkset_root: h.toString(),
-    chunk_commitments: chunkCommitments.map((chunk) => chunk.toString())
-  };
-  return { h, entry };
-}
-async function generateCommitments(provider, fullData, onChunk, options) {
-  const expectedChunksetSize = DEFAULT_CHUNKSET_SIZE_BYTES;
-  const shouldPad = options?.pad ?? true;
-  const chunksetCommitments = [];
-  const chunksetCommitmentHashes = [];
-  let rawDataSize = 0;
-  const chunksetGen = readInChunks(fullData, expectedChunksetSize);
-  for await (const [chunksetIdx, chunksetData] of chunksetGen) {
-    rawDataSize += chunksetData.length;
-    const { h, entry } = await generateChunksetCommitments(
-      shouldPad,
-      chunksetIdx,
-      chunksetData,
-      expectedChunksetSize,
-      provider,
-      onChunk
-    );
-    chunksetCommitments.push(entry);
-    chunksetCommitmentHashes.push(h);
-  }
-  if (rawDataSize === 0) {
-    const zeroChunkset = new Uint8Array(expectedChunksetSize);
-    const { h, entry } = await generateChunksetCommitments(
-      shouldPad,
-      0,
-      zeroChunkset,
-      expectedChunksetSize,
-      provider,
-      onChunk
-    );
-    chunksetCommitments.push(entry);
-    chunksetCommitmentHashes.push(h);
-  }
-  return {
-    schema_version: "1.3",
-    raw_data_size: rawDataSize,
-    blob_merkle_root: (await concatHashes(
-      chunksetCommitmentHashes.map((chunk) => chunk.toUint8Array())
-    )).toString(),
-    chunkset_commitments: chunksetCommitments
-  };
-}
-function validatePrePaddedChunkset(chunkset, expectedSize, chunksetIdx) {
-  if (chunkset.byteLength !== expectedSize) {
-    throw new Error(
-      `Chunkset ${chunksetIdx} has size ${chunkset.byteLength} bytes but expected ${expectedSize} bytes. Enable padding or supply pre-padded data before calling generateCommitments.`
-    );
-  }
-  return chunkset;
-}
+var BlobNameSchema = z.string().min(1, "Blob name path parameter cannot be empty.").max(1024, "Blob name cannot exceed 1024 characters.").refine((name) => !name.endsWith("/"), {
+  message: "Blob name cannot end with a slash"
+});
 
-// ../../packages/sdk/dist/chunk-3QINXXV6.mjs
-import {
-  AccountAddress as AccountAddress2,
-  Aptos,
-  AptosConfig as AptosConfig2,
-  Hex as Hex2,
-  MoveVector
-} from "@aptos-labs/ts-sdk";
-var ShelbyBlobClient = class _ShelbyBlobClient {
-  aptos;
-  deployer;
+// ../../packages/sdk/dist/chunk-L7H6EKII.mjs
+import { AccountAddress as AccountAddress3 } from "@aptos-labs/ts-sdk";
+function encodeURIComponentKeepSlashes(str) {
+  return encodeURIComponent(str).replace(/%2F/g, "/");
+}
+var ShelbyRPCClient = class {
+  baseUrl;
+  apiKey;
+  rpcConfig;
   indexer;
   /**
-   * The ShelbyBlobClient is used to interact with the Shelby contract on the Aptos blockchain. This
-   * includes functions for registering blob commitments and retrieving blob metadata.
+   * Creates a new ShelbyRPCClient for interacting with Shelby RPC nodes.
+   * This client handles blob storage operations including upload and download.
+   *
+   * @param config - The client configuration object.
+   * @param config.network - The Shelby network to use.
+   *
+   * @example
+   * ```typescript
+   * const client = new ShelbyRPCClient({
+   *   network: Network.SHELBYNET,
+   *   apiKey: "AG-***",
+   * });
+   * ```
+   */
+  constructor(config) {
+    this.baseUrl = config.rpc?.baseUrl ?? NetworkToShelbyRPCBaseUrl.shelbynet;
+    this.apiKey = config.apiKey ?? config.rpc?.apiKey;
+    this.rpcConfig = config.rpc ?? {};
+    this.indexer = getShelbyIndexerClient(config);
+  }
+  async #uploadPart(uploadId, partIdx, partData) {
+    const nRetries = 5;
+    for (let i = 0; i < nRetries; ++i) {
+      const partResponse = await fetch(
+        buildRequestUrl(
+          `/v1/multipart-uploads/${uploadId}/parts/${partIdx}`,
+          this.baseUrl
+        ),
+        {
+          method: "PUT",
+          headers: {
+            "Content-Type": "application/octet-stream",
+            ...this.apiKey ? { Authorization: `Bearer ${this.apiKey}` } : {}
+          },
+          body: partData
+        }
+      );
+      if (partResponse.ok) return;
+      if (i < nRetries - 1) {
+        const delay = 2 ** i * 100;
+        await sleep(delay);
+      }
+    }
+    throw new Error(`Failed to upload part ${partIdx}.`);
+  }
+  async #putBlobMultipart(account, blobName, blobData, partSize = 5 * 1024 * 1024) {
+    const startResponse = await fetch(
+      buildRequestUrl("/v1/multipart-uploads", this.baseUrl),
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          ...this.apiKey ? { Authorization: `Bearer ${this.apiKey}` } : {}
+        },
+        body: JSON.stringify({
+          rawAccount: account.toString(),
+          rawBlobName: blobName,
+          rawPartSize: partSize
+        })
+      }
+    );
+    if (!startResponse.ok) {
+      let errorBodyText = "Could not read error body";
+      try {
+        errorBodyText = await startResponse.text();
+      } catch (_e) {
+      }
+      throw new Error(
+        `Failed to start multipart upload! status: ${startResponse.status}, body: ${errorBodyText}`
+      );
+    }
+    const { uploadId } = await startResponse.json();
+    const totalParts = Math.ceil(blobData.length / partSize);
+    for (let partIdx = 0; partIdx < totalParts; partIdx++) {
+      const start = partIdx * partSize;
+      const end = Math.min(start + partSize, blobData.length);
+      const partData = blobData.slice(start, end);
+      await this.#uploadPart(uploadId, partIdx, partData);
+    }
+    const completeResponse = await fetch(
+      buildRequestUrl(
+        `/v1/multipart-uploads/${uploadId}/complete`,
+        this.baseUrl
+      ),
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          ...this.apiKey ? { Authorization: `Bearer ${this.apiKey}` } : {}
+        }
+      }
+    );
+    if (!completeResponse.ok) {
+      let errorBodyText = "Could not read error body";
+      try {
+        errorBodyText = await completeResponse.text();
+      } catch (_e) {
+      }
+      throw new Error(
+        `Failed to complete multipart upload! status: ${completeResponse.status}, body: ${errorBodyText}`
+      );
+    }
+  }
+  /**
+   * Uploads blob data to the Shelby RPC node for storage by storage providers.
+   * This method should be called after blob commitments have been registered on the blockchain.
+   * Uses multipart upload for efficient handling of large files.
+   *
+   * @param params.account - The account that owns the blob.
+   * @param params.blobName - The name/path of the blob (e.g. "folder/file.txt").
+   * @param params.blobData - The raw blob data as a Uint8Array.
+   *
+   * @example
+   * ```typescript
+   * const blobData = new TextEncoder().encode("Hello, world!");
+   *
+   * await client.putBlob({
+   *   account: AccountAddress.from("0x1"),
+   *   blobName: "greetings/hello.txt",
+   *   blobData
+   * });
+   * ```
+   */
+  async putBlob(params) {
+    BlobNameSchema.parse(params.blobName);
+    await this.#putBlobMultipart(
+      params.account,
+      params.blobName,
+      params.blobData
+    );
+  }
+  // FIXME make this possible to stream in put ^^^
+  /**
+   * Downloads a blob from the Shelby RPC node.
+   * Returns a streaming response with validation to ensure data integrity.
+   *
+   * @param params.account - The account that owns the blob.
+   * @param params.blobName - The name/path of the blob (e.g. "folder/file.txt").
+   * @param params.range - Optional byte range for partial downloads.
+   * @param params.range.start - Starting byte position (inclusive).
+   * @param params.range.end - Ending byte position (inclusive, optional).
+   *
+   * @returns A ShelbyBlob object containing the account, name, readable stream, and content length.
+   *
+   * @throws Error if the download fails or content length doesn't match.
+   *
+   * @example
+   * ```typescript
+   * // Download entire blob
+   * const blob = await client.getBlob({
+   *   account: AccountAddress.from("0x1"),
+   *   blobName: "documents/report.pdf"
+   * });
+   *
+   * // Download partial content (bytes 100-199)
+   * const partial = await client.getBlob({
+   *   account: AccountAddress.from("0x1"),
+   *   blobName: "large-file.bin",
+   *   range: { start: 100, end: 199 }
+   * });
+   * ```
+   */
+  async getBlob(params) {
+    BlobNameSchema.parse(params.blobName);
+    const url = buildRequestUrl(
+      `/v1/blobs/${params.account.toString()}/${encodeURIComponentKeepSlashes(
+        params.blobName
+      )}`,
+      this.baseUrl
+    );
+    const requestInit = {};
+    if (params.range !== void 0) {
+      const headers = new Headers();
+      const { start, end } = params.range;
+      if (end === void 0) {
+        headers.set("Range", `bytes=${start}-`);
+      } else {
+        if (end < start) {
+          throw new Error("Range end cannot be less than start.");
+        }
+        headers.set("Range", `bytes=${start}-${end}`);
+      }
+      requestInit.headers = headers;
+    }
+    const response = await fetch(url, {
+      ...requestInit,
+      headers: {
+        ...requestInit.headers,
+        ...this.apiKey ? { Authorization: `Bearer ${this.apiKey}` } : {}
+      }
+    });
+    if (!response.ok) {
+      throw new Error(
+        `Failed to download blob: ${response.status} ${response.statusText}`
+      );
+    }
+    if (!response.body) {
+      throw new Error("Response body is null");
+    }
+    const contentLengthHeader = response.headers.get("content-length");
+    if (contentLengthHeader === null) {
+      throw new Error(
+        "Response did not have content-length header, which is required"
+      );
+    }
+    const expectedContentLength = Number.parseInt(contentLengthHeader, 10);
+    if (Number.isNaN(expectedContentLength)) {
+      throw new Error(
+        `Invalid content-length header received: ${contentLengthHeader}`
+      );
+    }
+    const validatingStream = new ReadableStream({
+      start(controller) {
+        const maybeReader = response.body?.getReader();
+        if (!maybeReader) {
+          controller.error(new Error("Response body reader is unavailable"));
+          return;
+        }
+        const reader = maybeReader;
+        let bytesReceived = 0;
+        function pump() {
+          return reader.read().then(({ done, value }) => {
+            if (done) {
+              if (bytesReceived !== expectedContentLength) {
+                controller.error(
+                  new Error(
+                    `Downloaded data size (${bytesReceived} bytes) does not match content-length header (${expectedContentLength} bytes). This might indicate a partial or corrupted download.`
+                  )
+                );
+                return;
+              }
+              controller.close();
+              return;
+            }
+            bytesReceived += value.byteLength;
+            controller.enqueue(value);
+            return pump();
+          }).catch((error) => {
+            controller.error(error);
+          });
+        }
+        return pump();
+      }
+    });
+    return {
+      account: AccountAddress3.from(params.account),
+      name: params.blobName,
+      readable: validatingStream,
+      contentLength: expectedContentLength
+    };
+  }
+};
+
+// ../../packages/sdk/dist/chunk-OTBLZL2S.mjs
+import { AccountAddress as AccountAddress4 } from "@aptos-labs/ts-sdk";
+var createBlobKey = (params) => {
+  return `@${AccountAddress4.from(params.account).toStringLongWithoutPrefix()}/${params.blobName}`;
+};
+
+// ../../packages/sdk/dist/chunk-PCNLFNAT.mjs
+import { z as z2 } from "zod";
+var ChunksetCommitmentSchema = z2.object({
+  // Chunkset root (vector commitment of child chunks)
+  chunkset_root: z2.string().nullable(),
+  // the size is known statically from the current configuration
+  chunk_commitments: z2.array(z2.string())
+}).refine(
+  (data) => {
+    return data.chunk_commitments.length === DEFAULT_ERASURE_K + DEFAULT_ERASURE_M;
+  },
+  {
+    message: `Chunkset must have exactly ${DEFAULT_ERASURE_K + DEFAULT_ERASURE_M} chunks (ERASURE_K + ERASURE_M = ${DEFAULT_ERASURE_K} + ${DEFAULT_ERASURE_M})`,
+    path: ["chunk_commitments"]
+  }
+);
+function expectedTotalChunksets(rawSize, chunksetSize = DEFAULT_CHUNKSET_SIZE_BYTES) {
+  if (chunksetSize <= 0) {
+    throw new Error("chunksetSize must be positive");
+  }
+  if (rawSize === 0) return 1;
+  return Math.ceil(rawSize / chunksetSize);
+}
+var BlobCommitmentsSchema = z2.object({
+  schema_version: z2.string(),
+  raw_data_size: z2.number(),
+  // FIXME I am not sure about this being here, or if it should be somewhere else
+  blob_merkle_root: z2.string(),
+  chunkset_commitments: z2.array(ChunksetCommitmentSchema)
+}).refine(
+  (data) => {
+    return expectedTotalChunksets(data.raw_data_size) === data.chunkset_commitments.length;
+  },
+  {
+    message: "Total chunkset count mismatches with raw data size",
+    // FIXME put more details in here
+    path: ["chunkset_commitments"]
+  }
+);
+async function generateChunksetCommitments(shouldPad, chunksetIdx, chunksetData, expectedChunksetSize, provider, onChunk) {
+  const { erasure_n } = provider.config;
+  const chunkCommitments = [];
+  const chunksetPayload = shouldPad ? zeroPadBytes(chunksetData, expectedChunksetSize) : validatePrePaddedChunkset(
+    chunksetData,
+    expectedChunksetSize,
+    chunksetIdx
+  );
+  const { chunks } = provider.encode(chunksetPayload);
+  if (chunks.length !== erasure_n) {
+    throw new Error(
+      `Erasure provider produced ${chunks.length} chunks, expected ${erasure_n}.`
+    );
+  }
+  let chunkIdx = 0;
+  for (const chunkData of chunks) {
+    if (onChunk !== void 0) {
+      await onChunk(chunksetIdx, chunkIdx, chunkData);
+    }
+    const chunkHash = await concatHashes([chunkData]);
+    chunkCommitments.push(chunkHash);
+    chunkIdx += 1;
+  }
+  const h = await concatHashes(
+    chunkCommitments.map((chunk) => chunk.toUint8Array())
+  );
+  const entry = {
+    chunkset_root: h.toString(),
+    chunk_commitments: chunkCommitments.map((chunk) => chunk.toString())
+  };
+  return { h, entry };
+}
+async function generateCommitments(provider, fullData, onChunk, options) {
+  const expectedChunksetSize = DEFAULT_CHUNKSET_SIZE_BYTES;
+  const shouldPad = options?.pad ?? true;
+  const chunksetCommitments = [];
+  const chunksetCommitmentHashes = [];
+  let rawDataSize = 0;
+  const chunksetGen = readInChunks(fullData, expectedChunksetSize);
+  for await (const [chunksetIdx, chunksetData] of chunksetGen) {
+    rawDataSize += chunksetData.length;
+    const { h, entry } = await generateChunksetCommitments(
+      shouldPad,
+      chunksetIdx,
+      chunksetData,
+      expectedChunksetSize,
+      provider,
+      onChunk
+    );
+    chunksetCommitments.push(entry);
+    chunksetCommitmentHashes.push(h);
+  }
+  if (rawDataSize === 0) {
+    const zeroChunkset = new Uint8Array(expectedChunksetSize);
+    const { h, entry } = await generateChunksetCommitments(
+      shouldPad,
+      0,
+      zeroChunkset,
+      expectedChunksetSize,
+      provider,
+      onChunk
+    );
+    chunksetCommitments.push(entry);
+    chunksetCommitmentHashes.push(h);
+  }
+  return {
+    schema_version: "1.3",
+    raw_data_size: rawDataSize,
+    blob_merkle_root: (await concatHashes(
+      chunksetCommitmentHashes.map((chunk) => chunk.toUint8Array())
+    )).toString(),
+    chunkset_commitments: chunksetCommitments
+  };
+}
+function validatePrePaddedChunkset(chunkset, expectedSize, chunksetIdx) {
+  if (chunkset.byteLength !== expectedSize) {
+    throw new Error(
+      `Chunkset ${chunksetIdx} has size ${chunkset.byteLength} bytes but expected ${expectedSize} bytes. Enable padding or supply pre-padded data before calling generateCommitments.`
+    );
+  }
+  return chunkset;
+}
+
+// ../../packages/sdk/dist/chunk-Y7KTNPPR.mjs
+import {
+  AccountAddress as AccountAddress5,
+  Aptos as Aptos2,
+  AptosConfig as AptosConfig2,
+  Hex as Hex3,
+  MoveVector
+} from "@aptos-labs/ts-sdk";
+var ShelbyBlobClient = class _ShelbyBlobClient {
+  aptos;
+  deployer;
+  indexer;
+  /**
+   * The ShelbyBlobClient is used to interact with the Shelby contract on the Aptos blockchain. This
+   * includes functions for registering blob commitments and retrieving blob metadata.
    *
    * @param config - The client configuration object.
    * @param config.network - The Shelby network to use.
@@ -4288,8 +4599,8 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
         API_KEY: baseAptosConfig.clientConfig?.API_KEY ?? config.apiKey
       }
     });
-    this.aptos = new Aptos(aptosConfig);
-    this.deployer = config.deployer ?? AccountAddress2.fromString(SHELBY_DEPLOYER);
+    this.aptos = new Aptos2(aptosConfig);
+    this.deployer = config.deployer ?? AccountAddress5.fromString(SHELBY_DEPLOYER);
     this.indexer = getShelbyIndexerClient(config);
   }
   /**
@@ -4338,15 +4649,16 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
         );
       }
       return {
-        blobMerkleRoot: Hex2.fromHexInput(
+        blobMerkleRoot: Hex3.fromHexInput(
           metadata.blob_commitment
         ).toUint8Array(),
-        owner: AccountAddress2.fromString(metadata.owner),
+        owner: AccountAddress5.fromString(metadata.owner),
         name: params.name,
+        blobNameSuffix: getBlobNameSuffix(params.name),
         size: Number(metadata.blob_size),
         encoding,
         expirationMicros: metadata.expiration_micros,
-        sliceAddress: AccountAddress2.fromString(metadata.slice.inner),
+        sliceAddress: AccountAddress5.fromString(metadata.slice.inner),
         isWritten: metadata.is_written
       };
     } catch (error) {
@@ -4375,13 +4687,14 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
    * ```
    */
   getAccountBlobs(params) {
+    const { where, ...rest } = params;
     return this.getBlobs({
       where: {
-        ...params.where,
-        owner: { _eq: AccountAddress2.from(params.account).toString() }
+        ...where ?? {},
+        owner: { _eq: AccountAddress5.from(params.account).toString() }
       },
-      pagination: params.pagination,
-      orderBy: params.orderBy
+      pagination: rest.pagination,
+      orderBy: rest.orderBy
     });
   }
   /**
@@ -4403,17 +4716,24 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
   async getBlobs(params = {}) {
     const { limit, offset } = params.pagination ?? {};
     const { orderBy, where } = params;
+    const currentMicros = Date.now() * 1e3;
+    const defaultActiveFilter = {
+      expires_at: { _gte: currentMicros },
+      is_deleted: { _eq: "0" }
+    };
+    const finalWhere = where !== void 0 ? { ...defaultActiveFilter, ...where } : defaultActiveFilter;
     const { blobs } = await this.indexer.getBlobs({
-      where,
+      where: finalWhere,
       limit,
       offset,
       orderBy
     });
     return blobs.map(
       (blob) => ({
-        owner: AccountAddress2.from(blob.owner),
+        owner: AccountAddress5.from(blob.owner),
         name: blob.blob_name,
-        blobMerkleRoot: Hex2.fromHexInput(blob.blob_commitment).toUint8Array(),
+        blobNameSuffix: getBlobNameSuffix(blob.blob_name),
+        blobMerkleRoot: Hex3.fromHexInput(blob.blob_commitment).toUint8Array(),
         size: Number(blob.size),
         // TODO: Add encoding when supported in NCI
         encoding: {
@@ -4422,7 +4742,7 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
           ...ERASURE_CODE_AND_CHUNK_MAPPING.ClayCode_16Total_10Data_13Helper
         },
         expirationMicros: Number(blob.expires_at),
-        sliceAddress: AccountAddress2.from(blob.slice_address),
+        sliceAddress: AccountAddress5.from(blob.slice_address),
         isWritten: Boolean(Number(blob.is_written))
       })
     );
@@ -4445,7 +4765,7 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
     return blob_activities.map(
       (activity) => ({
         blobName: activity.blob_name,
-        accountAddress: AccountAddress2.from(
+        accountAddress: AccountAddress5.from(
           activity.blob_name.substring(1, 65)
         ),
         type: activityTypeMapping[activity.event_type] ?? "unknown",
@@ -4458,28 +4778,36 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
     );
   }
   /**
-   * Retrieves the blob chunks for a given blob from the blockchain. The blob chunk will contain
-   * the commitment, the storage provider location, and the status of the chunk (stored or pending).
+   * Retrieves the total number of blobs from the blockchain.
    *
-   * @deprecated Will need to get reworked when we are acking blobs from storage providers.
-   *
-   * @param params.account - The account namespace the blob is stored in (e.g. "0x1")
-   * @param params.name - The name of the blob (e.g. "foo/bar")
-   * @returns The chunks that make up the blob.
+   * @param params.where (optional) - The where clause to filter the blobs by.
+   * @returns The total number of blobs.
    *
    * @example
    * ```typescript
-   * // BlobChunk[]
-   * const chunks = await client.getBlobChunks({
-   *   account: AccountAddress.fromString("0x1"),
-   *   name: "foo/bar.txt",
-   * });
+   * const count = await client.getBlobsCount();
+   * ```
+   */
+  async getBlobsCount(params) {
+    const { where } = params;
+    const { blobs_aggregate } = await this.indexer.getBlobsCount({ where });
+    return blobs_aggregate?.aggregate?.count ?? 0;
+  }
+  /**
+   * Retrieves the total number of blob activities from the blockchain.
+   *
+   * @param params.where (optional) - The where clause to filter the blob activities by.
+   * @returns The total number of blob activities.
    *
-   * const isStored = chunks.every((c) => c.location.variant === "stored");
+   * @example
+   * ```typescript
+   * const count = await client.getBlobActivitiesCount();
    * ```
    */
-  getBlobChunks(_params) {
-    throw new Error("Not implemented");
+  async getBlobActivitiesCount(params) {
+    const { where } = params;
+    const { blob_activities_aggregate } = await this.indexer.getBlobActivitiesCount({ where });
+    return blob_activities_aggregate?.aggregate?.count ?? 0;
   }
   /**
    * Registers a blob on the blockchain by writing its merkle root and metadata.
@@ -4533,360 +4861,101 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
   }
   /**
    * Creates a transaction payload to register a blob on the blockchain.
-   * This is a static helper method for constructing the Move function call payload.
-   *
-   * @param params.deployer - Optional deployer account address. Defaults to SHELBY_DEPLOYER.
-   * @param params.account - The account that will own the blob.
-   * @param params.blobName - The name/path of the blob (e.g. "foo/bar.txt").
-   * @param params.blobSize - The size of the blob in bytes.
-   * @param params.blobMerkleRoot - The merkle root of the blob commitments as a hex string.
-   * @param params.expirationMicros - The expiration time of the blob in microseconds.
-   * @param params.numChunksets - The total number of chunksets in the blob.
-   *
-   * @returns An Aptos transaction payload data object for the register_blob Move function.
-   *
-   * @see https://github.com/shelby/shelby/blob/e08e84742cf2b80ad8bb7227deb3013398076d53/move/shelby_contract/sources/global_metadata.move#L357
-   */
-  static createRegisterBlobPayload(params) {
-    return {
-      function: `${(params.deployer ?? SHELBY_DEPLOYER).toString()}::global_metadata::register_blob`,
-      functionArguments: [
-        params.blobName,
-        params.expirationMicros,
-        MoveVector.U8(params.blobMerkleRoot),
-        params.numChunksets,
-        params.blobSize,
-        // TODO
-        0,
-        // payment tier
-        0
-        // encoding
-      ]
-    };
-  }
-  /**
-   * Creates a transaction payload to register multiple blobs on the blockchain.
-   * This is a static helper method for constructing the Move function call payload.
-   *
-   * @param params.deployer - Optional deployer account address. Defaults to SHELBY_DEPLOYER.
-   * @param params.account - The account that will own the blobs.
-   * @param params.expirationMicros - The expiration time of the blobs in microseconds.
-   * @param params.blobs - The blobs to register.
-   * @param params.blobs.blobName - The name/path of the blob (e.g. "foo/bar.txt").
-   * @param params.blobs.blobSize - The size of the blob in bytes.
-   * @param params.blobs.blobMerkleRoot - The merkle root of the blob commitments as a hex string.
-   * @param params.blobs.numChunksets - The total number of chunksets in the blob.
-   *
-   * @returns An Aptos transaction payload data object for the register_multiple_blobs Move function.
-   *
-   * @see https://github.com/shelby/shelby/blob/e08e84742cf2b80ad8bb7227deb3013398076d53/move/shelby_contract/sources/global_metadata.move#L357
-   */
-  static createBatchRegisterBlobsPayload(params) {
-    const blobNames = [];
-    const blobMerkleRoots = [];
-    const blobNumChunksets = [];
-    const blobSizes = [];
-    params.blobs.forEach((blob) => {
-      blobNames.push(blob.blobName);
-      blobMerkleRoots.push(MoveVector.U8(blob.blobMerkleRoot));
-      blobNumChunksets.push(blob.numChunksets);
-      blobSizes.push(blob.blobSize);
-    });
-    return {
-      function: `${(params.deployer ?? SHELBY_DEPLOYER).toString()}::global_metadata::register_multiple_blobs`,
-      functionArguments: [
-        blobNames,
-        params.expirationMicros,
-        blobMerkleRoots,
-        blobNumChunksets,
-        blobSizes,
-        // TODO
-        0,
-        0
-      ]
-    };
-  }
-};
-
-// ../../packages/sdk/dist/chunk-FIFKKWXV.mjs
-import { AccountAddress as AccountAddress3 } from "@aptos-labs/ts-sdk";
-import { z as z2 } from "zod";
-var BlobNameSchema = z2.string().min(1, "Blob name path parameter cannot be empty.").max(1024, "Blob name cannot exceed 1024 characters.").refine((name) => !name.endsWith("/"), {
-  message: "Blob name cannot end with a slash"
-});
-
-// ../../packages/sdk/dist/chunk-I6NG5GNL.mjs
-function sleep(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
-}
-
-// ../../packages/sdk/dist/chunk-GKRHKR3J.mjs
-import { AccountAddress as AccountAddress4 } from "@aptos-labs/ts-sdk";
-function encodeURIComponentKeepSlashes(str) {
-  return encodeURIComponent(str).replace(/%2F/g, "/");
-}
-var ShelbyRPCClient = class {
-  baseUrl;
-  apiKey;
-  rpcConfig;
-  indexer;
-  /**
-   * Creates a new ShelbyRPCClient for interacting with Shelby RPC nodes.
-   * This client handles blob storage operations including upload and download.
-   *
-   * @param config - The client configuration object.
-   * @param config.network - The Shelby network to use.
-   *
-   * @example
-   * ```typescript
-   * const client = new ShelbyRPCClient({
-   *   network: Network.SHELBYNET,
-   *   apiKey: "AG-***",
-   * });
-   * ```
-   */
-  constructor(config) {
-    this.baseUrl = config.rpc?.baseUrl ?? NetworkToShelbyRPCBaseUrl.shelbynet;
-    this.apiKey = config.apiKey ?? config.rpc?.apiKey;
-    this.rpcConfig = config.rpc ?? {};
-    this.indexer = getShelbyIndexerClient(config);
-  }
-  async #uploadPart(uploadId, partIdx, partData) {
-    const nRetries = 5;
-    for (let i = 0; i < nRetries; ++i) {
-      const partResponse = await fetch(
-        buildRequestUrl(
-          `/v1/multipart-uploads/${uploadId}/parts/${partIdx}`,
-          this.baseUrl
-        ),
-        {
-          method: "PUT",
-          headers: {
-            "Content-Type": "application/octet-stream",
-            ...this.apiKey ? { Authorization: `Bearer ${this.apiKey}` } : {}
-          },
-          body: partData
-        }
-      );
-      if (partResponse.ok) return;
-      if (i < nRetries - 1) {
-        const delay = 2 ** i * 100;
-        await sleep(delay);
-      }
-    }
-    throw new Error(`Failed to upload part ${partIdx}.`);
-  }
-  async #putBlobMultipart(account, blobName, blobData, partSize = 5 * 1024 * 1024) {
-    const startResponse = await fetch(
-      buildRequestUrl("/v1/multipart-uploads", this.baseUrl),
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          ...this.apiKey ? { Authorization: `Bearer ${this.apiKey}` } : {}
-        },
-        body: JSON.stringify({
-          rawAccount: account.toString(),
-          rawBlobName: blobName,
-          rawPartSize: partSize
-        })
-      }
-    );
-    if (!startResponse.ok) {
-      let errorBodyText = "Could not read error body";
-      try {
-        errorBodyText = await startResponse.text();
-      } catch (_e) {
-      }
-      throw new Error(
-        `Failed to start multipart upload! status: ${startResponse.status}, body: ${errorBodyText}`
-      );
-    }
-    const { uploadId } = await startResponse.json();
-    const totalParts = Math.ceil(blobData.length / partSize);
-    for (let partIdx = 0; partIdx < totalParts; partIdx++) {
-      const start = partIdx * partSize;
-      const end = Math.min(start + partSize, blobData.length);
-      const partData = blobData.slice(start, end);
-      await this.#uploadPart(uploadId, partIdx, partData);
-    }
-    const completeResponse = await fetch(
-      buildRequestUrl(
-        `/v1/multipart-uploads/${uploadId}/complete`,
-        this.baseUrl
-      ),
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          ...this.apiKey ? { Authorization: `Bearer ${this.apiKey}` } : {}
-        }
-      }
-    );
-    if (!completeResponse.ok) {
-      let errorBodyText = "Could not read error body";
-      try {
-        errorBodyText = await completeResponse.text();
-      } catch (_e) {
-      }
-      throw new Error(
-        `Failed to complete multipart upload! status: ${completeResponse.status}, body: ${errorBodyText}`
-      );
-    }
-  }
-  /**
-   * Uploads blob data to the Shelby RPC node for storage by storage providers.
-   * This method should be called after blob commitments have been registered on the blockchain.
-   * Uses multipart upload for efficient handling of large files.
+   * This is a static helper method for constructing the Move function call payload.
    *
-   * @param params.account - The account that owns the blob.
-   * @param params.blobName - The name/path of the blob (e.g. "folder/file.txt").
-   * @param params.blobData - The raw blob data as a Uint8Array.
+   * @param params.deployer - Optional deployer account address. Defaults to SHELBY_DEPLOYER.
+   * @param params.account - The account that will own the blob.
+   * @param params.blobName - The name/path of the blob (e.g. "foo/bar.txt").
+   * @param params.blobSize - The size of the blob in bytes.
+   * @param params.blobMerkleRoot - The merkle root of the blob commitments as a hex string.
+   * @param params.expirationMicros - The expiration time of the blob in microseconds.
+   * @param params.numChunksets - The total number of chunksets in the blob.
    *
-   * @example
-   * ```typescript
-   * const blobData = new TextEncoder().encode("Hello, world!");
+   * @returns An Aptos transaction payload data object for the register_blob Move function.
    *
-   * await client.putBlob({
-   *   account: AccountAddress.from("0x1"),
-   *   blobName: "greetings/hello.txt",
-   *   blobData
-   * });
-   * ```
+   * @see https://github.com/shelby/shelby/blob/e08e84742cf2b80ad8bb7227deb3013398076d53/move/shelby_contract/sources/global_metadata.move#L357
    */
-  async putBlob(params) {
-    BlobNameSchema.parse(params.blobName);
-    await this.#putBlobMultipart(
-      params.account,
-      params.blobName,
-      params.blobData
-    );
+  static createRegisterBlobPayload(params) {
+    return {
+      function: `${(params.deployer ?? SHELBY_DEPLOYER).toString()}::global_metadata::register_blob`,
+      functionArguments: [
+        params.blobName,
+        params.expirationMicros,
+        MoveVector.U8(params.blobMerkleRoot),
+        params.numChunksets,
+        params.blobSize,
+        // TODO
+        0,
+        // payment tier
+        0
+        // encoding
+      ]
+    };
   }
-  // FIXME make this possible to stream in put ^^^
   /**
-   * Downloads a blob from the Shelby RPC node.
-   * Returns a streaming response with validation to ensure data integrity.
+   * Creates a transaction payload to register multiple blobs on the blockchain.
+   * This is a static helper method for constructing the Move function call payload.
    *
-   * @param params.account - The account that owns the blob.
-   * @param params.blobName - The name/path of the blob (e.g. "folder/file.txt").
-   * @param params.range - Optional byte range for partial downloads.
-   * @param params.range.start - Starting byte position (inclusive).
-   * @param params.range.end - Ending byte position (inclusive, optional).
+   * @param params.deployer - Optional deployer account address. Defaults to SHELBY_DEPLOYER.
+   * @param params.account - The account that will own the blobs.
+   * @param params.expirationMicros - The expiration time of the blobs in microseconds.
+   * @param params.blobs - The blobs to register.
+   * @param params.blobs.blobName - The name/path of the blob (e.g. "foo/bar.txt").
+   * @param params.blobs.blobSize - The size of the blob in bytes.
+   * @param params.blobs.blobMerkleRoot - The merkle root of the blob commitments as a hex string.
+   * @param params.blobs.numChunksets - The total number of chunksets in the blob.
    *
-   * @returns A ShelbyBlob object containing the account, name, readable stream, and content length.
+   * @returns An Aptos transaction payload data object for the register_multiple_blobs Move function.
    *
-   * @throws Error if the download fails or content length doesn't match.
+   * @see https://github.com/shelby/shelby/blob/e08e84742cf2b80ad8bb7227deb3013398076d53/move/shelby_contract/sources/global_metadata.move#L357
+   */
+  static createBatchRegisterBlobsPayload(params) {
+    const blobNames = [];
+    const blobMerkleRoots = [];
+    const blobNumChunksets = [];
+    const blobSizes = [];
+    params.blobs.forEach((blob) => {
+      blobNames.push(blob.blobName);
+      blobMerkleRoots.push(MoveVector.U8(blob.blobMerkleRoot));
+      blobNumChunksets.push(blob.numChunksets);
+      blobSizes.push(blob.blobSize);
+    });
+    return {
+      function: `${(params.deployer ?? SHELBY_DEPLOYER).toString()}::global_metadata::register_multiple_blobs`,
+      functionArguments: [
+        blobNames,
+        params.expirationMicros,
+        blobMerkleRoots,
+        blobNumChunksets,
+        blobSizes,
+        // TODO
+        0,
+        0
+      ]
+    };
+  }
+  /**
+   * Creates a transaction payload to delete a blob on the blockchain.
+   * This is a static helper method for constructing the Move function call payload.
    *
-   * @example
-   * ```typescript
-   * // Download entire blob
-   * const blob = await client.getBlob({
-   *   account: AccountAddress.from("0x1"),
-   *   blobName: "documents/report.pdf"
-   * });
+   * @param params.deployer - Optional deployer account address. Defaults to SHELBY_DEPLOYER.
+   * @param params.blobNameSuffix - The blob name suffix (e.g. "bar.txt").
    *
-   * // Download partial content (bytes 100-199)
-   * const partial = await client.getBlob({
-   *   account: AccountAddress.from("0x1"),
-   *   blobName: "large-file.bin",
-   *   range: { start: 100, end: 199 }
-   * });
-   * ```
+   * @returns An Aptos transaction payload data object for the delete_blob Move function.
+   *
+   * @see https://github.com/shelby/shelby/blob/64e9d7b4f0005e586faeb1e4085c79159234b6b6/move/shelby_contract/sources/global_metadata.move#L616
    */
-  async getBlob(params) {
-    BlobNameSchema.parse(params.blobName);
-    const url = buildRequestUrl(
-      `/v1/blobs/${params.account.toString()}/${encodeURIComponentKeepSlashes(
-        params.blobName
-      )}`,
-      this.baseUrl
-    );
-    const requestInit = {};
-    if (params.range !== void 0) {
-      const headers = new Headers();
-      const { start, end } = params.range;
-      if (end === void 0) {
-        headers.set("Range", `bytes=${start}-`);
-      } else {
-        if (end < start) {
-          throw new Error("Range end cannot be less than start.");
-        }
-        headers.set("Range", `bytes=${start}-${end}`);
-      }
-      requestInit.headers = headers;
-    }
-    const response = await fetch(url, {
-      ...requestInit,
-      headers: {
-        ...requestInit.headers,
-        ...this.apiKey ? { Authorization: `Bearer ${this.apiKey}` } : {}
-      }
-    });
-    if (!response.ok) {
-      throw new Error(
-        `Failed to download blob: ${response.status} ${response.statusText}`
-      );
-    }
-    if (!response.body) {
-      throw new Error("Response body is null");
-    }
-    const contentLengthHeader = response.headers.get("content-length");
-    if (contentLengthHeader === null) {
-      throw new Error(
-        "Response did not have content-length header, which is required"
-      );
-    }
-    const expectedContentLength = Number.parseInt(contentLengthHeader, 10);
-    if (Number.isNaN(expectedContentLength)) {
-      throw new Error(
-        `Invalid content-length header received: ${contentLengthHeader}`
-      );
-    }
-    const validatingStream = new ReadableStream({
-      start(controller) {
-        const maybeReader = response.body?.getReader();
-        if (!maybeReader) {
-          controller.error(new Error("Response body reader is unavailable"));
-          return;
-        }
-        const reader = maybeReader;
-        let bytesReceived = 0;
-        function pump() {
-          return reader.read().then(({ done, value }) => {
-            if (done) {
-              if (bytesReceived !== expectedContentLength) {
-                controller.error(
-                  new Error(
-                    `Downloaded data size (${bytesReceived} bytes) does not match content-length header (${expectedContentLength} bytes). This might indicate a partial or corrupted download.`
-                  )
-                );
-                return;
-              }
-              controller.close();
-              return;
-            }
-            bytesReceived += value.byteLength;
-            controller.enqueue(value);
-            return pump();
-          }).catch((error) => {
-            controller.error(error);
-          });
-        }
-        return pump();
-      }
-    });
+  static createDeleteBlobPayload(params) {
     return {
-      account: AccountAddress4.from(params.account),
-      name: params.blobName,
-      readable: validatingStream,
-      contentLength: expectedContentLength
+      function: `${(params.deployer ?? SHELBY_DEPLOYER).toString()}::global_metadata::delete_blob`,
+      functionArguments: [params.blobNameSuffix]
     };
   }
 };
 
-// ../../packages/sdk/dist/chunk-4W3FFVXZ.mjs
+// ../../packages/sdk/dist/chunk-TPGMXZRD.mjs
 import {
-  Aptos as Aptos2
+  Aptos as Aptos3
 } from "@aptos-labs/ts-sdk";
 var ShelbyClient = class {
   /**
@@ -4943,7 +5012,7 @@ var ShelbyClient = class {
    */
   constructor(config, provider) {
     this.config = config;
-    this.aptos = new Aptos2(getAptosConfig(config));
+    this.aptos = new Aptos3(getAptosConfig(config));
     this.coordination = new ShelbyBlobClient(config);
     this.rpc = new ShelbyRPCClient(config);
     this._provider = provider;
@@ -5039,16 +5108,29 @@ var ShelbyClient = class {
   }
 };
 
-// ../../packages/sdk/dist/chunk-MYN7KW2X.mjs
+// ../../packages/sdk/dist/chunk-2DD6Q5CK.mjs
 var ShelbyNodeClient = class extends ShelbyClient {
 };
 
-// ../../packages/sdk/dist/chunk-CTGCK3H2.mjs
-import {
-  AccountAddress as AccountAddress5,
-  Aptos as Aptos3,
-  Hex as Hex3
-} from "@aptos-labs/ts-sdk";
+// ../../packages/sdk/dist/chunk-7P6ASYW6.mjs
+var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+
+// ../../packages/sdk/dist/chunk-A4IG6GSE.mjs
+var testUtil_exports = {};
+__export(testUtil_exports, {
+  makeChunk: () => makeChunk
+});
+function makeChunk(n) {
+  const c = Buffer.alloc(n);
+  for (let i = 0; i < n; ++i) {
+    c[i] = i % 256;
+  }
+  return c;
+}
 
 // ../../packages/sdk/dist/chunk-VRLIOKWG.mjs
 import { Network as Network4 } from "@aptos-labs/ts-sdk";
@@ -5078,26 +5160,6 @@ function getShelbyAccountExplorerUrl(network, accountAddress) {
   return `${baseUrl}/account/${accountAddress}`;
 }
 
-// ../../packages/sdk/dist/chunk-7P6ASYW6.mjs
-var __defProp = Object.defineProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-
-// ../../packages/sdk/dist/chunk-A4IG6GSE.mjs
-var testUtil_exports = {};
-__export(testUtil_exports, {
-  makeChunk: () => makeChunk
-});
-function makeChunk(n) {
-  const c = Buffer.alloc(n);
-  for (let i = 0; i < n; ++i) {
-    c[i] = i % 256;
-  }
-  return c;
-}
-
 // ../../packages/sdk/dist/chunk-C6RQ3AEU.mjs
 import { Network as Network6 } from "@aptos-labs/ts-sdk";
 function getAptosExplorerBaseUrl(network) {
@@ -5154,6 +5216,7 @@ var DEFAULT_CHUNK_SIZE_BYTES2 = 2 * 1024 * 1024;
 
 // src/commands/account.tsx
 import chalk from "chalk";
+import { filesize } from "filesize";
 import { render } from "ink";
 import { z as z9 } from "zod";
 
@@ -6266,6 +6329,9 @@ function getErasureCodingProvider() {
 
 // src/utils/paths.ts
 import path2 from "path";
+function endsWithDirectorySeparator(filePath) {
+  return filePath.endsWith("/") || filePath.endsWith("\\") || filePath.endsWith(path2.sep);
+}
 function normBlobName(pathModule, inputDirectoryName, filename, blobPrefix) {
   const blobNameWithoutInputDir = pathModule.relative(
     inputDirectoryName,
@@ -7029,10 +7095,10 @@ function askQuestion(question) {
     input: process.stdin,
     output: process.stdout
   });
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     rl.question(question, (answer) => {
       rl.close();
-      resolve2(answer.trim());
+      resolve3(answer.trim());
     });
   });
 }
@@ -7235,25 +7301,33 @@ function accountCommand(program) {
       });
       const activeAccount = getCurrentAccount(config, accountName).account;
       const shelbyClient = new ShelbyNodeClient(shelbyConfig);
-      console.log(
-        `\u{1F50D} Retrieving blobs for ${accountName} (${activeAccount.accountAddress.toString()})`
+      console.log(`\u{1F50D}  Retrieving blobs for ${accountName}`);
+      console.log(`\u{1F464}  Address: ${activeAccount.accountAddress.toString()}`);
+      const shelbyExplorerUrl = getShelbyAccountExplorerUrl(
+        shelbyConfig.network,
+        activeAccount.accountAddress.toString()
       );
+      console.log(`\u{1F5C2}\uFE0F  Shelby Explorer: ${shelbyExplorerUrl}`);
       const blobs = await shelbyClient.coordination.getBlobs({
         where: {
           owner: { _eq: activeAccount.accountAddress.toString() }
         }
       });
       console.log(
-        `\u2705 Retrieved ${blobs.length} blob${blobs.length === 1 ? "" : "s"} for ${accountName} (${activeAccount.accountAddress.toString()})`
+        `
+\u2705  Retrieved ${blobs.length} blob${blobs.length === 1 ? "" : "s"}`
       );
+      console.log("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
       if (blobs.length === 0) {
         console.log("No blobs found.");
+        console.log("\u2728  Done!");
         return;
       }
+      console.log("\u{1F4E6}  Stored Blobs");
       const { table, wrapCell } = createResponsiveTable({
         columns: [
           { header: "Name", width: 30, flex: true },
-          { header: "Size (bytes)", width: 15 },
+          { header: "Size", width: 12 },
           { header: "Expires", width: 25 }
         ],
         padding: 12
@@ -7262,14 +7336,20 @@ function accountCommand(program) {
         const expirationDate = new Date(blob.expirationMicros / 1e3);
         const blobNameMatch = blob.name.match(/@[^/]+\/(.+)/);
         const displayName = blobNameMatch ? blobNameMatch[1] : blob.name;
-        const row = [
-          displayName,
-          blob.size.toString(),
-          expirationDate.toLocaleString()
-        ];
+        const formattedSize = filesize(blob.size, { standard: "jedec" });
+        const formattedDate = expirationDate.toLocaleDateString("en-US", {
+          month: "short",
+          day: "numeric",
+          year: "numeric",
+          hour: "numeric",
+          minute: "2-digit",
+          hour12: true
+        });
+        const row = [displayName, formattedSize, formattedDate];
         table.push(row.map((cell, i) => wrapCell(cell, i)));
       }
       console.log(table.toString());
+      console.log("\u2728  Done!");
     } catch (error) {
       let displayMessage;
       if (error instanceof Error && error.message.includes("GraphQL Error (Code: 401)")) {
@@ -7776,52 +7856,99 @@ import { pipeline } from "stream/promises";
 import ora from "ora";
 import { z as z13 } from "zod";
 var denormBlobName2 = (a, b, c) => denormBlobName(path3, a, b, c);
-var endsWithDirectorySeparator = (filePath) => {
-  return filePath.endsWith("/") || filePath.endsWith("\\") || filePath.endsWith(path3.sep);
-};
 var DownloadOptionsSchema = z13.object({
-  src: z13.string().min(1, "`src`must be a valid blob name or directory prefix").describe("Blob name or directory prefix to download"),
-  dst: z13.string().min(1, "`dst` must be a valid filepath").describe("Local path where to save the downloaded content"),
+  source: z13.string({
+    required_error: "\n\u274C  Missing Required Argument\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n\n\u26A0\uFE0F  Missing source blob name or prefix (first argument)\n\n\u{1F4A1}  Usage:\n    shelby download <source-blob-name> <destination-path> [options]\n\n\u{1F4DD}  Examples:\n    shelby download my-blob.txt ./myfile.txt\n    shelby download my-folder/ ./my-folder/ -r\n"
+  }).min(1, "Source blob name or directory prefix is required").describe("Blob name or directory prefix to download"),
+  destination: z13.string({
+    required_error: "\n\u274C  Missing Required Argument\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n\n\u26A0\uFE0F  Missing destination path (second argument)\n\n\u{1F4A1}  Usage:\n    shelby download <source-blob-name> <destination-path> [options]\n\n\u{1F4DD}  Example:\n    shelby download my-blob.txt ./myfile.txt\n"
+  }).min(1, "`destination` must be a valid filepath").describe("Local path where to save the downloaded content"),
   recursive: z13.boolean().default(false).describe("Download assuming canonical directory layout and recurse"),
-  force: z13.boolean().default(false).describe("Overwrite the dst if it already exists")
+  force: z13.boolean().default(false).describe("Overwrite the destination if it already exists")
 }).refine(
   (data) => {
     if (data.recursive) {
-      if (!data.src.endsWith("/") || !endsWithDirectorySeparator(data.dst))
+      if (!data.source.endsWith("/") || !endsWithDirectorySeparator(data.destination))
         return false;
       return true;
     }
     return true;
   },
-  {
-    message: "Recursive downloads require src prefix and dst name to end in directory separator ('/' or '\\')"
-  }
+  (data) => ({
+    message: `
+\u274C  Invalid Download Options
+\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+
+\u26A0\uFE0F  Recursive downloads require:
+    - The source prefix must end with '/'
+    - The destination path must end with '/' or '\\'
+
+\u{1F9FE}  Received:
+    Source: ${data.source}
+    Destination: ${data.destination}
+
+\u{1F4A1}  Tip: Add trailing slashes to both paths:
+    \u{1F449}  shelby download --recursive ${data.source.endsWith("/") ? data.source : `${data.source}/`} ${endsWithDirectorySeparator(data.destination) ? data.destination : `${data.destination}/`}
+`
+  })
 ).refine(
   (data) => {
     if (!data.recursive) {
-      if (!BlobNameSchema.safeParse(data.src).success) return false;
-      if (endsWithDirectorySeparator(data.dst)) return false;
+      if (!BlobNameSchema.safeParse(data.source).success) return false;
+      if (endsWithDirectorySeparator(data.destination)) return false;
       return true;
     }
     return true;
   },
-  {
-    message: "Blob downloads, non-recursive, require that src blob name and dst path not end in directory separator ('/' or '\\')"
+  (data) => {
+    const sourceEndsWithSlash = data.source.endsWith("/") || data.source.endsWith("\\");
+    const destEndsWithSlash = endsWithDirectorySeparator(data.destination);
+    let tipMessage = "";
+    if (sourceEndsWithSlash && destEndsWithSlash) {
+      tipMessage = `\u{1F4A1}  Tip: For downloading a directory, use the --recursive flag:
+    \u{1F449}  shelby download --recursive ${data.source} ${data.destination}`;
+    } else if (sourceEndsWithSlash && !destEndsWithSlash) {
+      tipMessage = `\u{1F4A1}  Tip: For downloading a directory, both paths need trailing slashes:
+    \u{1F449}  shelby download --recursive ${data.source} ${data.destination}/`;
+    } else if (!sourceEndsWithSlash && destEndsWithSlash) {
+      tipMessage = `\u{1F4A1}  Choose one of the following:
+
+    To download a single blob (remove trailing slash from destination):
+    \u{1F449}  shelby download ${data.source} ${data.destination.replace(/[\\/]+$/, "")}
+
+    To download a directory recursively (add trailing slash to source):
+    \u{1F449}  shelby download --recursive ${data.source}/ ${data.destination}`;
+    }
+    return {
+      message: `
+\u274C  Invalid Download Options
+\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+
+\u26A0\uFE0F  Blob downloads (non-recursive) require:
+    - The source blob name must NOT end with '/' or '\\'
+    - The destination path must NOT end with '/' or '\\'
+
+\u{1F9FE}  Received:
+    Source: ${data.source}
+    Destination: ${data.destination}
+
+` + tipMessage + "\n"
+    };
   }
 );
 async function validateOutput(options) {
-  const parentDir = path3.dirname(options.dst);
+  const parentDir = path3.dirname(options.destination);
   try {
     const parentStats = await fs3.stat(parentDir);
     if (!parentStats.isDirectory()) {
       throw new Error(
-        `Parent path '${parentDir}' exists but is not a directory. Cannot create dst ${options.recursive ? "directory" : "file"} '${options.dst}'.`
+        `Parent path '${parentDir}' exists but is not a directory. Cannot create destination ${options.recursive ? "directory" : "file"} '${options.destination}'.`
       );
     }
   } catch (error) {
     if (error instanceof Error && "code" in error && error.code === "ENOENT") {
       throw new Error(
-        `Parent directory '${parentDir}' of dst '${options.dst}' does not exist. Create it first or use a different dst path.`
+        `Parent directory '${parentDir}' of destination '${options.destination}' does not exist. Create it first or use a different destination path.`
       );
     }
     throw error;
@@ -7829,7 +7956,7 @@ async function validateOutput(options) {
   if (options.force) return;
   let outputStats;
   try {
-    outputStats = await fs3.stat(options.dst);
+    outputStats = await fs3.stat(options.destination);
   } catch (error) {
     if (error instanceof Error && "code" in error && error.code === "ENOENT") {
       return;
@@ -7839,61 +7966,70 @@ async function validateOutput(options) {
   const isDirectory = outputStats.isDirectory();
   if (!options.recursive && isDirectory) {
     throw new Error(
-      `dst path '${options.dst}' is a directory but expected a file path to download a single blob (--recursive not provided).`
+      `destination path '${options.destination}' is a directory but expected a file path to download a single blob (--recursive not provided).`
     );
   }
   if (options.recursive && !isDirectory) {
     throw new Error(
-      `dst path '${options.dst}' exists but is not a directory. Directory downloads require a directory path.`
+      `destination path '${options.destination}' exists but is not a directory. Directory downloads require a directory path.`
     );
   }
   if (options.recursive) {
-    const entries = await fs3.readdir(options.dst);
+    const entries = await fs3.readdir(options.destination);
     if (entries.length > 0) {
       throw new Error(
-        `Directory '${options.dst}' exists and is not empty. Use --force to overwrite or choose an empty directory.`
+        `Directory '${options.destination}' exists and is not empty. Use --force to overwrite or choose an empty directory.`
       );
     }
   } else {
     throw new Error(
-      `File '${options.dst}' already exists. Use --force to overwrite.`
+      `File '${options.destination}' already exists. Use --force to overwrite.`
     );
   }
 }
 async function createFileList(options, nodeClient, account) {
   const matchingBlobList = [];
+  const stripAccountPrefix = (fullName) => {
+    const blobNameMatch = fullName.match(/^@[^/]+\/(.+)$/);
+    return blobNameMatch ? blobNameMatch[1] : fullName;
+  };
   if (options.recursive) {
-    const allBlobs = await nodeClient.coordination.getAccountBlobs({
+    const activeBlobs = await nodeClient.coordination.getAccountBlobs({
       account
     });
-    for (const blobMd of allBlobs) {
-      const blobNameWithoutAccount = blobMd.name.slice(1 + 64 + 1);
-      if (!blobNameWithoutAccount.startsWith(options.src)) continue;
+    for (const blobMd of activeBlobs) {
+      const blobNameWithoutAccount = stripAccountPrefix(blobMd.name);
+      if (!blobNameWithoutAccount.startsWith(options.source)) continue;
       matchingBlobList.push(blobMd);
     }
     if (matchingBlobList.length === 0) {
       throw new Error(
-        `No blobs matching prefix ${options.src} were found in account ${account}`
+        `No active blobs matching prefix '${options.source}' were found for account ${account.toString()}. They may have expired or been deleted.`
       );
     }
   } else {
-    const md = await nodeClient.coordination.getBlobMetadata({
-      account,
-      name: options.src
+    const activeBlobs = await nodeClient.coordination.getAccountBlobs({
+      account
     });
-    if (md === void 0) {
-      throw new Error(`Could not find a blob with name ${options.src}`);
+    const md = activeBlobs.find(
+      (blob) => stripAccountPrefix(blob.name) === options.source
+    );
+    if (!md) {
+      throw new Error(
+        `No active blob named '${options.source}' was found for account ${account.toString()}. It may have expired or been deleted.
+`
+      );
     }
     matchingBlobList.push(md);
   }
   const ret = [];
   for (const blobMd of matchingBlobList) {
-    const blobNameWithoutAccount = blobMd.name.slice(1 + 64 + 1);
+    const blobNameWithoutAccount = stripAccountPrefix(blobMd.name);
     const entry = {
       filename: denormBlobName2(
-        options.src,
+        options.source,
         blobNameWithoutAccount,
-        options.dst
+        options.destination
       ),
       blobname: blobNameWithoutAccount,
       // FIXME this is nasty
@@ -7935,96 +8071,170 @@ function createProgressTransform(totalBytes, reporter) {
   });
 }
 function downloadCommand(program) {
-  program.command("download <src> <dst>").description("Download a file or directory from Shelby RPC").option(
+  program.command("download").description("Download a file or directory from Shelby RPC").argument("[source]", "Source blob name or prefix").argument("[destination]", "Destination path").option(
     "-r, --recursive",
     "Download assuming canonical directory layout using '/' as separators. Produces a directory."
-  ).option("-f, --force", "Overwrite the dst").action(
-    async (src, dst, rawOptions) => {
-      const options = DownloadOptionsSchema.parse({
-        ...rawOptions,
-        src,
-        dst
-      });
-      options.dst = path3.resolve(options.dst);
-      await validateOutput(options);
-      if (options.recursive) {
-        console.log(
-          `Downloading directory: ${options.src} -> ${options.dst}`
-        );
-      } else {
-        console.log(`Downloading blob: ${options.src} -> ${options.dst}`);
-      }
-      const configPath = program.opts().configFile;
-      let config;
+  ).option("-f, --force", "Overwrite the destination").action(
+    async (source, destination, rawOptions) => {
+      let options;
       try {
-        config = loadConfig(configPath);
+        options = DownloadOptionsSchema.parse({
+          ...rawOptions,
+          source,
+          destination
+        });
       } catch (error) {
-        console.error(`Error: ${error.message}`);
+        if (error instanceof z13.ZodError) {
+          const firstIssue = error.issues[0];
+          if (firstIssue) {
+            console.log(firstIssue.message);
+          } else {
+            console.error("\u26A0\uFE0F  Invalid download options provided");
+          }
+        } else {
+          console.error(
+            `\u26A0\uFE0F  ${error instanceof Error ? error.message : String(error)}`
+          );
+        }
         process.exit(1);
       }
-      const shelbyConfig = getCurrentShelbyConfig(config, {
-        context: program.opts().context
-      });
-      const activeAccount = getCurrentAccount(
-        config,
-        program.opts().account
-      ).account;
-      const nodeClient = new ShelbyNodeClient(shelbyConfig);
-      const fileList = await createFileList(
-        options,
-        nodeClient,
-        activeAccount.accountAddress
-      );
-      for (const fileEntry of fileList) {
-        console.log(
-          `Downloading ${fileEntry.blobname} -> ${fileEntry.filename}`
-        );
-      }
-      if (options.force) {
-        console.log(`--force was set, so deleting ${options.dst}`);
-        await fs3.rm(options.dst, { recursive: true, force: true });
-      }
+      options.destination = path3.resolve(options.destination);
+      let config;
+      let spinner;
       const handleSigint = () => {
-        spinner.fail("Quitting due to ctrl-C / SIGINT...");
+        spinner?.fail("Quitting due to ctrl-C / SIGINT...");
         process.exit(1);
       };
-      process.removeAllListeners("SIGINT");
-      process.on("SIGINT", handleSigint);
-      const spinner = ora({
-        text: "Creating dst directory tree...",
-        discardStdin: false
-      }).start();
-      await createOutputDirectories(fileList);
-      let totalSize = 0;
-      for (const fileEntry of fileList) totalSize += fileEntry.sizeBytes;
-      const startTime = performance.now();
-      let amountDownloaded = 0;
-      const formatProgressPercent = () => (100 * (amountDownloaded / totalSize)).toFixed(2);
-      const formatProgressRate = () => {
-        const mib = amountDownloaded / 1024 / 1024;
-        const sec = (performance.now() - startTime) / 1e3;
-        return (mib / sec).toFixed(2);
-      };
-      for (const fileEntry of fileList) {
-        const out = fsS.createWriteStream(fileEntry.filename);
-        const { readable } = await nodeClient.rpc.getBlob({
-          account: activeAccount.accountAddress,
-          blobName: fileEntry.blobname
+      try {
+        const configPath = program.opts().configFile;
+        config = loadConfig(configPath);
+        const shelbyConfig = getCurrentShelbyConfig(config, {
+          context: program.opts().context
         });
-        const reporter = (filePercent, rateMiB) => {
-          spinner.text = `Downloading ${fileEntry.blobname}, ${filePercent}% at ${rateMiB} MiB/s .. (Overall: ${formatProgressPercent()}%, ${formatProgressRate()} MiB/s)`;
-        };
-        const nodeStream = Readable2.fromWeb(readable);
-        await pipeline(
-          nodeStream,
-          createProgressTransform(fileEntry.sizeBytes, reporter),
-          out
+        const activeAccount = getCurrentAccount(
+          config,
+          program.opts().account
+        ).account;
+        const nodeClient = new ShelbyNodeClient(shelbyConfig);
+        const fileList = await createFileList(
+          options,
+          nodeClient,
+          activeAccount.accountAddress
+        );
+        await validateOutput(options);
+        console.log(`
+\u{1F4E5}  Downloading Files (${fileList.length} total)`);
+        console.log("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+        for (let i = 0; i < fileList.length; i++) {
+          const fileEntry = fileList[i];
+          const blobBaseName = path3.basename(fileEntry.blobname);
+          console.log(`${i + 1}.  ${blobBaseName}  \u2192  ${fileEntry.filename}`);
+        }
+        console.log();
+        if (options.force) {
+          console.log(`--force was set, so deleting ${options.destination}`);
+          await fs3.rm(options.destination, { recursive: true, force: true });
+        }
+        process.removeAllListeners("SIGINT");
+        process.on("SIGINT", handleSigint);
+        spinner = ora({
+          text: "Creating destination directory tree...",
+          discardStdin: false
+        }).start();
+        await createOutputDirectories(fileList);
+        let totalSize = 0;
+        for (const fileEntry of fileList) totalSize += fileEntry.sizeBytes;
+        const startTime = performance.now();
+        let amountDownloaded = 0;
+        let filesDownloaded = 0;
+        const isSingleFile = fileList.length === 1;
+        const formatProgressPercent = () => totalSize > 0 ? (100 * (amountDownloaded / totalSize)).toFixed(2) : "0.00";
+        for (const fileEntry of fileList) {
+          const out = fsS.createWriteStream(fileEntry.filename);
+          const fileName = path3.basename(fileEntry.blobname);
+          const { readable } = await nodeClient.rpc.getBlob({
+            account: activeAccount.accountAddress,
+            blobName: fileEntry.blobname
+          });
+          const reporter = (filePercent, _rateMiB) => {
+            if (spinner) {
+              if (isSingleFile) {
+                spinner.text = `Downloading ${fileName}... (${filePercent}%)`;
+              } else {
+                spinner.text = `Downloading ${fileName}... (${filesDownloaded}/${fileList.length} files, ${formatProgressPercent()}%)`;
+              }
+            }
+          };
+          const nodeStream = Readable2.fromWeb(readable);
+          await pipeline(
+            nodeStream,
+            createProgressTransform(fileEntry.sizeBytes, reporter),
+            out
+          );
+          amountDownloaded += fileEntry.sizeBytes;
+          filesDownloaded++;
+        }
+        const totalTime = (performance.now() - startTime) / 1e3;
+        spinner?.stop();
+        console.log(
+          `
+\u2705  All downloads complete \u2014 took ${totalTime.toFixed(1)} seconds`
         );
-        amountDownloaded += fileEntry.sizeBytes;
+        console.log("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+        console.log("\u2728  Done!");
+      } catch (error) {
+        spinner?.stop();
+        console.log("\n\u274C  Download Failed");
+        console.log("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+        if (options.recursive) {
+          console.log(`\u{1F9FE}  Directory: ${options.source}`);
+        } else {
+          console.log(`\u{1F9FE}  File: ${options.source}`);
+        }
+        if (config) {
+          const activeAccount = getCurrentAccount(
+            config,
+            program.opts().account
+          ).account;
+          console.log(
+            `\u{1F464}  Account: ${activeAccount.accountAddress.toString()}`
+          );
+        }
+        console.log();
+        if (error instanceof Error) {
+          if (error.message.includes("GraphQL Error (Code: 401)")) {
+            const contextName = program.opts().context || config?.default_context;
+            console.error("\u26A0\uFE0F  Authentication required.");
+            console.error(
+              "    Please add an indexer API key to your context configuration."
+            );
+            console.error();
+            console.error("\u{1F4A1}  Tip: Update your context with an API key:");
+            console.error(
+              `    \u{1F449}  shelby context update ${contextName ?? "default"} --indexer-api-key YOUR_KEY`
+            );
+          } else if (error.message.includes("No active blob") || error.message.includes("may have expired or been deleted")) {
+            const blobName = options.source;
+            console.error(
+              `\u26A0\uFE0F  No active blob${options.recursive ? "s" : ""} named '${blobName}' ${options.recursive ? "were" : "was"} found.`
+            );
+            console.error("    It may have expired or been deleted.");
+            console.error();
+            console.error(
+              "\u{1F4A1}  Tip: Try listing available blobs before downloading:"
+            );
+            console.error("    \u{1F449}  shelby account blobs");
+          } else {
+            console.error(`\u26A0\uFE0F  ${error.message}`);
+          }
+        } else {
+          console.error(`\u26A0\uFE0F  ${String(error)}`);
+        }
+        console.log("\n");
+        process.exit(1);
+      } finally {
+        process.removeListener("SIGINT", handleSigint);
       }
-      const totalTime = (performance.now() - startTime) / 1e3;
-      const totalRate = amountDownloaded / 1024 / 1024 / totalTime;
-      spinner.succeed(`Final rate ${totalRate.toFixed(2)} MiB/s`);
     }
   );
 }
@@ -8246,13 +8456,63 @@ import * as path5 from "path";
 import { Aptos as Aptos5, AptosConfig as AptosConfig4 } from "@aptos-labs/ts-sdk";
 import * as chrono from "chrono-node";
 import { glob } from "glob";
+import ignore from "ignore";
 import { Box as Box7, render as render4, Text as Text7 } from "ink";
 import SelectInput4 from "ink-select-input";
 import ora2 from "ora";
 import { z as z15 } from "zod";
+
+// src/utils/commander-helpers.ts
+function createExitOverrideHandler(commandName, requiredArgs, requiredOptions, exampleUsage, warningMessage) {
+  return (err) => {
+    if (err.code === "commander.helpDisplayed") {
+      process.exit(0);
+    }
+    const args = process.argv.slice(process.argv.indexOf(commandName) + 1);
+    const hasArguments = args.some((arg) => !arg.startsWith("-"));
+    if (err.code === "commander.missingMandatoryOptionValue") {
+      if (!hasArguments && requiredOptions) {
+        console.error("\n\u274C  Missing Required Arguments");
+        console.error("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n");
+        const warning = warningMessage || "Missing required arguments or options";
+        console.error(`\u26A0\uFE0F  ${warning}
+`);
+        console.error("\u{1F4A1}  Usage:");
+        console.error(
+          `    shelby ${commandName} ${requiredArgs} ${requiredOptions}
+`
+        );
+        if (exampleUsage) {
+          console.error("\u{1F4DD}  Examples:");
+          console.error(`    ${exampleUsage}`);
+        }
+        console.error("\n");
+      } else {
+        console.error(err.message);
+      }
+      process.exit(1);
+    }
+    if (err.code === "commander.optionMissingArgument") {
+      console.error("\n\u274C  Missing Option Value");
+      console.error("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n");
+      const cleanMessage = err.message.replace(/^error:\s*/i, "");
+      console.error(`\u26A0\uFE0F  ${cleanMessage}
+`);
+      if (exampleUsage) {
+        console.error("\u{1F4A1}  Example:");
+        console.error(`    ${exampleUsage}`);
+      }
+      console.error("\n");
+      process.exit(1);
+    }
+    throw err;
+  };
+}
+
+// src/commands/upload.tsx
 import { jsx as jsx13, jsxs as jsxs7 } from "react/jsx-runtime";
 var normBlobName2 = (i, f, b) => normBlobName(path5, i, f, b);
-var flexibleDateSchema = z15.string().transform((val) => {
+var flexibleDateSchema = z15.string().transform((val, ctx) => {
   const now = /* @__PURE__ */ new Date();
   let parsedDate = null;
   if (/^\d+$/.test(val)) {
@@ -8274,77 +8534,207 @@ var flexibleDateSchema = z15.string().transform((val) => {
     }
   }
   if (!parsedDate || Number.isNaN(parsedDate.getTime())) {
-    throw new Error(
-      `Invalid date format: "${val}". Try formats like "tomorrow", "in 2 days", "next Friday", "2025-12-31", or a UNIX timestamp.`
-    );
+    ctx.addIssue({
+      code: z15.ZodIssueCode.custom,
+      message: `
+\u274C  Upload Failed
+\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+
+\u26A0\uFE0F  Invalid date format: "${val}"
+
+\u{1F4A1}  Try formats like:
+    \u2022 "tomorrow", "in 2 days", "next Friday"
+    \u2022 "2025-12-31"
+    \u2022 UNIX timestamp
+
+\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`
+    });
+    return z15.NEVER;
   }
   if (parsedDate.getTime() <= now.getTime()) {
-    throw new Error(
-      `Expiration date must be in the future. "${val}" resolves to ${parsedDate.toLocaleString()} which is in the past.`
-    );
+    ctx.addIssue({
+      code: z15.ZodIssueCode.custom,
+      message: `
+\u274C  Upload Failed
+\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+
+\u26A0\uFE0F  Expiration date must be in the future
+
+\u{1F4C5}  "${val}" resolves to ${parsedDate.toLocaleString()}
+    which is in the past.
+
+\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`
+    });
+    return z15.NEVER;
   }
   return parsedDate;
 });
 var UploadOptionsSchema = z15.object({
-  src: z15.string().nonempty("`src` positional arg is required"),
-  dst: z15.string().nonempty("`dst` position arg is required"),
+  source: z15.string({
+    required_error: '\n\u274C  Missing Required Argument\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n\n\u26A0\uFE0F  Missing source file or directory path (first argument)\n\n\u{1F4A1}  Usage:\n    shelby upload <source-file-or-directory> <destination-blob-name> [options]\n\n\u{1F4DD}  Examples:\n    shelby upload ./myfile.txt my-blob.txt -e tomorrow\n    shelby upload ./my-folder/ my-folder/ -r -e "next week"\n\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500'
+  }).min(1, "Source file or directory path is required"),
+  destination: z15.string({
+    required_error: "\n\u274C  Missing Required Argument\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n\n\u26A0\uFE0F  Missing destination blob name (second argument)\n\n\u{1F4A1}  Usage:\n    shelby upload <source-file-or-directory> <destination-blob-name> [options]\n\n\u{1F4DD}  Example:\n    shelby upload ./myfile.txt files/my-blob.txt -e tomorrow\n\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"
+  }).min(1, "Destination blob name is required"),
   expiration: flexibleDateSchema,
   recursive: z15.boolean().optional().default(false),
   assumeYes: z15.boolean().optional().default(false),
   outputCommitments: z15.string().optional()
 }).superRefine(async (data, ctx) => {
-  const stats = await fs5.stat(data.src);
+  const stats = await fs5.stat(data.source);
   if (!stats.isFile() && !stats.isDirectory()) {
     ctx.addIssue({
       code: z15.ZodIssueCode.custom,
-      message: "`src` must be a file or a directory",
-      path: ["src"]
+      message: "\n\u274C  Upload Failed\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n\n\u26A0\uFE0F  Source path must be a file or directory\n\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
+      path: ["source"]
     });
     return;
   }
   if (stats.isDirectory()) {
-    if (!data.dst.endsWith("/")) {
+    if (!data.destination.endsWith("/")) {
       ctx.addIssue({
         code: z15.ZodIssueCode.custom,
-        message: "When src is a directory, dst must end with '/'",
-        path: ["dst"]
+        message: `
+\u274C  Upload Failed
+\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+
+\u26A0\uFE0F  When source is a directory, destination must end with '/'
+
+\u{1F4A1}  Tip: When uploading a directory, add a trailing slash:
+    \u{1F449}  shelby upload -r ${data.source} ${data.destination}/
+
+\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`,
+        path: ["destination"]
       });
     }
   } else if (stats.isFile()) {
-    const blobNameResult = BlobNameSchema.safeParse(data.dst);
+    const blobNameResult = BlobNameSchema.safeParse(data.destination);
     if (!blobNameResult.success) {
       ctx.addIssue({
         code: z15.ZodIssueCode.custom,
-        message: "When src is a file, dst must be a valid blob name (cannot end with '/')",
-        path: ["dst"]
+        message: `
+\u274C  Upload Failed
+\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+
+\u26A0\uFE0F  When source is a file, destination must be a valid blob name (cannot end with '/')
+
+\u{1F4A1}  Tip: When uploading a file, remove the trailing slash:
+    \u{1F449}  shelby upload ${data.source} ${data.destination.replace(/\/$/, "")}
+
+\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`,
+        path: ["destination"]
       });
     }
   }
 });
+async function buildGitignoreMap(root) {
+  const resolvedRoot = path5.resolve(root);
+  const gitignoreMap = /* @__PURE__ */ new Map();
+  const ensureMatcher = (dir) => {
+    const existing = gitignoreMap.get(dir);
+    if (existing) {
+      return existing;
+    }
+    const instance = ignore();
+    gitignoreMap.set(dir, instance);
+    return instance;
+  };
+  ensureMatcher(resolvedRoot).add(".git/");
+  const gitignoreFiles = await glob("**/.gitignore", {
+    cwd: resolvedRoot,
+    dot: true,
+    absolute: true,
+    nodir: true
+  });
+  for (const gitignorePath of gitignoreFiles) {
+    try {
+      const contents = await fs5.readFile(gitignorePath, "utf8");
+      const directory = path5.dirname(gitignorePath);
+      ensureMatcher(directory).add(contents);
+    } catch (error) {
+      if (error instanceof Error && Object.hasOwn(error, "code") && // biome-ignore lint/suspicious/noExplicitAny: node fs error type
+      error.code === "ENOENT") {
+        continue;
+      }
+      throw error;
+    }
+  }
+  return gitignoreMap;
+}
+function collectDirectoriesFromRoot(root, filePath) {
+  const directories = [];
+  let current = path5.dirname(filePath);
+  while (true) {
+    directories.push(current);
+    if (current === root) {
+      break;
+    }
+    const parent = path5.dirname(current);
+    if (parent === current) {
+      break;
+    }
+    current = parent;
+  }
+  return directories.reverse();
+}
+function shouldIgnorePath(gitignoreMap, root, filePath) {
+  const directories = collectDirectoriesFromRoot(root, filePath);
+  let ignored = false;
+  for (const directory of directories) {
+    const matcher = gitignoreMap.get(directory);
+    if (!matcher) {
+      continue;
+    }
+    const relative2 = path5.relative(directory, filePath).split(path5.sep).join("/");
+    const result = matcher.test(relative2);
+    if (result.ignored) {
+      ignored = true;
+    }
+    if (result.unignored) {
+      ignored = false;
+    }
+  }
+  return ignored;
+}
 async function createFilelist(options) {
-  const stats = await fs5.stat(options.src);
+  const stats = await fs5.stat(options.source);
   if (stats.isFile()) {
-    const blobname = normBlobName2(options.src, options.src, options.dst);
+    const blobname = normBlobName2(
+      options.source,
+      options.source,
+      options.destination
+    );
     const blobNameValidation = BlobNameSchema.safeParse(blobname);
     if (!blobNameValidation.success) {
       throw new Error(
-        `File ${options.src} as blobname ${blobname} would form an invalid blob name: ${blobNameValidation.error.message}`
+        `File ${options.source} as blobname ${blobname} would form an invalid blob name: ${blobNameValidation.error.message}`
       );
     }
-    return [{ filename: options.src, blobname, sizeBytes: stats.size }];
+    return [{ filename: options.source, blobname, sizeBytes: stats.size }];
   }
   if (!options.recursive) {
     throw new Error(
-      `${options.src} is a directory. Use --recursive to upload directories.`
+      `${options.source} is a directory. Use --recursive to upload directories.`
     );
   }
+  const sourceRoot = path5.resolve(options.source);
+  const gitignoreMap = await buildGitignoreMap(sourceRoot);
   const fileList = [];
-  const result = await glob(path5.join(options.src, "**", "*"), {
-    nodir: true
+  const result = await glob("**/*", {
+    cwd: sourceRoot,
+    absolute: true,
+    nodir: true,
+    dot: true
   });
   for await (const file of result) {
+    if (shouldIgnorePath(gitignoreMap, sourceRoot, file)) {
+      continue;
+    }
     const stats2 = await fs5.stat(file);
-    const blobname = normBlobName2(options.src, file, options.dst);
+    if (!stats2.isFile()) {
+      continue;
+    }
+    const blobname = normBlobName2(sourceRoot, file, options.destination);
     const blobNameValidation = BlobNameSchema.safeParse(blobname);
     if (!blobNameValidation.success) {
       throw new Error(
@@ -8360,7 +8750,7 @@ async function createFilelist(options) {
   return fileList;
 }
 function uploadCommand(program) {
-  program.command("upload <src> <dst>").description("Upload a file or directory to the shelby RPC in the config.").requiredOption(
+  const uploadCmd = program.command("upload").description("Upload a file or directory to the shelby RPC in the config.").argument("[source]", "Source file or directory path").argument("[destination]", "Destination blob name").requiredOption(
     "-e, --expiration <datetime>",
     'Expiration date/time (required). Examples: "tomorrow", "in 2 days", "next Friday", "2025-12-31", UNIX timestamp'
   ).option("-r, --recursive", "If uploading a directory, recurse").option(
@@ -8369,205 +8759,227 @@ function uploadCommand(program) {
   ).option(
     "--output-commitments <filename>",
     "Location to store commitments computed as as part of the upload"
-  ).action(async (src, dst, options) => {
-    let validatedOptions;
-    try {
-      validatedOptions = await UploadOptionsSchema.parseAsync({
-        ...options,
-        src,
-        dst
-      });
-    } catch (error) {
-      const { displayMessage } = handleError(error);
-      console.error(`\u274C ${displayMessage}`);
-      process.exit(1);
-    }
-    const configPath = program.opts().configFile;
-    let config;
-    try {
-      config = loadConfig(configPath);
-    } catch (error) {
-      console.error(`Error: ${error.message}`);
-      process.exit(1);
-    }
-    const start = performance.now();
-    const filelist = await createFilelist(validatedOptions);
-    const timeToCreateFilelist = ((performance.now() - start) / 1e3).toFixed(
-      5
-    );
-    console.log("\n\u{1F680}  Upload Summary");
-    console.log("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
-    if (filelist.length === 1) {
-      console.log(`\u{1F4E6}  File:        ${filelist[0].filename}`);
-      console.log(`\u{1F4C1}  Blob Name:   ${filelist[0].blobname}`);
-    } else {
-      console.log(`\u{1F4E6}  Files:       ${filelist.length} files`);
+  ).configureOutput({
+    writeErr: (_str) => {
     }
-    console.log("");
-    console.log(
-      `\u{1F9EE}  Filelist created (${filelist.length} ${filelist.length === 1 ? "entry" : "entries"})`
-    );
-    console.log(`\u23F1\uFE0F  Took: ${timeToCreateFilelist}s`);
-    if (validatedOptions.assumeYes) {
-      console.log("\u2699\uFE0F  Flag: --assume-yes (auto-confirmed)");
-    }
-    if (!validatedOptions.assumeYes) {
-      const shouldContinue = await new Promise((resolve2) => {
-        const { unmount } = render4(
-          /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
-            /* @__PURE__ */ jsx13(Text7, { children: "Continue?" }),
-            /* @__PURE__ */ jsx13(
-              SelectInput4,
-              {
-                items: [
-                  { label: "Yes", value: true },
-                  { label: "No", value: false }
-                ],
-                onSelect: (item) => {
-                  unmount();
-                  resolve2(item.value);
-                }
-              }
-            )
-          ] })
-        );
-      });
-      if (!shouldContinue) {
-        console.log("Upload cancelled.");
-        process.exit(0);
-      }
-    }
-    const shelbyConfig = getCurrentShelbyConfig(config, {
-      context: program.opts().context
-    });
-    const activeAccount = getCurrentAccount(
-      config,
-      program.opts().account
-    ).account;
-    const aptos = new Aptos5(new AptosConfig4(shelbyConfig.aptos));
-    const shelbyClient = new ShelbyNodeClient(shelbyConfig);
-    const handleSigint = () => {
-      spinner.fail("Quitting due to ctrl-C / SIGINT...");
-      process.exit(1);
-    };
-    process.removeAllListeners("SIGINT");
-    process.on("SIGINT", handleSigint);
-    const expireUsec = validatedOptions.expiration.getTime() * 1e3;
-    const expirationDate = new Date(expireUsec / 1e3);
-    const formattedExpiration = expirationDate.toLocaleDateString("en-US", {
-      year: "numeric",
-      month: "short",
-      day: "numeric",
-      hour: "numeric",
-      minute: "2-digit",
-      second: "2-digit",
-      hour12: true
-    });
-    console.log("");
-    console.log(`\u{1F552}  Expires:  ${formattedExpiration}`);
-    const spinner = ora2({
-      text: "Uploading...",
-      discardStdin: false
-    }).start();
-    const startTime = performance.now();
-    let totalSize = 0;
-    let amountUploaded = 0;
-    const outputCommitments = {};
-    let firstTransactionHash;
-    const formatProgressPercent = () => (100 * (amountUploaded / totalSize)).toFixed(2);
-    for (const entry of filelist) {
-      totalSize += entry.sizeBytes;
-    }
-    let hasUploadedBlob = false;
-    for (const entry of filelist) {
-      const fileName = path5.basename(entry.filename);
-      spinner.text = `\u{1F4D6} Reading ${fileName}... (${formatProgressPercent()}%)`;
+  });
+  uploadCmd.exitOverride(
+    createExitOverrideHandler(
+      "upload",
+      "<source> <destination>",
+      "-e, --expiration <datetime>",
+      'shelby upload ./file.txt myblob -e "in 2 days"\n    shelby upload ./my-folder/ my-folder/ -r -e tomorrow',
+      "Missing source, destination, and expiration"
+    )
+  );
+  uploadCmd.action(
+    async (source, destination, options) => {
+      let validatedOptions;
       try {
-        const blobData = await fs5.readFile(entry.filename);
-        if (blobData.length !== entry.sizeBytes) {
-          throw new Error(
-            `Size of file ${entry.filename} changed after initial scan. Original size was ${entry.sizeBytes} but it is now ${blobData.length}`
-          );
-        }
-        spinner.text = `\u{1F517} Checking if blob exists... (${formatProgressPercent()}%)`;
-        const existingBlobMetadata = await shelbyClient.coordination.getBlobMetadata({
-          account: activeAccount.accountAddress,
-          name: entry.blobname
+        validatedOptions = await UploadOptionsSchema.parseAsync({
+          ...options,
+          source,
+          destination
         });
-        if (existingBlobMetadata) {
-          spinner.fail(
-            `Blob '${entry.blobname}' already exists. Please use a different name or delete the existing blob first.`
-          );
-          process.exit(1);
-        }
-        spinner.text = `\u{1F517} Generating commitments for ${fileName}... (${formatProgressPercent()}%)`;
-        const provider = await getErasureCodingProvider();
-        const blobCommitments = await generateCommitments(provider, blobData);
-        if (validatedOptions.outputCommitments) {
-          outputCommitments[entry.filename] = blobCommitments;
-        }
-        spinner.text = `\u{1F517} Registering ${fileName} on L1... (${formatProgressPercent()}%)`;
-        const { transaction: pendingRegisterBlobTransaction } = await shelbyClient.coordination.registerBlob({
-          account: activeAccount,
-          blobName: entry.blobname,
-          blobMerkleRoot: blobCommitments.blob_merkle_root,
-          size: blobData.length,
-          expirationMicros: validatedOptions.expiration.getTime() * 1e3
-        });
-        const registerTransactionHash = pendingRegisterBlobTransaction.hash;
-        if (!firstTransactionHash) {
-          firstTransactionHash = registerTransactionHash;
+      } catch (error) {
+        if (error instanceof z15.ZodError) {
+          const firstIssue = error.issues[0];
+          if (firstIssue) {
+            console.log(firstIssue.message);
+          } else {
+            console.error("\u26A0\uFE0F  Invalid options provided");
+          }
+        } else {
+          const { displayMessage } = handleError(error);
+          console.error(`\u26A0\uFE0F  ${displayMessage}`);
         }
-        await aptos.waitForTransaction({
-          transactionHash: pendingRegisterBlobTransaction.hash
-        });
-        spinner.text = `\u{1F4E4} Uploading ${fileName} to Shelby RPC... (${formatProgressPercent()}%)`;
-        await shelbyClient.rpc.putBlob({
-          account: activeAccount.accountAddress,
-          blobName: entry.blobname,
-          blobData
-        });
-        hasUploadedBlob = true;
-        amountUploaded += blobData.length;
+        process.exit(1);
+      }
+      const configPath = program.opts().configFile;
+      let config;
+      try {
+        config = loadConfig(configPath);
       } catch (error) {
-        const { displayMessage } = handleError(error);
-        spinner.fail(displayMessage);
+        console.error(`Error: ${error.message}`);
         process.exit(1);
       }
-    }
-    if (validatedOptions.outputCommitments) {
-      await fs5.writeFile(
-        validatedOptions.outputCommitments,
-        JSON.stringify(outputCommitments)
+      const start = performance.now();
+      const filelist = await createFilelist(validatedOptions);
+      const timeToCreateFilelist = ((performance.now() - start) / 1e3).toFixed(
+        5
       );
-    }
-    if (hasUploadedBlob) {
+      console.log("\n\u{1F680}  Upload Summary");
+      console.log("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+      if (filelist.length === 1) {
+        console.log(`\u{1F4E6}  File:        ${filelist[0].filename}`);
+        console.log(`\u{1F4C1}  Blob Name:   ${filelist[0].blobname}`);
+      } else {
+        console.log(`\u{1F4E6}  Files:       ${filelist.length} files`);
+      }
+      console.log("");
+      console.log(
+        `\u{1F9EE}  Filelist created (${filelist.length} ${filelist.length === 1 ? "entry" : "entries"})`
+      );
+      console.log(`\u23F1\uFE0F  Took: ${timeToCreateFilelist}s`);
+      if (validatedOptions.assumeYes) {
+        console.log("\u2699\uFE0F  Flag: --assume-yes (auto-confirmed)");
+      }
+      if (!validatedOptions.assumeYes) {
+        const shouldContinue = await new Promise((resolve3) => {
+          const { unmount } = render4(
+            /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
+              /* @__PURE__ */ jsx13(Text7, { children: "Continue?" }),
+              /* @__PURE__ */ jsx13(
+                SelectInput4,
+                {
+                  items: [
+                    { label: "Yes", value: true },
+                    { label: "No", value: false }
+                  ],
+                  onSelect: (item) => {
+                    unmount();
+                    resolve3(item.value);
+                  }
+                }
+              )
+            ] })
+          );
+        });
+        if (!shouldContinue) {
+          console.log("Upload cancelled.");
+          process.exit(0);
+        }
+      }
+      const shelbyConfig = getCurrentShelbyConfig(config, {
+        context: program.opts().context
+      });
+      const activeAccount = getCurrentAccount(
+        config,
+        program.opts().account
+      ).account;
+      const aptos = new Aptos5(new AptosConfig4(shelbyConfig.aptos));
+      const shelbyClient = new ShelbyNodeClient(shelbyConfig);
+      const handleSigint = () => {
+        spinner.fail("Quitting due to ctrl-C / SIGINT...");
+        process.exit(1);
+      };
+      process.removeAllListeners("SIGINT");
+      process.on("SIGINT", handleSigint);
+      const expireUsec = validatedOptions.expiration.getTime() * 1e3;
+      const expirationDate = new Date(expireUsec / 1e3);
+      const formattedExpiration = expirationDate.toLocaleDateString("en-US", {
+        year: "numeric",
+        month: "short",
+        day: "numeric",
+        hour: "numeric",
+        minute: "2-digit",
+        second: "2-digit",
+        hour12: true
+      });
+      console.log("");
+      console.log(`\u{1F552}  Expires:  ${formattedExpiration}`);
+      const spinner = ora2({
+        text: "Uploading...",
+        discardStdin: false
+      }).start();
+      const startTime = performance.now();
+      let totalSize = 0;
+      let amountUploaded = 0;
+      const outputCommitments = {};
+      let firstTransactionHash;
+      for (const entry of filelist) {
+        totalSize += entry.sizeBytes;
+      }
+      const isSingleFile = filelist.length === 1;
+      const formatProgressPercent = () => totalSize > 0 ? (100 * (amountUploaded / totalSize)).toFixed(2) : "0.00";
+      let filesProcessed = 0;
+      for (const entry of filelist) {
+        const fileName = path5.basename(entry.filename);
+        const fileProgress = isSingleFile ? `(${formatProgressPercent()}%)` : `(${filesProcessed}/${filelist.length} files, ${formatProgressPercent()}%)`;
+        spinner.text = `\u{1F4D6} Reading ${fileName}... ${fileProgress}`;
+        try {
+          const blobData = await fs5.readFile(entry.filename);
+          if (blobData.length !== entry.sizeBytes) {
+            throw new Error(
+              `Size of file ${entry.filename} changed after initial scan. Original size was ${entry.sizeBytes} but it is now ${blobData.length}`
+            );
+          }
+          spinner.text = `\u{1F517} Checking if blob exists... ${fileProgress}`;
+          const existingBlobMetadata = await shelbyClient.coordination.getBlobMetadata({
+            account: activeAccount.accountAddress,
+            name: entry.blobname
+          });
+          if (existingBlobMetadata) {
+            spinner.fail(
+              `Blob '${entry.blobname}' already exists. Please use a different name or delete the existing blob first.`
+            );
+            process.exit(1);
+          }
+          spinner.text = `\u{1F517} Generating commitments for ${fileName}... ${fileProgress}`;
+          const provider = await getErasureCodingProvider();
+          const blobCommitments = await generateCommitments(provider, blobData);
+          if (validatedOptions.outputCommitments) {
+            outputCommitments[entry.filename] = blobCommitments;
+          }
+          spinner.text = `\u{1F517} Registering ${fileName} on L1... ${fileProgress}`;
+          const { transaction: pendingRegisterBlobTransaction } = await shelbyClient.coordination.registerBlob({
+            account: activeAccount,
+            blobName: entry.blobname,
+            blobMerkleRoot: blobCommitments.blob_merkle_root,
+            size: blobData.length,
+            expirationMicros: validatedOptions.expiration.getTime() * 1e3
+          });
+          const registerTransactionHash = pendingRegisterBlobTransaction.hash;
+          if (!firstTransactionHash) {
+            firstTransactionHash = registerTransactionHash;
+          }
+          await aptos.waitForTransaction({
+            transactionHash: pendingRegisterBlobTransaction.hash
+          });
+          spinner.text = `\u{1F4E4} Uploading ${fileName} to Shelby RPC... ${fileProgress}`;
+          await shelbyClient.rpc.putBlob({
+            account: activeAccount.accountAddress,
+            blobName: entry.blobname,
+            blobData
+          });
+          amountUploaded += blobData.length;
+          filesProcessed++;
+        } catch (error) {
+          const { displayMessage } = handleError(error);
+          spinner.fail(displayMessage);
+          process.exit(1);
+        }
+      }
+      if (validatedOptions.outputCommitments) {
+        await fs5.writeFile(
+          validatedOptions.outputCommitments,
+          JSON.stringify(outputCommitments)
+        );
+      }
       const elapsedSec = ((performance.now() - startTime) / 1e3).toFixed(2);
       spinner.succeed(`Upload complete \u2014 took ${elapsedSec}s`);
-    } else {
-      spinner.succeed("Skipped upload, blob has already been uploaded.");
-    }
-    console.log("");
-    if (firstTransactionHash) {
-      const explorerUrl = getAptosTransactionExplorerUrl(
+      console.log("");
+      if (firstTransactionHash) {
+        const explorerUrl = getAptosTransactionExplorerUrl(
+          shelbyConfig.network,
+          firstTransactionHash
+        );
+        console.log("\u{1F310}  Aptos Explorer:");
+        console.log(`   ${explorerUrl}`);
+        console.log("");
+      }
+      const shelbyExplorerUrl = getShelbyAccountExplorerUrl(
         shelbyConfig.network,
-        firstTransactionHash
+        activeAccount.accountAddress.toString()
       );
-      console.log("\u{1F310}  Aptos Explorer:");
-      console.log(`   ${explorerUrl}`);
+      console.log("\u{1F5C2}\uFE0F  Shelby Explorer:");
+      console.log(`   ${shelbyExplorerUrl}`);
+      console.log("");
+      console.log("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+      console.log("\u2728  Done!");
       console.log("");
     }
-    const shelbyExplorerUrl = getShelbyAccountExplorerUrl(
-      shelbyConfig.network,
-      activeAccount.accountAddress.toString()
-    );
-    console.log("\u{1F5C2}\uFE0F  Shelby Explorer:");
-    console.log(`   ${shelbyExplorerUrl}`);
-    console.log("");
-    console.log("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
-    console.log("\u2728  Done!");
-    console.log("");
-  });
+  );
 }
 
 // src/cli.tsx