@shelby-protocol/cli 0.0.13 → 0.0.15

package/bin/entry.js

@@ -4,7 +4,8 @@
 import { Command } from "commander";
 
 // package.json
-var version = "0.0.13";
+var name = "@shelby-protocol/cli";
+var version = "0.0.15";
 
 // src/commands/account.tsx
 import readline from "readline";
@@ -68,7 +69,7 @@ import {
 
 // ../../packages/sdk/dist/chunk-I6NG5GNL.mjs
 function sleep(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
+  return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
 
 // ../../node_modules/.pnpm/tslib@2.8.1/node_modules/tslib/tslib.es6.mjs
@@ -228,10 +229,10 @@ var GraphQLError = class _GraphQLError extends Error {
    */
   constructor(message, ...rawArgs) {
     var _this$nodes, _nodeLocations$, _ref;
-    const { nodes, source, positions, path: path6, originalError, extensions } = toNormalizedOptions(rawArgs);
+    const { nodes, source, positions, path: path7, originalError, extensions } = toNormalizedOptions(rawArgs);
     super(message);
     this.name = "GraphQLError";
-    this.path = path6 !== null && path6 !== void 0 ? path6 : void 0;
+    this.path = path7 !== null && path7 !== void 0 ? path7 : void 0;
     this.originalError = originalError !== null && originalError !== void 0 ? originalError : void 0;
     this.nodes = undefinedIfEmpty(
       Array.isArray(nodes) ? nodes : nodes ? [nodes] : void 0
@@ -1277,9 +1278,9 @@ function formatArray(array, seenValues) {
 function getObjectTag(object) {
   const tag = Object.prototype.toString.call(object).replace(/^\[object /, "").replace(/]$/, "");
   if (tag === "Object" && typeof object.constructor === "function") {
-    const name = object.constructor.name;
-    if (typeof name === "string" && name !== "") {
-      return name;
+    const name2 = object.constructor.name;
+    if (typeof name2 === "string" && name2 !== "") {
+      return name2;
     }
   }
   return tag;
@@ -1326,13 +1327,13 @@ spurious results.`);
 
 // ../../node_modules/.pnpm/graphql@16.11.0/node_modules/graphql/language/source.mjs
 var Source = class {
-  constructor(body, name = "GraphQL request", locationOffset = {
+  constructor(body, name2 = "GraphQL request", locationOffset = {
     line: 1,
     column: 1
   }) {
     typeof body === "string" || devAssert(false, `Body must be a string. Received: ${inspect(body)}.`);
     this.body = body;
-    this.name = name;
+    this.name = name2;
     this.locationOffset = locationOffset;
     this.locationOffset.line > 0 || devAssert(
       false,
@@ -1482,14 +1483,14 @@ var Parser = class {
       });
     }
     const operation = this.parseOperationType();
-    let name;
+    let name2;
     if (this.peek(TokenKind.NAME)) {
-      name = this.parseName();
+      name2 = this.parseName();
     }
     return this.node(start, {
       kind: Kind.OPERATION_DEFINITION,
       operation,
-      name,
+      name: name2,
       variableDefinitions: this.parseVariableDefinitions(),
       directives: this.parseDirectives(false),
       selectionSet: this.parseSelectionSet()
@@ -1576,17 +1577,17 @@ var Parser = class {
     const start = this._lexer.token;
     const nameOrAlias = this.parseName();
     let alias;
-    let name;
+    let name2;
     if (this.expectOptionalToken(TokenKind.COLON)) {
       alias = nameOrAlias;
-      name = this.parseName();
+      name2 = this.parseName();
     } else {
-      name = nameOrAlias;
+      name2 = nameOrAlias;
     }
     return this.node(start, {
       kind: Kind.FIELD,
       alias,
-      name,
+      name: name2,
       arguments: this.parseArguments(false),
       directives: this.parseDirectives(false),
       selectionSet: this.peek(TokenKind.BRACE_L) ? this.parseSelectionSet() : void 0
@@ -1604,11 +1605,11 @@ var Parser = class {
    */
   parseArgument(isConst = false) {
     const start = this._lexer.token;
-    const name = this.parseName();
+    const name2 = this.parseName();
     this.expectToken(TokenKind.COLON);
     return this.node(start, {
       kind: Kind.ARGUMENT,
-      name,
+      name: name2,
       value: this.parseValueLiteral(isConst)
     });
   }
@@ -1803,11 +1804,11 @@ var Parser = class {
    */
   parseObjectField(isConst) {
     const start = this._lexer.token;
-    const name = this.parseName();
+    const name2 = this.parseName();
     this.expectToken(TokenKind.COLON);
     return this.node(start, {
       kind: Kind.OBJECT_FIELD,
-      name,
+      name: name2,
       value: this.parseValueLiteral(isConst)
     });
   }
@@ -1931,12 +1932,12 @@ var Parser = class {
     const start = this._lexer.token;
     const description = this.parseDescription();
     this.expectKeyword("scalar");
-    const name = this.parseName();
+    const name2 = this.parseName();
     const directives = this.parseConstDirectives();
     return this.node(start, {
       kind: Kind.SCALAR_TYPE_DEFINITION,
       description,
-      name,
+      name: name2,
       directives
     });
   }
@@ -1949,14 +1950,14 @@ var Parser = class {
     const start = this._lexer.token;
     const description = this.parseDescription();
     this.expectKeyword("type");
-    const name = this.parseName();
+    const name2 = this.parseName();
     const interfaces = this.parseImplementsInterfaces();
     const directives = this.parseConstDirectives();
     const fields = this.parseFieldsDefinition();
     return this.node(start, {
       kind: Kind.OBJECT_TYPE_DEFINITION,
       description,
-      name,
+      name: name2,
       interfaces,
       directives,
       fields
@@ -1989,7 +1990,7 @@ var Parser = class {
   parseFieldDefinition() {
     const start = this._lexer.token;
     const description = this.parseDescription();
-    const name = this.parseName();
+    const name2 = this.parseName();
     const args = this.parseArgumentDefs();
     this.expectToken(TokenKind.COLON);
     const type = this.parseTypeReference();
@@ -1997,7 +1998,7 @@ var Parser = class {
     return this.node(start, {
       kind: Kind.FIELD_DEFINITION,
       description,
-      name,
+      name: name2,
       arguments: args,
       type,
       directives
@@ -2020,7 +2021,7 @@ var Parser = class {
   parseInputValueDef() {
     const start = this._lexer.token;
     const description = this.parseDescription();
-    const name = this.parseName();
+    const name2 = this.parseName();
     this.expectToken(TokenKind.COLON);
     const type = this.parseTypeReference();
     let defaultValue;
@@ -2031,7 +2032,7 @@ var Parser = class {
     return this.node(start, {
       kind: Kind.INPUT_VALUE_DEFINITION,
       description,
-      name,
+      name: name2,
       type,
       defaultValue,
       directives
@@ -2045,14 +2046,14 @@ var Parser = class {
     const start = this._lexer.token;
     const description = this.parseDescription();
     this.expectKeyword("interface");
-    const name = this.parseName();
+    const name2 = this.parseName();
     const interfaces = this.parseImplementsInterfaces();
     const directives = this.parseConstDirectives();
     const fields = this.parseFieldsDefinition();
     return this.node(start, {
       kind: Kind.INTERFACE_TYPE_DEFINITION,
       description,
-      name,
+      name: name2,
       interfaces,
       directives,
       fields
@@ -2066,13 +2067,13 @@ var Parser = class {
     const start = this._lexer.token;
     const description = this.parseDescription();
     this.expectKeyword("union");
-    const name = this.parseName();
+    const name2 = this.parseName();
     const directives = this.parseConstDirectives();
     const types = this.parseUnionMemberTypes();
     return this.node(start, {
       kind: Kind.UNION_TYPE_DEFINITION,
       description,
-      name,
+      name: name2,
       directives,
       types
     });
@@ -2093,13 +2094,13 @@ var Parser = class {
     const start = this._lexer.token;
     const description = this.parseDescription();
     this.expectKeyword("enum");
-    const name = this.parseName();
+    const name2 = this.parseName();
     const directives = this.parseConstDirectives();
     const values = this.parseEnumValuesDefinition();
     return this.node(start, {
       kind: Kind.ENUM_TYPE_DEFINITION,
       description,
-      name,
+      name: name2,
       directives,
       values
     });
@@ -2122,12 +2123,12 @@ var Parser = class {
   parseEnumValueDefinition() {
     const start = this._lexer.token;
     const description = this.parseDescription();
-    const name = this.parseEnumValueName();
+    const name2 = this.parseEnumValueName();
     const directives = this.parseConstDirectives();
     return this.node(start, {
       kind: Kind.ENUM_VALUE_DEFINITION,
       description,
-      name,
+      name: name2,
       directives
     });
   }
@@ -2154,13 +2155,13 @@ var Parser = class {
     const start = this._lexer.token;
     const description = this.parseDescription();
     this.expectKeyword("input");
-    const name = this.parseName();
+    const name2 = this.parseName();
     const directives = this.parseConstDirectives();
     const fields = this.parseInputFieldsDefinition();
     return this.node(start, {
       kind: Kind.INPUT_OBJECT_TYPE_DEFINITION,
       description,
-      name,
+      name: name2,
       directives,
       fields
     });
@@ -2246,14 +2247,14 @@ var Parser = class {
     const start = this._lexer.token;
     this.expectKeyword("extend");
     this.expectKeyword("scalar");
-    const name = this.parseName();
+    const name2 = this.parseName();
     const directives = this.parseConstDirectives();
     if (directives.length === 0) {
       throw this.unexpected();
     }
     return this.node(start, {
       kind: Kind.SCALAR_TYPE_EXTENSION,
-      name,
+      name: name2,
       directives
     });
   }
@@ -2267,7 +2268,7 @@ var Parser = class {
     const start = this._lexer.token;
     this.expectKeyword("extend");
     this.expectKeyword("type");
-    const name = this.parseName();
+    const name2 = this.parseName();
     const interfaces = this.parseImplementsInterfaces();
     const directives = this.parseConstDirectives();
     const fields = this.parseFieldsDefinition();
@@ -2276,7 +2277,7 @@ var Parser = class {
     }
     return this.node(start, {
       kind: Kind.OBJECT_TYPE_EXTENSION,
-      name,
+      name: name2,
       interfaces,
       directives,
       fields
@@ -2292,7 +2293,7 @@ var Parser = class {
     const start = this._lexer.token;
     this.expectKeyword("extend");
     this.expectKeyword("interface");
-    const name = this.parseName();
+    const name2 = this.parseName();
     const interfaces = this.parseImplementsInterfaces();
     const directives = this.parseConstDirectives();
     const fields = this.parseFieldsDefinition();
@@ -2301,7 +2302,7 @@ var Parser = class {
     }
     return this.node(start, {
       kind: Kind.INTERFACE_TYPE_EXTENSION,
-      name,
+      name: name2,
       interfaces,
       directives,
       fields
@@ -2316,7 +2317,7 @@ var Parser = class {
     const start = this._lexer.token;
     this.expectKeyword("extend");
     this.expectKeyword("union");
-    const name = this.parseName();
+    const name2 = this.parseName();
     const directives = this.parseConstDirectives();
     const types = this.parseUnionMemberTypes();
     if (directives.length === 0 && types.length === 0) {
@@ -2324,7 +2325,7 @@ var Parser = class {
     }
     return this.node(start, {
       kind: Kind.UNION_TYPE_EXTENSION,
-      name,
+      name: name2,
       directives,
       types
     });
@@ -2338,7 +2339,7 @@ var Parser = class {
     const start = this._lexer.token;
     this.expectKeyword("extend");
     this.expectKeyword("enum");
-    const name = this.parseName();
+    const name2 = this.parseName();
     const directives = this.parseConstDirectives();
     const values = this.parseEnumValuesDefinition();
     if (directives.length === 0 && values.length === 0) {
@@ -2346,7 +2347,7 @@ var Parser = class {
     }
     return this.node(start, {
       kind: Kind.ENUM_TYPE_EXTENSION,
-      name,
+      name: name2,
       directives,
       values
     });
@@ -2360,7 +2361,7 @@ var Parser = class {
     const start = this._lexer.token;
     this.expectKeyword("extend");
     this.expectKeyword("input");
-    const name = this.parseName();
+    const name2 = this.parseName();
     const directives = this.parseConstDirectives();
     const fields = this.parseInputFieldsDefinition();
     if (directives.length === 0 && fields.length === 0) {
@@ -2368,7 +2369,7 @@ var Parser = class {
     }
     return this.node(start, {
       kind: Kind.INPUT_OBJECT_TYPE_EXTENSION,
-      name,
+      name: name2,
       directives,
       fields
     });
@@ -2384,7 +2385,7 @@ var Parser = class {
     const description = this.parseDescription();
     this.expectKeyword("directive");
     this.expectToken(TokenKind.AT);
-    const name = this.parseName();
+    const name2 = this.parseName();
     const args = this.parseArgumentDefs();
     const repeatable = this.expectOptionalKeyword("repeatable");
     this.expectKeyword("on");
@@ -2392,7 +2393,7 @@ var Parser = class {
     return this.node(start, {
       kind: Kind.DIRECTIVE_DEFINITION,
       description,
-      name,
+      name: name2,
       arguments: args,
       repeatable,
       locations
@@ -2435,9 +2436,9 @@ var Parser = class {
    */
   parseDirectiveLocation() {
     const start = this._lexer.token;
-    const name = this.parseName();
-    if (Object.prototype.hasOwnProperty.call(DirectiveLocation, name.value)) {
-      return name;
+    const name2 = this.parseName();
+    if (Object.prototype.hasOwnProperty.call(DirectiveLocation, name2.value)) {
+      return name2;
     }
     throw this.unexpected(start);
   }
@@ -2799,14 +2800,14 @@ function visit(root, visitor, visitorKeys = QueryDocumentKeys) {
   let node = root;
   let key = void 0;
   let parent = void 0;
-  const path6 = [];
+  const path7 = [];
   const ancestors = [];
   do {
     index++;
     const isLeaving = index === keys.length;
     const isEdited = isLeaving && edits.length !== 0;
     if (isLeaving) {
-      key = ancestors.length === 0 ? void 0 : path6[path6.length - 1];
+      key = ancestors.length === 0 ? void 0 : path7[path7.length - 1];
       node = parent;
       parent = ancestors.pop();
       if (isEdited) {
@@ -2840,20 +2841,20 @@ function visit(root, visitor, visitorKeys = QueryDocumentKeys) {
       if (node === null || node === void 0) {
         continue;
       }
-      path6.push(key);
+      path7.push(key);
     }
     let result;
     if (!Array.isArray(node)) {
       var _enterLeaveMap$get, _enterLeaveMap$get2;
       isNode(node) || devAssert(false, `Invalid AST Node: ${inspect(node)}.`);
       const visitFn = isLeaving ? (_enterLeaveMap$get = enterLeaveMap.get(node.kind)) === null || _enterLeaveMap$get === void 0 ? void 0 : _enterLeaveMap$get.leave : (_enterLeaveMap$get2 = enterLeaveMap.get(node.kind)) === null || _enterLeaveMap$get2 === void 0 ? void 0 : _enterLeaveMap$get2.enter;
-      result = visitFn === null || visitFn === void 0 ? void 0 : visitFn.call(visitor, node, key, parent, path6, ancestors);
+      result = visitFn === null || visitFn === void 0 ? void 0 : visitFn.call(visitor, node, key, parent, path7, ancestors);
       if (result === BREAK) {
         break;
       }
       if (result === false) {
         if (!isLeaving) {
-          path6.pop();
+          path7.pop();
           continue;
         }
       } else if (result !== void 0) {
@@ -2862,7 +2863,7 @@ function visit(root, visitor, visitorKeys = QueryDocumentKeys) {
           if (isNode(result)) {
             node = result;
           } else {
-            path6.pop();
+            path7.pop();
             continue;
           }
         }
@@ -2872,7 +2873,7 @@ function visit(root, visitor, visitorKeys = QueryDocumentKeys) {
       edits.push([key, node]);
     }
     if (isLeaving) {
-      path6.pop();
+      path7.pop();
     } else {
       var _node$kind;
       stack = {
@@ -2950,8 +2951,8 @@ var printDocASTReducer = {
     leave: ({ selections }) => block(selections)
   },
   Field: {
-    leave({ alias, name, arguments: args, directives, selectionSet }) {
-      const prefix = wrap("", alias, ": ") + name;
+    leave({ alias, name: name2, arguments: args, directives, selectionSet }) {
+      const prefix = wrap("", alias, ": ") + name2;
       let argsLine = prefix + wrap("(", join(args, ", "), ")");
       if (argsLine.length > MAX_LINE_LENGTH) {
         argsLine = prefix + wrap("(\n", indent(join(args, "\n")), "\n)");
@@ -2960,11 +2961,11 @@ var printDocASTReducer = {
     }
   },
   Argument: {
-    leave: ({ name, value }) => name + ": " + value
+    leave: ({ name: name2, value }) => name2 + ": " + value
   },
   // Fragments
   FragmentSpread: {
-    leave: ({ name, directives }) => "..." + name + wrap(" ", join(directives, " "))
+    leave: ({ name: name2, directives }) => "..." + name2 + wrap(" ", join(directives, " "))
   },
   InlineFragment: {
     leave: ({ typeCondition, directives, selectionSet }) => join(
@@ -2978,9 +2979,9 @@ var printDocASTReducer = {
     )
   },
   FragmentDefinition: {
-    leave: ({ name, typeCondition, variableDefinitions, directives, selectionSet }) => (
+    leave: ({ name: name2, typeCondition, variableDefinitions, directives, selectionSet }) => (
       // or removed in the future.
-      `fragment ${name}${wrap("(", join(variableDefinitions, ", "), ")")} on ${typeCondition} ${wrap("", join(directives, " "), " ")}` + selectionSet
+      `fragment ${name2}${wrap("(", join(variableDefinitions, ", "), ")")} on ${typeCondition} ${wrap("", join(directives, " "), " ")}` + selectionSet
     )
   },
   // Value
@@ -3009,15 +3010,15 @@ var printDocASTReducer = {
     leave: ({ fields }) => "{" + join(fields, ", ") + "}"
   },
   ObjectField: {
-    leave: ({ name, value }) => name + ": " + value
+    leave: ({ name: name2, value }) => name2 + ": " + value
   },
   // Directive
   Directive: {
-    leave: ({ name, arguments: args }) => "@" + name + wrap("(", join(args, ", "), ")")
+    leave: ({ name: name2, arguments: args }) => "@" + name2 + wrap("(", join(args, ", "), ")")
   },
   // Type
   NamedType: {
-    leave: ({ name }) => name
+    leave: ({ name: name2 }) => name2
   },
   ListType: {
     leave: ({ type }) => "[" + type + "]"
@@ -3033,13 +3034,13 @@ var printDocASTReducer = {
     leave: ({ operation, type }) => operation + ": " + type
   },
   ScalarTypeDefinition: {
-    leave: ({ description, name, directives }) => wrap("", description, "\n") + join(["scalar", name, join(directives, " ")], " ")
+    leave: ({ description, name: name2, directives }) => wrap("", description, "\n") + join(["scalar", name2, join(directives, " ")], " ")
   },
   ObjectTypeDefinition: {
-    leave: ({ description, name, interfaces, directives, fields }) => wrap("", description, "\n") + join(
+    leave: ({ description, name: name2, interfaces, directives, fields }) => wrap("", description, "\n") + join(
       [
         "type",
-        name,
+        name2,
         wrap("implements ", join(interfaces, " & ")),
         join(directives, " "),
         block(fields)
@@ -3048,19 +3049,19 @@ var printDocASTReducer = {
     )
   },
   FieldDefinition: {
-    leave: ({ description, name, arguments: args, type, directives }) => wrap("", description, "\n") + name + (hasMultilineItems(args) ? wrap("(\n", indent(join(args, "\n")), "\n)") : wrap("(", join(args, ", "), ")")) + ": " + type + wrap(" ", join(directives, " "))
+    leave: ({ description, name: name2, arguments: args, type, directives }) => wrap("", description, "\n") + name2 + (hasMultilineItems(args) ? wrap("(\n", indent(join(args, "\n")), "\n)") : wrap("(", join(args, ", "), ")")) + ": " + type + wrap(" ", join(directives, " "))
   },
   InputValueDefinition: {
-    leave: ({ description, name, type, defaultValue, directives }) => wrap("", description, "\n") + join(
-      [name + ": " + type, wrap("= ", defaultValue), join(directives, " ")],
+    leave: ({ description, name: name2, type, defaultValue, directives }) => wrap("", description, "\n") + join(
+      [name2 + ": " + type, wrap("= ", defaultValue), join(directives, " ")],
       " "
     )
   },
   InterfaceTypeDefinition: {
-    leave: ({ description, name, interfaces, directives, fields }) => wrap("", description, "\n") + join(
+    leave: ({ description, name: name2, interfaces, directives, fields }) => wrap("", description, "\n") + join(
       [
         "interface",
-        name,
+        name2,
         wrap("implements ", join(interfaces, " & ")),
         join(directives, " "),
         block(fields)
@@ -3069,22 +3070,22 @@ var printDocASTReducer = {
     )
   },
   UnionTypeDefinition: {
-    leave: ({ description, name, directives, types }) => wrap("", description, "\n") + join(
-      ["union", name, join(directives, " "), wrap("= ", join(types, " | "))],
+    leave: ({ description, name: name2, directives, types }) => wrap("", description, "\n") + join(
+      ["union", name2, join(directives, " "), wrap("= ", join(types, " | "))],
       " "
     )
   },
   EnumTypeDefinition: {
-    leave: ({ description, name, directives, values }) => wrap("", description, "\n") + join(["enum", name, join(directives, " "), block(values)], " ")
+    leave: ({ description, name: name2, directives, values }) => wrap("", description, "\n") + join(["enum", name2, join(directives, " "), block(values)], " ")
   },
   EnumValueDefinition: {
-    leave: ({ description, name, directives }) => wrap("", description, "\n") + join([name, join(directives, " ")], " ")
+    leave: ({ description, name: name2, directives }) => wrap("", description, "\n") + join([name2, join(directives, " ")], " ")
   },
   InputObjectTypeDefinition: {
-    leave: ({ description, name, directives, fields }) => wrap("", description, "\n") + join(["input", name, join(directives, " "), block(fields)], " ")
+    leave: ({ description, name: name2, directives, fields }) => wrap("", description, "\n") + join(["input", name2, join(directives, " "), block(fields)], " ")
   },
   DirectiveDefinition: {
-    leave: ({ description, name, arguments: args, repeatable, locations }) => wrap("", description, "\n") + "directive @" + name + (hasMultilineItems(args) ? wrap("(\n", indent(join(args, "\n")), "\n)") : wrap("(", join(args, ", "), ")")) + (repeatable ? " repeatable" : "") + " on " + join(locations, " | ")
+    leave: ({ description, name: name2, arguments: args, repeatable, locations }) => wrap("", description, "\n") + "directive @" + name2 + (hasMultilineItems(args) ? wrap("(\n", indent(join(args, "\n")), "\n)") : wrap("(", join(args, ", "), ")")) + (repeatable ? " repeatable" : "") + " on " + join(locations, " | ")
   },
   SchemaExtension: {
     leave: ({ directives, operationTypes }) => join(
@@ -3093,13 +3094,13 @@ var printDocASTReducer = {
     )
   },
   ScalarTypeExtension: {
-    leave: ({ name, directives }) => join(["extend scalar", name, join(directives, " ")], " ")
+    leave: ({ name: name2, directives }) => join(["extend scalar", name2, join(directives, " ")], " ")
   },
   ObjectTypeExtension: {
-    leave: ({ name, interfaces, directives, fields }) => join(
+    leave: ({ name: name2, interfaces, directives, fields }) => join(
       [
         "extend type",
-        name,
+        name2,
         wrap("implements ", join(interfaces, " & ")),
         join(directives, " "),
         block(fields)
@@ -3108,10 +3109,10 @@ var printDocASTReducer = {
     )
   },
   InterfaceTypeExtension: {
-    leave: ({ name, interfaces, directives, fields }) => join(
+    leave: ({ name: name2, interfaces, directives, fields }) => join(
       [
         "extend interface",
-        name,
+        name2,
         wrap("implements ", join(interfaces, " & ")),
         join(directives, " "),
         block(fields)
@@ -3120,10 +3121,10 @@ var printDocASTReducer = {
     )
   },
   UnionTypeExtension: {
-    leave: ({ name, directives, types }) => join(
+    leave: ({ name: name2, directives, types }) => join(
       [
         "extend union",
-        name,
+        name2,
         join(directives, " "),
         wrap("= ", join(types, " | "))
       ],
@@ -3131,10 +3132,10 @@ var printDocASTReducer = {
     )
   },
   EnumTypeExtension: {
-    leave: ({ name, directives, values }) => join(["extend enum", name, join(directives, " "), block(values)], " ")
+    leave: ({ name: name2, directives, values }) => join(["extend enum", name2, join(directives, " "), block(values)], " ")
   },
   InputObjectTypeExtension: {
-    leave: ({ name, directives, fields }) => join(["extend input", name, join(directives, " "), block(fields)], " ")
+    leave: ({ name: name2, directives, fields }) => join(["extend input", name2, join(directives, " "), block(fields)], " ")
   }
 };
 function join(maybeArray, separator = "") {
@@ -3270,7 +3271,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) {
@@ -3306,6 +3307,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 {
@@ -3314,11 +3333,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-VPT45MTZ.mjs
+// ../../packages/sdk/dist/chunk-HFGEQP5N.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
@@ -3354,9 +3379,9 @@ var HeadersInitToPlainObject = (headers) => {
   if (headers instanceof Headers) {
     oHeaders = HeadersInstanceToPlainObject(headers);
   } else if (Array.isArray(headers)) {
-    headers.forEach(([name, value]) => {
-      if (name && value !== void 0) {
-        oHeaders[name] = value;
+    headers.forEach(([name2, value]) => {
+      if (name2 && value !== void 0) {
+        oHeaders[name2] = value;
       }
     });
   } else if (headers) {
@@ -3620,8 +3645,8 @@ var createFetcher = (method) => async (params) => {
     initResolved = initNew;
   }
   if (searchParams) {
-    searchParams.forEach((value, name) => {
-      url.searchParams.append(name, value);
+    searchParams.forEach((value, name2) => {
+      url.searchParams.append(name2, value);
     });
   }
   const $fetch = params.fetch ?? fetch;
@@ -3833,7 +3858,7 @@ var parseRequestArgs = (documentOrOptions, variables, requestHeaders) => {
   };
 };
 
-// ../../packages/sdk/dist/chunk-VPT45MTZ.mjs
+// ../../packages/sdk/dist/chunk-HFGEQP5N.mjs
 function createShelbyIndexerClient(baseUrl, options) {
   const graphqlClient = new GraphQLClient(baseUrl, options);
   return getSdk(graphqlClient);
@@ -3866,7 +3891,7 @@ function getShelbyIndexerClient(config) {
   });
 }
 
-// ../../packages/sdk/dist/chunk-KBUWZXFA.mjs
+// ../../packages/sdk/dist/chunk-4JZO2D7T.mjs
 import { Hex as Hex2 } from "@aptos-labs/ts-sdk";
 async function* readInChunks(input, chunkSize) {
   let idx = 0;
@@ -3945,12 +3970,16 @@ function isReadableStream(value) {
 function toUint8Array(view) {
   return view instanceof Uint8Array ? view : new Uint8Array(view.buffer, view.byteOffset, view.byteLength);
 }
-function buildRequestUrl(path6, baseUrl) {
+function buildRequestUrl(path7, baseUrl) {
   const baseHasSlash = baseUrl.endsWith("/");
   const safeBase = baseHasSlash ? baseUrl : `${baseUrl}/`;
-  const safePath = path6.replace(/^\/+/, "");
+  const safePath = path7.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 = {
@@ -4134,11 +4163,11 @@ function buildClayConfig(input) {
 // ../../packages/sdk/dist/chunk-FIFKKWXV.mjs
 import { AccountAddress as AccountAddress2 } from "@aptos-labs/ts-sdk";
 import { z } from "zod";
-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("/"), {
+var BlobNameSchema = z.string().min(1, "Blob name path parameter cannot be empty.").max(1024, "Blob name cannot exceed 1024 characters.").refine((name2) => !name2.endsWith("/"), {
   message: "Blob name cannot end with a slash"
 });
 
-// ../../packages/sdk/dist/chunk-TEDFWEY6.mjs
+// ../../packages/sdk/dist/chunk-7P3P3D3X.mjs
 import { AccountAddress as AccountAddress3 } from "@aptos-labs/ts-sdk";
 function encodeURIComponentKeepSlashes(str) {
   return encodeURIComponent(str).replace(/%2F/g, "/");
@@ -4408,7 +4437,7 @@ var createBlobKey = (params) => {
   return `@${AccountAddress4.from(params.account).toStringLongWithoutPrefix()}/${params.blobName}`;
 };
 
-// ../../packages/sdk/dist/chunk-LTV26KU4.mjs
+// ../../packages/sdk/dist/chunk-PCNLFNAT.mjs
 import { z as z2 } from "zod";
 var ChunksetCommitmentSchema = z2.object({
   // Chunkset root (vector commitment of child chunks)
@@ -4530,7 +4559,7 @@ function validatePrePaddedChunkset(chunkset, expectedSize, chunksetIdx) {
   return chunkset;
 }
 
-// ../../packages/sdk/dist/chunk-MEINKPI3.mjs
+// ../../packages/sdk/dist/chunk-HDYY6NS4.mjs
 import {
   AccountAddress as AccountAddress5,
   Aptos as Aptos2,
@@ -4595,7 +4624,7 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
     try {
       const rawMetadata = await this.aptos.view({
         payload: {
-          function: `${this.deployer.toString()}::global_metadata::get_blob_metadata`,
+          function: `${this.deployer.toString()}::blob_metadata::get_blob_metadata`,
           functionArguments: [
             createBlobKey({
               account: params.account,
@@ -4626,6 +4655,7 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
         ).toUint8Array(),
         owner: AccountAddress5.fromString(metadata.owner),
         name: params.name,
+        blobNameSuffix: getBlobNameSuffix(params.name),
         size: Number(metadata.blob_size),
         encoding,
         expirationMicros: metadata.expiration_micros,
@@ -4658,13 +4688,14 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
    * ```
    */
   getAccountBlobs(params) {
+    const { where, ...rest } = params;
     return this.getBlobs({
       where: {
-        ...params.where,
+        ...where ?? {},
         owner: { _eq: AccountAddress5.from(params.account).toString() }
       },
-      pagination: params.pagination,
-      orderBy: params.orderBy
+      pagination: rest.pagination,
+      orderBy: rest.orderBy
     });
   }
   /**
@@ -4686,8 +4717,14 @@ 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
@@ -4696,6 +4733,7 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
       (blob) => ({
         owner: AccountAddress5.from(blob.owner),
         name: blob.blob_name,
+        blobNameSuffix: getBlobNameSuffix(blob.blob_name),
         blobMerkleRoot: Hex3.fromHexInput(blob.blob_commitment).toUint8Array(),
         size: Number(blob.size),
         // TODO: Add encoding when supported in NCI
@@ -4720,10 +4758,10 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
       orderBy
     });
     const activityTypeMapping = {
-      [`${this.deployer.toStringLong()}::global_metadata::BlobRegisteredEvent`]: "register_blob",
-      [`${this.deployer.toStringLong()}::global_metadata::BlobDeletedEvent`]: "delete_blob",
-      [`${this.deployer.toStringLong()}::global_metadata::BlobExpirationExtendedEvent`]: "extend_blob_expiration",
-      [`${this.deployer.toStringLong()}::global_metadata::BlobWrittenEvent`]: "write_blob"
+      [`${this.deployer.toStringLong()}::blob_metadata::BlobRegisteredEvent`]: "register_blob",
+      [`${this.deployer.toStringLong()}::blob_metadata::BlobDeletedEvent`]: "delete_blob",
+      [`${this.deployer.toStringLong()}::blob_metadata::BlobExpirationExtendedEvent`]: "extend_blob_expiration",
+      [`${this.deployer.toStringLong()}::blob_metadata::BlobWrittenEvent`]: "write_blob"
     };
     return blob_activities.map(
       (activity) => ({
@@ -4741,28 +4779,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).
-   *
-   * @deprecated Will need to get reworked when we are acking blobs from storage providers.
+   * Retrieves the total number of blobs from the blockchain.
    *
-   * @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.
    *
-   * const isStored = chunks.every((c) => c.location.variant === "stored");
+   * @param params.where (optional) - The where clause to filter the blob activities by.
+   * @returns The total number of blob activities.
+   *
+   * @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.
@@ -4814,6 +4860,63 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
       })
     };
   }
+  /**
+   * Registers multiple blobs on the blockchain by writing their merkle roots and metadata.
+   *
+   * @param params.account - The account that is signing and paying for the transaction.
+   * @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.options - Optional transaction building options.
+   * @param params.options.chunksetSizeBytes - Custom chunkset size (defaults to DEFAULT_CHUNKSET_SIZE_BYTES).
+   * @param params.options.build - Additional Aptos transaction building options.
+   *
+   * @returns An object containing the pending transaction.
+   *
+   * @example
+   * ```typescript
+   * const provider = await ClayErasureCodingProvider.create();
+   * const blobCommitments = await generateCommitments(provider, data);
+   *
+   * const { transaction } = await client.batchRegisterBlobs({
+   *   account: signer,
+   *   expirationMicros: Date.now() * 1000 + 3600_000_000, // 1 hour from now in microseconds
+   *   blobs: [
+   *     {
+   *       blobName: "foo/bar.txt",
+   *       blobSize: data.length,
+   *       blobMerkleRoot: blobCommitments.blob_merkle_root,
+   *     },
+   *   ],
+   * });
+   * ```
+   */
+  async batchRegisterBlobs(params) {
+    const chunksetSize = params.options?.chunksetSizeBytes ?? DEFAULT_CHUNKSET_SIZE_BYTES;
+    const transaction = await this.aptos.transaction.build.simple({
+      ...params.options?.build,
+      sender: params.account.accountAddress,
+      data: _ShelbyBlobClient.createBatchRegisterBlobsPayload({
+        deployer: this.deployer,
+        account: params.account.accountAddress,
+        expirationMicros: params.expirationMicros,
+        blobs: params.blobs.map((blob) => ({
+          blobName: blob.blobName,
+          blobSize: blob.blobSize,
+          blobMerkleRoot: blob.blobMerkleRoot,
+          numChunksets: expectedTotalChunksets(blob.blobSize, chunksetSize)
+        }))
+      })
+    });
+    return {
+      transaction: await this.aptos.signAndSubmitTransaction({
+        signer: params.account,
+        transaction
+      })
+    };
+  }
   /**
    * Creates a transaction payload to register a blob on the blockchain.
    * This is a static helper method for constructing the Move function call payload.
@@ -4832,7 +4935,7 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
    */
   static createRegisterBlobPayload(params) {
     return {
-      function: `${(params.deployer ?? SHELBY_DEPLOYER).toString()}::global_metadata::register_blob`,
+      function: `${(params.deployer ?? SHELBY_DEPLOYER).toString()}::blob_metadata::register_blob`,
       functionArguments: [
         params.blobName,
         params.expirationMicros,
@@ -4876,7 +4979,7 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
       blobSizes.push(blob.blobSize);
     });
     return {
-      function: `${(params.deployer ?? SHELBY_DEPLOYER).toString()}::global_metadata::register_multiple_blobs`,
+      function: `${(params.deployer ?? SHELBY_DEPLOYER).toString()}::blob_metadata::register_multiple_blobs`,
       functionArguments: [
         blobNames,
         params.expirationMicros,
@@ -4889,12 +4992,168 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
       ]
     };
   }
+  /**
+   * Creates a transaction payload to delete 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.blobNameSuffix - The blob name suffix (e.g. "bar.txt").
+   *
+   * @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
+   */
+  static createDeleteBlobPayload(params) {
+    return {
+      function: `${(params.deployer ?? SHELBY_DEPLOYER).toString()}::blob_metadata::delete_blob`,
+      functionArguments: [params.blobNameSuffix]
+    };
+  }
 };
 
-// ../../packages/sdk/dist/chunk-2Y3ZLUYT.mjs
+// ../../packages/sdk/dist/chunk-CQZZRXA6.mjs
 import {
   Aptos as Aptos3
 } from "@aptos-labs/ts-sdk";
+
+// ../../node_modules/.pnpm/yocto-queue@1.2.1/node_modules/yocto-queue/index.js
+var Node = class {
+  value;
+  next;
+  constructor(value) {
+    this.value = value;
+  }
+};
+var Queue = class {
+  #head;
+  #tail;
+  #size;
+  constructor() {
+    this.clear();
+  }
+  enqueue(value) {
+    const node = new Node(value);
+    if (this.#head) {
+      this.#tail.next = node;
+      this.#tail = node;
+    } else {
+      this.#head = node;
+      this.#tail = node;
+    }
+    this.#size++;
+  }
+  dequeue() {
+    const current = this.#head;
+    if (!current) {
+      return;
+    }
+    this.#head = this.#head.next;
+    this.#size--;
+    return current.value;
+  }
+  peek() {
+    if (!this.#head) {
+      return;
+    }
+    return this.#head.value;
+  }
+  clear() {
+    this.#head = void 0;
+    this.#tail = void 0;
+    this.#size = 0;
+  }
+  get size() {
+    return this.#size;
+  }
+  *[Symbol.iterator]() {
+    let current = this.#head;
+    while (current) {
+      yield current.value;
+      current = current.next;
+    }
+  }
+  *drain() {
+    while (this.#head) {
+      yield this.dequeue();
+    }
+  }
+};
+
+// ../../node_modules/.pnpm/p-limit@7.1.1/node_modules/p-limit/index.js
+function pLimit(concurrency) {
+  validateConcurrency(concurrency);
+  const queue = new Queue();
+  let activeCount = 0;
+  const resumeNext = () => {
+    if (activeCount < concurrency && queue.size > 0) {
+      activeCount++;
+      queue.dequeue()();
+    }
+  };
+  const next = () => {
+    activeCount--;
+    resumeNext();
+  };
+  const run = async (function_, resolve3, arguments_) => {
+    const result = (async () => function_(...arguments_))();
+    resolve3(result);
+    try {
+      await result;
+    } catch {
+    }
+    next();
+  };
+  const enqueue = (function_, resolve3, arguments_) => {
+    new Promise((internalResolve) => {
+      queue.enqueue(internalResolve);
+    }).then(run.bind(void 0, function_, resolve3, arguments_));
+    if (activeCount < concurrency) {
+      resumeNext();
+    }
+  };
+  const generator = (function_, ...arguments_) => new Promise((resolve3) => {
+    enqueue(function_, resolve3, arguments_);
+  });
+  Object.defineProperties(generator, {
+    activeCount: {
+      get: () => activeCount
+    },
+    pendingCount: {
+      get: () => queue.size
+    },
+    clearQueue: {
+      value() {
+        queue.clear();
+      }
+    },
+    concurrency: {
+      get: () => concurrency,
+      set(newConcurrency) {
+        validateConcurrency(newConcurrency);
+        concurrency = newConcurrency;
+        queueMicrotask(() => {
+          while (activeCount < concurrency && queue.size > 0) {
+            resumeNext();
+          }
+        });
+      }
+    },
+    map: {
+      async value(array, function_) {
+        const promises = array.map((value, index) => this(function_, value, index));
+        return Promise.all(promises);
+      }
+    }
+  });
+  return generator;
+}
+function validateConcurrency(concurrency) {
+  if (!((Number.isInteger(concurrency) || concurrency === Number.POSITIVE_INFINITY) && concurrency > 0)) {
+    throw new TypeError("Expected `concurrency` to be a number from 1 and up");
+  }
+}
+
+// ../../packages/sdk/dist/chunk-CQZZRXA6.mjs
 var ShelbyClient = class {
   /**
    * The coordination client is used to interact with the Aptos blockchain which handles the commitments
@@ -5024,6 +5283,89 @@ var ShelbyClient = class {
       blobData: params.blobData
     });
   }
+  /**
+   * Uploads a batch of blobs to the Shelby network.
+   * This method handles the complete upload flow including commitment generation,
+   * blockchain registration, and storage upload.
+   *
+   * @param params.blobs - The blobs to upload.
+   * @param params.blobs.blobData - The raw data to upload as a Uint8Array.
+   * @param params.blobs.blobName - The name/path of the blob (e.g. "folder/file.txt").
+   * @param params.expirationMicros - The expiration time in microseconds since Unix epoch.
+   * @param params.signer - The account that signs and pays for the transaction.
+   * @param params.options - Optional upload configuration.
+   * @param params.options.chunksetSizeBytes - Custom chunkset size.
+   * @param params.options.build - Additional Aptos transaction options.
+   *
+   * @returns The transaction and generated blob commitments (when implemented).
+   *
+   * @example
+   * ```typescript
+   * await client.batchUpload({
+   *   blobs: [
+   *     { blobData: Buffer.from("Hello, World!"), blobName: "hello.txt" },
+   *     { blobData: Buffer.from("Hello, World 2!"), blobName: "hello2.txt" },
+   *   ],
+   *   expirationMicros: Date.now() * 1000 + 86400_000_000 // 24 hours from now
+   * });
+   * ```
+   */
+  async batchUpload(params) {
+    const existingBlobs = await this.coordination.getBlobs({
+      where: {
+        blob_name: {
+          _in: params.blobs.map(
+            (blob) => createBlobKey({
+              account: params.signer.accountAddress,
+              blobName: blob.blobName
+            })
+          )
+        }
+      }
+    });
+    const blobsToRegister = params.blobs.filter(
+      (blob) => !existingBlobs.some(
+        (existingBlob) => existingBlob.name === createBlobKey({
+          account: params.signer.accountAddress,
+          blobName: blob.blobName
+        })
+      )
+    );
+    if (blobsToRegister.length > 0) {
+      const provider = await this.getProvider();
+      const blobCommitments = await Promise.all(
+        blobsToRegister.map(
+          async (blob) => generateCommitments(provider, blob.blobData)
+        )
+      );
+      const { transaction: pendingRegisterBlobTransaction } = await this.coordination.batchRegisterBlobs({
+        account: params.signer,
+        expirationMicros: params.expirationMicros,
+        blobs: blobsToRegister.map((blob, index) => ({
+          blobName: blob.blobName,
+          blobSize: blob.blobData.length,
+          blobMerkleRoot: blobCommitments[index].blob_merkle_root
+        })),
+        options: params.options
+      });
+      await this.coordination.aptos.waitForTransaction({
+        transactionHash: pendingRegisterBlobTransaction.hash,
+        options: { waitForIndexer: true }
+      });
+    }
+    const limit = pLimit(3);
+    await Promise.all(
+      params.blobs.map(
+        (blob) => limit(
+          () => this.rpc.putBlob({
+            account: params.signer.accountAddress,
+            blobName: blob.blobName,
+            blobData: blob.blobData
+          })
+        )
+      )
+    );
+  }
   /**
    * Downloads a blob from the Shelby RPC node.
    *
@@ -5046,15 +5388,15 @@ var ShelbyClient = class {
   }
 };
 
-// ../../packages/sdk/dist/chunk-X56YUBBI.mjs
+// ../../packages/sdk/dist/chunk-2JMRK5PM.mjs
 var ShelbyNodeClient = class extends ShelbyClient {
 };
 
 // ../../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 });
+  for (var name2 in all)
+    __defProp(target, name2, { get: all[name2], enumerable: true });
 };
 
 // ../../packages/sdk/dist/chunk-A4IG6GSE.mjs
@@ -5153,9 +5495,10 @@ var reed_solomon_erasure_bg_default = __toBinaryNode("AGFzbQEAAAAB/oCAgAASYAJ/fw
 var DEFAULT_CHUNK_SIZE_BYTES2 = 2 * 1024 * 1024;
 
 // src/commands/account.tsx
-import chalk from "chalk";
+import chalk2 from "chalk";
+import { filesize } from "filesize";
 import { render } from "ink";
-import { z as z9 } from "zod";
+import { z as z10 } from "zod";
 
 // src/components/AccountWizard.tsx
 import { Box, Text } from "ink";
@@ -5326,10 +5669,10 @@ function saveConfig(config, configPath = "~/.shelby/config.yaml") {
   fs.writeFileSync(resolvedPath, YAML.stringify(config), "utf8");
 }
 function getCurrentContext(config, contextName) {
-  const name = contextName || config.default_context;
-  const context = config.contexts[name];
+  const name2 = contextName || config.default_context;
+  const context = config.contexts[name2];
   if (!context) {
-    throw new Error(`Context '${name}' not found in config`);
+    throw new Error(`Context '${name2}' not found in config`);
   }
   return {
     api_key: context.api_key,
@@ -5338,19 +5681,19 @@ function getCurrentContext(config, contextName) {
   };
 }
 function getCurrentAccount(config, accountName) {
-  const name = accountName || config.default_account;
-  if (!name) {
-    throw new Error(`Account with name '${name}' not found in config`);
+  const name2 = accountName || config.default_account;
+  if (!name2) {
+    throw new Error(`Account with name '${name2}' not found in config`);
   }
-  const account = config.accounts[name];
+  const account = config.accounts[name2];
   if (!account) {
-    throw new Error(`Account '${name}' not found in config`);
+    throw new Error(`Account '${name2}' not found in config`);
   }
   let privateKey;
   if (account.private_key) {
     privateKey = account.private_key;
   } else {
-    throw new Error(`No private key found for account '${name}'`);
+    throw new Error(`No private key found for account '${name2}'`);
   }
   return {
     address: account.address,
@@ -5361,11 +5704,11 @@ function getCurrentAccount(config, accountName) {
   };
 }
 function getAptosSettingsFromContext(context) {
-  const { name, api_key, ...options } = context.aptos_network;
+  const { name: name2, api_key, ...options } = context.aptos_network;
   const activeApiKey = api_key || context.api_key;
   return {
     ...options,
-    network: NetworkToNetworkName[name],
+    network: NetworkToNetworkName[name2],
     clientConfig: { API_KEY: activeApiKey }
   };
 }
@@ -5402,13 +5745,13 @@ function getCurrentShelbyConfig(config, opts = { context: config.default_context
 }
 
 // src/utils/account.ts
-function validateAccountName(name, config) {
-  const parsed = AccountNameSchema.safeParse(name);
-  if (!parsed.success || name.length === 0) {
+function validateAccountName(name2, config) {
+  const parsed = AccountNameSchema.safeParse(name2);
+  if (!parsed.success || name2.length === 0) {
     return parsed.error?.errors[0]?.message || "Account name must be a non-empty string containing only letters, numbers, underscores, or hyphens.";
   }
-  if (config?.accounts[name]) {
-    return `Account '${name}' already exists. Choose a different name.`;
+  if (config?.accounts[name2]) {
+    return `Account '${name2}' already exists. Choose a different name.`;
   }
   return void 0;
 }
@@ -5453,33 +5796,33 @@ var AccountWizard = ({
   const [step, setStep] = useState(
     initialName ? "address" : "name"
   );
-  const [name, setName] = useState(initialName || "");
+  const [name2, setName] = useState(initialName || "");
   const [nameError, setNameError] = useState(null);
   const [address, setAddress] = useState("");
   const [privateKey, setPrivateKey] = useState("");
   useEffect(() => {
     if (step === "done") {
       onComplete({
-        name,
+        name: name2,
         address: address || void 0,
         privateKey
       });
     }
-  }, [onComplete, step, name, address, privateKey]);
+  }, [onComplete, step, name2, address, privateKey]);
   if (step === "name") {
     return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx(Text, { children: "Account name?" }),
       /* @__PURE__ */ jsx(
         TextInput,
         {
-          value: name,
+          value: name2,
           onChange: (value) => {
             setName(value);
             const error = validateAccountName(value, config);
             setNameError(error || null);
           },
           onSubmit: () => {
-            const error = validateAccountName(name, config);
+            const error = validateAccountName(name2, config);
             if (error) {
               setNameError(error);
               return;
@@ -5563,7 +5906,7 @@ function AptosNetworkNameSelector({
   onSelect
 }) {
   const items = [
-    ...shelbyNetworks.map((name) => ({ label: name, value: name })),
+    ...shelbyNetworks.map((name2) => ({ label: name2, value: name2 })),
     ...additionalItems
   ];
   return /* @__PURE__ */ jsx3(
@@ -5599,9 +5942,9 @@ var APTOS_CONFIG_FIELDS = [
     type: "select",
     key: "name",
     label: "Network Name",
-    items: shelbyNetworks.map((name) => ({
-      label: name,
-      value: name
+    items: shelbyNetworks.map((name2) => ({
+      label: name2,
+      value: name2
     }))
   },
   {
@@ -6000,7 +6343,7 @@ var CreateContextWizard = ({
   onComplete
 }) => {
   const [step, setStep] = useState4("name");
-  const [name, setName] = useState4("");
+  const [name2, setName] = useState4("");
   const [apiKey, setApiKey] = useState4("");
   const [shelbyNetwork, setShelbyNetwork] = useState4(
     {}
@@ -6011,12 +6354,12 @@ var CreateContextWizard = ({
     const validatedAptosNetwork = AptosNetworkSchema.parse(aptosNetwork);
     const validatedShelbyNetwork = ShelbyNetworkSchema.parse(shelbyNetwork);
     onComplete({
-      name,
+      name: name2,
       apiKey: apiKey || void 0,
       shelbyNetwork: validatedShelbyNetwork,
       aptosNetwork: validatedAptosNetwork
     });
-  }, [step, name, apiKey, shelbyNetwork, aptosNetwork, onComplete]);
+  }, [step, name2, apiKey, shelbyNetwork, aptosNetwork, onComplete]);
   if (step === "name") {
     return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx6(Text5, { children: "Context name?" }),
@@ -6025,7 +6368,7 @@ var CreateContextWizard = ({
         {
           placeholder: "Enter context name",
           required: true,
-          value: name,
+          value: name2,
           onChange: setName,
           onSubmit: () => setStep("api-key")
         }
@@ -6255,6 +6598,158 @@ function assetTypeToString(asset) {
   return AccountAddress7.from(asset).toString();
 }
 
+// src/utils/cache.ts
+import path2 from "path";
+import fs2 from "fs-extra";
+var Cache = class {
+  cachePath;
+  schema;
+  constructor(cacheFileName, schema) {
+    this.cachePath = resolveConfigPath(`~/.shelby/${cacheFileName}`);
+    this.schema = schema;
+  }
+  /**
+   * Read data from cache
+   * Returns null if cache doesn't exist or fails validation
+   */
+  read() {
+    try {
+      if (!fs2.existsSync(this.cachePath)) {
+        return null;
+      }
+      const data = fs2.readFileSync(this.cachePath, "utf-8");
+      const parsed = JSON.parse(data);
+      const result = this.schema.safeParse(parsed);
+      if (!result.success) {
+        return null;
+      }
+      return result.data;
+    } catch {
+      return null;
+    }
+  }
+  /**
+   * Write data to cache
+   * Data is validated before writing
+   */
+  write(data) {
+    try {
+      const validated = this.schema.parse(data);
+      const cacheDir = path2.dirname(this.cachePath);
+      fs2.mkdirpSync(cacheDir);
+      fs2.writeFileSync(
+        this.cachePath,
+        JSON.stringify(validated, null, 2),
+        "utf-8"
+      );
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  /**
+   * Delete the cache file
+   */
+  clear() {
+    try {
+      if (fs2.existsSync(this.cachePath)) {
+        fs2.unlinkSync(this.cachePath);
+      }
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  /**
+   * Check if cache exists
+   */
+  exists() {
+    return fs2.existsSync(this.cachePath);
+  }
+  /**
+   * Get the resolved cache file path
+   */
+  getPath() {
+    return this.cachePath;
+  }
+};
+
+// src/utils/check-version.ts
+import boxen from "boxen";
+import chalk from "chalk";
+import { getLatestVersion } from "fast-npm-meta";
+import * as semver from "semver";
+import { z as z9 } from "zod";
+var CHECK_INTERVAL = 1e3 * 60 * 60 * 24;
+var NOTIFY_INTERVAL = CHECK_INTERVAL;
+var VersionCacheSchema = z9.object({
+  lastChecked: z9.number(),
+  latestVersion: z9.string(),
+  lastNotified: z9.number().optional()
+});
+var versionCache = new Cache("version-check.json", VersionCacheSchema);
+async function fetchLatestVersion() {
+  try {
+    const result = await getLatestVersion(name, { throw: false });
+    if ("error" in result) {
+      return null;
+    }
+    return result.version;
+  } catch {
+    return null;
+  }
+}
+function displayUpdateNotification(latestVersion) {
+  const message = [
+    `Update available ${chalk.dim(version)} \u2192 ${chalk.green(
+      latestVersion
+    )}`,
+    "",
+    `Run ${chalk.cyan(`npm install -g ${name}`)} to update`
+  ].join("\n");
+  console.log(
+    "\n" + boxen(message, {
+      padding: 1,
+      margin: 1,
+      borderStyle: "round",
+      borderColor: "yellow"
+    }) + "\n"
+  );
+}
+async function checkForUpdates(force = false) {
+  try {
+    const now = Date.now();
+    const cache = versionCache.read();
+    const shouldUseCache = cache && !force && now - cache.lastChecked < CHECK_INTERVAL;
+    if (shouldUseCache) {
+      if (semver.gt(cache.latestVersion, version)) {
+        const shouldNotify = !cache.lastNotified || now - cache.lastNotified >= NOTIFY_INTERVAL;
+        if (shouldNotify) {
+          displayUpdateNotification(cache.latestVersion);
+          versionCache.write({ ...cache, lastNotified: now });
+        }
+      }
+      return;
+    }
+    const latestVersion = await fetchLatestVersion();
+    if (!latestVersion) return;
+    const isUpdateAvailable = semver.gt(latestVersion, version);
+    versionCache.write({
+      lastChecked: now,
+      latestVersion,
+      lastNotified: isUpdateAvailable ? now : cache?.lastNotified
+    });
+    if (isUpdateAvailable) {
+      displayUpdateNotification(latestVersion);
+    }
+  } catch (err) {
+    console.error("Unable to check for updates", err);
+  }
+}
+async function checkForUpdatesAsync() {
+  await checkForUpdates();
+}
+
 // src/utils/erasure.ts
 var providerPromise;
 function getErasureCodingProvider() {
@@ -6265,7 +6760,10 @@ function getErasureCodingProvider() {
 }
 
 // src/utils/paths.ts
-import path2 from "path";
+import path3 from "path";
+function endsWithDirectorySeparator(filePath) {
+  return filePath.endsWith("/") || filePath.endsWith("\\") || filePath.endsWith(path3.sep);
+}
 function normBlobName(pathModule, inputDirectoryName, filename, blobPrefix) {
   const blobNameWithoutInputDir = pathModule.relative(
     inputDirectoryName,
@@ -6277,7 +6775,7 @@ function normBlobName(pathModule, inputDirectoryName, filename, blobPrefix) {
   );
   const blobNameNormalized = pathModule.normalize(blobNameWithPrefix);
   const parts = blobNameNormalized.split(pathModule.sep);
-  return path2.posix.join(...parts);
+  return path3.posix.join(...parts);
 }
 function denormBlobName(pathModule, blobPrefix, blobName, outputPrefix) {
   if (!pathModule.isAbsolute(outputPrefix)) {
@@ -6511,7 +7009,7 @@ function createResponsiveTable(options) {
 
 // src/utils/version.ts
 import { execSync } from "child_process";
-import semver from "semver";
+import semver2 from "semver";
 var MIN_APTOS_CLI_VERSION = "7.8.0";
 var MIN_NODE_VERSION = "22.0.0";
 function getNodeVersion() {
@@ -6519,7 +7017,7 @@ function getNodeVersion() {
 }
 function getNodeVersionInfo(minVersion = MIN_NODE_VERSION) {
   const version2 = getNodeVersion();
-  const meetsRequirement = semver.gte(version2, minVersion);
+  const meetsRequirement = semver2.gte(version2, minVersion);
   return { version: version2, meetsRequirement };
 }
 function getAptosCliVersion() {
@@ -6535,7 +7033,7 @@ function getAptosCliVersion() {
 }
 function getAptosCliVersionInfo(minVersion = MIN_APTOS_CLI_VERSION) {
   const version2 = getAptosCliVersion();
-  const meetsRequirement = version2 ? semver.gte(version2, minVersion) : false;
+  const meetsRequirement = version2 ? semver2.gte(version2, minVersion) : false;
   return { version: version2, meetsRequirement };
 }
 
@@ -7017,10 +7515,10 @@ var handleError = (error) => {
 
 // src/commands/account.tsx
 import { jsx as jsx10 } from "react/jsx-runtime";
-var CreateAccountOptionsSchema = z9.object({
-  name: z9.string().optional(),
-  privateKey: z9.string().optional(),
-  address: z9.string().optional(),
+var CreateAccountOptionsSchema = z10.object({
+  name: z10.string().optional(),
+  privateKey: z10.string().optional(),
+  address: z10.string().optional(),
   scheme: SignatureSchemeSchema.optional()
 });
 var allSchemes = SignatureSchemeSchema.options.join(", ");
@@ -7029,10 +7527,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());
     });
   });
 }
@@ -7047,12 +7545,12 @@ async function promptForAccountName(config) {
     return answer;
   }
 }
-var ListAccountOptionsSchema = z9.object({});
-var UseAccountOptionsSchema = z9.object({
-  accountName: z9.string()
+var ListAccountOptionsSchema = z10.object({});
+var UseAccountOptionsSchema = z10.object({
+  accountName: z10.string()
 });
-var DeleteAccountOptionsSchema = z9.object({
-  accountName: z9.string()
+var DeleteAccountOptionsSchema = z10.object({
+  accountName: z10.string()
 });
 function accountCommand(program) {
   const account = program.command("account").description("Manage signing accounts (addresses & keys)");
@@ -7064,7 +7562,7 @@ function accountCommand(program) {
     "Aptos account address (hex-encoded)"
   ).action(async (options) => {
     CreateAccountOptionsSchema.parse(options);
-    const { name, privateKey, address, scheme } = options;
+    const { name: name2, privateKey, address, scheme } = options;
     const configPath = program.opts().configFile;
     let config;
     try {
@@ -7123,20 +7621,20 @@ function accountCommand(program) {
         /* @__PURE__ */ jsx10(
           AccountWizard,
           {
-            initialName: name,
+            initialName: name2,
             config,
             onComplete: ({
-              name: name2,
+              name: name3,
               address: address2,
               privateKey: privateKey2
             }) => {
-              config.accounts[name2] = {
+              config.accounts[name3] = {
                 private_key: privateKey2,
                 address: address2
               };
               saveConfig(config, configPath);
               console.log(
-                `\u2705 Account ${name2} saved to ${resolveConfigPath(configPath)}`
+                `\u2705 Account ${name3} saved to ${resolveConfigPath(configPath)}`
               );
               unmount();
             }
@@ -7172,9 +7670,9 @@ function accountCommand(program) {
       padding: 12
       // Account for borders (4) + cell padding (6) + margin
     });
-    for (const [name, { address, private_key }] of accounts) {
-      const isDefault = name === config.default_account ? " (default)" : "";
-      const displayName = name + isDefault;
+    for (const [name2, { address, private_key }] of accounts) {
+      const isDefault = name2 === config.default_account ? " (default)" : "";
+      const displayName = name2 + isDefault;
       const maskedKey = private_key ? `${private_key.slice(0, 20)}...` : "";
       const row = [displayName, address || "", maskedKey];
       table.push(row.map((cell, i) => wrapCell(cell, i)));
@@ -7235,25 +7733,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 +7768,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)")) {
@@ -7344,16 +7856,16 @@ function accountCommand(program) {
       console.log("\n\u{1F464}  Account Information");
       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 (!addressArg && accountName) {
-        console.log(`\u{1F3F7}\uFE0F  Alias:        ${chalk.cyan(accountName)}`);
+        console.log(`\u{1F3F7}\uFE0F  Alias:        ${chalk2.cyan(accountName)}`);
       }
-      console.log(`\u{1F310}  Context:      ${chalk.magenta(contextName)}`);
+      console.log(`\u{1F310}  Context:      ${chalk2.magenta(contextName)}`);
       console.log("");
-      console.log(`\u{1F511}  Address:      ${chalk.dim(targetAddress)}`);
+      console.log(`\u{1F511}  Address:      ${chalk2.dim(targetAddress)}`);
       console.log(
-        `\u{1F517}  Aptos Explorer:  ${chalk.blueBright.underline(aptosExplorerUrl)}`
+        `\u{1F517}  Aptos Explorer:  ${chalk2.blueBright.underline(aptosExplorerUrl)}`
       );
       console.log(
-        `\u{1F5C2}\uFE0F  Shelby Explorer: ${chalk.blueBright.underline(shelbyExplorerUrl)}`
+        `\u{1F5C2}\uFE0F  Shelby Explorer: ${chalk2.blueBright.underline(shelbyExplorerUrl)}`
       );
       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("\n\u{1F4B0}  Balance:\n");
@@ -7403,21 +7915,21 @@ function accountCommand(program) {
 }
 
 // src/commands/commitment.ts
-import * as fs2 from "fs";
+import * as fs3 from "fs";
 import * as fsP from "fs/promises";
 import { Readable } from "stream";
-import { z as z10 } from "zod";
-var CommitmentOptionsSchema = z10.object({
-  input: z10.string().nonempty("`--input` is required").refine(
-    async (path6) => {
-      const stat4 = await fsP.stat(path6);
+import { z as z11 } from "zod";
+var CommitmentOptionsSchema = z11.object({
+  input: z11.string().nonempty("`--input` is required").refine(
+    async (path7) => {
+      const stat4 = await fsP.stat(path7);
       return stat4.isFile();
     },
     {
       message: "`--input` must be a file"
     }
   ),
-  output: z10.string().nonempty("`--output` is required")
+  output: z11.string().nonempty("`--output` is required")
 });
 function commitmentCommand(program) {
   program.command("commitment <input> <output>").description(
@@ -7427,7 +7939,7 @@ function commitmentCommand(program) {
       input,
       output
     });
-    const inputFile = fs2.createReadStream(validatedOptions.input);
+    const inputFile = fs3.createReadStream(validatedOptions.input);
     const provider = await getErasureCodingProvider();
     const commitment = await generateCommitments(
       provider,
@@ -7439,29 +7951,29 @@ function commitmentCommand(program) {
 
 // src/commands/context.tsx
 import { render as render2 } from "ink";
-import { z as z12 } from "zod";
+import { z as z13 } from "zod";
 
 // src/utils/commands.ts
-import z11 from "zod";
-var AptosCommandOptionsSchema = z11.object({
-  aptosNetwork: z11.string().optional(),
+import z12 from "zod";
+var AptosCommandOptionsSchema = z12.object({
+  aptosNetwork: z12.string().optional(),
   // predefined network name
-  aptosFullnode: z11.string().url().optional(),
-  aptosFaucet: z11.string().url().optional(),
-  aptosIndexer: z11.string().url().optional(),
-  aptosPepper: z11.string().url().optional(),
-  aptosProver: z11.string().url().optional(),
-  aptosApiKey: z11.string().optional()
+  aptosFullnode: z12.string().url().optional(),
+  aptosFaucet: z12.string().url().optional(),
+  aptosIndexer: z12.string().url().optional(),
+  aptosPepper: z12.string().url().optional(),
+  aptosProver: z12.string().url().optional(),
+  aptosApiKey: z12.string().optional()
 });
 var addAptosCommandOptions = (context) => context.option(
   "--aptos-network <network>",
   `Aptos network (${shelbyNetworks.join(", ")})`
 ).option("--aptos-fullnode <url>", "Aptos fullnode URL").option("--aptos-faucet <url>", "Aptos faucet URL").option("--aptos-indexer <url>", "Aptos indexer URL").option("--aptos-pepper <url>", "Aptos pepper URL").option("--aptos-prover <url>", "Aptos prover URL").option("--aptos-api-key <key>", "Aptos API key");
-var ShelbyCommandOptionsSchema = z11.object({
+var ShelbyCommandOptionsSchema = z12.object({
   shelbyRpcEndpoint: EndpointSchema.optional(),
   shelbyIndexerEndpoint: EndpointSchema.optional(),
-  shelbyRpcApiKey: z11.string().optional(),
-  shelbyIndexerApiKey: z11.string().optional()
+  shelbyRpcApiKey: z12.string().optional(),
+  shelbyIndexerApiKey: z12.string().optional()
 });
 var addShelbyCommandOptions = (context) => context.option("--shelby-rpc-endpoint <url>", "Shelby RPC endpoint").option("--shelby-indexer-endpoint <url>", "Shelby indexer endpoint").option("--shelby-rpc-api-key <key>", "Shelby RPC API key").option("--shelby-indexer-api-key <key>", "Shelby indexer API key");
 
@@ -7498,13 +8010,13 @@ function getShelbyNetworkFromOptions(options) {
     indexer_api_key: options.shelbyIndexerApiKey
   };
 }
-var CreateContextOptionsSchema = z12.object({ name: z12.string().optional() }).merge(AptosCommandOptionsSchema).merge(ShelbyCommandOptionsSchema);
-var UpdateContextOptionsSchema = z12.object({}).merge(ShelbyCommandOptionsSchema).merge(AptosCommandOptionsSchema);
+var CreateContextOptionsSchema = z13.object({ name: z13.string().optional() }).merge(AptosCommandOptionsSchema).merge(ShelbyCommandOptionsSchema);
+var UpdateContextOptionsSchema = z13.object({}).merge(ShelbyCommandOptionsSchema).merge(AptosCommandOptionsSchema);
 function contextCommand(program) {
   const context = program.command("context").description("Manage network contexts (Shelby RPC & Aptos endpoints)");
   addShelbyCommandOptions(addAptosCommandOptions(context.command("create"))).description("Create a new context").option("--name <context-name>", "Name of the context").action((options) => {
     CreateContextOptionsSchema.parse(options);
-    const { name } = options;
+    const { name: name2 } = options;
     const aptosNetwork = getAptosNetworkFromOptions(options);
     const shelbyNetwork = getShelbyNetworkFromOptions(options);
     const configPath = program.opts().configFile;
@@ -7515,7 +8027,7 @@ function contextCommand(program) {
       config = {
         contexts: {},
         accounts: {},
-        default_context: name || "",
+        default_context: name2 || "",
         default_account: "default_account"
       };
     }
@@ -7525,10 +8037,10 @@ function contextCommand(program) {
     const hasAptosNetworkChanges = Object.values(aptosNetwork).some(
       (value) => value !== void 0
     );
-    if (name && (hasAptosNetworkChanges || hasShelbyNetworkChanges)) {
+    if (name2 && (hasAptosNetworkChanges || hasShelbyNetworkChanges)) {
       const validatedAptosNetwork = AptosNetworkSchema.parse(aptosNetwork);
       const validatedShelbyNetwork = ShelbyNetworkSchema.parse(shelbyNetwork);
-      config.contexts[name] = {
+      config.contexts[name2] = {
         shelby_network: {
           ...validatedShelbyNetwork,
           // This is to ensure there are no trailing slashes
@@ -7540,7 +8052,7 @@ function contextCommand(program) {
         aptos_network: validatedAptosNetwork
       };
       saveConfig(config, configPath);
-      console.log(`\u2705 Context '${name}' created successfully`);
+      console.log(`\u2705 Context '${name2}' created successfully`);
       return;
     }
     const { unmount } = render2(
@@ -7548,18 +8060,18 @@ function contextCommand(program) {
         CreateContextWizard,
         {
           onComplete: ({
-            name: name2,
+            name: name3,
             apiKey,
             shelbyNetwork: shelbyNetwork2,
             aptosNetwork: aptosNetwork2
           }) => {
-            config.contexts[name2] = {
+            config.contexts[name3] = {
               api_key: apiKey,
               shelby_network: shelbyNetwork2,
               aptos_network: aptosNetwork2
             };
             saveConfig(config, configPath);
-            console.log(`\u2705 Context '${name2}' created successfully`);
+            console.log(`\u2705 Context '${name3}' created successfully`);
             unmount();
             process.exit(0);
           }
@@ -7769,59 +8281,106 @@ function contextCommand(program) {
 
 // src/commands/download.tsx
 import * as fsS from "fs";
-import * as fs3 from "fs/promises";
-import * as path3 from "path";
+import * as fs4 from "fs/promises";
+import * as path4 from "path";
 import { Readable as Readable2, Transform } from "stream";
 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"),
-  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")
+import { z as z14 } from "zod";
+var denormBlobName2 = (a, b, c) => denormBlobName(path4, a, b, c);
+var DownloadOptionsSchema = z14.object({
+  source: z14.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: z14.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: z14.boolean().default(false).describe("Download assuming canonical directory layout and recurse"),
+  force: z14.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 = path4.dirname(options.destination);
   try {
-    const parentStats = await fs3.stat(parentDir);
+    const parentStats = await fs4.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 +8388,7 @@ async function validateOutput(options) {
   if (options.force) return;
   let outputStats;
   try {
-    outputStats = await fs3.stat(options.dst);
+    outputStats = await fs4.stat(options.destination);
   } catch (error) {
     if (error instanceof Error && "code" in error && error.code === "ENOENT") {
       return;
@@ -7839,64 +8398,73 @@ 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 fs4.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) {
-    let blobname;
-    if (options.recursive) {
-      blobname = blobMd.name.slice(1 + 64 + 1);
-    } else {
-      blobname = blobMd.name;
-    }
+    const blobNameWithoutAccount = stripAccountPrefix(blobMd.name);
     const entry = {
-      filename: denormBlobName2(options.src, blobname, options.dst),
-      blobname,
+      filename: denormBlobName2(
+        options.source,
+        blobNameWithoutAccount,
+        options.destination
+      ),
+      blobname: blobNameWithoutAccount,
+      // FIXME this is nasty
       sizeBytes: blobMd.size
     };
     ret.push(entry);
@@ -7906,12 +8474,12 @@ async function createFileList(options, nodeClient, account) {
 async function createOutputDirectories(fileList) {
   const uniqueDirectories = /* @__PURE__ */ new Set();
   for (const fileEntry of fileList) {
-    const parentDir = path3.dirname(fileEntry.filename);
+    const parentDir = path4.dirname(fileEntry.filename);
     uniqueDirectories.add(parentDir);
   }
   for (const dir of uniqueDirectories) {
     try {
-      await fs3.mkdir(dir, { recursive: true });
+      await fs4.mkdir(dir, { recursive: true });
     } catch (error) {
       throw new Error(
         `Failed to create directory '${dir}': ${error instanceof Error ? error.message : error}`
@@ -7935,96 +8503,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 z14.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 = path4.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 = path4.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 fs4.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 = path4.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`);
     }
   );
 }
@@ -8032,10 +8674,10 @@ function downloadCommand(program) {
 // src/commands/faucet.tsx
 import { Network as Network9 } from "@aptos-labs/ts-sdk";
 import { execaSync } from "execa";
-import { z as z14 } from "zod";
-var FaucetOptionsSchema = z14.object({
-  network: z14.enum([Network9.SHELBYNET]).optional(),
-  open: z14.boolean().optional().default(true)
+import { z as z15 } from "zod";
+var FaucetOptionsSchema = z15.object({
+  network: z15.enum([Network9.SHELBYNET]).optional(),
+  open: z15.boolean().optional().default(true)
 });
 function faucetCommand(program) {
   program.command("faucet").description("Open the Shelby faucet web page to request tokens").option("--network <network>", "Network to request tokens for (shelbynet)").option("--no-open", "Don't automatically open browser, just print the URL").action((options) => {
@@ -8106,9 +8748,9 @@ function openBrowser(url) {
 }
 
 // src/commands/init.tsx
-import path4 from "path";
+import path5 from "path";
 import { Network as Network10 } from "@aptos-labs/ts-sdk";
-import fs4 from "fs-extra";
+import fs5 from "fs-extra";
 import { render as render3 } from "ink";
 import { jsx as jsx12 } from "react/jsx-runtime";
 function initCommand(program) {
@@ -8237,22 +8879,72 @@ function cloneContexts(contexts) {
   return JSON.parse(JSON.stringify(contexts));
 }
 function ensureConfigDir(resolvedPath) {
-  fs4.mkdirpSync(path4.dirname(resolvedPath));
+  fs5.mkdirpSync(path5.dirname(resolvedPath));
 }
 
 // src/commands/upload.tsx
-import * as fs5 from "fs/promises";
-import * as path5 from "path";
+import * as fs6 from "fs/promises";
+import * as path6 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";
+import { z as z16 } 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 normBlobName2 = (i, f, b) => normBlobName(path6, i, f, b);
+var flexibleDateSchema = z16.string().transform((val, ctx) => {
   const now = /* @__PURE__ */ new Date();
   let parsedDate = null;
   if (/^\d+$/.test(val)) {
@@ -8274,77 +8966,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: z16.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 z16.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: z16.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 z16.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"),
+var UploadOptionsSchema = z16.object({
+  source: z16.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: z16.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()
+  recursive: z16.boolean().optional().default(false),
+  assumeYes: z16.boolean().optional().default(false),
+  outputCommitments: z16.string().optional()
 }).superRefine(async (data, ctx) => {
-  const stats = await fs5.stat(data.src);
+  const stats = await fs6.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"]
+      code: z16.ZodIssueCode.custom,
+      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"]
+        code: z16.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  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"]
+        code: z16.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  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 = path6.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 fs6.readFile(gitignorePath, "utf8");
+      const directory = path6.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 = path6.dirname(filePath);
+  while (true) {
+    directories.push(current);
+    if (current === root) {
+      break;
+    }
+    const parent = path6.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 = path6.relative(directory, filePath).split(path6.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 fs6.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 = path6.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) {
-    const stats2 = await fs5.stat(file);
-    const blobname = normBlobName2(options.src, file, options.dst);
+    if (shouldIgnorePath(gitignoreMap, sourceRoot, file)) {
+      continue;
+    }
+    const stats2 = await fs6.stat(file);
+    if (!stats2.isFile()) {
+      continue;
+    }
+    const blobname = normBlobName2(sourceRoot, file, options.destination);
     const blobNameValidation = BlobNameSchema.safeParse(blobname);
     if (!blobNameValidation.success) {
       throw new Error(
@@ -8360,7 +9182,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 +9191,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 z16.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 = path6.basename(entry.filename);
+        const fileProgress = isSingleFile ? `(${formatProgressPercent()}%)` : `(${filesProcessed}/${filelist.length} files, ${formatProgressPercent()}%)`;
+        spinner.text = `\u{1F4D6} Reading ${fileName}... ${fileProgress}`;
+        try {
+          const blobData = await fs6.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 fs6.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
@@ -8608,6 +9452,7 @@ function createProgram() {
 
 // src/entry.ts
 function main() {
+  checkForUpdatesAsync();
   const rawArgs = process.argv.slice(2);
   const normalizedArgs = rawArgs[0] === "--" ? rawArgs.slice(1) : rawArgs;
   createProgram().parse([process.argv[0], process.argv[1], ...normalizedArgs]);