@alchemy/cli 0.10.0 → 0.11.1

package/dist/{chunk-ANONMDDZ.js → chunk-OL5MEN62.js}

@@ -4,22 +4,21 @@ import {
   configDir,
   load,
   save
-} from "./chunk-GLKB4JM7.js";
+} from "./chunk-LANOFNO6.js";
 import {
   CLIError,
   ErrorCode,
   debug,
   errAccessDenied,
-  errAccessKeyRequired,
   errAdminAPI,
   errAppRequired,
   errAuthRequired,
   errInvalidAPIKey,
-  errInvalidAccessKey,
   errInvalidArgs,
   errLoginRequired,
   errNetwork,
   errNetworkNotEnabled,
+  errNetworkRequired,
   errNotFound,
   errRPC,
   errRateLimited,
@@ -31,7 +30,7 @@ import {
   redactSensitiveText,
   timeout,
   verbose
-} from "./chunk-CTTW4PA4.js";
+} from "./chunk-5BEJA752.js";
 
 // src/lib/resolve.ts
 import { readFileSync as readFileSync2 } from "fs";
@@ -625,6 +624,11 @@ var Client = class _Client {
     if (networkNotEnabled) return networkNotEnabled;
     return errInvalidAPIKey(detail || void 0);
   }
+  isWrappedNetworkFailure(err) {
+    return err.status === void 0 && err.code === -32e3 && /\b(fetch failed|failed to fetch|network error|econnrefused|enotfound|etimedout|eai_again|socket hang up)\b/i.test(
+      err.message
+    );
+  }
   tryParseRPCError(text) {
     try {
       const parsed = JSON.parse(text);
@@ -635,6 +639,9 @@ var Client = class _Client {
     }
     return null;
   }
+  isFetchFailureError(err) {
+    return err.status === void 0 && err.message.trim().toLowerCase() === "fetch failed";
+  }
   verboseLog(message) {
     if (verbose) {
       process.stderr.write(`[verbose] ${message}
@@ -671,6 +678,9 @@ var Client = class _Client {
         if (err.status !== void 0) {
           throw errNetwork(`HTTP ${err.status}: ${err.message}`);
         }
+        if (this.isWrappedNetworkFailure(err)) {
+          throw errNetwork(err.message);
+        }
         throw errRPC(err.code, err.message);
       }
       throw err;
@@ -945,17 +955,10 @@ var AdminClient = class _AdminClient {
   static ADMIN_API_BASE_URL_ENV = "ALCHEMY_ADMIN_API_BASE_URL";
   credential;
   constructor(credential) {
-    if (typeof credential === "string") {
-      this.validateAccessKey(credential);
-      this.credential = { type: "access_key", key: credential };
-    } else {
-      if (credential.type === "access_key") {
-        this.validateAccessKey(credential.key);
-      } else if (!credential.token.trim()) {
-        throw errAuthRequired();
-      }
-      this.credential = credential;
+    if (!credential.token.trim()) {
+      throw errLoginRequired();
     }
+    this.credential = credential;
   }
   baseURL() {
     const override = this.baseURLOverride();
@@ -976,11 +979,6 @@ var AdminClient = class _AdminClient {
       allowedHostnames: [STAGING_ADMIN_API_HOST]
     });
   }
-  validateAccessKey(accessKey) {
-    if (!accessKey.trim() || /\s/.test(accessKey)) {
-      throw errInvalidAccessKey();
-    }
-  }
   assertSafeRequestTarget(url) {
     let parsed;
     try {
@@ -1003,7 +1001,7 @@ var AdminClient = class _AdminClient {
       method,
       redirect: "error",
       headers: {
-        Authorization: `Bearer ${this.credential.type === "access_key" ? this.credential.key : this.credential.token}`,
+        Authorization: `Bearer ${this.credential.token}`,
         "Content-Type": "application/json",
         Accept: "application/json"
       },
@@ -1011,7 +1009,7 @@ var AdminClient = class _AdminClient {
     });
     if (resp.status === 401) {
       debug(`401 Unauthorized from ${url}`);
-      throw errInvalidAccessKey();
+      throw errLoginRequired();
     }
     if (resp.status === 403) {
       const detail = await resp.text().catch(() => "");
@@ -1127,17 +1125,10 @@ var GasManagerClient = class _GasManagerClient {
   static BASE_URL_ENV = "ALCHEMY_GAS_MANAGER_BASE_URL";
   credential;
   constructor(credential) {
-    if (typeof credential === "string") {
-      this.validateAccessKey(credential);
-      this.credential = { type: "access_key", key: credential };
-    } else {
-      if (credential.type === "access_key") {
-        this.validateAccessKey(credential.key);
-      } else if (!credential.token.trim()) {
-        throw errAuthRequired();
-      }
-      this.credential = credential;
+    if (!credential.token.trim()) {
+      throw errLoginRequired();
     }
+    this.credential = credential;
   }
   baseURL() {
     const override = this.baseURLOverride();
@@ -1156,11 +1147,6 @@ var GasManagerClient = class _GasManagerClient {
   baseURLOverride() {
     return parseBaseURLOverride(_GasManagerClient.BASE_URL_ENV);
   }
-  validateAccessKey(accessKey) {
-    if (!accessKey.trim() || /\s/.test(accessKey)) {
-      throw errInvalidAccessKey();
-    }
-  }
   assertSafeRequestTarget(url) {
     let parsed;
     try {
@@ -1179,19 +1165,18 @@ var GasManagerClient = class _GasManagerClient {
     const url = `${this.baseURL()}${path}`;
     debug(`${method} ${url}`);
     this.assertSafeRequestTarget(url);
-    const token = this.credential.type === "access_key" ? this.credential.key : this.credential.token;
     const resp = await fetchWithTimeout(url, {
       method,
       redirect: "error",
       headers: {
-        Authorization: `Bearer ${token}`,
+        Authorization: `Bearer ${this.credential.token}`,
         "Content-Type": "application/json",
         Accept: "application/json"
       },
       ...body !== void 0 && { body: JSON.stringify(body) }
     });
     if (resp.status === 401) {
-      throw this.credential.type === "auth_token" ? errLoginRequired() : errInvalidAccessKey();
+      throw errLoginRequired();
     }
     if (resp.status === 403) {
       const detail = await resp.text().catch(() => "");
@@ -1202,15 +1187,12 @@ var GasManagerClient = class _GasManagerClient {
       } catch {
         reason = detail || void 0;
       }
-      if (this.credential.type === "auth_token") {
-        const tail = reason ? ` (${reason})` : "";
-        throw new CLIError(
-          ErrorCode.AUTH_REQUIRED,
-          `Access denied for this Alchemy account or app${tail}. Re-authenticate with 'alchemy auth login' or check that the default app is one you have permission to manage.`,
-          "alchemy auth login"
-        );
-      }
-      throw errAccessDenied(typeof reason === "string" ? reason : void 0);
+      const tail = reason ? ` (${reason})` : "";
+      throw new CLIError(
+        ErrorCode.AUTH_REQUIRED,
+        `Access denied for this Alchemy account or app${tail}. Re-authenticate with 'alchemy auth login' or check that the default app is one you have permission to manage.`,
+        "alchemy auth login"
+      );
     }
     if (resp.status === 404) {
       const text = await resp.text().catch(() => "");
@@ -1569,43 +1551,29 @@ function resolveAPIKey(program, cfg) {
   if (config.app?.apiKey) return config.app.apiKey;
   return void 0;
 }
-function resolveAccessKey(_program, cfg) {
-  if (process.env.ALCHEMY_ACCESS_KEY) return process.env.ALCHEMY_ACCESS_KEY;
-  const config = cfg ?? load();
-  if (config.access_key) return config.access_key;
-  return void 0;
-}
-function resolveNetwork(program, cfg, defaultNetwork) {
+function resolveOptionalNetwork(program) {
   const opts = getCommandOptions(program);
-  if (opts.network) return opts.network;
-  if (process.env.ALCHEMY_NETWORK) return process.env.ALCHEMY_NETWORK;
-  const config = cfg ?? load();
-  if (config.network) return config.network;
-  return defaultNetwork ?? "eth-mainnet";
+  return opts.network;
 }
-function resolveSolanaNetwork(program, cfg) {
-  const opts = getCommandOptions(program);
-  if (opts.network) {
-    if (!isSolanaNetwork(opts.network)) {
-      throw errInvalidArgs(
-        `Network '${opts.network}' is not a Solana network. Use a solana-* network with the solana namespace.`
-      );
-    }
-    return opts.network;
-  }
-  if (process.env.ALCHEMY_NETWORK) {
-    if (!isSolanaNetwork(process.env.ALCHEMY_NETWORK)) {
-      throw errInvalidArgs(
-        `ALCHEMY_NETWORK='${process.env.ALCHEMY_NETWORK}' is not a Solana network. Use a solana-* network with the solana namespace.`
-      );
-    }
-    return process.env.ALCHEMY_NETWORK;
+function resolveNetwork(program) {
+  const network = resolveOptionalNetwork(program);
+  if (network) return network;
+  throw errNetworkRequired();
+}
+function resolveRequiredNetwork(program) {
+  return resolveNetwork(program);
+}
+function resolveSolanaNetwork(program) {
+  const network = resolveOptionalNetwork(program);
+  if (!network) {
+    throw errNetworkRequired("alchemy solana network list");
   }
-  const config = cfg ?? load();
-  if (config.network && isSolanaNetwork(config.network)) {
-    return config.network;
+  if (!isSolanaNetwork(network)) {
+    throw errInvalidArgs(
+      `Network '${network}' is not a Solana network. Use a solana-* network with the solana namespace.`
+    );
   }
-  return "solana-mainnet";
+  return network;
 }
 function resolveAppId(program, cfg) {
   const opts = getCommandOptions(program);
@@ -1627,11 +1595,9 @@ function resolveAuthToken(cfg) {
 }
 function adminClientFromFlags(program) {
   const cfg = load();
-  const accessKey = resolveAccessKey(program, cfg);
-  if (accessKey) return new AdminClient(accessKey);
   const authToken = resolveAuthToken(cfg);
   if (authToken) return new AdminClient({ type: "auth_token", token: authToken });
-  throw errAccessKeyRequired();
+  throw errLoginRequired();
 }
 function hasAuthLoginToken(cfg) {
   return Boolean(resolveAuthToken(cfg));
@@ -1653,7 +1619,7 @@ function resolveX402Client(program) {
   if (!resolveX402(program, cfg)) return null;
   const walletKey = resolveWalletKey(program, cfg);
   if (!walletKey) return null;
-  return new X402Client(walletKey, resolveNetwork(program, cfg));
+  return new X402Client(walletKey, resolveNetwork(program));
 }
 function resolveWalletKey(program, cfg) {
   const opts = getCommandOptions(program);
@@ -1743,9 +1709,20 @@ function resolveActiveSigner(program, cfg) {
 function resolveDelegatedMode(program, cfg) {
   return resolveActiveSigner(program, cfg) === "session";
 }
+function resolveClientNetwork(program, opts) {
+  return opts?.forceNetwork ?? resolveNetwork(program);
+}
+function apiKeyClientFromFlags(program, opts) {
+  const cfg = load();
+  const network = resolveClientNetwork(program, opts);
+  debug(`using network=${network}`);
+  const apiKey = resolveAPIKey(program, cfg);
+  if (!apiKey) throw errAuthRequired();
+  return new Client(apiKey, network);
+}
 function clientFromFlags(program, opts) {
   const cfg = load();
-  const network = opts?.forceNetwork ?? resolveNetwork(program, cfg, opts?.defaultNetwork);
+  const network = resolveClientNetwork(program, opts);
   debug(`using network=${network}`);
   if (resolveX402(program, cfg)) {
     const walletKey = resolveWalletKey(program, cfg);
@@ -1807,8 +1784,9 @@ export {
   isSessionValid,
   getWalletSessionByChain,
   resolveAPIKey,
-  resolveAccessKey,
+  resolveOptionalNetwork,
   resolveNetwork,
+  resolveRequiredNetwork,
   resolveSolanaNetwork,
   resolveAppId,
   resolveAuthToken,
@@ -1825,6 +1803,7 @@ export {
   resolveSolanaFeePolicyId,
   resolveActiveSigner,
   resolveDelegatedMode,
+  apiKeyClientFromFlags,
   clientFromFlags,
   resolveConfiguredNetworkSlugs,
   resolveWalletSession,

package/dist/{chunk-VN5JUWHO.js → chunk-QWLBZTG5.js}

@@ -2,11 +2,11 @@
 if(process.argv.includes("--no-color"))process.env.NO_COLOR="1";
 import {
   isInteractiveAllowed
-} from "./chunk-3GBDYROJ.js";
+} from "./chunk-RPSHRYCZ.js";
 import {
   resolveAuthToken,
   resolveWalletSession
-} from "./chunk-ANONMDDZ.js";
+} from "./chunk-OL5MEN62.js";
 
 // src/lib/onboarding.ts
 var SETUP_CAPABILITY_ORDER = [
@@ -26,9 +26,6 @@ var SETUP_CAPABILITY_LABELS = {
 function hasAPIKey(cfg) {
   return Boolean(cfg.api_key?.trim());
 }
-function hasAccessKeyAndApp(cfg) {
-  return Boolean(cfg.access_key?.trim() && cfg.app?.id && cfg.app.apiKey);
-}
 function hasX402Wallet(cfg) {
   return cfg.x402 === true && Boolean(cfg.wallet_key_file?.trim());
 }
@@ -40,7 +37,7 @@ function capabilityStatus(args) {
 }
 function getSetupCapabilities(cfg) {
   const hasConfiguredAPIKey = hasAPIKey(cfg) || Boolean(cfg.app?.apiKey?.trim());
-  const hasAdminAuth = Boolean(cfg.access_key?.trim()) || hasAuthToken(cfg);
+  const hasAdminAuth = hasAuthToken(cfg);
   const hasNotifyAuth = Boolean(
     cfg.webhook_api_key?.trim() || cfg.app?.webhookApiKey?.trim()
   );
@@ -58,9 +55,9 @@ function getSetupCapabilities(cfg) {
     }),
     admin_api: capabilityStatus({
       complete: hasAdminAuth,
-      satisfiedBy: cfg.access_key?.trim() ? "access_key" : hasAuthToken(cfg) ? "auth_token" : null,
-      missing: hasAdminAuth ? [] : ["access-key or auth token"],
-      nextCommands: hasAdminAuth ? [] : ["alchemy auth", "alchemy config set access-key <key>"]
+      satisfiedBy: hasAdminAuth ? "auth_token" : null,
+      missing: hasAdminAuth ? [] : ["auth token"],
+      nextCommands: hasAdminAuth ? [] : ["alchemy auth"]
     }),
     notify_webhooks: capabilityStatus({
       complete: hasNotifyAuth,
@@ -87,7 +84,6 @@ function getSetupCapabilities(cfg) {
 }
 function getSetupMethod(cfg) {
   if (hasAPIKey(cfg)) return "api_key";
-  if (hasAccessKeyAndApp(cfg)) return "access_key_app";
   if (hasX402Wallet(cfg)) return "x402_wallet";
   if (hasAuthToken(cfg)) return "auth_token";
   return null;
@@ -110,11 +106,10 @@ function getSetupStatus(cfg) {
   return {
     complete: false,
     satisfiedBy: null,
-    missing: ["Provide one auth path: alchemy auth OR api-key OR ALCHEMY_ACCESS_KEY+app OR SIWx wallet"],
+    missing: ["Provide one auth path: alchemy auth OR api-key OR SIWx wallet"],
     nextCommands: [
       "alchemy auth",
       "alchemy config set app",
-      "alchemy config set access-key <key> && alchemy config set app <app-id>",
       "alchemy wallet connect --mode local && alchemy config set x402 true"
     ],
     capabilities

package/dist/{chunk-3GBDYROJ.js → chunk-RPSHRYCZ.js}

@@ -2,7 +2,7 @@
 if(process.argv.includes("--no-color"))process.env.NO_COLOR="1";
 import {
   isJSONMode
-} from "./chunk-CTTW4PA4.js";
+} from "./chunk-5BEJA752.js";
 
 // src/lib/interaction.ts
 import { stdin, stdout } from "process";

package/dist/{chunk-HRWD4V2P.js → chunk-SRGDGXY5.js}

@@ -2,10 +2,10 @@
 if(process.argv.includes("--no-color"))process.env.NO_COLOR="1";
 import {
   configPath
-} from "./chunk-GLKB4JM7.js";
+} from "./chunk-LANOFNO6.js";
 import {
   esc
-} from "./chunk-CTTW4PA4.js";
+} from "./chunk-5BEJA752.js";
 
 // src/lib/update-check.ts
 import { execFileSync } from "child_process";
@@ -53,7 +53,7 @@ function semverLT(a, b) {
   return false;
 }
 function currentVersion() {
-  return true ? "0.10.0" : "0.0.0";
+  return true ? "0.11.1" : "0.0.0";
 }
 function toUpdateStatus(latestVersion, checkedAt) {
   const current = currentVersion();

package/dist/{errors-YPNK3AVF.js → errors-6BEPCY5N.js}

@@ -5,16 +5,15 @@ import {
   EXIT_CODES,
   ErrorCode,
   errAccessDenied,
-  errAccessKeyRequired,
   errAdminAPI,
   errAppRequired,
   errAuthRequired,
   errInvalidAPIKey,
-  errInvalidAccessKey,
   errInvalidArgs,
   errLoginRequired,
   errNetwork,
   errNetworkNotEnabled,
+  errNetworkRequired,
   errNoActiveSession,
   errNotFound,
   errRPC,
@@ -24,25 +23,25 @@ import {
   errSolanaTransactionFailed,
   errSolanaWalletKeyRequired,
   errWalletKeyRequired,
+  errWalletRequired,
   exitWithError,
   isReplMode,
   setReplMode
-} from "./chunk-CTTW4PA4.js";
+} from "./chunk-5BEJA752.js";
 export {
   CLIError,
   EXIT_CODES,
   ErrorCode,
   errAccessDenied,
-  errAccessKeyRequired,
   errAdminAPI,
   errAppRequired,
   errAuthRequired,
   errInvalidAPIKey,
-  errInvalidAccessKey,
   errInvalidArgs,
   errLoginRequired,
   errNetwork,
   errNetworkNotEnabled,
+  errNetworkRequired,
   errNoActiveSession,
   errNotFound,
   errRPC,
@@ -52,6 +51,7 @@ export {
   errSolanaTransactionFailed,
   errSolanaWalletKeyRequired,
   errWalletKeyRequired,
+  errWalletRequired,
   exitWithError,
   isReplMode,
   setReplMode