x402-proxy 0.3.0 → 0.3.2

package/README.md

@@ -10,14 +10,7 @@ npx x402-proxy https://twitter.surf.cascade.fyi/user/cascade_fyi
 
 That's it. The endpoint returns 402, x402-proxy pays and streams the response.
 
-First time? Set up a wallet:
-
-```bash
-npx x402-proxy setup          # generate wallet from BIP-39 mnemonic
-npx x402-proxy wallet fund    # see where to send USDC
-```
-
-One mnemonic derives both EVM (Base) and Solana keypairs. Fund either chain and go.
+No wallet? It'll walk you through setup automatically. One mnemonic derives both EVM (Base) and Solana keypairs. Fund either chain and go.
 
 ## MCP Proxy
 
@@ -45,29 +38,28 @@ Works like curl. Response body streams to stdout, payment info goes to stderr.
 
 ```bash
 # GET request
-x402-proxy https://twitter.surf.cascade.fyi/user/cascade_fyi
+$ npx x402-proxy https://twitter.surf.cascade.fyi/user/cascade_fyi
 
 # POST with body and headers
-x402-proxy --method POST \
+$ npx x402-proxy --method POST \
   --header "Content-Type: application/json" \
   --body '{"url":"https://x402.org"}' \
   https://web.surf.cascade.fyi/v1/crawl
 
 # Pipe-safe
-x402-proxy https://api.example.com/data | jq '.results'
+$ npx x402-proxy https://api.example.com/data | jq '.results'
 ```
 
 ## Commands
 
 ```bash
-x402-proxy <url>                    # paid HTTP request (default command)
-x402-proxy mcp <url>                # MCP stdio proxy for agents
-x402-proxy setup                    # onboarding wizard
-x402-proxy status                   # config + wallet + spend summary
-x402-proxy wallet                   # show addresses
-x402-proxy wallet history           # payment history
-x402-proxy wallet fund              # funding instructions
-x402-proxy wallet export-key <chain> # bare key to stdout (evm|solana)
+$ npx x402-proxy <url>                    # paid HTTP request (default command)
+$ npx x402-proxy mcp <url>                # MCP stdio proxy for agents
+$ npx x402-proxy setup                    # onboarding wizard
+$ npx x402-proxy status                   # config + wallet + spend summary
+$ npx x402-proxy wallet                   # show addresses and balances
+$ npx x402-proxy wallet history           # payment history
+$ npx x402-proxy wallet export-key <target> # bare key/mnemonic to stdout (evm|solana|mnemonic)
 ```
 
 All commands support `--help` for details.
@@ -83,8 +75,9 @@ Config stored at `$XDG_CONFIG_HOME/x402-proxy/` (default `~/.config/x402-proxy/`
 ### Export keys for other tools
 
 ```bash
-# Pipe-safe - outputs bare key to stdout
-MY_KEY=$(npx x402-proxy wallet export-key evm)
+# Pipe-safe - outputs bare key/mnemonic to stdout
+$ MY_KEY=$(npx x402-proxy wallet export-key evm)
+$ MY_MNEMONIC=$(npx x402-proxy wallet export-key mnemonic)
 ```
 
 ## Env Vars

package/dist/bin/cli.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
-import { C as calcSpend, S as appendHistory, T as readHistory, _ as getWalletPath, a as resolveWallet, b as saveConfig, c as generateMnemonic, d as info, f as isTTY, g as getHistoryPath, h as getConfigDirShort, i as buildX402Client, l as dim, m as ensureConfigDir, n as statusCommand, o as deriveEvmKeypair, p as warn, r as walletInfoCommand, s as deriveSolanaKeypair, u as error, v as isConfigured, w as formatTxLine, x as saveWalletFile, y as loadConfig } from "../status-DRSZjSq9.js";
+import { a as resolveWallet, c as info, d as appendHistory, f as calcSpend, i as buildX402Client, l as isTTY, m as readHistory, n as statusCommand, o as dim, p as formatTxLine, r as walletInfoCommand, s as error, u as warn } from "../status-Cp51UDnh.js";
+import { c as isConfigured, i as ensureConfigDir, l as loadConfig, o as getHistoryPath, u as loadWalletFile } from "../derive-Rikypf5B.js";
+import { n as setupCommand } from "../setup-CvB0go56.js";
 import { buildApplication, buildCommand, buildRouteMap, run } from "@stricli/core";
 import pc from "picocolors";
 import { decodePaymentResponseHeader, wrapFetchWithPayment } from "@x402/fetch";
@@ -109,7 +111,7 @@ Examples:
 	async func(flags, url) {
 		if (!url) {
 			if (isConfigured()) {
-				const { displayStatus } = await import("../status-BFDDA6oN.js");
+				const { displayStatus } = await import("../status-4nQP3Fpu.js");
 				await displayStatus();
 				console.log();
 				console.log(pc.dim("  Commands:"));
@@ -118,7 +120,6 @@ Examples:
 				console.log(`    ${pc.cyan("$ npx x402-proxy setup")}              Reconfigure wallet`);
 				console.log(`    ${pc.cyan("$ npx x402-proxy wallet")}             Addresses and balances`);
 				console.log(`    ${pc.cyan("$ npx x402-proxy wallet history")}     Full payment history`);
-				console.log(`    ${pc.cyan("$ npx x402-proxy wallet fund")}        Funding instructions`);
 				console.log();
 				console.log(pc.dim("  try: ") + pc.cyan("$ npx x402-proxy https://twitter.surf.cascade.fyi/user/cascade_fyi"));
 				console.log();
@@ -135,7 +136,6 @@ Examples:
 				console.log(`    ${pc.cyan("$ npx x402-proxy mcp <url>")}          MCP proxy for AI agents`);
 				console.log(`    ${pc.cyan("$ npx x402-proxy wallet")}             Addresses and balances`);
 				console.log(`    ${pc.cyan("$ npx x402-proxy wallet history")}     Payment history`);
-				console.log(`    ${pc.cyan("$ npx x402-proxy wallet fund")}        Funding instructions`);
 				console.log(`    ${pc.cyan("$ npx x402-proxy --help")}             All options`);
 				console.log();
 				console.log(pc.dim("  try: ") + pc.cyan("$ npx x402-proxy setup"));
@@ -152,14 +152,22 @@ Examples:
 			error(`Invalid URL: ${url}`);
 			process.exit(1);
 		}
-		const wallet = resolveWallet({
+		let wallet = resolveWallet({
 			evmKey: flags.evmKey,
 			solanaKey: flags.solanaKey
 		});
 		if (wallet.source === "none") {
-			error("No wallet configured.");
-			console.error(pc.dim(`Run ${pc.cyan("x402-proxy setup")} or set X402_PROXY_WALLET_MNEMONIC`));
-			process.exit(1);
+			if (!isTTY()) {
+				error("No wallet configured.");
+				console.error(pc.dim(`Run:\n  ${pc.cyan("$ npx x402-proxy setup")}\n\nOr set X402_PROXY_WALLET_MNEMONIC`));
+				process.exit(1);
+			}
+			dim("  No wallet found. Let's set one up first.\n");
+			const { runSetup } = await import("../setup-DtPaKQ37.js");
+			await runSetup();
+			console.log();
+			wallet = resolveWallet();
+			if (wallet.source === "none") return;
 		}
 		const config = loadConfig();
 		const { x402Fetch, shiftPayment } = createX402ProxyHandler({ client: await buildX402Client(wallet, {
@@ -190,8 +198,39 @@ Examples:
 		const elapsedMs = Date.now() - startMs;
 		const payment = shiftPayment();
 		const txSig = extractTxSignature(response);
+		if (response.status === 402 && isTTY()) {
+			const prHeader = response.headers.get("PAYMENT-REQUIRED") ?? response.headers.get("X-PAYMENT-REQUIRED");
+			let accepts = [];
+			if (prHeader) try {
+				accepts = JSON.parse(Buffer.from(prHeader, "base64").toString()).accepts ?? [];
+			} catch {}
+			if (accepts.length > 0) {
+				const cheapest = accepts.reduce((min, a) => Number(a.amount) < Number(min.amount) ? a : min);
+				error(`Payment required: ${(Number(cheapest.amount) / 1e6).toFixed(4)} USDC`);
+			} else error("Payment required");
+			const hasEvm = accepts.some((a) => a.network.startsWith("eip155:"));
+			const hasSolana = accepts.some((a) => a.network.startsWith("solana:"));
+			const hasOther = accepts.some((a) => !a.network.startsWith("eip155:") && !a.network.startsWith("solana:"));
+			if (hasEvm || hasSolana) {
+				console.error();
+				dim("  Fund your wallet with USDC:");
+				if (hasEvm && wallet.evmAddress) console.error(`    Base:   ${pc.cyan(wallet.evmAddress)}`);
+				if (hasSolana && wallet.solanaAddress) console.error(`    Solana: ${pc.cyan(wallet.solanaAddress)}`);
+				if (hasEvm && !wallet.evmAddress) dim("    Base:   endpoint accepts EVM but no EVM wallet configured");
+				if (hasSolana && !wallet.solanaAddress) dim("    Solana: endpoint accepts Solana but no Solana wallet configured");
+			} else if (hasOther) {
+				const networks = [...new Set(accepts.map((a) => a.network))].join(", ");
+				console.error();
+				error(`This endpoint only accepts payment on unsupported networks: ${networks}`);
+			}
+			console.error();
+			dim("  Then re-run:");
+			console.error(`    ${pc.cyan(`$ npx x402-proxy ${url}`)}`);
+			console.error();
+			return;
+		}
 		if (payment && isTTY()) {
-			info(`  Payment: ${payment.amount ?? "?"} (${payment.network ?? "unknown"})`);
+			info(`  Payment: ${payment.amount ? (Number(payment.amount) / 1e6).toFixed(4) : "?"} USDC (${payment.network ?? "unknown"})`);
 			if (txSig) dim(`  Tx: ${txSig}`);
 		}
 		if (isTTY()) dim(`  ${response.status} ${response.statusText} (${elapsedMs}ms)`);
@@ -269,7 +308,7 @@ Add to your MCP client config (Claude, Cursor, etc.):
 			solanaKey: flags.solanaKey
 		});
 		if (wallet.source === "none") {
-			error("No wallet configured. Set X402_PROXY_WALLET_MNEMONIC or run x402-proxy setup.");
+			error("No wallet configured.\nRun:\n  $ npx x402-proxy setup\n\nOr set X402_PROXY_WALLET_MNEMONIC");
 			process.exit(1);
 		}
 		warn("Note: MCP proxy is alpha - please report issues.");
@@ -290,7 +329,7 @@ Add to your MCP client config (Claude, Cursor, etc.):
 		const { x402MCPClient } = await import("@x402/mcp");
 		const x402Mcp = new x402MCPClient(new Client({
 			name: "x402-proxy",
-			version: "0.3.0"
+			version: "0.3.2"
 		}), x402PaymentClient, {
 			autoPayment: true,
 			onPaymentRequested: (ctx) => {
@@ -335,7 +374,7 @@ Add to your MCP client config (Claude, Cursor, etc.):
 		dim(`  ${tools.length} tools available`);
 		const localServer = new McpServer({
 			name: "x402-proxy",
-			version: "0.3.0"
+			version: "0.3.2"
 		});
 		for (const tool of tools) localServer.tool(tool.name, tool.description ?? "", tool.inputSchema?.properties ? Object.fromEntries(Object.entries(tool.inputSchema.properties).map(([k, v]) => [k, v])) : {}, async (args) => {
 			const result = await x402Mcp.callTool(tool.name, args);
@@ -366,103 +405,38 @@ Add to your MCP client config (Claude, Cursor, etc.):
 	}
 });
 
-//#endregion
-//#region src/commands/setup.ts
-const setupCommand = buildCommand({
-	docs: { brief: "Set up x402-proxy with a new wallet" },
-	parameters: {
-		flags: { force: {
-			kind: "boolean",
-			brief: "Overwrite existing configuration",
-			default: false
-		} },
-		positional: {
-			kind: "tuple",
-			parameters: []
-		}
-	},
-	async func(flags) {
-		if (isConfigured() && !flags.force) {
-			prompts.log.warn(`Already configured. Wallet at ${pc.dim(getWalletPath())}\nUse ${pc.cyan("x402-proxy setup --force")} to reconfigure.`);
-			return;
-		}
-		prompts.intro(pc.cyan("x402-proxy setup"));
-		prompts.log.info("This will generate a single BIP-39 mnemonic that derives wallets for both Solana and EVM chains.");
-		const action = await prompts.select({
-			message: "How would you like to set up your wallet?",
-			options: [{
-				value: "generate",
-				label: "Generate a new mnemonic"
-			}, {
-				value: "import",
-				label: "Import an existing mnemonic"
-			}]
-		});
-		if (prompts.isCancel(action)) {
-			prompts.cancel("Setup cancelled.");
-			process.exit(0);
-		}
-		let mnemonic;
-		if (action === "generate") {
-			mnemonic = generateMnemonic();
-			prompts.log.warn("Write down your mnemonic and store it safely. It will NOT be shown again.");
-			prompts.log.message(pc.bold(mnemonic));
-		} else {
-			const input = await prompts.text({
-				message: "Enter your 24-word mnemonic:",
-				validate: (v = "") => {
-					const words = v.trim().split(/\s+/);
-					if (words.length !== 12 && words.length !== 24) return "Mnemonic must be 12 or 24 words";
-				}
-			});
-			if (prompts.isCancel(input)) {
-				prompts.cancel("Setup cancelled.");
-				process.exit(0);
-			}
-			mnemonic = input.trim();
-		}
-		const evm = deriveEvmKeypair(mnemonic);
-		const sol = deriveSolanaKeypair(mnemonic);
-		prompts.log.success(`Base address:   ${pc.green(evm.address)}`);
-		prompts.log.success(`Solana address: ${pc.green(sol.address)}`);
-		saveWalletFile({
-			version: 1,
-			mnemonic,
-			addresses: {
-				evm: evm.address,
-				solana: sol.address
-			}
-		});
-		saveConfig({});
-		prompts.log.info(`Config directory: ${pc.dim(getConfigDirShort())}`);
-		prompts.log.step("Fund your wallets to start using x402 resources:");
-		prompts.log.message(`  Solana (USDC): Send USDC to ${pc.cyan(sol.address)}`);
-		prompts.log.message(`  Base (USDC):   Send USDC to ${pc.cyan(evm.address)}`);
-		prompts.log.step("Try your first request:");
-		prompts.log.message(`  ${pc.cyan("$ npx x402-proxy https://twitter.surf.cascade.fyi/user/cascade_fyi")}`);
-		prompts.outro(pc.green("Setup complete!"));
-	}
-});
-
 //#endregion
 //#region src/commands/wallet-export.ts
 const walletExportCommand = buildCommand({
-	docs: { brief: "Export private key to stdout (pipe-safe)" },
+	docs: { brief: "Export private key or mnemonic to stdout (pipe-safe)" },
 	parameters: {
 		flags: {},
 		positional: {
 			kind: "tuple",
 			parameters: [{
-				brief: "Chain to export: evm or solana",
+				brief: "What to export: evm, solana, or mnemonic",
 				parse: (input) => {
 					const v = input.toLowerCase();
-					if (v !== "evm" && v !== "solana") throw new Error("Must be 'evm' or 'solana'");
+					if (v !== "evm" && v !== "solana" && v !== "mnemonic") throw new Error("Must be 'evm', 'solana', or 'mnemonic'");
 					return v;
 				}
 			}]
 		}
 	},
 	async func(flags, chain) {
+		if (chain === "mnemonic") {
+			const mnemonic = process.env.X402_PROXY_WALLET_MNEMONIC || loadWalletFile()?.mnemonic;
+			if (!mnemonic) {
+				error("No mnemonic available. Wallet may have been configured with individual keys.");
+				process.exit(1);
+			}
+			if (process.stdout.isTTY) {
+				const confirmed = await prompts.confirm({ message: "This will print your mnemonic to the terminal. Continue?" });
+				if (prompts.isCancel(confirmed) || !confirmed) process.exit(0);
+			} else warn("Warning: mnemonic will be printed to stdout.");
+			process.stdout.write(mnemonic);
+			return;
+		}
 		const wallet = resolveWallet();
 		if (wallet.source === "none") {
 			error("No wallet configured.");
@@ -485,44 +459,6 @@ const walletExportCommand = buildCommand({
 	}
 });
 
-//#endregion
-//#region src/commands/wallet-fund.ts
-const walletFundCommand = buildCommand({
-	docs: { brief: "Show wallet funding instructions" },
-	parameters: {
-		flags: {},
-		positional: {
-			kind: "tuple",
-			parameters: []
-		}
-	},
-	func() {
-		const wallet = resolveWallet();
-		if (wallet.source === "none") {
-			console.log(pc.yellow("No wallet configured."));
-			console.log(pc.dim(`Run ${pc.cyan("x402-proxy setup")} to create one.`));
-			process.exit(1);
-		}
-		console.log();
-		info("Funding Instructions");
-		console.log();
-		if (wallet.solanaAddress) {
-			console.log(pc.bold("  Solana (USDC):"));
-			console.log(`  Send USDC to: ${pc.green(wallet.solanaAddress)}`);
-			console.log(pc.dim("  Network: Solana Mainnet"));
-			console.log();
-		}
-		if (wallet.evmAddress) {
-			console.log(pc.bold("  Base (USDC):"));
-			console.log(`  Send USDC to: ${pc.green(wallet.evmAddress)}`);
-			console.log(pc.dim("  Network: Base (Chain ID 8453)"));
-			console.log();
-		}
-		console.log(pc.dim("  Tip: Most x402 services accept USDC on Base or Solana."));
-		console.log();
-	}
-});
-
 //#endregion
 //#region src/commands/wallet-history.ts
 const walletHistoryCommand = buildCommand({
@@ -582,7 +518,6 @@ const routes = buildRouteMap({
 			routes: {
 				info: walletInfoCommand,
 				history: walletHistoryCommand,
-				fund: walletFundCommand,
 				"export-key": walletExportCommand
 			},
 			defaultCommand: "info",
@@ -596,7 +531,7 @@ const routes = buildRouteMap({
 });
 const app = buildApplication(routes, {
 	name: "x402-proxy",
-	versionInfo: { currentVersion: "0.3.0" },
+	versionInfo: { currentVersion: "0.3.2" },
 	scanner: { caseStyle: "allow-kebab-for-camel" }
 });
 

package/dist/derive-Rikypf5B.js

@@ -0,0 +1,161 @@
+#!/usr/bin/env node
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { parse, stringify } from "yaml";
+import { base58 } from "@scure/base";
+import { ed25519 } from "@noble/curves/ed25519.js";
+import { secp256k1 } from "@noble/curves/secp256k1.js";
+import { hmac } from "@noble/hashes/hmac.js";
+import { sha512 } from "@noble/hashes/sha2.js";
+import { keccak_256 } from "@noble/hashes/sha3.js";
+import { HDKey } from "@scure/bip32";
+import { generateMnemonic, mnemonicToSeedSync } from "@scure/bip39";
+import { wordlist } from "@scure/bip39/wordlists/english.js";
+
+//#region src/lib/config.ts
+const APP_NAME = "x402-proxy";
+function getConfigDir() {
+	const xdg = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config");
+	return path.join(xdg, APP_NAME);
+}
+/** Config dir with $HOME replaced by ~ for display */
+function getConfigDirShort() {
+	const dir = getConfigDir();
+	const home = os.homedir();
+	return dir.startsWith(home) ? `~${dir.slice(home.length)}` : dir;
+}
+function getWalletPath() {
+	return path.join(getConfigDir(), "wallet.json");
+}
+function getHistoryPath() {
+	return path.join(getConfigDir(), "history.jsonl");
+}
+function ensureConfigDir() {
+	fs.mkdirSync(getConfigDir(), { recursive: true });
+}
+function loadWalletFile() {
+	const p = getWalletPath();
+	if (!fs.existsSync(p)) return null;
+	try {
+		const data = JSON.parse(fs.readFileSync(p, "utf-8"));
+		if (data.version === 1 && typeof data.mnemonic === "string") return data;
+		return null;
+	} catch {
+		return null;
+	}
+}
+function saveWalletFile(wallet) {
+	ensureConfigDir();
+	fs.writeFileSync(getWalletPath(), JSON.stringify(wallet, null, 2), {
+		mode: 384,
+		encoding: "utf-8"
+	});
+}
+function loadConfig() {
+	const dir = getConfigDir();
+	for (const name of [
+		"config.yaml",
+		"config.yml",
+		"config.jsonc",
+		"config.json"
+	]) {
+		const p = path.join(dir, name);
+		if (!fs.existsSync(p)) continue;
+		try {
+			const raw = fs.readFileSync(p, "utf-8");
+			if (name.endsWith(".yaml") || name.endsWith(".yml")) return parse(raw);
+			if (name.endsWith(".jsonc")) {
+				const stripped = raw.replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
+				return JSON.parse(stripped);
+			}
+			return JSON.parse(raw);
+		} catch {}
+	}
+	return null;
+}
+function saveConfig(config) {
+	ensureConfigDir();
+	const p = path.join(getConfigDir(), "config.yaml");
+	fs.writeFileSync(p, stringify(config), "utf-8");
+}
+function isConfigured() {
+	if (process.env.X402_PROXY_WALLET_MNEMONIC) return true;
+	if (process.env.X402_PROXY_WALLET_EVM_KEY) return true;
+	if (process.env.X402_PROXY_WALLET_SOLANA_KEY) return true;
+	return loadWalletFile() !== null;
+}
+
+//#endregion
+//#region src/lib/derive.ts
+/**
+* Wallet derivation from BIP-39 mnemonic.
+*
+* A single 24-word mnemonic is the root secret. Both Solana and EVM keypairs
+* are deterministically derived from it.
+*
+* Solana: SLIP-10 Ed25519 at m/44'/501'/0'/0'
+* EVM:    BIP-32 secp256k1  at m/44'/60'/0'/0/0
+*
+* Ported from agentbox/packages/openclaw-x402/src/wallet.ts
+*/
+function generateMnemonic$1() {
+	return generateMnemonic(wordlist, 256);
+}
+/**
+* SLIP-10 Ed25519 derivation at m/44'/501'/0'/0' (Phantom/Backpack compatible).
+*/
+const enc = new TextEncoder();
+function deriveSolanaKeypair(mnemonic) {
+	const seed = mnemonicToSeedSync(mnemonic);
+	let I = hmac(sha512, enc.encode("ed25519 seed"), seed);
+	let key = I.slice(0, 32);
+	let chainCode = I.slice(32);
+	for (const index of [
+		2147483692,
+		2147484149,
+		2147483648,
+		2147483648
+	]) {
+		const data = new Uint8Array(37);
+		data[0] = 0;
+		data.set(key, 1);
+		data[33] = index >>> 24 & 255;
+		data[34] = index >>> 16 & 255;
+		data[35] = index >>> 8 & 255;
+		data[36] = index & 255;
+		I = hmac(sha512, chainCode, data);
+		key = I.slice(0, 32);
+		chainCode = I.slice(32);
+	}
+	const secretKey = new Uint8Array(key);
+	const publicKey = ed25519.getPublicKey(secretKey);
+	return {
+		secretKey,
+		publicKey,
+		address: base58.encode(publicKey)
+	};
+}
+/**
+* BIP-32 secp256k1 derivation at m/44'/60'/0'/0/0.
+*/
+function deriveEvmKeypair(mnemonic) {
+	const seed = mnemonicToSeedSync(mnemonic);
+	const derived = HDKey.fromMasterSeed(seed).derive("m/44'/60'/0'/0/0");
+	if (!derived.privateKey) throw new Error("Failed to derive EVM private key");
+	const privateKey = `0x${Buffer.from(derived.privateKey).toString("hex")}`;
+	const hash = keccak_256(secp256k1.getPublicKey(derived.privateKey, false).slice(1));
+	return {
+		privateKey,
+		address: checksumAddress(Buffer.from(hash.slice(-20)).toString("hex"))
+	};
+}
+function checksumAddress(addr) {
+	const hash = Buffer.from(keccak_256(enc.encode(addr))).toString("hex");
+	let out = "0x";
+	for (let i = 0; i < 40; i++) out += Number.parseInt(hash[i], 16) >= 8 ? addr[i].toUpperCase() : addr[i];
+	return out;
+}
+
+//#endregion
+export { getConfigDirShort as a, isConfigured as c, saveConfig as d, saveWalletFile as f, ensureConfigDir as i, loadConfig as l, deriveSolanaKeypair as n, getHistoryPath as o, generateMnemonic$1 as r, getWalletPath as s, deriveEvmKeypair as t, loadWalletFile as u };

package/dist/setup-CvB0go56.js

@@ -0,0 +1,88 @@
+#!/usr/bin/env node
+import { a as getConfigDirShort, c as isConfigured, d as saveConfig, f as saveWalletFile, n as deriveSolanaKeypair, r as generateMnemonic, s as getWalletPath, t as deriveEvmKeypair } from "./derive-Rikypf5B.js";
+import { buildCommand } from "@stricli/core";
+import pc from "picocolors";
+import * as prompts from "@clack/prompts";
+
+//#region src/commands/setup.ts
+async function runSetup(opts) {
+	if (isConfigured() && !opts?.force) {
+		prompts.log.warn(`Already configured. Wallet at ${pc.dim(getWalletPath())}\nTo reconfigure, run:\n  ${pc.cyan("$ npx x402-proxy setup --force")}`);
+		return;
+	}
+	prompts.intro(pc.cyan("x402-proxy setup"));
+	prompts.log.info("This will generate a single BIP-39 mnemonic that derives wallets for both Solana and EVM chains.");
+	const action = await prompts.select({
+		message: "How would you like to set up your wallet?",
+		options: [{
+			value: "generate",
+			label: "Generate a new mnemonic"
+		}, {
+			value: "import",
+			label: "Import an existing mnemonic"
+		}]
+	});
+	if (prompts.isCancel(action)) {
+		prompts.cancel("Setup cancelled.");
+		process.exit(0);
+	}
+	let mnemonic;
+	if (action === "generate") {
+		mnemonic = generateMnemonic();
+		prompts.log.warn("Write down your mnemonic and store it safely. It will NOT be shown again.");
+		prompts.log.message(pc.bold(mnemonic));
+	} else {
+		const input = await prompts.text({
+			message: "Enter your 24-word mnemonic:",
+			validate: (v = "") => {
+				const words = v.trim().split(/\s+/);
+				if (words.length !== 12 && words.length !== 24) return "Mnemonic must be 12 or 24 words";
+			}
+		});
+		if (prompts.isCancel(input)) {
+			prompts.cancel("Setup cancelled.");
+			process.exit(0);
+		}
+		mnemonic = input.trim();
+	}
+	const evm = deriveEvmKeypair(mnemonic);
+	const sol = deriveSolanaKeypair(mnemonic);
+	prompts.log.success(`Base address:   ${pc.green(evm.address)}`);
+	prompts.log.success(`Solana address: ${pc.green(sol.address)}`);
+	saveWalletFile({
+		version: 1,
+		mnemonic,
+		addresses: {
+			evm: evm.address,
+			solana: sol.address
+		}
+	});
+	saveConfig({});
+	prompts.log.info(`Config directory: ${pc.dim(getConfigDirShort())}`);
+	prompts.log.step("Fund your wallets to start using x402 resources:");
+	prompts.log.message(`  Solana (USDC): Send USDC to ${pc.cyan(sol.address)}`);
+	prompts.log.message(`  Base (USDC):   Send USDC to ${pc.cyan(evm.address)}`);
+	prompts.log.step("Try your first request:");
+	prompts.log.message(`  ${pc.cyan("$ npx x402-proxy https://twitter.surf.cascade.fyi/user/cascade_fyi")}`);
+	prompts.outro(pc.green("Setup complete!"));
+}
+const setupCommand = buildCommand({
+	docs: { brief: "Set up x402-proxy with a new wallet" },
+	parameters: {
+		flags: { force: {
+			kind: "boolean",
+			brief: "Overwrite existing configuration",
+			default: false
+		} },
+		positional: {
+			kind: "tuple",
+			parameters: []
+		}
+	},
+	async func(flags) {
+		await runSetup({ force: flags.force });
+	}
+});
+
+//#endregion
+export { setupCommand as n, runSetup as t };

package/dist/setup-DtPaKQ37.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+import { n as setupCommand, t as runSetup } from "./setup-CvB0go56.js";
+
+export { runSetup };

package/dist/{status-BFDDA6oN.js → status-4nQP3Fpu.js}

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import { n as statusCommand, t as displayStatus } from "./status-DRSZjSq9.js";
+import { n as statusCommand, t as displayStatus } from "./status-Cp51UDnh.js";
 
 export { displayStatus };

package/dist/{status-DRSZjSq9.js → status-Cp51UDnh.js}

@@ -1,25 +1,15 @@
 #!/usr/bin/env node
+import { a as getConfigDirShort, l as loadConfig, n as deriveSolanaKeypair, o as getHistoryPath, t as deriveEvmKeypair, u as loadWalletFile } from "./derive-Rikypf5B.js";
 import { buildCommand } from "@stricli/core";
 import pc from "picocolors";
 import { x402Client } from "@x402/fetch";
-import fs, { appendFileSync, existsSync, readFileSync, statSync, writeFileSync } from "node:fs";
-import os from "node:os";
-import path from "node:path";
-import { parse, stringify } from "yaml";
+import { appendFileSync, existsSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { base58 } from "@scure/base";
 import { ExactEvmScheme, toClientEvmSigner } from "@x402/evm";
 import { ExactSvmScheme } from "@x402/svm/exact/client";
 import { createPublicClient, http } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 import { base } from "viem/chains";
-import { ed25519 } from "@noble/curves/ed25519.js";
-import { secp256k1 } from "@noble/curves/secp256k1.js";
-import { hmac } from "@noble/hashes/hmac.js";
-import { sha512 } from "@noble/hashes/sha2.js";
-import { keccak_256 } from "@noble/hashes/sha3.js";
-import { HDKey } from "@scure/bip32";
-import { generateMnemonic, mnemonicToSeedSync } from "@scure/bip39";
-import { wordlist } from "@scure/bip39/wordlists/english.js";
 
 //#region src/history.ts
 const HISTORY_MAX_LINES = 1e3;
@@ -132,80 +122,6 @@ function formatTxLine(r, opts) {
 	return `  ${timeStr} ${r.ok ? "" : "✗ "}${parts.join(" · ")}`;
 }
 
-//#endregion
-//#region src/lib/config.ts
-const APP_NAME = "x402-proxy";
-function getConfigDir() {
-	const xdg = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config");
-	return path.join(xdg, APP_NAME);
-}
-/** Config dir with $HOME replaced by ~ for display */
-function getConfigDirShort() {
-	const dir = getConfigDir();
-	const home = os.homedir();
-	return dir.startsWith(home) ? `~${dir.slice(home.length)}` : dir;
-}
-function getWalletPath() {
-	return path.join(getConfigDir(), "wallet.json");
-}
-function getHistoryPath() {
-	return path.join(getConfigDir(), "history.jsonl");
-}
-function ensureConfigDir() {
-	fs.mkdirSync(getConfigDir(), { recursive: true });
-}
-function loadWalletFile() {
-	const p = getWalletPath();
-	if (!fs.existsSync(p)) return null;
-	try {
-		const data = JSON.parse(fs.readFileSync(p, "utf-8"));
-		if (data.version === 1 && typeof data.mnemonic === "string") return data;
-		return null;
-	} catch {
-		return null;
-	}
-}
-function saveWalletFile(wallet) {
-	ensureConfigDir();
-	fs.writeFileSync(getWalletPath(), JSON.stringify(wallet, null, 2), {
-		mode: 384,
-		encoding: "utf-8"
-	});
-}
-function loadConfig() {
-	const dir = getConfigDir();
-	for (const name of [
-		"config.yaml",
-		"config.yml",
-		"config.jsonc",
-		"config.json"
-	]) {
-		const p = path.join(dir, name);
-		if (!fs.existsSync(p)) continue;
-		try {
-			const raw = fs.readFileSync(p, "utf-8");
-			if (name.endsWith(".yaml") || name.endsWith(".yml")) return parse(raw);
-			if (name.endsWith(".jsonc")) {
-				const stripped = raw.replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
-				return JSON.parse(stripped);
-			}
-			return JSON.parse(raw);
-		} catch {}
-	}
-	return null;
-}
-function saveConfig(config) {
-	ensureConfigDir();
-	const p = path.join(getConfigDir(), "config.yaml");
-	fs.writeFileSync(p, stringify(config), "utf-8");
-}
-function isConfigured() {
-	if (process.env.X402_PROXY_WALLET_MNEMONIC) return true;
-	if (process.env.X402_PROXY_WALLET_EVM_KEY) return true;
-	if (process.env.X402_PROXY_WALLET_SOLANA_KEY) return true;
-	return loadWalletFile() !== null;
-}
-
 //#endregion
 //#region src/lib/output.ts
 function isTTY() {
@@ -224,77 +140,6 @@ function dim(msg) {
 	process.stderr.write(`${isTTY() ? pc.dim(msg) : msg}\n`);
 }
 
-//#endregion
-//#region src/lib/derive.ts
-/**
-* Wallet derivation from BIP-39 mnemonic.
-*
-* A single 24-word mnemonic is the root secret. Both Solana and EVM keypairs
-* are deterministically derived from it.
-*
-* Solana: SLIP-10 Ed25519 at m/44'/501'/0'/0'
-* EVM:    BIP-32 secp256k1  at m/44'/60'/0'/0/0
-*
-* Ported from agentbox/packages/openclaw-x402/src/wallet.ts
-*/
-function generateMnemonic$1() {
-	return generateMnemonic(wordlist, 256);
-}
-/**
-* SLIP-10 Ed25519 derivation at m/44'/501'/0'/0' (Phantom/Backpack compatible).
-*/
-const enc = new TextEncoder();
-function deriveSolanaKeypair(mnemonic) {
-	const seed = mnemonicToSeedSync(mnemonic);
-	let I = hmac(sha512, enc.encode("ed25519 seed"), seed);
-	let key = I.slice(0, 32);
-	let chainCode = I.slice(32);
-	for (const index of [
-		2147483692,
-		2147484149,
-		2147483648,
-		2147483648
-	]) {
-		const data = new Uint8Array(37);
-		data[0] = 0;
-		data.set(key, 1);
-		data[33] = index >>> 24 & 255;
-		data[34] = index >>> 16 & 255;
-		data[35] = index >>> 8 & 255;
-		data[36] = index & 255;
-		I = hmac(sha512, chainCode, data);
-		key = I.slice(0, 32);
-		chainCode = I.slice(32);
-	}
-	const secretKey = new Uint8Array(key);
-	const publicKey = ed25519.getPublicKey(secretKey);
-	return {
-		secretKey,
-		publicKey,
-		address: base58.encode(publicKey)
-	};
-}
-/**
-* BIP-32 secp256k1 derivation at m/44'/60'/0'/0/0.
-*/
-function deriveEvmKeypair(mnemonic) {
-	const seed = mnemonicToSeedSync(mnemonic);
-	const derived = HDKey.fromMasterSeed(seed).derive("m/44'/60'/0'/0/0");
-	if (!derived.privateKey) throw new Error("Failed to derive EVM private key");
-	const privateKey = `0x${Buffer.from(derived.privateKey).toString("hex")}`;
-	const hash = keccak_256(secp256k1.getPublicKey(derived.privateKey, false).slice(1));
-	return {
-		privateKey,
-		address: checksumAddress(Buffer.from(hash.slice(-20)).toString("hex"))
-	};
-}
-function checksumAddress(addr) {
-	const hash = Buffer.from(keccak_256(enc.encode(addr))).toString("hex");
-	let out = "0x";
-	for (let i = 0; i < 40; i++) out += Number.parseInt(hash[i], 16) >= 8 ? addr[i].toUpperCase() : addr[i];
-	return out;
-}
-
 //#endregion
 //#region src/lib/resolve-wallet.ts
 /**
@@ -468,8 +313,7 @@ const walletInfoCommand = buildCommand({
 		const wallet = resolveWallet();
 		if (wallet.source === "none") {
 			console.log(pc.yellow("No wallet configured."));
-			console.log(pc.dim(`Run ${pc.cyan("x402-proxy setup")} to create one.`));
-			console.log(pc.dim(`Or set ${pc.cyan("X402_PROXY_WALLET_MNEMONIC")} environment variable.`));
+			console.log(pc.dim(`\nRun:\n  ${pc.cyan("$ npx x402-proxy setup")}\n\nOr set ${pc.cyan("X402_PROXY_WALLET_MNEMONIC")} environment variable.`));
 			process.exit(1);
 		}
 		console.log();
@@ -487,6 +331,12 @@ const walletInfoCommand = buildCommand({
 			const bal = sol ? balanceLine(sol.usdc, sol.sol, "SOL") : pc.dim(" (network error)");
 			console.log(`  Solana: ${pc.green(wallet.solanaAddress)}${bal}`);
 		}
+		const evmEmpty = !evm || evm.usdc === "0.00";
+		const solEmpty = !sol || sol.usdc === "0.00";
+		if (evmEmpty && solEmpty) {
+			console.log();
+			dim("  Send USDC to either address above to start using x402 APIs.");
+		}
 		console.log();
 		const records = readHistory(getHistoryPath());
 		if (records.length > 0) {
@@ -501,7 +351,7 @@ const walletInfoCommand = buildCommand({
 			console.log(pc.dim(`  Today: ${spend.today.toFixed(4)} USDC | Total: ${spend.total.toFixed(4)} USDC | ${spend.count} tx`));
 		} else dim("  No transactions yet.");
 		console.log();
-		console.log(pc.dim("  See also: wallet history, wallet fund, wallet export-key"));
+		console.log(pc.dim("  See also: wallet history, wallet export-key"));
 		console.log();
 	}
 });
@@ -572,4 +422,4 @@ const statusCommand = buildCommand({
 });
 
 //#endregion
-export { calcSpend as C, appendHistory as S, readHistory as T, getWalletPath as _, resolveWallet as a, saveConfig as b, generateMnemonic$1 as c, info as d, isTTY as f, getHistoryPath as g, getConfigDirShort as h, buildX402Client as i, dim as l, ensureConfigDir as m, statusCommand as n, deriveEvmKeypair as o, warn as p, walletInfoCommand as r, deriveSolanaKeypair as s, displayStatus as t, error as u, isConfigured as v, formatTxLine as w, saveWalletFile as x, loadConfig as y };
+export { resolveWallet as a, info as c, appendHistory as d, calcSpend as f, buildX402Client as i, isTTY as l, readHistory as m, statusCommand as n, dim as o, formatTxLine as p, walletInfoCommand as r, error as s, displayStatus as t, warn as u };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x402-proxy",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "curl for x402 paid APIs. Auto-pays any endpoint on Base and Solana.",
   "type": "module",
   "sideEffects": false,
@@ -41,7 +41,8 @@
     "@types/node": "^22.0.0",
     "publint": "^0.3.17",
     "tsdown": "^0.20.3",
-    "typescript": "^5.9.0"
+    "typescript": "^5.9.0",
+    "vitest": "^4.0.18"
   },
   "files": [
     "dist/**",
@@ -78,6 +79,7 @@
     "build": "rm -rf dist && tsdown --publint",
     "dev": "tsdown --watch",
     "type-check": "tsc --noEmit",
+    "test": "vitest run",
     "check": "pnpm type-check && biome check --write"
   }
 }