@vapi-network/cli 0.2.2 → 0.2.3

package/dist/index.js

@@ -45329,8 +45329,8 @@ var DEFAULT_DISCOVERY_URL = `${DEFAULT_REGISTRY_URL}/api/call/services`;
 var DEFAULT_MARKETPLACE_DISCOVERY_URL = `${DEFAULT_REGISTRY_URL}/api/call/discovery`;
 var DEFAULT_REGISTRY_FALLBACKS = [
   {
-    discoveryUrl: "https://console.vapinetwork.ai/api/call/services",
-    marketplaceDiscoveryUrl: "https://console.vapinetwork.ai/api/call/discovery"
+    discoveryUrl: DEFAULT_DISCOVERY_URL,
+    marketplaceDiscoveryUrl: DEFAULT_MARKETPLACE_DISCOVERY_URL
   }
 ];
 var DEFAULT_SPEND_CAPS = {
@@ -45435,6 +45435,83 @@ async function migrateLegacyVapiHome(options = {}) {
   }
   return copied;
 }
+var LEGACY_REGISTRY_HOSTS = /* @__PURE__ */ new Map([
+  ["console.vapinetwork.ai", "api.vapinetwork.ai"],
+  ["console-staging.vapinetwork.ai", "api-staging.vapinetwork.ai"]
+]);
+var LEGACY_REGISTRY_PATHS = /* @__PURE__ */ new Map([
+  ["/api/network/services", "/api/call/services"],
+  ["/api/marketplace/discovery", "/api/call/discovery"]
+]);
+var REGISTRY_DOMAIN = "vapinetwork.ai";
+function rewriteLegacyRegistryUrl(value) {
+  let url2;
+  try {
+    url2 = new URL(value);
+  } catch {
+    return value;
+  }
+  let rewritten = false;
+  const host = LEGACY_REGISTRY_HOSTS.get(url2.hostname.toLowerCase());
+  if (host) {
+    url2.hostname = host;
+    rewritten = true;
+  }
+  const hostname3 = url2.hostname.toLowerCase();
+  if (hostname3 === REGISTRY_DOMAIN || hostname3.endsWith(`.${REGISTRY_DOMAIN}`)) {
+    const path = LEGACY_REGISTRY_PATHS.get(url2.pathname.replace(/\/+$/, ""));
+    if (path) {
+      url2.pathname = path;
+      rewritten = true;
+    }
+  }
+  return rewritten ? url2.href : value;
+}
+function rewriteLegacyRegistryUrls(config2) {
+  const changes = [];
+  const rewrite = (field, from16) => {
+    const to = rewriteLegacyRegistryUrl(from16);
+    if (to !== from16) changes.push({ field, from: from16, to });
+    return to;
+  };
+  const next = {
+    ...config2,
+    discoveryUrl: rewrite("discoveryUrl", config2.discoveryUrl),
+    marketplaceDiscoveryUrl: rewrite("marketplaceDiscoveryUrl", config2.marketplaceDiscoveryUrl),
+    ...config2.registryFallbacks ? {
+      registryFallbacks: config2.registryFallbacks.map((fallback, index2) => ({
+        discoveryUrl: rewrite(
+          `registryFallbacks[${index2}].discoveryUrl`,
+          fallback.discoveryUrl
+        ),
+        marketplaceDiscoveryUrl: rewrite(
+          `registryFallbacks[${index2}].marketplaceDiscoveryUrl`,
+          fallback.marketplaceDiscoveryUrl
+        )
+      }))
+    } : {}
+  };
+  return changes.length === 0 ? { config: config2, changes } : { config: next, changes };
+}
+function formatLegacyRegistryRewrites(changes) {
+  return [
+    "Rewrote retired vAPI registry URLs in the local config:",
+    ...changes.map((change) => `  ${change.field}: ${change.from} -> ${change.to}`)
+  ].join("\n");
+}
+async function migrateLegacyRegistryConfig(path = getVapiPaths().config) {
+  let raw;
+  try {
+    raw = await readFile(path, "utf8");
+  } catch (error61) {
+    if (isMissingFile(error61)) return [];
+    throw error61;
+  }
+  const { config: config2, changes } = rewriteLegacyRegistryUrls(configSchema.parse(JSON.parse(raw)));
+  if (changes.length === 0) return [];
+  await writeConfigFile(path, config2);
+  return changes;
+}
 function getDefaultConfig(source = process.env, options = {}) {
   const registry2 = registryEndpoints(source.VAPI_REGISTRY_URL?.trim() || DEFAULT_REGISTRY_URL);
   const requested = new Set(options.networks ?? ["base"]);
@@ -45473,7 +45550,7 @@ function getDefaultConfig(source = process.env, options = {}) {
     spendCaps: { ...DEFAULT_SPEND_CAPS }
   };
 }
-async function loadConfig(path = getVapiPaths().config, source = process.env) {
+async function loadConfig(path = getVapiPaths().config, source = process.env, options = {}) {
   if (!process.env.VAPI_HOME?.trim() && path === getVapiPaths(join(homedir(), ".vapi")).config) {
     await migrateLegacyVapiHome({ targetDirectory: join(homedir(), ".vapi") });
   }
@@ -45484,8 +45561,16 @@ async function loadConfig(path = getVapiPaths().config, source = process.env) {
     if (isMissingFile(error61)) return getDefaultConfig(source);
     throw error61;
   }
-  const config2 = configSchema.parse(JSON.parse(raw));
-  config2.registryFallbacks ??= DEFAULT_REGISTRY_FALLBACKS.map((fallback) => ({ ...fallback }));
+  const parsed = configSchema.parse(JSON.parse(raw));
+  parsed.registryFallbacks ??= DEFAULT_REGISTRY_FALLBACKS.map((fallback) => ({ ...fallback }));
+  const migrated = rewriteLegacyRegistryUrls(parsed);
+  const config2 = migrated.config;
+  if (migrated.changes.length > 0 && options.notice) {
+    options.notice(
+      `${formatLegacyRegistryRewrites(migrated.changes)}
+Run vapi init to write the new URLs to ${path}.`
+    );
+  }
   const baseRpcUrl = source.BASE_RPC_URL?.trim();
   const arcRpcUrl = source.ARC_TESTNET_RPC_URL?.trim();
   const solanaRpcUrl = source.SOLANA_RPC_URL?.trim();
@@ -45541,15 +45626,7 @@ async function writeDefaultConfig(path = getVapiPaths().config, source = process
     if (copied.includes(path)) return await loadConfig(path, source);
   }
   const config2 = getDefaultConfig(source, options);
-  await mkdir(dirname(path), { recursive: true, mode: 448 });
-  const temporaryPath = `${path}.${process.pid}.tmp`;
-  await writeFile(temporaryPath, `${JSON.stringify(config2, null, 2)}
-`, {
-    encoding: "utf8",
-    mode: 384,
-    flag: "wx"
-  });
-  await rename(temporaryPath, path);
+  await writeConfigFile(path, config2);
   return config2;
 }
 async function enableDefaultNetwork(network, path = getVapiPaths().config, source = process.env) {
@@ -45560,6 +45637,10 @@ async function enableDefaultNetwork(network, path = getVapiPaths().config, sourc
       usdc: NETWORKS[SOLANA_MAINNET_CAIP2].usdc
     };
   }
+  await writeConfigFile(path, config2);
+  return config2;
+}
+async function writeConfigFile(path, config2) {
   await mkdir(dirname(path), { recursive: true, mode: 448 });
   const temporaryPath = `${path}.${process.pid}.tmp`;
   await writeFile(temporaryPath, `${JSON.stringify(config2, null, 2)}
@@ -45569,7 +45650,6 @@ async function enableDefaultNetwork(network, path = getVapiPaths().config, sourc
     flag: "wx"
   });
   await rename(temporaryPath, path);
-  return config2;
 }
 async function pathExists(path) {
   try {
@@ -45990,6 +46070,49 @@ async function unlockKeystore(passphrase, path = getVapiPaths().keystore) {
   }
   return await paymentAccountFromKeys(keys);
 }
+async function readKeystoreAddress(path = getVapiPaths().keystore) {
+  let raw;
+  try {
+    raw = await readFile3(path, "utf8");
+  } catch {
+    return void 0;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return void 0;
+  }
+  const address2 = typeof parsed === "object" && parsed !== null ? Reflect.get(parsed, "address") : void 0;
+  return typeof address2 === "string" ? address2 : void 0;
+}
+async function exportKeystoreKeys(passphrase, path = getVapiPaths().keystore) {
+  let raw;
+  try {
+    raw = await readFile3(path, "utf8");
+  } catch (error61) {
+    if (isMissingFile(error61)) {
+      throw new KeystoreError(`No vAPI keystore found at ${path}. Run vapi init.`);
+    }
+    throw error61;
+  }
+  const keys = await decryptKeys(parseAnyKeystore(JSON.parse(raw)), passphrase);
+  const evmPrivateKey = keys.evm;
+  const exported = {
+    evm: { address: privateKeyToAccount(evmPrivateKey).address, privateKey: evmPrivateKey }
+  };
+  if (!keys.solana) return exported;
+  const seed = Uint8Array.from(Buffer.from(keys.solana, "base64"));
+  const signer = await createSolanaSigner(Uint8Array.from(seed));
+  const publicKey = Uint8Array.from(getBase58Encoder().encode(signer.address));
+  const secretKey = new Uint8Array(seed.length + publicKey.length);
+  secretKey.set(seed);
+  secretKey.set(publicKey, seed.length);
+  const encoded = getBase58Decoder().decode(secretKey);
+  seed.fill(0);
+  secretKey.fill(0);
+  return { ...exported, solana: { address: signer.address, secretKey: encoded } };
+}
 async function enableSolanaKey(passphrase, path = getVapiPaths().keystore) {
   let raw;
   try {
@@ -46669,7 +46792,7 @@ function csvCell(value) {
 import { mkdir as mkdir6, writeFile as writeFile4 } from "node:fs/promises";
 import { arch, platform, release } from "node:os";
 import { join as join2 } from "node:path";
-var VAPI_CLIENT_VERSION = "0.2.2";
+var VAPI_CLIENT_VERSION = "0.2.3";
 async function createSupportReport(options) {
   const message = options.message.trim();
   if (!message) throw new Error("Support report message must not be empty.");
@@ -48962,7 +49085,7 @@ function rgbToAnsi256(red, green, blue) {
 }
 
 // src/version.ts
-var CLI_VERSION = "0.2.2";
+var CLI_VERSION = "0.2.3";
 
 // src/cli.ts
 var HELP_HEADING = "vAPI Network";
@@ -48980,6 +49103,7 @@ Usage:
   vapi receipts export --format <json|csv> [--range <24h|7d|30d>]
   vapi stats [--range <24h|7d|30d>] [--json]
   vapi sweep <address> [--network <caip2>] [--json]
+  vapi export-key [--network <caip2>] [--json]
   vapi report "<what happened>" [--include-addresses] [--send] [--json]
   vapi mcp [--json]
   vapi serve [--json]
@@ -49048,6 +49172,9 @@ async function runCli(argv = process.argv.slice(2), io = processIo, dependencies
       case "sweep":
         await sweepCommand(args.slice(1), json2, io);
         return 0;
+      case "export-key":
+        await exportKeyCommand(args.slice(1), json2, io);
+        return 0;
       case "report":
         await reportCommand(args.slice(1), json2, io, dependencies);
         return 0;
@@ -49087,8 +49214,18 @@ async function initCommand(argv, json2, io, dependencies) {
   if (!process.env.VAPI_HOME?.trim()) {
     migrated = await migrateLegacyVapiHome({ targetDirectory: paths.directory, notice: io.stderr });
   }
+  const adopted = migrated.includes(paths.keystore);
+  if (!adopted && await fileExists(paths.keystore)) {
+    const address2 = await readKeystoreAddress(paths.keystore);
+    throw new Error(
+      [
+        `Keystore already exists at ${paths.keystore}. Refusing to replace the local payment key.`,
+        ...address2 ? [`Address: ${address2}`] : []
+      ].join("\n")
+    );
+  }
   const passphrase = await getKeystorePassphrase({ confirm: true });
-  let account = migrated.includes(paths.keystore) ? await unlockKeystore(passphrase, paths.keystore) : await createKeystore(passphrase, paths.keystore, { enableSolana });
+  let account = adopted ? await unlockKeystore(passphrase, paths.keystore) : await createKeystore(passphrase, paths.keystore, { enableSolana });
   if (enableSolana && !account.solana) {
     account = await enableSolanaKey(passphrase, paths.keystore);
   }
@@ -49097,7 +49234,8 @@ async function initCommand(argv, json2, io, dependencies) {
   } else if (enableSolana) {
     await enableDefaultNetwork("solana", paths.config);
   }
-  const config2 = await loadConfig(paths.config);
+  const configRewrites = await migrateLegacyRegistryConfig(paths.config);
+  const config2 = await readConfig(paths.config, io);
   const accounts = await listAccounts({
     address: account.address,
     ...account.solana ? { solanaAddress: account.solana.address } : {},
@@ -49109,6 +49247,7 @@ async function initCommand(argv, json2, io, dependencies) {
     accounts,
     config: paths.config,
     keystore: paths.keystore,
+    ...configRewrites.length > 0 ? { configRewrites } : {},
     message: "vAPI wallet created. Its encrypted key stays on this machine.",
     nextSteps: buildNextSteps(account.address)
   };
@@ -49116,6 +49255,7 @@ async function initCommand(argv, json2, io, dependencies) {
     io.stdout(JSON.stringify(result));
     return;
   }
+  if (configRewrites.length > 0) io.stdout(formatLegacyRegistryRewrites(configRewrites));
   io.stdout(result.message);
   io.stdout(`Address: ${result.address}`);
   io.stdout(
@@ -49140,7 +49280,7 @@ async function fundCommand(argv, json2, io, dependencies) {
   });
   const fiatAmount = optionalUsdAmount(parsed.one("--amount"), "--amount");
   const paths = getVapiPaths();
-  const config2 = await loadConfig(paths.config);
+  const config2 = await readConfig(paths.config, io);
   const account = await unlockKeystore(await getKeystorePassphrase(), paths.keystore);
   const session = await createOnrampSession({
     address: account.address,
@@ -49160,7 +49300,7 @@ async function searchCommand(argv, json2, io, dependencies) {
     maximumPositionals: 1
   });
   const limit = optionalPositiveInteger(parsed.one("--limit"), "--limit");
-  const config2 = await loadConfig(getVapiPaths().config);
+  const config2 = await readConfig(getVapiPaths().config, io);
   const page = await searchMarketplace(
     {
       ...parsed.positionals[0] ? { query: parsed.positionals[0] } : {},
@@ -49184,7 +49324,7 @@ async function inspectCommand(argv, json2, io, dependencies) {
     parsed.positionals[0],
     "Usage: vapi inspect <id> [--endpoint <name>]"
   );
-  const config2 = await loadConfig(getVapiPaths().config);
+  const config2 = await readConfig(getVapiPaths().config, io);
   const result = await inspectService(
     { id, ...parsed.one("--endpoint") ? { endpoint: parsed.one("--endpoint") } : {} },
     config2,
@@ -49208,7 +49348,7 @@ async function payCommand(argv, json2, io) {
   });
   const target = requiredPositional(parsed.positionals[0], "Usage: vapi pay <id-or-url> [options]");
   const paths = getVapiPaths();
-  const config2 = await loadConfig(paths.config);
+  const config2 = await readConfig(paths.config, io);
   const account = await unlockKeystore(await getKeystorePassphrase(), paths.keystore);
   const bodyText = parsed.one("--body");
   const maxPriceUsd = aliasedOption(parsed, "--max", "--max-price-usd");
@@ -49234,7 +49374,7 @@ async function payCommand(argv, json2, io) {
 async function balanceCommand(argv, json2, io, dependencies) {
   requireNoArguments(argv, "balance");
   const paths = getVapiPaths();
-  const config2 = await loadConfig(paths.config);
+  const config2 = await readConfig(paths.config, io);
   const account = await unlockKeystore(await getKeystorePassphrase(), paths.keystore);
   const wallet = await getWallet(account, config2, dependencies);
   output2(io, json2, wallet, formatWallet(wallet));
@@ -49252,7 +49392,7 @@ async function accountsCommand(argv, json2, io, dependencies) {
   const passphrase = await getKeystorePassphrase();
   const account = enable ? await enableSolanaKey(passphrase, paths.keystore) : await unlockKeystore(passphrase, paths.keystore);
   if (enable) await enableDefaultNetwork("solana", paths.config);
-  const config2 = await loadConfig(paths.config);
+  const config2 = await readConfig(paths.config, io);
   const accounts = await listAccounts({
     address: account.address,
     ...account.solana ? { solanaAddress: account.solana.address } : {},
@@ -49321,7 +49461,7 @@ async function sweepCommand(argv, json2, io) {
   );
   const requestedNetwork = parsed.one("--network");
   const paths = getVapiPaths();
-  const config2 = await loadConfig(paths.config);
+  const config2 = await readConfig(paths.config, io);
   const account = await unlockKeystore(await getKeystorePassphrase(), paths.keystore);
   if (requestedNetwork && !isNetworkConfigured(config2.networks, requestedNetwork)) {
     throw new Error(`Network ${requestedNetwork} is not configured.`);
@@ -49365,6 +49505,33 @@ async function reportCommand(argv, json2, io, dependencies) {
   });
   output2(io, json2, result, formatSupportReport(result));
 }
+var EXPORT_KEY_WARNING = "Anyone with this key can spend the wallet. Never paste it into a website or chat.";
+async function exportKeyCommand(argv, json2, io) {
+  const parsed = parseArguments(argv, {
+    valueOptions: /* @__PURE__ */ new Set(["--network"]),
+    maximumPositionals: 0
+  });
+  const network = parsed.one("--network") ?? BASE_MAINNET_CAIP2;
+  const solana = isSolanaNetwork(network);
+  if (!solana && !network.startsWith("eip155:")) {
+    throw new UsageError("--network must be an eip155:<chainId> or Solana network identifier.");
+  }
+  const paths = getVapiPaths();
+  const keys = await exportKeystoreKeys(await getKeystorePassphrase(), paths.keystore);
+  if (solana && !keys.solana) {
+    throw new Error(
+      `No Solana key is enabled in ${paths.keystore}. Run vapi accounts --enable solana first.`
+    );
+  }
+  const selected = solana && keys.solana ? keys.solana : keys.evm;
+  const result = {
+    network,
+    address: selected.address,
+    privateKey: "secretKey" in selected ? selected.secretKey : selected.privateKey
+  };
+  io.stderr(EXPORT_KEY_WARNING);
+  io.stdout(json2 ? JSON.stringify(result) : result.privateKey);
+}
 async function mcpCommand(argv) {
   requireNoArguments(argv, "mcp");
   const paths = getVapiPaths();
@@ -49378,6 +49545,9 @@ async function mcpCommand(argv) {
     searchesPath: paths.searches
   });
 }
+async function readConfig(path, io) {
+  return await loadConfig(path, process.env, { notice: io.stderr });
+}
 function output2(io, json2, value, human) {
   io.stdout(json2 ? JSON.stringify(value) : human);
 }