@shelby-protocol/cli 0.0.9 → 0.0.10

package/bin/entry.js

@@ -4,10 +4,16 @@
 import { Command } from "commander";
 
 // package.json
-var version = "0.0.9";
+var version = "0.0.10";
 
 // src/commands/account.tsx
-import { AptosApiError as AptosApiError2, Hex as Hex4 } from "@aptos-labs/ts-sdk";
+import readline from "readline";
+import {
+  Account as Account3,
+  AptosApiError as AptosApiError2,
+  Ed25519PrivateKey as Ed25519PrivateKey4,
+  Hex as Hex4
+} from "@aptos-labs/ts-sdk";
 
 // ../../packages/sdk/dist/chunk-RBFWGDMY.mjs
 import { AptosConfig, Network } from "@aptos-labs/ts-sdk";
@@ -229,10 +235,10 @@ var GraphQLError = class _GraphQLError extends Error {
    */
   constructor(message, ...rawArgs) {
     var _this$nodes, _nodeLocations$, _ref;
-    const { nodes, source, positions, path: path5, originalError, extensions } = toNormalizedOptions(rawArgs);
+    const { nodes, source, positions, path: path6, originalError, extensions } = toNormalizedOptions(rawArgs);
     super(message);
     this.name = "GraphQLError";
-    this.path = path5 !== null && path5 !== void 0 ? path5 : void 0;
+    this.path = path6 !== null && path6 !== void 0 ? path6 : void 0;
     this.originalError = originalError !== null && originalError !== void 0 ? originalError : void 0;
     this.nodes = undefinedIfEmpty(
       Array.isArray(nodes) ? nodes : nodes ? [nodes] : void 0
@@ -2800,14 +2806,14 @@ function visit(root, visitor, visitorKeys = QueryDocumentKeys) {
   let node = root;
   let key = void 0;
   let parent = void 0;
-  const path5 = [];
+  const path6 = [];
   const ancestors = [];
   do {
     index++;
     const isLeaving = index === keys.length;
     const isEdited = isLeaving && edits.length !== 0;
     if (isLeaving) {
-      key = ancestors.length === 0 ? void 0 : path5[path5.length - 1];
+      key = ancestors.length === 0 ? void 0 : path6[path6.length - 1];
       node = parent;
       parent = ancestors.pop();
       if (isEdited) {
@@ -2841,20 +2847,20 @@ function visit(root, visitor, visitorKeys = QueryDocumentKeys) {
       if (node === null || node === void 0) {
         continue;
       }
-      path5.push(key);
+      path6.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, path5, ancestors);
+      result = visitFn === null || visitFn === void 0 ? void 0 : visitFn.call(visitor, node, key, parent, path6, ancestors);
       if (result === BREAK) {
         break;
       }
       if (result === false) {
         if (!isLeaving) {
-          path5.pop();
+          path6.pop();
           continue;
         }
       } else if (result !== void 0) {
@@ -2863,7 +2869,7 @@ function visit(root, visitor, visitorKeys = QueryDocumentKeys) {
           if (isNode(result)) {
             node = result;
           } else {
-            path5.pop();
+            path6.pop();
             continue;
           }
         }
@@ -2873,7 +2879,7 @@ function visit(root, visitor, visitorKeys = QueryDocumentKeys) {
       edits.push([key, node]);
     }
     if (isLeaving) {
-      path5.pop();
+      path6.pop();
     } else {
       var _node$kind;
       stack = {
@@ -3319,7 +3325,7 @@ function getSdk(client, withWrapper = defaultWrapper) {
   };
 }
 
-// ../../packages/sdk/dist/chunk-75VHXY5P.mjs
+// ../../packages/sdk/dist/chunk-57KKLRIW.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
@@ -3834,14 +3840,14 @@ var parseRequestArgs = (documentOrOptions, variables, requestHeaders) => {
   };
 };
 
-// ../../packages/sdk/dist/chunk-75VHXY5P.mjs
+// ../../packages/sdk/dist/chunk-57KKLRIW.mjs
 function createShelbyIndexerClient(baseUrl, options) {
   const graphqlClient = new GraphQLClient(baseUrl, options);
   return getSdk(graphqlClient);
 }
 function getShelbyIndexerClient(config) {
   const aptosConfig = config.aptos ?? getAptosConfig(config);
-  let { apiKey, baseUrl } = config.indexer ?? {};
+  let { apiKey: indexerApiKey, baseUrl } = config.indexer ?? {};
   if (!baseUrl) {
     switch (aptosConfig?.network) {
       // TODO: Add endpoints for core networks
@@ -3858,6 +3864,7 @@ function getShelbyIndexerClient(config) {
       "The ShelbyClientConfig does not support the Shelby indexer. Please configure the endpoint in the ShelbyClientConfig.indexer.endpoint or provide a supported Aptos network."
     );
   }
+  const apiKey = indexerApiKey ?? config.apiKey;
   return createShelbyIndexerClient(baseUrl, {
     headers: {
       ...apiKey ? { Authorization: `Bearer ${apiKey}` } : {},
@@ -3945,10 +3952,10 @@ function isReadableStream(value) {
 function toUint8Array(view) {
   return view instanceof Uint8Array ? view : new Uint8Array(view.buffer, view.byteOffset, view.byteLength);
 }
-function buildRequestUrl(path5, baseUrl) {
+function buildRequestUrl(path6, baseUrl) {
   const baseHasSlash = baseUrl.endsWith("/");
   const safeBase = baseHasSlash ? baseUrl : `${baseUrl}/`;
-  const safePath = path5.replace(/^\/+/, "");
+  const safePath = path6.replace(/^\/+/, "");
   return new URL(safePath, safeBase);
 }
 
@@ -4338,9 +4345,9 @@ async function loadWasm() {
     resolve(here, "../dist/clay.wasm")
   ];
   let bytes;
-  for (const path5 of paths) {
+  for (const path6 of paths) {
     try {
-      bytes = await readFile(path5);
+      bytes = await readFile(path6);
       break;
     } catch {
     }
@@ -4522,7 +4529,7 @@ var BlobNameSchema = z.string().min(1, "Blob name path parameter cannot be empty
   message: "Blob name cannot end with a slash"
 });
 
-// ../../packages/sdk/dist/chunk-NRNVAY72.mjs
+// ../../packages/sdk/dist/chunk-PGBEBDNY.mjs
 import { AccountAddress as AccountAddress3 } from "@aptos-labs/ts-sdk";
 function encodeURIComponentKeepSlashes(str) {
   return encodeURIComponent(str).replace(/%2F/g, "/");
@@ -4914,7 +4921,7 @@ function validatePrePaddedChunkset(chunkset, expectedSize, chunksetIdx) {
   return chunkset;
 }
 
-// ../../packages/sdk/dist/chunk-XGMJ4CG4.mjs
+// ../../packages/sdk/dist/chunk-USBWGA27.mjs
 import {
   AccountAddress as AccountAddress5,
   Aptos as Aptos2,
@@ -5078,16 +5085,16 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
         owner: AccountAddress5.from(blob.owner),
         name: blob.blob_name,
         blobMerkleRoot: Hex3.fromHexInput(blob.blob_commitment).toUint8Array(),
-        size: blob.size,
+        size: Number(blob.size),
         // TODO: Add encoding when supported in NCI
         encoding: {
           variant: "clay",
           ...ERASURE_CODE_PARAMS.ClayCode_16Total_10Data_13Helper,
           ...ERASURE_CODE_AND_CHUNK_MAPPING.ClayCode_16Total_10Data_13Helper
         },
-        expirationMicros: blob.expires_at,
+        expirationMicros: Number(blob.expires_at),
         sliceAddress: AccountAddress5.from(blob.slice_address),
-        isWritten: blob.is_written
+        isWritten: Boolean(Number(blob.is_written))
       })
     );
   }
@@ -5272,7 +5279,7 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
   }
 };
 
-// ../../packages/sdk/dist/chunk-QP2C6ORP.mjs
+// ../../packages/sdk/dist/chunk-PUNXDYH2.mjs
 import {
   Aptos as Aptos3
 } from "@aptos-labs/ts-sdk";
@@ -5427,7 +5434,7 @@ var ShelbyClient = class {
   }
 };
 
-// ../../packages/sdk/dist/chunk-LSNN4V5F.mjs
+// ../../packages/sdk/dist/chunk-I7SQAWUY.mjs
 var ShelbyNodeClient = class extends ShelbyClient {
 };
 
@@ -5464,7 +5471,7 @@ var shelbyNetworks = [Network4.LOCAL, Network4.SHELBYNET];
 
 // src/commands/account.tsx
 import { render } from "ink";
-import { z as z8 } from "zod";
+import { z as z9 } from "zod";
 
 // src/components/AccountWizard.tsx
 import { Box, Text } from "ink";
@@ -5478,95 +5485,13 @@ import {
   Aptos as Aptos4,
   AptosConfig as AptosConfig3,
   Ed25519Account,
-  Ed25519PrivateKey as Ed25519PrivateKey2,
-  Network as Network7,
+  Ed25519PrivateKey,
   NetworkToNetworkName
 } from "@aptos-labs/ts-sdk";
 import fs from "fs-extra";
 import YAML from "yaml";
 import { z as z6 } from "zod";
 
-// tests/utils/mockConfig.ts
-import { Network as Network5 } from "@aptos-labs/ts-sdk";
-
-// src/utils/context-helpers.ts
-import {
-  NetworkToFaucetAPI,
-  NetworkToIndexerAPI,
-  NetworkToNodeAPI,
-  NetworkToPepperAPI,
-  NetworkToProverAPI
-} from "@aptos-labs/ts-sdk";
-function createContextForNetwork(network) {
-  return {
-    aptos_network: {
-      name: network,
-      fullnode: NetworkToNodeAPI[network],
-      faucet: NetworkToFaucetAPI[network],
-      indexer: NetworkToIndexerAPI[network],
-      pepper: NetworkToPepperAPI[network],
-      prover: NetworkToProverAPI[network]
-    },
-    shelby_network: {
-      rpc_endpoint: NetworkToShelbyRPCBaseUrl[network]
-    }
-  };
-}
-
-// src/utils/keys.ts
-import {
-  Account,
-  AccountAddress as AccountAddress6,
-  Ed25519PrivateKey,
-  Secp256k1PrivateKey,
-  SigningSchemeInput
-} from "@aptos-labs/ts-sdk";
-function generateEd25519Account() {
-  const account = Account.generate({
-    scheme: SigningSchemeInput.Ed25519,
-    legacy: true
-  });
-  return account;
-}
-function isValidEd25519PrivateKey(value) {
-  try {
-    new Ed25519PrivateKey(value);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function isValidAddress(address) {
-  return AccountAddress6.isValid({ input: address }).valid;
-}
-var SECP256K1_NAME = "secp256k1";
-var ED25519_NAME = "ed25519";
-function isValidScheme(scheme) {
-  return SECP256K1_NAME === scheme || ED25519_NAME === scheme;
-}
-
-// tests/utils/mockConfig.ts
-var mockAccounts = {
-  alice: generateEd25519Account(),
-  bob: generateEd25519Account()
-};
-var mockConfig = {
-  contexts: {
-    [Network5.SHELBYNET]: createContextForNetwork(Network5.SHELBYNET)
-  },
-  accounts: Object.fromEntries(
-    Object.entries(mockAccounts).map(([name, acc]) => [
-      name,
-      {
-        address: acc.accountAddress.toString(),
-        private_key: acc.privateKey.toAIP80String()
-      }
-    ])
-  ),
-  default_context: Network5.SHELBYNET,
-  default_account: Object.keys(mockAccounts)[0]
-};
-
 // src/schemas/AptosNetworkSchema.ts
 import { z as z4 } from "zod";
 
@@ -5597,19 +5522,45 @@ var ShelbyNetworkSchema = z5.object({
 });
 
 // src/utils/constants.ts
-import { APTOS_COIN, Network as Network6 } from "@aptos-labs/ts-sdk";
+import { APTOS_COIN, Network as Network5 } from "@aptos-labs/ts-sdk";
+
+// src/utils/context-helpers.ts
+import {
+  NetworkToFaucetAPI,
+  NetworkToIndexerAPI,
+  NetworkToNodeAPI,
+  NetworkToPepperAPI,
+  NetworkToProverAPI
+} from "@aptos-labs/ts-sdk";
+function createContextForNetwork(network) {
+  return {
+    aptos_network: {
+      name: network,
+      fullnode: NetworkToNodeAPI[network],
+      faucet: NetworkToFaucetAPI[network],
+      indexer: NetworkToIndexerAPI[network],
+      pepper: NetworkToPepperAPI[network],
+      prover: NetworkToProverAPI[network]
+    },
+    shelby_network: {
+      rpc_endpoint: NetworkToShelbyRPCBaseUrl[network]
+    }
+  };
+}
+
+// src/utils/constants.ts
 var DEFAULT_CONFIG_PATH = "~/.shelby/config.yaml";
 var DEFAULT_CONFIG = {
   contexts: {
-    [Network6.LOCAL]: {
-      ...createContextForNetwork(Network6.LOCAL),
+    [Network5.LOCAL]: {
+      ...createContextForNetwork(Network5.LOCAL),
       // Override shelby_network for local
       shelby_network: { rpc_endpoint: "http://localhost:9090/" }
     },
-    [Network6.SHELBYNET]: createContextForNetwork(Network6.SHELBYNET)
+    [Network5.SHELBYNET]: createContextForNetwork(Network5.SHELBYNET)
   },
   accounts: {},
-  default_context: Network6.SHELBYNET,
+  default_context: Network5.SHELBYNET,
   default_account: ""
 };
 var STANDARD_CONTEXT_NAMES = Object.keys(DEFAULT_CONFIG.contexts).join(
@@ -5631,6 +5582,7 @@ var BALANCE_TARGETS = [
 
 // src/utils/config.ts
 var ContextSchema = z6.object({
+  api_key: z6.string().optional(),
   aptos_network: AptosNetworkSchema,
   shelby_network: ShelbyNetworkSchema.optional()
 });
@@ -5666,9 +5618,9 @@ function loadConfig(configPath = DEFAULT_CONFIG_PATH) {
   const dir = path.dirname(resolvedPath);
   if (!fs.existsSync(resolvedPath)) {
     fs.mkdirpSync(dir);
-    const yamlText = YAML.stringify(mockConfig);
+    const yamlText = YAML.stringify(DEFAULT_CONFIG);
     fs.writeFileSync(resolvedPath, yamlText, "utf8");
-    return mockConfig;
+    return DEFAULT_CONFIG;
   }
   const raw = fs.readFileSync(resolvedPath, "utf8");
   let parsed;
@@ -5696,6 +5648,7 @@ function getCurrentContext(config, contextName) {
     throw new Error(`Context '${name}' not found in config`);
   }
   return {
+    api_key: context.api_key,
     aptos_network: context.aptos_network,
     shelby_network: context.shelby_network
   };
@@ -5719,46 +5672,36 @@ function getCurrentAccount(config, accountName) {
     address: account.address,
     privateKey,
     account: new Ed25519Account({
-      privateKey: new Ed25519PrivateKey2(privateKey)
+      privateKey: new Ed25519PrivateKey(privateKey)
     })
   };
 }
-function getAptosFromNetwork(network) {
-  const { name, api_key, ...options } = network;
-  let config;
-  switch (name) {
-    case Network7.SHELBYNET:
-    case Network7.LOCAL:
-      config = new AptosConfig3({
-        network: NetworkToNetworkName[name],
-        clientConfig: { API_KEY: api_key },
-        ...options
-      });
-      break;
-    default:
-      config = new AptosConfig3({
-        network: Network7.CUSTOM,
-        clientConfig: { API_KEY: api_key },
-        ...options
-      });
-      break;
-  }
-  return new Aptos4(config);
+function getAptosSettingsFromContext(context) {
+  const { name, api_key, ...options } = context.aptos_network;
+  const activeApiKey = api_key || context.api_key;
+  return {
+    ...options,
+    network: NetworkToNetworkName[name],
+    clientConfig: { API_KEY: activeApiKey }
+  };
+}
+function getAptosFromContext(context) {
+  const config = getAptosSettingsFromContext(context);
+  return new Aptos4(new AptosConfig3(config));
 }
-function getShelbyClientConfigFromNetwork(network, options) {
+function getShelbyConfigFromContext(context) {
+  const aptosSettings = getAptosSettingsFromContext(context);
   return {
-    network: options.aptosNetwork.name,
-    aptos: {
-      ...options.aptosNetwork,
-      network: NetworkToNetworkName[options.aptosNetwork.name]
-    },
+    network: context.aptos_network.name,
+    apiKey: context.api_key,
+    aptos: aptosSettings,
     rpc: {
-      baseUrl: network.rpc_endpoint ?? NetworkToShelbyRPCBaseUrl[options.aptosNetwork.name],
-      apiKey: network.rpc_api_key
+      baseUrl: context.shelby_network?.rpc_endpoint,
+      apiKey: context.shelby_network?.rpc_api_key
     },
     indexer: {
-      baseUrl: network.indexer_endpoint ?? NetworkToShelbyBlobIndexerBaseUrl[options.aptosNetwork.name],
-      apiKey: network.indexer_api_key ?? ""
+      baseUrl: context.shelby_network?.indexer_endpoint,
+      apiKey: context.shelby_network?.indexer_api_key
     }
   };
 }
@@ -5770,18 +5713,58 @@ function getCurrentShelbyConfig(config, opts = { context: config.default_context
       `Context '${context ?? config.default_context}' not found in config`
     );
   }
-  const shelby = getShelbyClientConfigFromNetwork(
-    selectedContext.shelby_network ?? {},
-    { aptosNetwork: selectedContext.aptos_network }
-  );
+  const shelby = getShelbyConfigFromContext(selectedContext);
   return shelby;
 }
 
+// src/utils/account.ts
+function validateAccountName(name, config) {
+  const parsed = AccountNameSchema.safeParse(name);
+  if (!parsed.success || name.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.`;
+  }
+  return void 0;
+}
+
+// src/utils/keys.ts
+import {
+  Account,
+  AccountAddress as AccountAddress6,
+  Ed25519PrivateKey as Ed25519PrivateKey2,
+  Secp256k1PrivateKey,
+  SigningSchemeInput
+} from "@aptos-labs/ts-sdk";
+import { z as z7 } from "zod";
+function generateEd25519Account() {
+  const account = Account.generate({
+    scheme: SigningSchemeInput.Ed25519,
+    legacy: true
+  });
+  return account;
+}
+function isValidEd25519PrivateKey(value) {
+  try {
+    new Ed25519PrivateKey2(value);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isValidAddress(address) {
+  return AccountAddress6.isValid({ input: address }).valid;
+}
+var ED25519_NAME = "ed25519";
+var SignatureSchemeSchema = z7.enum([ED25519_NAME]);
+
 // src/components/AccountWizard.tsx
 import { jsx, jsxs } from "react/jsx-runtime";
 var AccountWizard = ({
   onComplete,
-  initialName
+  initialName,
+  config
 }) => {
   const [step, setStep] = useState(
     initialName ? "address" : "name"
@@ -5808,21 +5791,17 @@ var AccountWizard = ({
           value: name,
           onChange: (value) => {
             setName(value);
-            const result = AccountNameSchema.safeParse(value);
-            if (!result.success) {
-              setNameError(result.error.errors[0]?.message || "Invalid name");
-            } else {
-              setNameError(null);
-            }
+            const error = validateAccountName(value, config);
+            setNameError(error || null);
           },
           onSubmit: () => {
-            const result = AccountNameSchema.safeParse(name);
-            if (!result.success) {
-              setNameError(result.error.errors[0]?.message || "Invalid name");
-            } else {
-              setNameError(null);
-              setStep("address");
+            const error = validateAccountName(name, config);
+            if (error) {
+              setNameError(error);
+              return;
             }
+            setNameError(null);
+            setStep("address");
           }
         }
       ),
@@ -6006,7 +5985,7 @@ var SHELBY_CONFIG_FIELDS = [
 import { Box as Box3, Text as Text3 } from "ink";
 import TextInput2 from "ink-text-input";
 import { useState as useState2 } from "react";
-import z7 from "zod";
+import z8 from "zod";
 import { jsx as jsx4, jsxs as jsxs3 } from "react/jsx-runtime";
 function FormTextInput({
   type,
@@ -6036,7 +6015,7 @@ function FormTextInput({
             return;
           }
           if (value2) {
-            if (type === "url" && !z7.string().url().safeParse(value2).success) {
+            if (type === "url" && !z8.string().url().safeParse(value2).success) {
               setError("The field must be a valid URL");
               return;
             }
@@ -6053,21 +6032,28 @@ function FormTextInput({
 // src/components/ContextReviewWizard.tsx
 import { jsx as jsx5, jsxs as jsxs4 } from "react/jsx-runtime";
 var ContextReviewWizard = ({
+  initialApiKey,
   initialAptosNetwork,
   initialShelbyNetwork,
   onComplete
 }) => {
   const [step, setStep] = useState3("review");
   const [fieldEditorInput, setFieldEditorInput] = useState3("");
+  const [apiKey, setApiKey] = useState3(initialApiKey || "");
   const [aptosNetwork, setAptosNetwork] = useState3(initialAptosNetwork);
   const [shelbyNetwork, setShelbyNetwork] = useState3(initialShelbyNetwork);
   useEffect2(() => {
     if (step === "done") {
-      onComplete({ aptosNetwork, shelbyNetwork });
+      onComplete({
+        apiKey: apiKey || void 0,
+        aptosNetwork,
+        shelbyNetwork
+      });
     }
-  }, [step, aptosNetwork, shelbyNetwork, onComplete]);
+  }, [step, apiKey, aptosNetwork, shelbyNetwork, onComplete]);
   const formatFieldDisplay = (display) => !display ? "(not set)" : display.source === "current" ? `(current: ${display.value})` : `(default: ${display.value})`;
-  const getShelbyFieldDisplayValue = (key) => {
+  const formatApiKeyDisplay = (key) => key ? `(current: ${key})` : "(not set)";
+  const getShelbyFieldDisplay = (key) => {
     const value = shelbyNetwork[key];
     if (value && value !== "") {
       return { value, source: "current" };
@@ -6106,11 +6092,17 @@ var ContextReviewWizard = ({
         SelectInput2,
         {
           items: [
+            { label: "API Key", value: "api-key" },
             { label: "Shelby Config", value: "shelby" },
             { label: "Aptos Config", value: "aptos" },
             { label: "Finish Setup \u2714", value: "finish" }
           ],
           onSelect: (item) => {
+            if (item.value === "api-key") {
+              setFieldEditorInput(apiKey);
+              setStep("api-key-edit");
+              return;
+            }
             if (item.value === "shelby") {
               setStep("shelby-config-options");
               return;
@@ -6125,9 +6117,13 @@ var ContextReviewWizard = ({
       ),
       /* @__PURE__ */ jsxs4(Box4, { marginTop: 1, flexDirection: "column", children: [
         /* @__PURE__ */ jsx5(Text4, { color: "gray", children: "Current settings" }),
+        /* @__PURE__ */ jsxs4(Text4, { children: [
+          "API Key: ",
+          formatApiKeyDisplay(apiKey)
+        ] }),
         /* @__PURE__ */ jsx5(Text4, { children: "Shelby Config:" }),
         SHELBY_CONFIG_FIELDS.map((field) => {
-          const display = getShelbyFieldDisplayValue(field.key);
+          const display = getShelbyFieldDisplay(field.key);
           if (!display) return null;
           return /* @__PURE__ */ jsx5(
             Text4,
@@ -6152,6 +6148,24 @@ var ContextReviewWizard = ({
       ] })
     ] });
   }
+  if (step === "api-key-edit") {
+    return /* @__PURE__ */ jsx5(
+      FormTextInput,
+      {
+        title: "Edit API Key",
+        description: `Current value: ${formatApiKeyDisplay(apiKey)}`,
+        required: false,
+        value: fieldEditorInput,
+        placeholder: "Enter API key (optional)",
+        onChange: setFieldEditorInput,
+        onSubmit: (value) => {
+          setApiKey(value);
+          setFieldEditorInput("");
+          setStep("review");
+        }
+      }
+    );
+  }
   if (step === "shelby-config-options") {
     return /* @__PURE__ */ jsx5(
       FormSelectInput,
@@ -6161,7 +6175,7 @@ var ContextReviewWizard = ({
         items: [
           ...SHELBY_CONFIG_FIELDS.map((field) => ({
             label: `${field.label} ${formatFieldDisplay(
-              getShelbyFieldDisplayValue(field.key)
+              getShelbyFieldDisplay(field.key)
             )}`,
             value: field.key
           })),
@@ -6186,7 +6200,7 @@ var ContextReviewWizard = ({
     const key = step.replace("shelby-config-edit-", "");
     const field = SHELBY_CONFIG_FIELDS.find((f) => f.key === key);
     if (!field) return null;
-    const currentValue = getShelbyFieldDisplayValue(key);
+    const currentValue = getShelbyFieldDisplay(key);
     if (field.type !== "text") return null;
     return /* @__PURE__ */ jsx5(
       FormTextInput,
@@ -6303,6 +6317,7 @@ var CreateContextWizard = ({
 }) => {
   const [step, setStep] = useState4("name");
   const [name, setName] = useState4("");
+  const [apiKey, setApiKey] = useState4("");
   const [shelbyNetwork, setShelbyNetwork] = useState4(
     {}
   );
@@ -6313,10 +6328,11 @@ var CreateContextWizard = ({
     const validatedShelbyNetwork = ShelbyNetworkSchema.parse(shelbyNetwork);
     onComplete({
       name,
+      apiKey: apiKey || void 0,
       shelbyNetwork: validatedShelbyNetwork,
       aptosNetwork: validatedAptosNetwork
     });
-  }, [step, name, shelbyNetwork, aptosNetwork, onComplete]);
+  }, [step, name, apiKey, shelbyNetwork, aptosNetwork, onComplete]);
   if (step === "name") {
     return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx6(Text5, { children: "Context name?" }),
@@ -6327,6 +6343,22 @@ var CreateContextWizard = ({
           required: true,
           value: name,
           onChange: setName,
+          onSubmit: () => setStep("api-key")
+        }
+      )
+    ] });
+  }
+  if (step === "api-key") {
+    return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx6(Text5, { children: "API Key (optional)?" }),
+      /* @__PURE__ */ jsx6(Text5, { color: "gray", children: "Enter an API key to use as default for this context, or press Enter to skip." }),
+      /* @__PURE__ */ jsx6(
+        FormTextInput,
+        {
+          placeholder: "Enter API key (optional)",
+          required: false,
+          value: apiKey,
+          onChange: setApiKey,
           onSubmit: () => setStep("aptos-network-name")
         }
       )
@@ -6351,9 +6383,11 @@ var CreateContextWizard = ({
     return /* @__PURE__ */ jsx6(
       ContextReviewWizard,
       {
+        initialApiKey: apiKey,
         initialAptosNetwork: aptosNetwork,
         initialShelbyNetwork: shelbyNetwork,
-        onComplete: ({ aptosNetwork: aptosNetwork2, shelbyNetwork: shelbyNetwork2 }) => {
+        onComplete: ({ apiKey: newApiKey, aptosNetwork: aptosNetwork2, shelbyNetwork: shelbyNetwork2 }) => {
+          setApiKey(newApiKey || "");
           setAptosNetwork(aptosNetwork2);
           setShelbyNetwork(shelbyNetwork2);
           setStep("done");
@@ -6369,7 +6403,7 @@ import { useState as useState5 } from "react";
 import { jsx as jsx7 } from "react/jsx-runtime";
 
 // src/components/InitWizard.tsx
-import { Network as Network8 } from "@aptos-labs/ts-sdk";
+import { Account as Account2, Ed25519PrivateKey as Ed25519PrivateKey3, Network as Network6 } from "@aptos-labs/ts-sdk";
 import { Box as Box6, Text as Text6 } from "ink";
 import SelectInput3 from "ink-select-input";
 import Spinner from "ink-spinner";
@@ -6814,27 +6848,34 @@ function getAptosCliVersionInfo(minVersion = MIN_APTOS_CLI_VERSION) {
 
 // src/components/InitWizard.tsx
 import { jsx as jsx8, jsxs as jsxs6 } from "react/jsx-runtime";
-var InitWizard = ({ existingConfig, onComplete }) => {
+var InitWizard = ({
+  existingConfig,
+  onComplete,
+  onCancel
+}) => {
   const [step, setStep] = useState6(
     existingConfig ? "confirmOverwrite" : "checkAptos"
   );
+  const [overwriteExisting, setOverwriteExisting] = useState6(false);
   const [aptosCliMeetsRequirement, setAptosCliMeetsRequirement] = useState6(false);
   const [aptosCliVersion, setAptosCliVersion] = useState6(null);
   const [setupStandardContexts, setSetupStandardContexts] = useState6(false);
   const [setupCustomContext, setSetupCustomContext] = useState6(false);
   const [customContextName, setCustomContextName] = useState6(
-    Network8.SHELBYNET
+    Network6.SHELBYNET
   );
   const [shelbyRpcEndpoint, setShelbyRpcEndpoint] = useState6(
-    NetworkToShelbyRPCBaseUrl[Network8.SHELBYNET]
+    NetworkToShelbyRPCBaseUrl[Network6.SHELBYNET]
   );
-  const [aptosNetwork, setAptosNetwork] = useState6(Network8.SHELBYNET);
+  const [aptosNetwork, setAptosNetwork] = useState6(Network6.SHELBYNET);
+  const [standardContextsApiKey, setStandardContextsApiKey] = useState6("");
+  const [customContextApiKey, setCustomContextApiKey] = useState6("");
   const [setupAccount, setSetupAccount] = useState6(false);
   const [accountName, setAccountName] = useState6("alice");
   const [accountNameError, setAccountNameError] = useState6("");
   const [signatureScheme, setSignatureScheme] = useState6("ed25519");
   const [privateKey, setPrivateKey] = useState6("");
-  const [address, _setAddress] = useState6("");
+  const [address, setAddress] = useState6("");
   const [generatedKey, setGeneratedKey] = useState6("");
   const [generatedAddress, setGeneratedAddress] = useState6("");
   useEffect4(() => {
@@ -6847,12 +6888,13 @@ var InitWizard = ({ existingConfig, onComplete }) => {
   }, [step]);
   useEffect4(() => {
     if (step === "complete") {
-      const config = existingConfig ? { ...existingConfig } : {
+      const shouldStartFresh = overwriteExisting || !existingConfig;
+      const config = shouldStartFresh ? {
         contexts: {},
         accounts: {},
         default_context: setupStandardContexts ? DEFAULT_CONFIG.default_context : customContextName,
-        default_account: setupAccount ? accountName : "default_account"
-      };
+        default_account: setupAccount ? accountName : ""
+      } : { ...existingConfig };
       if (setupStandardContexts || setupCustomContext) {
         config.default_context = setupStandardContexts ? DEFAULT_CONFIG.default_context : customContextName;
       }
@@ -6860,10 +6902,20 @@ var InitWizard = ({ existingConfig, onComplete }) => {
         config.default_account = accountName;
       }
       if (setupStandardContexts) {
-        config.contexts = { ...config.contexts, ...DEFAULT_CONFIG.contexts };
+        const modifiedStandardContexts = { ...DEFAULT_CONFIG.contexts };
+        if (standardContextsApiKey) {
+          Object.keys(modifiedStandardContexts).forEach((contextName) => {
+            modifiedStandardContexts[contextName] = {
+              ...modifiedStandardContexts[contextName],
+              api_key: standardContextsApiKey
+            };
+          });
+        }
+        config.contexts = modifiedStandardContexts;
       }
       if (setupCustomContext) {
         config.contexts[customContextName] = {
+          api_key: customContextApiKey || void 0,
           aptos_network: {
             name: aptosNetwork
           },
@@ -6894,9 +6946,14 @@ var InitWizard = ({ existingConfig, onComplete }) => {
           ],
           onSelect: (item) => {
             if (item.value) {
+              setOverwriteExisting(true);
               setStep("checkAptos");
             } else {
-              process.exit(0);
+              if (onCancel) {
+                onCancel();
+              } else {
+                process.exit(0);
+              }
             }
           }
         }
@@ -6942,12 +6999,41 @@ var InitWizard = ({ existingConfig, onComplete }) => {
           ],
           onSelect: (item) => {
             setSetupStandardContexts(item.value);
-            setStep("customContext");
+            if (item.value) {
+              setStep("standardContextsApiKey");
+            } else {
+              setStep("customContext");
+            }
           }
         }
       )
     ] });
   }
+  if (step === "standardContextsApiKey") {
+    return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs6(Text6, { children: [
+        "\u2714 Checking for Aptos CLI >=v",
+        MIN_APTOS_CLI_VERSION,
+        "...",
+        " ",
+        aptosCliMeetsRequirement ? "found" : "not found"
+      ] }),
+      /* @__PURE__ */ jsxs6(Text6, { children: [
+        "\u2714 Do you want to set up standard contexts (",
+        STANDARD_CONTEXT_NAMES,
+        ")? Yes"
+      ] }),
+      /* @__PURE__ */ jsx8(Text6, { children: "API Key? (optional: leave blank to skip)" }),
+      /* @__PURE__ */ jsx8(
+        TextInput3,
+        {
+          value: standardContextsApiKey,
+          onChange: setStandardContextsApiKey,
+          onSubmit: () => setStep("customContext")
+        }
+      )
+    ] });
+  }
   if (step === "customContext") {
     return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
       /* @__PURE__ */ jsxs6(Text6, { children: [
@@ -6964,6 +7050,11 @@ var InitWizard = ({ existingConfig, onComplete }) => {
         " ",
         setupStandardContexts ? "Yes" : "No"
       ] }),
+      setupStandardContexts && /* @__PURE__ */ jsxs6(Text6, { children: [
+        "\u2714 API Key for standard contexts?",
+        " ",
+        standardContextsApiKey ? "Set" : "Not set"
+      ] }),
       /* @__PURE__ */ jsx8(Text6, { children: "Do you want to set up a custom context?" }),
       /* @__PURE__ */ jsx8(
         SelectInput3,
@@ -7003,7 +7094,7 @@ var InitWizard = ({ existingConfig, onComplete }) => {
     ] });
   }
   if (step === "shelbyRpcEndpoint") {
-    const defaultRpcEndpoint = DEFAULT_CONFIG.contexts[Network8.SHELBYNET].shelby_network?.rpc_endpoint;
+    const defaultRpcEndpoint = DEFAULT_CONFIG.contexts[Network6.SHELBYNET].shelby_network?.rpc_endpoint;
     return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
       /* @__PURE__ */ jsxs6(Text6, { children: [
         "\u2714 Context name? ",
@@ -7037,12 +7128,33 @@ var InitWizard = ({ existingConfig, onComplete }) => {
           items: shelbyNetworks.map((name) => ({ label: name, value: name })),
           onSelect: (item) => {
             setAptosNetwork(item.value);
-            setStep("setupAccount");
+            setStep("customContextApiKey");
           }
         }
       )
     ] });
   }
+  if (step === "customContextApiKey") {
+    return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs6(Text6, { children: [
+        "\u2714 Shelby RPC endpoint? ",
+        shelbyRpcEndpoint
+      ] }),
+      /* @__PURE__ */ jsxs6(Text6, { children: [
+        "\u2714 Aptos network? ",
+        aptosNetwork
+      ] }),
+      /* @__PURE__ */ jsx8(Text6, { children: "API Key? (optional: leave blank to skip)" }),
+      /* @__PURE__ */ jsx8(
+        TextInput3,
+        {
+          value: customContextApiKey,
+          onChange: setCustomContextApiKey,
+          onSubmit: () => setStep("setupAccount")
+        }
+      )
+    ] });
+  }
   if (step === "setupAccount") {
     return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx8(Text6, { children: "Create or update an account now?" }),
@@ -7132,6 +7244,10 @@ var InitWizard = ({ existingConfig, onComplete }) => {
               const newKey = generateEd25519Account();
               setGeneratedKey(newKey.privateKey.toAIP80String());
               setGeneratedAddress(newKey.accountAddress.toString());
+            } else {
+              const priv = new Ed25519PrivateKey3(privateKey);
+              const key = Account2.fromPrivateKey({ privateKey: priv });
+              setAddress(key.accountAddress.toString());
             }
             setStep("complete");
           }
@@ -7146,25 +7262,33 @@ var InitWizard = ({ existingConfig, onComplete }) => {
 import { useEffect as useEffect5, useState as useState7 } from "react";
 import { jsx as jsx9 } from "react/jsx-runtime";
 var UpdateContextWizard = ({
+  currentApiKey,
   currentShelbyNetwork = {},
   currentAptosNetwork,
   onComplete
 }) => {
   const [step, setStep] = useState7("review");
+  const [apiKey, setApiKey] = useState7(currentApiKey || "");
   const [shelbyNetwork, setShelbyNetwork] = useState7(currentShelbyNetwork);
   const [aptosNetwork, setAptosNetwork] = useState7(currentAptosNetwork);
   useEffect5(() => {
     if (step === "done") {
-      onComplete({ shelbyNetwork, aptosNetwork });
+      onComplete({
+        apiKey: apiKey || void 0,
+        shelbyNetwork,
+        aptosNetwork
+      });
     }
-  }, [step, shelbyNetwork, aptosNetwork, onComplete]);
+  }, [step, apiKey, shelbyNetwork, aptosNetwork, onComplete]);
   if (step === "review") {
     return /* @__PURE__ */ jsx9(
       ContextReviewWizard,
       {
+        initialApiKey: apiKey,
         initialAptosNetwork: aptosNetwork,
         initialShelbyNetwork: shelbyNetwork,
-        onComplete: ({ aptosNetwork: aptosNetwork2, shelbyNetwork: shelbyNetwork2 }) => {
+        onComplete: ({ apiKey: newApiKey, aptosNetwork: aptosNetwork2, shelbyNetwork: shelbyNetwork2 }) => {
+          setApiKey(newApiKey || "");
           setAptosNetwork(aptosNetwork2);
           setShelbyNetwork(shelbyNetwork2);
           setStep("done");
@@ -7245,32 +7369,54 @@ var handleError = (error) => {
 
 // src/commands/account.tsx
 import { jsx as jsx10 } from "react/jsx-runtime";
-var CreateAccountOptionsSchema = z8.object({
-  name: z8.string().optional(),
-  privateKey: z8.string().optional(),
-  address: z8.string().optional(),
-  scheme: z8.union([z8.literal(ED25519_NAME), z8.literal(SECP256K1_NAME)]).optional()
+var CreateAccountOptionsSchema = z9.object({
+  name: z9.string().optional(),
+  privateKey: z9.string().optional(),
+  address: z9.string().optional(),
+  scheme: SignatureSchemeSchema.optional()
 });
-var ListAccountOptionsSchema = z8.object({});
-var UseAccountOptionsSchema = z8.object({
-  accountName: z8.string()
+var allSchemes = SignatureSchemeSchema.options.join(", ");
+function askQuestion(question) {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  return new Promise((resolve3) => {
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve3(answer.trim());
+    });
+  });
+}
+async function promptForAccountName(config) {
+  while (true) {
+    const answer = await askQuestion("Enter a name for this account: ");
+    const error = validateAccountName(answer, config);
+    if (error) {
+      console.error(`\u274C ${error}`);
+      continue;
+    }
+    return answer;
+  }
+}
+var ListAccountOptionsSchema = z9.object({});
+var UseAccountOptionsSchema = z9.object({
+  accountName: z9.string()
 });
-var DeleteAccountOptionsSchema = z8.object({
-  accountName: z8.string()
+var DeleteAccountOptionsSchema = z9.object({
+  accountName: z9.string()
 });
 function accountCommand(program) {
   const account = program.command("account").description("Manage signing accounts (addresses & keys)");
   account.command("create").description("Create a new account").option("--name <account-name>", "Name of the account").option(
-    // '--scheme <signature-scheme: "secp256k1" | "ed25519">',
-    '--scheme <signature-scheme: "ed25519">',
+    `--scheme <signature-scheme: "${SignatureSchemeSchema.Enum.ed25519}">`,
     "Signature scheme of the private key"
   ).option("--private-key <key>", "Raw private key").option(
     "--address <account-address>",
     "Aptos account address (hex-encoded)"
-  ).action((options) => {
+  ).action(async (options) => {
     CreateAccountOptionsSchema.parse(options);
     const { name, privateKey, address, scheme } = options;
-    const allPresent = name && privateKey && address && scheme;
     const configPath = program.opts().configFile;
     let config;
     try {
@@ -7280,48 +7426,78 @@ function accountCommand(program) {
         `${err.message}. Please ensure you've first initialized the config by doing \`shelby init\``
       );
     }
-    if (allPresent) {
-      if (isValidAddress(address) && isValidEd25519PrivateKey(privateKey) && isValidScheme(scheme)) {
-        config.accounts[name] = {
-          private_key: privateKey
-        };
-        if (options.address) {
-          config.accounts[name].address = address;
+    const targetName = options.name ?? null;
+    if (privateKey && !scheme) {
+      console.error(
+        `\u274C --scheme is required when providing --private-key (currently only "${allSchemes}" is supported).`
+      );
+      process.exit(1);
+    }
+    if (scheme && !SignatureSchemeSchema.options.includes(scheme)) {
+      console.error(
+        `\u274C Unsupported signature scheme. Only "${allSchemes}" is supported.`
+      );
+      process.exit(1);
+    }
+    let finalName = targetName;
+    if (privateKey && !finalName) {
+      finalName = await promptForAccountName(config);
+    }
+    const canCreateFromFlags = Boolean(privateKey && finalName);
+    if (canCreateFromFlags && privateKey && finalName) {
+      if (!isValidEd25519PrivateKey(privateKey)) {
+        throw new Error("Error invalid account address or private key");
+      }
+      let finalAddress = address ?? "";
+      if (finalAddress) {
+        if (!isValidAddress(finalAddress)) {
+          throw new Error("Error invalid account address or private key");
         }
       } else {
-        throw new Error("Error invalid account address or private key");
+        const edKey = new Ed25519PrivateKey4(privateKey);
+        const derived = Account3.fromPrivateKey({ privateKey: edKey });
+        finalAddress = derived.accountAddress.toString();
+      }
+      config.accounts[finalName] = {
+        private_key: privateKey,
+        address: finalAddress
+      };
+      if (!config.default_account) {
+        config.default_account = finalName;
       }
       saveConfig(config, configPath);
-      console.log(`\u2705 Account '${name}' created successfully`);
-    } else {
-      try {
-        const { unmount } = render(
-          /* @__PURE__ */ jsx10(
-            AccountWizard,
-            {
-              initialName: name,
-              onComplete: ({
-                name: name2,
-                address: address2,
-                privateKey: privateKey2
-              }) => {
-                config.accounts[name2] = {
-                  private_key: privateKey2,
-                  address: address2
-                };
-                saveConfig(config, configPath);
-                console.log(
-                  `\u2705 Account ${name2} saved to ${resolveConfigPath(configPath)}`
-                );
-                unmount();
-              }
+      console.log(`\u2705 Account '${finalName}' created successfully`);
+      console.log(`   Address: ${finalAddress}`);
+      return;
+    }
+    try {
+      const { unmount } = render(
+        /* @__PURE__ */ jsx10(
+          AccountWizard,
+          {
+            initialName: name,
+            config,
+            onComplete: ({
+              name: name2,
+              address: address2,
+              privateKey: privateKey2
+            }) => {
+              config.accounts[name2] = {
+                private_key: privateKey2,
+                address: address2
+              };
+              saveConfig(config, configPath);
+              console.log(
+                `\u2705 Account ${name2} saved to ${resolveConfigPath(configPath)}`
+              );
+              unmount();
             }
-          )
-        );
-      } catch (err) {
-        console.error(`Error listing accounts: ${err.message}`);
-        process.exit(1);
-      }
+          }
+        )
+      );
+    } catch (err) {
+      console.error(`Error creating account: ${err.message}`);
+      process.exit(1);
     }
   });
   account.command("list").description("List all accounts in a table view").action(() => {
@@ -7472,7 +7648,7 @@ function accountCommand(program) {
       const config = loadConfig(configPath);
       const contextName = globalOpts.context || config.default_context;
       const context = getCurrentContext(config, contextName);
-      const aptos = getAptosFromNetwork(context.aptos_network);
+      const aptos = getAptosFromContext(context);
       const accountName = globalOpts.account || config.default_account;
       const accountInfo = getCurrentAccount(config, accountName);
       const targetAddress = resolveAccountAddress({
@@ -7564,18 +7740,18 @@ function accountCommand(program) {
 import * as fs2 from "fs";
 import * as fsP from "fs/promises";
 import { Readable } from "stream";
-import { z as z9 } from "zod";
-var CommitmentOptionsSchema = z9.object({
-  input: z9.string().nonempty("`--input` is required").refine(
-    async (path5) => {
-      const stat4 = await fsP.stat(path5);
+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);
       return stat4.isFile();
     },
     {
       message: "`--input` must be a file"
     }
   ),
-  output: z9.string().nonempty("`--output` is required")
+  output: z10.string().nonempty("`--output` is required")
 });
 function commitmentCommand(program) {
   program.command("commitment <input> <output>").description(
@@ -7597,29 +7773,29 @@ function commitmentCommand(program) {
 
 // src/commands/context.tsx
 import { render as render2 } from "ink";
-import { z as z11 } from "zod";
+import { z as z12 } from "zod";
 
 // src/utils/commands.ts
-import z10 from "zod";
-var AptosCommandOptionsSchema = z10.object({
-  aptosNetwork: z10.string().optional(),
+import z11 from "zod";
+var AptosCommandOptionsSchema = z11.object({
+  aptosNetwork: z11.string().optional(),
   // predefined network name
-  aptosFullnode: z10.string().url().optional(),
-  aptosFaucet: z10.string().url().optional(),
-  aptosIndexer: z10.string().url().optional(),
-  aptosPepper: z10.string().url().optional(),
-  aptosProver: z10.string().url().optional(),
-  aptosApiKey: z10.string().optional()
+  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()
 });
 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 = z10.object({
+var ShelbyCommandOptionsSchema = z11.object({
   shelbyRpcEndpoint: EndpointSchema.optional(),
   shelbyIndexerEndpoint: EndpointSchema.optional(),
-  shelbyRpcApiKey: z10.string().optional(),
-  shelbyIndexerApiKey: z10.string().optional()
+  shelbyRpcApiKey: z11.string().optional(),
+  shelbyIndexerApiKey: z11.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");
 
@@ -7656,8 +7832,8 @@ function getShelbyNetworkFromOptions(options) {
     indexer_api_key: options.shelbyIndexerApiKey
   };
 }
-var CreateContextOptionsSchema = z11.object({ name: z11.string().optional() }).merge(AptosCommandOptionsSchema).merge(ShelbyCommandOptionsSchema);
-var UpdateContextOptionsSchema = z11.object({}).merge(ShelbyCommandOptionsSchema).merge(AptosCommandOptionsSchema);
+var CreateContextOptionsSchema = z12.object({ name: z12.string().optional() }).merge(AptosCommandOptionsSchema).merge(ShelbyCommandOptionsSchema);
+var UpdateContextOptionsSchema = z12.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) => {
@@ -7707,10 +7883,12 @@ function contextCommand(program) {
         {
           onComplete: ({
             name: name2,
+            apiKey,
             shelbyNetwork: shelbyNetwork2,
             aptosNetwork: aptosNetwork2
           }) => {
             config.contexts[name2] = {
+              api_key: apiKey,
               shelby_network: shelbyNetwork2,
               aptos_network: aptosNetwork2
             };
@@ -7772,10 +7950,12 @@ function contextCommand(program) {
       /* @__PURE__ */ jsx11(
         UpdateContextWizard,
         {
+          currentApiKey: currentContext.api_key,
           currentShelbyNetwork: currentContext.shelby_network,
           currentAptosNetwork: currentContext.aptos_network,
-          onComplete: ({ shelbyNetwork: shelbyNetwork2, aptosNetwork: aptosNetwork2 }) => {
+          onComplete: ({ apiKey, shelbyNetwork: shelbyNetwork2, aptosNetwork: aptosNetwork2 }) => {
             config.contexts[contextName] = {
+              api_key: apiKey,
               shelby_network: {
                 ...currentContext.shelby_network,
                 ...shelbyNetwork2,
@@ -7819,8 +7999,6 @@ function contextCommand(program) {
         },
         { header: "Indexer", width: 40, shrinkPriority: "high" },
         { header: "Faucet", width: 40, shrinkPriority: "high" },
-        { header: "Pepper", width: 40, shrinkPriority: "low", minWidth: 8 },
-        { header: "Prover", width: 40, shrinkPriority: "low", minWidth: 8 },
         {
           header: "API Key",
           width: 15,
@@ -7828,7 +8006,7 @@ function contextCommand(program) {
           minWidth: 6
         }
       ],
-      padding: 25
+      padding: 20
     });
     const { table: shelbyConfigTable, wrapCell: wrapShelbyCell } = createResponsiveTable({
       columns: [
@@ -7850,11 +8028,13 @@ function contextCommand(program) {
       ],
       padding: 18
     });
+    const defaultContext = config.default_context;
+    const formatName = (ctxName) => ctxName === defaultContext ? `${ctxName} (default)` : ctxName;
     for (const [ctxName, ctx] of Object.entries(config.contexts)) {
       const shelbyRow = [
-        ctxName,
-        ctx.shelby_network?.rpc_endpoint || "(default)",
-        ctx.shelby_network?.indexer_endpoint || "(default)",
+        formatName(ctxName),
+        ctx.shelby_network?.rpc_endpoint || "",
+        ctx.shelby_network?.indexer_endpoint || "",
         ctx.shelby_network?.rpc_api_key || "",
         ctx.shelby_network?.indexer_api_key || ""
       ];
@@ -7862,13 +8042,11 @@ function contextCommand(program) {
         shelbyRow.map((cell, i) => wrapShelbyCell(cell, i))
       );
       const aptosRow = [
-        ctxName,
+        formatName(ctxName),
         ctx.aptos_network.name,
-        ctx.aptos_network.fullnode || "(default)",
-        ctx.aptos_network.indexer || "(default)",
-        ctx.aptos_network.faucet || "(default)",
-        ctx.aptos_network.pepper || "(default)",
-        ctx.aptos_network.prover || "(default)",
+        ctx.aptos_network.fullnode || "",
+        ctx.aptos_network.indexer || "",
+        ctx.aptos_network.faucet || "",
         ctx.aptos_network.api_key || ""
       ];
       aptosConfigTable.push(
@@ -7930,16 +8108,16 @@ import * as path3 from "path";
 import { Readable as Readable2, Transform } from "stream";
 import { pipeline } from "stream/promises";
 import ora from "ora";
-import { z as z12 } from "zod";
+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 = z12.object({
-  src: z12.string().min(1, "`src`must be a valid blob name or directory prefix").describe("Blob name or directory prefix to download"),
-  dst: z12.string().min(1, "`dst` must be a valid filepath").describe("Local path where to save the downloaded content"),
-  recursive: z12.boolean().default(false).describe("Download assuming canonical directory layout and recurse"),
-  force: z12.boolean().default(false).describe("Overwrite the dst if it already exists")
+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")
 }).refine(
   (data) => {
     if (data.recursive) {
@@ -8179,12 +8357,12 @@ function downloadCommand(program) {
 }
 
 // src/commands/faucet.tsx
-import { Network as Network9 } from "@aptos-labs/ts-sdk";
+import { Network as Network7 } from "@aptos-labs/ts-sdk";
 import { execaSync } from "execa";
-import { z as z13 } from "zod";
-var FaucetOptionsSchema = z13.object({
-  network: z13.enum([Network9.SHELBYNET]).optional(),
-  "no-open": z13.boolean().optional().default(false)
+import { z as z14 } from "zod";
+var FaucetOptionsSchema = z14.object({
+  network: z14.enum([Network7.SHELBYNET]).optional(),
+  "no-open": z14.boolean().optional().default(false)
 });
 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) => {
@@ -8194,7 +8372,7 @@ function faucetCommand(program) {
       const config = loadConfig(configPath);
       const accountName = program.opts().account || config.default_account;
       const { account } = getCurrentAccount(config, accountName);
-      const network = validatedOptions.network || Network9.SHELBYNET;
+      const network = validatedOptions.network || Network7.SHELBYNET;
       if (network === "mainnet") {
         throw new Error(
           "\u274C No faucet available for mainnet. Mainnet tokens must be obtained through other means."
@@ -8255,28 +8433,20 @@ function openBrowser(url) {
 }
 
 // src/commands/init.tsx
+import path4 from "path";
+import fs4 from "fs-extra";
 import { render as render3 } from "ink";
 import { jsx as jsx12 } from "react/jsx-runtime";
 function initCommand(program) {
   program.command("init").description(
     "Bootstrap your Shelby config via an interactive wizard or flags"
   ).option(
-    "--setup-default-contexts",
-    `Create ${STANDARD_CONTEXT_NAMES} contexts`,
+    "--setup-default",
+    "Generate standard contexts and a fresh account",
     false
-  ).option("--context <name>", "Custom context name").option(
-    "--shelby-rpc-endpoint <url>",
-    "Shelby RPC endpoint for this context"
-  ).option(
-    "--aptos-api-endpoint <url>",
-    "Aptos REST API endpoint for this context"
-  ).option(
-    "--signature-scheme <scheme>",
-    // "Signature scheme (ed25519 or secp256k1)",
-    "Signature scheme (ed25519)",
-    ED25519_NAME
-  ).option("--private-key <key>", "Raw private key").action((options) => {
+  ).action((options) => {
     const configPath = program.opts().configFile || "~/.shelby/config.yaml";
+    const resolvedPath = resolveConfigPath(configPath);
     const accountName = program.opts().account;
     const hasExistingConfig = configExists(configPath);
     let existingConfigValid = false;
@@ -8285,104 +8455,112 @@ function initCommand(program) {
         loadConfig(configPath);
         existingConfigValid = true;
       } catch (_error) {
-        const resolvedPath = resolveConfigPath(configPath);
+        const resolvedPath2 = resolveConfigPath(configPath);
         console.log(
-          `\u26A0\uFE0F  Found existing config at ${resolvedPath} but it has an incompatible schema.`
+          `\u26A0\uFE0F  Found existing config at ${resolvedPath2} but it has an incompatible schema.`
         );
         console.log(
           "\u26A0\uFE0F  The config will be overwritten with a new configuration.\n"
         );
       }
     }
-    if (options.setupDefaultContexts || options.context && options.shelbyRpcEndpoint && options.aptosNetwork) {
-      if (options.privateKey) {
-        const validation = AccountNameSchema.safeParse(accountName);
-        if (!validation.success) {
-          console.error(
-            `\u274C Invalid account name: ${validation.error.errors[0].message}`
-          );
-          process.exit(1);
-        }
-      }
-      let config;
-      if (existingConfigValid) {
-        config = loadConfig(configPath);
-      } else {
-        config = {
-          contexts: {},
-          accounts: {},
-          default_context: options.setupDefaultContexts ? DEFAULT_CONFIG.default_context : options.context,
-          default_account: accountName
-        };
-      }
-      if (options.setupDefaultContexts) {
-        config.contexts = DEFAULT_CONFIG.contexts;
-      }
-      if (options.context && options.shelbyRpcEndpoint && options.aptosNetwork) {
-        config.contexts[options.context] = {
-          aptos_network: options.aptosNetwork,
-          shelby_network: { rpc_endpoint: options.shelbyRpcEndpoint }
-        };
-      }
-      if (options.privateKey) {
-        config.accounts[accountName] = {
-          private_key: options.privateKey
-        };
+    if (options.setupDefault) {
+      if (configExists(configPath)) {
+        console.error(
+          `\u274C Refusing to overwrite existing config at ${resolvedPath}. Remove it first or run 'shelby init' interactively.`
+        );
+        process.exit(1);
       }
+      const generated = generateEd25519Account();
+      const finalAccountName = accountName ?? "default";
+      const config = {
+        contexts: cloneContexts(DEFAULT_CONFIG.contexts),
+        accounts: {
+          [finalAccountName]: {
+            private_key: generated.privateKey.toAIP80String(),
+            address: generated.accountAddress.toString()
+          }
+        },
+        default_context: DEFAULT_CONFIG.default_context,
+        default_account: finalAccountName
+      };
+      ensureConfigDir(resolvedPath);
       saveConfig(config, configPath);
       console.log(
-        `\u2705 Configuration saved to ${resolveConfigPath(configPath)}`
+        `\u2705 Default Shelby configuration created at ${resolvedPath}`
       );
-    } else {
-      let existingConfig;
-      if (existingConfigValid) {
-        existingConfig = loadConfig(configPath);
-      }
-      const { unmount } = render3(
-        /* @__PURE__ */ jsx12(
-          InitWizard,
-          {
-            existingConfig,
-            onComplete: (config) => {
-              saveConfig(config, configPath);
+      console.log(`   Account name: ${finalAccountName}`);
+      console.log(`   Address:      ${generated.accountAddress.toString()}`);
+      console.log(`   Private key:  ${generated.privateKey.toAIP80String()}`);
+      console.log("\n\u2139\uFE0F Fund the new account before performing uploads:");
+      console.log(
+        `   aptos init --profile ${finalAccountName} --assume-yes --private-key ${generated.privateKey.toAIP80String()} --network ${DEFAULT_CONFIG.default_context}`
+      );
+      console.log(
+        `   aptos account fund-with-faucet --profile ${finalAccountName}`
+      );
+      return;
+    }
+    let existingConfigInstance;
+    if (existingConfigValid) {
+      existingConfigInstance = loadConfig(configPath);
+    }
+    const { unmount } = render3(
+      /* @__PURE__ */ jsx12(
+        InitWizard,
+        {
+          existingConfig: existingConfigInstance,
+          onComplete: (config) => {
+            ensureConfigDir(resolvedPath);
+            saveConfig(config, configPath);
+            console.log(`\u2705 Configuration saved to ${resolvedPath}`);
+            if (config.default_account && config.accounts[config.default_account]?.private_key?.startsWith(
+              "ed25519-priv-"
+            )) {
               console.log(
-                `\u2705 Configuration saved to ${resolveConfigPath(configPath)}`
+                "\n\u2139\uFE0F To fund your new account on-chain (shelbynet only):"
+              );
+              console.log("   1. Import the private key into Aptos CLI:");
+              console.log(
+                `      aptos init --profile ${config.default_account} --private-key ${config.accounts[config.default_account].private_key} --network ${config.default_context}`
+              );
+              console.log("   2. Run the faucet:");
+              console.log(
+                `      aptos account fund-with-faucet --profile ${config.default_account}`
               );
-              if (config.default_account && config.accounts[config.default_account]?.private_key?.startsWith("ed25519-priv-")) {
-                console.log(
-                  "\n\u2139\uFE0F To fund your new account on-chain (shelbynet only):"
-                );
-                console.log("   1. Import the private key into Aptos CLI:");
-                console.log(
-                  `      aptos init --profile ${config.default_account} --private-key ${config.accounts[config.default_account].private_key} --network ${config.default_context}`
-                );
-                console.log("   2. Run the faucet:");
-                console.log(
-                  `      aptos account fund-with-faucet --profile ${config.default_account}`
-                );
-              }
-              unmount();
-              process.exit(0);
             }
+            unmount();
+            process.exit(0);
+          },
+          onCancel: () => {
+            unmount();
+            console.log("\u274C Init cancelled. Config file was not modified.");
+            process.exit(0);
           }
-        )
-      );
-    }
+        }
+      )
+    );
   });
 }
+function cloneContexts(contexts) {
+  return JSON.parse(JSON.stringify(contexts));
+}
+function ensureConfigDir(resolvedPath) {
+  fs4.mkdirpSync(path4.dirname(resolvedPath));
+}
 
 // src/commands/upload.tsx
-import * as fs4 from "fs/promises";
-import * as path4 from "path";
+import * as fs5 from "fs/promises";
+import * as path5 from "path";
 import { Aptos as Aptos5, AptosConfig as AptosConfig4 } from "@aptos-labs/ts-sdk";
 import { glob } from "glob";
 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 z14 } from "zod";
+import { z as z15 } from "zod";
 import { jsx as jsx13, jsxs as jsxs7 } from "react/jsx-runtime";
-var normBlobName2 = (i, f, b) => normBlobName(path4, i, f, b);
-var flexibleDateSchema = z14.string().transform((val) => {
+var normBlobName2 = (i, f, b) => normBlobName(path5, i, f, b);
+var flexibleDateSchema = z15.string().transform((val) => {
   if (/^\d+$/.test(val)) {
     const timestamp = Number.parseInt(val, 10);
     if (timestamp > 0 && timestamp < 4102444800) {
@@ -8395,18 +8573,18 @@ var flexibleDateSchema = z14.string().transform((val) => {
   }
   return ret;
 });
-var UploadOptionsSchema = z14.object({
-  src: z14.string().nonempty("`src` positional arg is required"),
-  dst: z14.string().nonempty("`dst` position arg is required"),
+var UploadOptionsSchema = z15.object({
+  src: z15.string().nonempty("`src` positional arg is required"),
+  dst: z15.string().nonempty("`dst` position arg is required"),
   expiration: flexibleDateSchema,
-  recursive: z14.boolean().optional().default(false),
-  assumeYes: z14.boolean().optional().default(false),
-  outputCommitments: z14.string().optional()
+  recursive: z15.boolean().optional().default(false),
+  assumeYes: z15.boolean().optional().default(false),
+  outputCommitments: z15.string().optional()
 }).superRefine(async (data, ctx) => {
-  const stats = await fs4.stat(data.src);
+  const stats = await fs5.stat(data.src);
   if (!stats.isFile() && !stats.isDirectory()) {
     ctx.addIssue({
-      code: z14.ZodIssueCode.custom,
+      code: z15.ZodIssueCode.custom,
       message: "`src` must be a file or a directory",
       path: ["src"]
     });
@@ -8415,7 +8593,7 @@ var UploadOptionsSchema = z14.object({
   if (stats.isDirectory()) {
     if (!data.dst.endsWith("/")) {
       ctx.addIssue({
-        code: z14.ZodIssueCode.custom,
+        code: z15.ZodIssueCode.custom,
         message: "When src is a directory, dst must end with '/'",
         path: ["dst"]
       });
@@ -8424,7 +8602,7 @@ var UploadOptionsSchema = z14.object({
     const blobNameResult = BlobNameSchema.safeParse(data.dst);
     if (!blobNameResult.success) {
       ctx.addIssue({
-        code: z14.ZodIssueCode.custom,
+        code: z15.ZodIssueCode.custom,
         message: "When src is a file, dst must be a valid blob name (cannot end with '/')",
         path: ["dst"]
       });
@@ -8432,7 +8610,7 @@ var UploadOptionsSchema = z14.object({
   }
 });
 async function createFilelist(options) {
-  const stats = await fs4.stat(options.src);
+  const stats = await fs5.stat(options.src);
   if (stats.isFile()) {
     const blobname = normBlobName2(options.src, options.src, options.dst);
     const blobNameValidation = BlobNameSchema.safeParse(blobname);
@@ -8449,11 +8627,11 @@ async function createFilelist(options) {
     );
   }
   const fileList = [];
-  const result = await glob(path4.join(options.src, "**", "*"), {
+  const result = await glob(path5.join(options.src, "**", "*"), {
     nodir: true
   });
   for await (const file of result) {
-    const stats2 = await fs4.stat(file);
+    const stats2 = await fs5.stat(file);
     const blobname = normBlobName2(options.src, file, options.dst);
     const blobNameValidation = BlobNameSchema.safeParse(blobname);
     if (!blobNameValidation.success) {
@@ -8580,7 +8758,7 @@ function uploadCommand(program) {
     for (const entry of filelist) {
       spinner.text = `Reading ${entry.filename}.. (Overall: ${formatProgressPercent()}%, ${formatProgressRate()} MiB/s)`;
       try {
-        const blobData = await fs4.readFile(entry.filename);
+        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}`
@@ -8640,7 +8818,7 @@ function uploadCommand(program) {
       }
     }
     if (validatedOptions.outputCommitments) {
-      await fs4.writeFile(
+      await fs5.writeFile(
         validatedOptions.outputCommitments,
         JSON.stringify(outputCommitments)
       );
@@ -8690,4 +8868,9 @@ function createProgram() {
 }
 
 // src/entry.ts
-createProgram().parse(process.argv);
+function main() {
+  const rawArgs = process.argv.slice(2);
+  const normalizedArgs = rawArgs[0] === "--" ? rawArgs.slice(1) : rawArgs;
+  createProgram().parse([process.argv[0], process.argv[1], ...normalizedArgs]);
+}
+main();