x402-proxy 0.10.7 → 0.10.9

package/dist/bin/cli.js

@@ -1,21 +1,19 @@
 #!/usr/bin/env node
-import { _ as error, b as success, c as resolveWallet, d as displayNetwork, f as formatAmount, g as dim, h as readHistory, l as appendHistory, m as formatUsdcValue, n as fetchAllBalances, o as walletInfoCommand, p as formatTxLine, s as buildX402Client, u as calcSpend, v as info, x as warn, y as isTTY } from "../wallet-B0S-rma9.js";
-import { a as getHistoryPath, c as isConfigured, d as saveConfig, i as getConfigDirShort, l as loadConfig, u as loadWalletFile } from "../config-D9wIR3xc.js";
-import { n as setupCommand, t as runSetup } from "../setup-CNyMLnM-.js";
-import { n as statusCommand } from "../status-DihAcUSC.js";
+import { i as __toESM } from "../chunk-DjEMn6fM.js";
+import { c as buildCommand, i as base58, l as buildRouteMap, o as require_picocolors, s as buildApplication, u as run } from "../derive-DNUl8LU9.js";
+import { C as warn, S as success, _ as decodePaymentResponseHeader, b as info, c as resolveWallet, d as displayNetwork, f as formatAmount, g as wrapFetchWithPayment, h as readHistory, l as appendHistory, m as formatUsdcValue, n as fetchAllBalances, o as walletInfoCommand, p as formatTxLine, s as buildX402Client, u as calcSpend, v as dim, x as isTTY, y as error } from "../wallet-DSyht15_.js";
+import { t as parseUnits } from "../parseUnits-CApwcKSD.js";
+import { a as getDebugLogPath, d as loadWalletFile, f as saveConfig, i as getConfigDirShort, l as isConfigured, n as ensureConfigDir, o as getHistoryPath, u as loadConfig } from "../config-rvKA3SYT.js";
+import { a as Nt, c as Wt, i as Jt, l as Ct, n as setupCommand, o as R, r as Gt, s as Rt, t as runSetup } from "../setup-BY4J49Lv.js";
+import { n as statusCommand } from "../status-X21VnGUO.js";
 import { dirname, join, normalize, resolve } from "node:path";
-import { buildApplication, buildCommand, buildRouteMap, run } from "@stricli/core";
 import { spawn } from "node:child_process";
-import pc from "picocolors";
 import { once } from "node:events";
 import http from "node:http";
-import { decodePaymentResponseHeader, wrapFetchWithPayment } from "@x402/fetch";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { randomUUID } from "node:crypto";
+import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { base58 } from "@scure/base";
-import "@sinclair/typebox";
-import * as prompts from "@clack/prompts";
-//#region src/openclaw/defaults.ts
+//#region packages/x402-proxy/src/openclaw/defaults.ts
 const DEFAULT_SURF_PROVIDER_ID = "surf";
 const DEFAULT_SURF_BASE_URL = "/x402-proxy/v1";
 const DEFAULT_SURF_UPSTREAM_URL = "https://surf.cascade.fyi/api/v1/inference";
@@ -139,7 +137,15 @@ function resolveMppSessionBudget(value, fallback = "0.5") {
 	return typeof value === "string" && value.trim().length > 0 ? value : fallback;
 }
 //#endregion
-//#region src/handler.ts
+//#region packages/x402-proxy/src/lib/env.ts
+function isDebugEnabled() {
+	return process.env.X402_PROXY_DEBUG === "1";
+}
+function getMppVoucherHeadroomUsdc() {
+	return process.env.X402_PROXY_MPP_VOUCHER_HEADROOM_USDC;
+}
+//#endregion
+//#region packages/x402-proxy/src/handler.ts
 /**
 * Detect which payment protocols a 402 response advertises.
 * - x402: PAYMENT-REQUIRED or X-PAYMENT-REQUIRED header
@@ -190,19 +196,38 @@ function createX402ProxyHandler(opts) {
 	};
 }
 const TEMPO_NETWORK = "eip155:4217";
+const MPP_VOUCHER_HEADROOM_USDC_DEFAULT = "0.005";
+function computeMppVoucherTarget(params) {
+	const { requiredCumulative, deposit, headroom } = params;
+	if (deposit <= requiredCumulative) return requiredCumulative;
+	if (headroom <= 0n) return requiredCumulative;
+	const target = requiredCumulative + headroom;
+	return target > deposit ? deposit : target;
+}
+function parseVoucherHeadroom(value) {
+	const configured = value?.trim() || MPP_VOUCHER_HEADROOM_USDC_DEFAULT;
+	try {
+		const parsed = parseUnits(configured, 6);
+		return parsed > 0n ? parsed : 0n;
+	} catch {
+		return parseUnits(MPP_VOUCHER_HEADROOM_USDC_DEFAULT, 6);
+	}
+}
 /**
 * Create an MPP proxy handler using mppx client.
 * Dynamically imports mppx/client to keep startup fast.
 */
 async function createMppProxyHandler(opts) {
-	const { Mppx, tempo } = await import("mppx/client");
-	const { privateKeyToAccount } = await import("viem/accounts");
-	const { saveSession, clearSession } = await import("../config-Be35NM5s.js");
+	const { Mppx, tempo } = await import("../client-CVDTUY0l.js");
+	const { Session } = await import("../tempo-DER0P-ul.js");
+	const { privateKeyToAccount } = await import("../accounts-DzvAlQRn.js");
+	const { saveSession, clearSession } = await import("../config-BUQsit4s.js");
 	const account = privateKeyToAccount(opts.evmKey);
 	const maxDeposit = opts.maxDeposit ?? "1";
+	const voucherHeadroomRaw = parseVoucherHeadroom(getMppVoucherHeadroomUsdc());
 	const paymentQueue = [];
 	let lastChallengeAmount;
-	const debug = process.env.X402_PROXY_DEBUG === "1";
+	const debug = isDebugEnabled();
 	const mppx = Mppx.create({
 		methods: [tempo({
 			account,
@@ -225,8 +250,40 @@ async function createMppProxyHandler(opts) {
 			}
 		};
 	}
-	let session;
+	const activeSessions = /* @__PURE__ */ new Set();
 	let persistedChannelId;
+	function rememberSession(session) {
+		activeSessions.add(session);
+		if (session.channelId && session.channelId !== persistedChannelId) {
+			persistedChannelId = session.channelId;
+			if (debug) process.stderr.write(`[x402-proxy] channelId: ${persistedChannelId}\n`);
+			try {
+				saveSession({
+					channelId: session.channelId,
+					createdAt: (/* @__PURE__ */ new Date()).toISOString()
+				});
+			} catch {}
+		}
+	}
+	function pushCloseReceipt(session, receipt) {
+		if (!receipt) return;
+		const spentUsdc = receipt.spent ? (Number(receipt.spent) / 1e6).toString() : void 0;
+		paymentQueue.push({
+			protocol: "mpp",
+			network: TEMPO_NETWORK,
+			intent: "session",
+			amount: spentUsdc,
+			channelId: session.channelId ?? void 0,
+			receipt: {
+				method: receipt.method,
+				reference: receipt.reference,
+				status: receipt.status,
+				timestamp: receipt.timestamp,
+				acceptedCumulative: receipt.acceptedCumulative,
+				txHash: receipt.txHash
+			}
+		});
+	}
 	return {
 		async fetch(input, init) {
 			const response = await mppx.fetch(typeof input === "string" ? input : input.toString(), injectPayerHeader(init));
@@ -252,60 +309,197 @@ async function createMppProxyHandler(opts) {
 			return response;
 		},
 		async sse(input, init) {
-			session ??= tempo.session({
-				account,
-				maxDeposit
-			});
 			const url = typeof input === "string" ? input : input.toString();
-			const iterable = await session.sse(url, injectPayerHeader(init));
-			if (session.channelId && session.channelId !== persistedChannelId) {
-				persistedChannelId = session.channelId;
-				if (debug) process.stderr.write(`[x402-proxy] channelId: ${persistedChannelId}\n`);
-				try {
-					saveSession({
+			let createCredential;
+			let spent = 0n;
+			const session = {
+				channelId: void 0,
+				cumulative: 0n,
+				opened: false,
+				async close() {
+					if (!session.opened || !session.channelId || !createCredential) return void 0;
+					const credential = await createCredential({
+						action: "close",
 						channelId: session.channelId,
-						createdAt: (/* @__PURE__ */ new Date()).toISOString()
+						cumulativeAmountRaw: spent.toString()
 					});
-				} catch {}
-			}
+					const receiptHeader = (await mppx.rawFetch(url, {
+						method: "POST",
+						headers: {
+							Authorization: credential,
+							"X-Payer-Address": payerAddress
+						}
+					})).headers.get("Payment-Receipt");
+					if (!receiptHeader) return void 0;
+					try {
+						const receipt = Session.Receipt.deserializeSessionReceipt(receiptHeader);
+						spent = spent > BigInt(receipt.spent) ? spent : BigInt(receipt.spent);
+						return receipt;
+					} catch {
+						return;
+					}
+				}
+			};
+			const sessionMppx = Mppx.create({
+				methods: [tempo({
+					account,
+					maxDeposit,
+					onChannelUpdate(entry) {
+						session.channelId = entry.channelId;
+						session.cumulative = entry.cumulativeAmount;
+						session.opened = entry.opened;
+						if (entry.channelId && entry.channelId !== persistedChannelId) {
+							persistedChannelId = entry.channelId;
+							if (debug) process.stderr.write(`[x402-proxy] channelId: ${persistedChannelId}\n`);
+							try {
+								saveSession({
+									channelId: entry.channelId,
+									createdAt: (/* @__PURE__ */ new Date()).toISOString()
+								});
+							} catch {}
+						}
+					}
+				})],
+				polyfill: false,
+				onChallenge: async (challenge, helpers) => {
+					const req = challenge.request;
+					if (req.amount) lastChallengeAmount = (Number(req.amount) / 10 ** (req.decimals ?? 6)).toString();
+					createCredential = helpers.createCredential;
+				}
+			});
+			const response = await sessionMppx.fetch(url, injectPayerHeader({
+				...init,
+				headers: {
+					...init?.headers instanceof Headers ? Object.fromEntries(init.headers.entries()) : init?.headers ?? {},
+					Accept: "text/event-stream"
+				}
+			}));
+			if (!response.body) throw new Error("MPP SSE response has no body");
+			rememberSession(session);
 			paymentQueue.push({
 				protocol: "mpp",
 				network: TEMPO_NETWORK,
 				intent: "session"
 			});
-			return iterable;
+			const reader = response.body.getReader();
+			const decoder = new TextDecoder();
+			async function* iterate() {
+				let buffer = "";
+				try {
+					while (true) {
+						const { done, value } = await reader.read();
+						if (done) break;
+						buffer += decoder.decode(value, { stream: true });
+						const parts = buffer.split("\n\n");
+						buffer = parts.pop() ?? "";
+						for (const part of parts) {
+							if (!part.trim()) continue;
+							const event = Session.Sse.parseEvent(part);
+							if (!event) continue;
+							switch (event.type) {
+								case "message":
+									yield event.data;
+									break;
+								case "payment-receipt":
+									spent = spent > BigInt(event.data.spent) ? spent : BigInt(event.data.spent);
+									break;
+								case "payment-need-voucher": {
+									if (!createCredential) throw new Error("MPP voucher requested before challenge helper was captured");
+									const target = computeMppVoucherTarget({
+										requiredCumulative: BigInt(event.data.requiredCumulative),
+										deposit: BigInt(event.data.deposit),
+										headroom: voucherHeadroomRaw
+									});
+									const credential = await createCredential({
+										action: "voucher",
+										channelId: event.data.channelId,
+										cumulativeAmountRaw: target.toString()
+									});
+									const voucherResponse = await sessionMppx.rawFetch(url, {
+										method: "POST",
+										headers: {
+											Authorization: credential,
+											"X-Payer-Address": payerAddress
+										},
+										signal: init?.signal
+									});
+									if (!voucherResponse.ok) {
+										const body = await voucherResponse.text().catch(() => "");
+										throw new Error(`Voucher POST failed with status ${voucherResponse.status}${body ? `: ${body.slice(0, 200)}` : ""}`);
+									}
+									const receiptHeader = voucherResponse.headers.get("Payment-Receipt");
+									if (receiptHeader) try {
+										const receipt = Session.Receipt.deserializeSessionReceipt(receiptHeader);
+										spent = spent > BigInt(receipt.spent) ? spent : BigInt(receipt.spent);
+									} catch {}
+									break;
+								}
+							}
+						}
+					}
+				} finally {
+					reader.releaseLock();
+				}
+			}
+			return iterate();
 		},
 		shiftPayment: () => paymentQueue.shift(),
 		async close() {
-			if (session?.opened) {
-				const receipt = await session.close();
-				try {
-					clearSession();
-				} catch {}
-				if (receipt) {
-					const spentUsdc = receipt.spent ? (Number(receipt.spent) / 1e6).toString() : void 0;
-					paymentQueue.push({
-						protocol: "mpp",
-						network: TEMPO_NETWORK,
-						intent: "session",
-						amount: spentUsdc,
-						channelId: session.channelId ?? void 0,
-						receipt: {
-							method: receipt.method,
-							reference: receipt.reference,
-							status: receipt.status,
-							timestamp: receipt.timestamp,
-							acceptedCumulative: receipt.acceptedCumulative,
-							txHash: receipt.txHash
-						}
-					});
+			const sessions = Array.from(activeSessions);
+			if (sessions.length === 0) return;
+			const byChannelId = /* @__PURE__ */ new Map();
+			const sessionsWithoutChannel = [];
+			for (const session of sessions) {
+				if (!session.opened) continue;
+				if (!session.channelId) {
+					sessionsWithoutChannel.push(session);
+					continue;
 				}
+				const existing = byChannelId.get(session.channelId);
+				if (!existing || session.cumulative > existing.cumulative) byChannelId.set(session.channelId, session);
 			}
+			for (const session of sessions) activeSessions.delete(session);
+			const sessionsToClose = [...byChannelId.values(), ...sessionsWithoutChannel];
+			let shouldClearPersistedSession = false;
+			for (const session of sessionsToClose) {
+				const receipt = await session.close();
+				if (session.channelId && session.channelId === persistedChannelId) shouldClearPersistedSession = true;
+				pushCloseReceipt(session, receipt);
+			}
+			if (shouldClearPersistedSession) try {
+				clearSession();
+			} catch {}
 		}
 	};
 }
 //#endregion
-//#region src/openclaw/tools.ts
+//#region packages/x402-proxy/src/lib/debug-log.ts
+const MAX_DEBUG_LOG_BYTES = 10 * 1024 * 1024;
+const ROTATED_DEBUG_LOG_SUFFIX = ".1";
+function rotateIfNeeded(path) {
+	if (!existsSync(path)) return;
+	const { size } = statSync(path);
+	if (size <= MAX_DEBUG_LOG_BYTES) return;
+	const rotated = `${path}${ROTATED_DEBUG_LOG_SUFFIX}`;
+	try {
+		rmSync(rotated, { force: true });
+	} catch {}
+	renameSync(path, rotated);
+}
+function writeDebugLog(event, fields = {}) {
+	try {
+		ensureConfigDir();
+		const path = getDebugLogPath();
+		rotateIfNeeded(path);
+		appendFileSync(path, `${JSON.stringify({
+			ts: (/* @__PURE__ */ new Date()).toISOString(),
+			event,
+			...fields
+		})}\n`, "utf-8");
+	} catch {}
+}
+//#endregion
+//#region packages/x402-proxy/src/openclaw/tools.ts
 const SOL_MAINNET = "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
 const USDC_DECIMALS = 6;
 function paymentAmount(payment) {
@@ -324,9 +518,9 @@ function addressForNetwork(evmAddress, solanaAddress, network) {
 	return solanaAddress ?? evmAddress;
 }
 //#endregion
-//#region src/openclaw/route.ts
+//#region packages/x402-proxy/src/openclaw/route.ts
 function dbg(msg) {
-	if (process.env.X402_PROXY_DEBUG === "1") process.stderr.write(`[x402-proxy] ${msg}\n`);
+	if (isDebugEnabled()) process.stderr.write(`[x402-proxy] ${msg}\n`);
 }
 function createDownstreamAbort(req, res) {
 	const controller = new AbortController();
@@ -350,6 +544,7 @@ function createInferenceProxyRouteHandler(opts) {
 	const sortedProviders = providers.slice().sort((left, right) => right.baseUrl.length - left.baseUrl.length);
 	return async (req, res) => {
 		const downstream = createDownstreamAbort(req, res);
+		const requestId = randomUUID().slice(0, 8);
 		const url = new URL(req.url ?? "/", "http://localhost");
 		const provider = sortedProviders.find((entry) => entry.baseUrl === "/" || url.pathname.startsWith(entry.baseUrl));
 		if (!provider) {
@@ -409,6 +604,15 @@ function createInferenceProxyRouteHandler(opts) {
 		} catch {}
 		const method = req.method ?? "GET";
 		const startMs = Date.now();
+		writeDebugLog("proxy.request.start", {
+			requestId,
+			method,
+			path: url.pathname,
+			upstreamUrl,
+			protocol: provider.protocol,
+			isMessagesApi,
+			isLlmEndpoint
+		});
 		try {
 			const requestInit = {
 				method,
@@ -435,6 +639,7 @@ function createInferenceProxyRouteHandler(opts) {
 					requestInit,
 					abortSignal: downstream.signal,
 					isLlmEndpoint,
+					requestId,
 					walletAddress: mppWalletAddress,
 					historyPath,
 					logger,
@@ -536,18 +741,43 @@ function createInferenceProxyRouteHandler(opts) {
 			const sse = isLlmEndpoint && ct.includes("text/event-stream") ? createSseTracker() : null;
 			const reader = response.body.getReader();
 			const decoder = new TextDecoder();
+			let sawFirstChunk = false;
+			let sawFirstWrite = false;
 			try {
 				while (true) {
 					if (downstream.signal.aborted) {
+						writeDebugLog("proxy.x402.aborted", { requestId });
 						await reader.cancel().catch(() => {});
 						break;
 					}
 					const { done, value } = await reader.read();
 					if (done) break;
+					if (!sawFirstChunk) {
+						sawFirstChunk = true;
+						writeDebugLog("proxy.x402.first_chunk", {
+							requestId,
+							ms: Date.now() - startMs
+						});
+					}
 					res.write(value);
+					if (!sawFirstWrite) {
+						sawFirstWrite = true;
+						writeDebugLog("proxy.x402.first_write", {
+							requestId,
+							ms: Date.now() - startMs
+						});
+					}
 					sse?.push(decoder.decode(value, { stream: true }));
 					if (isMessagesApi && sse?.sawAnthropicMessageStop) {
+						writeDebugLog("proxy.x402.message_stop", {
+							requestId,
+							ms: Date.now() - startMs
+						});
 						await reader.cancel().catch(() => {});
+						writeDebugLog("proxy.x402.semantic_close", {
+							requestId,
+							ms: Date.now() - startMs
+						});
 						break;
 					}
 				}
@@ -555,6 +785,11 @@ function createInferenceProxyRouteHandler(opts) {
 				reader.releaseLock();
 			}
 			if (!res.writableEnded) res.end();
+			writeDebugLog("proxy.x402.end", {
+				requestId,
+				ms: Date.now() - startMs,
+				hasUsage: sse?.result != null
+			});
 			if (shouldAppendInferenceHistory({
 				isLlmEndpoint,
 				amount,
@@ -574,6 +809,11 @@ function createInferenceProxyRouteHandler(opts) {
 			return true;
 		} catch (err) {
 			const msg = String(err);
+			writeDebugLog("proxy.request.error", {
+				requestId,
+				ms: Date.now() - startMs,
+				error: msg.substring(0, 200)
+			});
 			logger.error(`x402: fetch threw: ${msg}`);
 			getX402Proxy()?.shiftPayment();
 			if (isLlmEndpoint) appendHistory(historyPath, {
@@ -592,6 +832,11 @@ function createInferenceProxyRouteHandler(opts) {
 			if (!res.headersSent) writeErrorResponse(res, 402, userMessage, "x402_payment_error", "payment_failed", isMessagesApi);
 			return true;
 		} finally {
+			writeDebugLog("proxy.request.finish", {
+				requestId,
+				ms: Date.now() - startMs,
+				aborted: downstream.signal.aborted
+			});
 			downstream.cleanup();
 		}
 	};
@@ -711,7 +956,7 @@ function createSseTracker() {
 	};
 }
 async function handleMppRequest(opts) {
-	const { res, upstreamUrl, requestInit, abortSignal, isLlmEndpoint, walletAddress, historyPath, logger, allModels, thinkingMode, wantsStreaming, isMessagesApi, startMs, mpp } = opts;
+	const { res, upstreamUrl, requestInit, abortSignal, isLlmEndpoint, requestId, walletAddress, historyPath, logger, allModels, thinkingMode, wantsStreaming, isMessagesApi, startMs, mpp } = opts;
 	try {
 		if (wantsStreaming) {
 			res.writeHead(200, {
@@ -721,46 +966,100 @@ async function handleMppRequest(opts) {
 			});
 			const sse = createSseTracker();
 			dbg(`mpp.sse() calling ${upstreamUrl}`);
+			writeDebugLog("proxy.mpp.sse.open", {
+				requestId,
+				upstreamUrl
+			});
 			const stream = await mpp.sse(upstreamUrl, requestInit);
 			dbg("mpp.sse() resolved, iterating stream");
 			const iterator = stream[Symbol.asyncIterator]();
 			let semanticComplete = false;
+			let sawFirstChunk = false;
+			let sawFirstWrite = false;
 			try {
 				if (isMessagesApi) while (true) {
-					if (abortSignal.aborted) break;
+					if (abortSignal.aborted) {
+						writeDebugLog("proxy.mpp.aborted", { requestId });
+						break;
+					}
 					const { done, value } = await iterator.next();
 					if (done) break;
 					const text = String(value);
+					if (!sawFirstChunk) {
+						sawFirstChunk = true;
+						writeDebugLog("proxy.mpp.first_chunk", {
+							requestId,
+							ms: Date.now() - startMs
+						});
+					}
 					let eventType = "unknown";
 					try {
 						eventType = JSON.parse(text).type ?? "unknown";
 					} catch {}
 					res.write(`event: ${eventType}\ndata: ${text}\n\n`);
+					if (!sawFirstWrite) {
+						sawFirstWrite = true;
+						writeDebugLog("proxy.mpp.first_write", {
+							requestId,
+							ms: Date.now() - startMs
+						});
+					}
 					sse.pushJson(text);
 					if (sse.sawAnthropicMessageStop) {
 						semanticComplete = true;
+						writeDebugLog("proxy.mpp.message_stop", {
+							requestId,
+							ms: Date.now() - startMs
+						});
 						break;
 					}
 				}
 				else {
 					while (true) {
-						if (abortSignal.aborted) break;
+						if (abortSignal.aborted) {
+							writeDebugLog("proxy.mpp.aborted", { requestId });
+							break;
+						}
 						const { done, value } = await iterator.next();
 						if (done) break;
 						const text = String(value);
+						if (!sawFirstChunk) {
+							sawFirstChunk = true;
+							writeDebugLog("proxy.mpp.first_chunk", {
+								requestId,
+								ms: Date.now() - startMs
+							});
+						}
 						res.write(`data: ${text}\n\n`);
+						if (!sawFirstWrite) {
+							sawFirstWrite = true;
+							writeDebugLog("proxy.mpp.first_write", {
+								requestId,
+								ms: Date.now() - startMs
+							});
+						}
 						sse.pushJson(text);
 					}
 					if (!abortSignal.aborted) res.write("data: [DONE]\n\n");
 				}
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : String(err);
+				writeDebugLog("proxy.mpp.stream_error", {
+					requestId,
+					ms: Date.now() - startMs,
+					error: msg.substring(0, 200),
+					semanticComplete
+				});
 				if (!(abortSignal.aborted || semanticComplete) || !msg.includes("terminated")) throw err;
 			} finally {
 				await iterator.return?.().catch(() => {});
 			}
 			dbg(`stream done, ${sse.result ? `${sse.result.model} ${sse.result.inputTokens}+${sse.result.outputTokens}t` : "no usage"}`);
 			if (!res.writableEnded) res.end();
+			if (semanticComplete) writeDebugLog("proxy.mpp.semantic_close", {
+				requestId,
+				ms: Date.now() - startMs
+			});
 			mpp.shiftPayment();
 			if (shouldAppendInferenceHistory({
 				isLlmEndpoint,
@@ -775,9 +1074,19 @@ async function handleMppRequest(opts) {
 				usage: sse.result,
 				durationMs: Date.now() - startMs
 			});
+			writeDebugLog("proxy.mpp.end", {
+				requestId,
+				ms: Date.now() - startMs,
+				hasUsage: sse.result != null
+			});
 			return true;
 		}
 		const response = await mpp.fetch(upstreamUrl, requestInit);
+		writeDebugLog("proxy.mpp.fetch.response", {
+			requestId,
+			status: response.status,
+			ms: Date.now() - startMs
+		});
 		const tx = extractTxSignature(response);
 		if (response.status === 402) {
 			const responseBody = await response.text();
@@ -873,14 +1182,14 @@ function appendInferenceHistory(opts) {
 	});
 }
 //#endregion
-//#region src/commands/serve.ts
+//#region packages/x402-proxy/src/commands/serve.ts
 async function resolveWalletForServe(flags) {
 	let wallet = resolveWallet({
 		evmKey: flags.evmKey,
 		solanaKey: flags.solanaKey
 	});
 	if (wallet.source !== "none") return wallet;
-	const { runSetup } = await import("../setup-DTIxPe58.js");
+	const { runSetup } = await import("../setup-wMOAgrsN.js");
 	if (isTTY()) {
 		dim("  No wallet found. Let's set one up first.\n");
 		await runSetup();
@@ -1081,7 +1390,7 @@ Examples:
 	}
 });
 //#endregion
-//#region src/commands/claude.ts
+//#region packages/x402-proxy/src/commands/claude.ts
 const DEFAULT_MODEL = "stepfun/step-3.5-flash";
 const modelList = [
 	"stepfun/step-3.5-flash",
@@ -1217,7 +1526,8 @@ not listed above.`
 	}
 });
 //#endregion
-//#region src/commands/config.ts
+//#region packages/x402-proxy/src/commands/config.ts
+var import_picocolors = /* @__PURE__ */ __toESM(require_picocolors(), 1);
 const VALID_KEYS = {
 	defaultNetwork: {
 		description: "Preferred network (base, solana, tempo)",
@@ -1277,23 +1587,23 @@ const configShowCommand = buildCommand({
 	async func() {
 		const config = loadConfig();
 		console.log();
-		console.log(pc.bold("Configuration"));
+		console.log(import_picocolors.default.bold("Configuration"));
 		dim(`  ${getConfigDirShort()}/config.yaml`);
 		console.log();
 		if (!config || Object.keys(config).length === 0) {
 			dim("  No configuration set. Using defaults.");
 			console.log();
 			dim("  Available keys:");
-			for (const [key, meta] of Object.entries(VALID_KEYS)) dim(`    ${pc.cyan(key)} - ${meta.description}`);
+			for (const [key, meta] of Object.entries(VALID_KEYS)) dim(`    ${import_picocolors.default.cyan(key)} - ${meta.description}`);
 			console.log();
-			dim(`  Set with: ${pc.cyan("npx x402-proxy config set <key> <value>")}`);
+			dim(`  Set with: ${import_picocolors.default.cyan("npx x402-proxy config set <key> <value>")}`);
 			console.log();
 			return;
 		}
 		for (const key of Object.keys(VALID_KEYS)) {
 			const value = config[key];
-			if (value !== void 0) console.log(`  ${pc.cyan(key)}: ${pc.green(String(value))}`);
-			else dim(`  ${key}: ${pc.dim("(not set)")}`);
+			if (value !== void 0) console.log(`  ${import_picocolors.default.cyan(key)}: ${import_picocolors.default.green(String(value))}`);
+			else dim(`  ${key}: ${import_picocolors.default.dim("(not set)")}`);
 		}
 		console.log();
 	}
@@ -1326,7 +1636,7 @@ To unset a value, use: npx x402-proxy config unset <key>`
 			error(`Unknown config key: ${key}`);
 			console.error();
 			dim("  Available keys:");
-			for (const [k, m] of Object.entries(VALID_KEYS)) dim(`    ${pc.cyan(k)} - ${m.description}`);
+			for (const [k, m] of Object.entries(VALID_KEYS)) dim(`    ${import_picocolors.default.cyan(k)} - ${m.description}`);
 			process.exit(1);
 		}
 		const meta = VALID_KEYS[key];
@@ -1340,7 +1650,7 @@ To unset a value, use: npx x402-proxy config unset <key>`
 		const config = loadConfig() ?? {};
 		config[key] = parsed;
 		saveConfig(config);
-		console.log(`  ${pc.cyan(key)} = ${pc.green(String(parsed))}`);
+		console.log(`  ${import_picocolors.default.cyan(key)} = ${import_picocolors.default.green(String(parsed))}`);
 	}
 });
 const configUnsetCommand = buildCommand({
@@ -1367,7 +1677,7 @@ const configUnsetCommand = buildCommand({
 	}
 });
 //#endregion
-//#region src/commands/fetch.ts
+//#region packages/x402-proxy/src/commands/fetch.ts
 function isStreamingResponse(res) {
 	return (res.headers.get("content-type") ?? "").includes("text/event-stream");
 }
@@ -1465,39 +1775,39 @@ Examples:
 		};
 		if (!url) {
 			if (isConfigured()) {
-				const { displayStatus } = await import("../status-DZlJ4pS7.js");
+				const { displayStatus } = await import("../status-Bu23RjW6.js");
 				await displayStatus();
 				console.log();
-				console.log(pc.dim("  Commands:"));
-				console.log(`    ${pc.cyan("$ npx x402-proxy <url>")}              Fetch a paid API`);
-				console.log(`    ${pc.cyan("$ npx x402-proxy mcp <url>")}          MCP proxy for AI agents`);
-				console.log(`    ${pc.cyan("$ npx x402-proxy claude")}             Run Claude Code via paid proxy`);
-				console.log(`    ${pc.cyan("$ npx x402-proxy claude --model <id>")} Use a specific model`);
-				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(import_picocolors.default.dim("  Commands:"));
+				console.log(`    ${import_picocolors.default.cyan("$ npx x402-proxy <url>")}              Fetch a paid API`);
+				console.log(`    ${import_picocolors.default.cyan("$ npx x402-proxy mcp <url>")}          MCP proxy for AI agents`);
+				console.log(`    ${import_picocolors.default.cyan("$ npx x402-proxy claude")}             Run Claude Code via paid proxy`);
+				console.log(`    ${import_picocolors.default.cyan("$ npx x402-proxy claude --model <id>")} Use a specific model`);
+				console.log(`    ${import_picocolors.default.cyan("$ npx x402-proxy setup")}              Reconfigure wallet`);
+				console.log(`    ${import_picocolors.default.cyan("$ npx x402-proxy wallet")}             Addresses and balances`);
+				console.log(`    ${import_picocolors.default.cyan("$ npx x402-proxy wallet history")}     Full payment history`);
 				console.log();
-				console.log(pc.dim("  try: ") + pc.cyan(`$ npx x402-proxy -X POST -d '{"ref":"CoinbaseDev"}' https://surf.cascade.fyi/api/v1/twitter/user`));
+				console.log(import_picocolors.default.dim("  try: ") + import_picocolors.default.cyan(`$ npx x402-proxy -X POST -d '{"ref":"CoinbaseDev"}' https://surf.cascade.fyi/api/v1/twitter/user`));
 				console.log();
-				console.log(pc.dim("  https://github.com/cascade-protocol/x402-proxy"));
+				console.log(import_picocolors.default.dim("  https://github.com/cascade-protocol/x402-proxy"));
 				console.log();
 			} else {
 				console.log();
-				console.log(pc.cyan(pc.bold("x402-proxy")));
-				console.log(pc.dim("curl for x402 paid APIs"));
+				console.log(import_picocolors.default.cyan(import_picocolors.default.bold("x402-proxy")));
+				console.log(import_picocolors.default.dim("curl for x402 paid APIs"));
 				console.log();
-				console.log(pc.dim("  Commands:"));
-				console.log(`    ${pc.cyan("$ npx x402-proxy setup")}              Create a wallet`);
-				console.log(`    ${pc.cyan("$ npx x402-proxy <url>")}              Fetch a paid API`);
-				console.log(`    ${pc.cyan("$ npx x402-proxy mcp <url>")}          MCP proxy for AI agents`);
-				console.log(`    ${pc.cyan("$ npx x402-proxy claude")}             Run Claude Code via paid proxy`);
-				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 --help")}             All options`);
+				console.log(import_picocolors.default.dim("  Commands:"));
+				console.log(`    ${import_picocolors.default.cyan("$ npx x402-proxy setup")}              Create a wallet`);
+				console.log(`    ${import_picocolors.default.cyan("$ npx x402-proxy <url>")}              Fetch a paid API`);
+				console.log(`    ${import_picocolors.default.cyan("$ npx x402-proxy mcp <url>")}          MCP proxy for AI agents`);
+				console.log(`    ${import_picocolors.default.cyan("$ npx x402-proxy claude")}             Run Claude Code via paid proxy`);
+				console.log(`    ${import_picocolors.default.cyan("$ npx x402-proxy wallet")}             Addresses and balances`);
+				console.log(`    ${import_picocolors.default.cyan("$ npx x402-proxy wallet history")}     Payment history`);
+				console.log(`    ${import_picocolors.default.cyan("$ npx x402-proxy --help")}             All options`);
 				console.log();
-				console.log(pc.dim("  try: ") + pc.cyan("$ npx x402-proxy setup"));
+				console.log(import_picocolors.default.dim("  try: ") + import_picocolors.default.cyan("$ npx x402-proxy setup"));
 				console.log();
-				console.log(pc.dim("  https://github.com/cascade-protocol/x402-proxy"));
+				console.log(import_picocolors.default.dim("  https://github.com/cascade-protocol/x402-proxy"));
 				console.log();
 			}
 			return;
@@ -1516,11 +1826,11 @@ Examples:
 		if (wallet.source === "none") {
 			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`));
+				console.error(import_picocolors.default.dim(`Run:\n  ${import_picocolors.default.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-DTIxPe58.js");
+			const { runSetup } = await import("../setup-wMOAgrsN.js");
 			await runSetup();
 			console.log();
 			wallet = resolveWallet();
@@ -1533,7 +1843,7 @@ Examples:
 		verbose(`protocol: ${resolvedProtocol ?? "auto-detect"}, maxDeposit: ${maxDeposit}`);
 		let preferredNetwork = config?.defaultNetwork;
 		if (!preferredNetwork && wallet.evmAddress && wallet.solanaAddress) {
-			const { fetchAllBalances } = await import("../wallet-DBrVZJqe.js");
+			const { fetchAllBalances } = await import("../wallet-DKVlrR1S.js");
 			const balances = await fetchAllBalances(wallet.evmAddress, wallet.solanaAddress);
 			const evmUsdc = balances.evm ? Number(balances.evm.usdc) : 0;
 			const solUsdc = balances.sol ? Number(balances.sol.usdc) : 0;
@@ -1700,7 +2010,7 @@ Examples:
 			const hasSolana = accepts.some((a) => a.network.startsWith("solana:"));
 			const hasMpp = detected.mpp;
 			const hasOther = accepts.some((a) => !a.network.startsWith("eip155:") && !a.network.startsWith("solana:"));
-			const { fetchAllBalances } = await import("../wallet-DBrVZJqe.js");
+			const { fetchAllBalances } = await import("../wallet-DKVlrR1S.js");
 			const balances = await fetchAllBalances(wallet.evmAddress, wallet.solanaAddress);
 			const evmUsdc = hasEvm && balances.evm ? Number(balances.evm.usdc) : 0;
 			const solUsdc = hasSolana && balances.sol ? Number(balances.sol.usdc) : 0;
@@ -1719,9 +2029,9 @@ Examples:
 				if (payment) dim("  Payment was signed and sent but rejected by the server.");
 				else dim("  Payment was not attempted despite sufficient balance.");
 				if (serverReason) dim(`  Reason: ${serverReason}`);
-				if (hasEvm && wallet.evmAddress && evmUsdc > 0) console.error(`    Base:   ${pc.cyan(wallet.evmAddress)} ${pc.dim(`(${formatAmount(evmUsdc, "USDC")})`)}`);
-				if (hasMpp && wallet.evmAddress && tempoUsdc > 0) console.error(`    Tempo:  ${pc.cyan(wallet.evmAddress)} ${pc.dim(`(${formatAmount(tempoUsdc, "USDC")})`)}`);
-				if (hasSolana && wallet.solanaAddress && solUsdc > 0) console.error(`    Solana: ${pc.cyan(wallet.solanaAddress)} ${pc.dim(`(${formatAmount(solUsdc, "USDC")})`)}`);
+				if (hasEvm && wallet.evmAddress && evmUsdc > 0) console.error(`    Base:   ${import_picocolors.default.cyan(wallet.evmAddress)} ${import_picocolors.default.dim(`(${formatAmount(evmUsdc, "USDC")})`)}`);
+				if (hasMpp && wallet.evmAddress && tempoUsdc > 0) console.error(`    Tempo:  ${import_picocolors.default.cyan(wallet.evmAddress)} ${import_picocolors.default.dim(`(${formatAmount(tempoUsdc, "USDC")})`)}`);
+				if (hasSolana && wallet.solanaAddress && solUsdc > 0) console.error(`    Solana: ${import_picocolors.default.cyan(wallet.solanaAddress)} ${import_picocolors.default.dim(`(${formatAmount(solUsdc, "USDC")})`)}`);
 				console.error();
 				dim("  This may be a temporary server-side issue. Try again in a moment.");
 				console.error();
@@ -1731,16 +2041,16 @@ Examples:
 					console.error();
 					dim("  Fund your wallet with USDC:");
 					if (hasEvm && wallet.evmAddress) {
-						const balHint = evmUsdc > 0 ? pc.dim(` (${formatAmount(evmUsdc, "USDC")})`) : "";
-						console.error(`    Base:   ${pc.cyan(wallet.evmAddress)}${balHint}`);
+						const balHint = evmUsdc > 0 ? import_picocolors.default.dim(` (${formatAmount(evmUsdc, "USDC")})`) : "";
+						console.error(`    Base:   ${import_picocolors.default.cyan(wallet.evmAddress)}${balHint}`);
 					}
 					if (hasMpp && wallet.evmAddress) {
-						const balHint = tempoUsdc > 0 ? pc.dim(` (${formatAmount(tempoUsdc, "USDC")})`) : "";
-						console.error(`    Tempo:  ${pc.cyan(wallet.evmAddress)}${balHint}`);
+						const balHint = tempoUsdc > 0 ? import_picocolors.default.dim(` (${formatAmount(tempoUsdc, "USDC")})`) : "";
+						console.error(`    Tempo:  ${import_picocolors.default.cyan(wallet.evmAddress)}${balHint}`);
 					}
 					if (hasSolana && wallet.solanaAddress) {
-						const balHint = solUsdc > 0 ? pc.dim(` (${formatAmount(solUsdc, "USDC")})`) : "";
-						console.error(`    Solana: ${pc.cyan(wallet.solanaAddress)}${balHint}`);
+						const balHint = solUsdc > 0 ? import_picocolors.default.dim(` (${formatAmount(solUsdc, "USDC")})`) : "";
+						console.error(`    Solana: ${import_picocolors.default.cyan(wallet.solanaAddress)}${balHint}`);
 					}
 					if (hasEvm && !wallet.evmAddress) dim("    Base:   endpoint accepts EVM but no EVM wallet configured");
 					if (hasMpp && !wallet.evmAddress) dim("    Tempo:  endpoint accepts MPP but no EVM wallet configured");
@@ -1752,7 +2062,7 @@ Examples:
 				}
 				console.error();
 				dim("  Then re-run:");
-				console.error(`    ${pc.cyan(`$ npx x402-proxy ${url}`)}`);
+				console.error(`    ${import_picocolors.default.cyan(`$ npx x402-proxy ${url}`)}`);
 				console.error();
 			}
 			return;
@@ -1764,7 +2074,7 @@ Examples:
 		}
 		if (isTTY()) {
 			const statusText = `  ${response.status} ${response.statusText} (${elapsedMs}ms)`;
-			const colorFn = response.status < 300 ? pc.green : response.status < 400 ? pc.yellow : pc.red;
+			const colorFn = response.status < 300 ? import_picocolors.default.green : response.status < 400 ? import_picocolors.default.yellow : import_picocolors.default.red;
 			process.stderr.write(`${colorFn(statusText)}\n`);
 		}
 		if (x402Payment) {
@@ -1822,7 +2132,83 @@ Examples:
 	}
 });
 //#endregion
-//#region src/commands/mcp.ts
+//#region packages/x402-proxy/src/commands/mcp.ts
+const X402_PAYMENT_META_KEY = "x402/payment";
+const X402_PAYMENT_RESPONSE_META_KEY = "x402/payment-response";
+function cloneTool(tool) {
+	return { ...tool };
+}
+function cloneResource(resource) {
+	return { ...resource };
+}
+function normalizeCallToolResult(result) {
+	return {
+		content: result.content,
+		...result.structuredContent !== void 0 ? { structuredContent: result.structuredContent } : {},
+		...result.isError !== void 0 ? { isError: result.isError } : {},
+		...result._meta !== void 0 ? { _meta: result._meta } : {}
+	};
+}
+function isTextContent(content) {
+	return content.type === "text" && typeof content.text === "string";
+}
+function isX402PaymentRequired(value) {
+	if (typeof value !== "object" || value === null) return false;
+	const candidate = value;
+	return typeof candidate.x402Version === "number" && Array.isArray(candidate.accepts);
+}
+function extractPaymentRequiredFromObject(value) {
+	if (isX402PaymentRequired(value)) return value;
+	if (typeof value !== "object" || value === null) return void 0;
+	const wrappedError = value["x402/error"];
+	if (typeof wrappedError === "object" && wrappedError !== null) {
+		const errorData = wrappedError.data;
+		if (isX402PaymentRequired(errorData)) return errorData;
+	}
+}
+function extractPaymentRequiredFromResult(result) {
+	if (!result.isError) return void 0;
+	const structured = extractPaymentRequiredFromObject(result.structuredContent);
+	if (structured) return structured;
+	const first = result.content[0];
+	if (!first || !isTextContent(first)) return void 0;
+	try {
+		return extractPaymentRequiredFromObject(JSON.parse(first.text));
+	} catch {
+		return;
+	}
+}
+function extractPaymentRequiredFromError(error) {
+	if (typeof error !== "object" || error === null) return void 0;
+	return error.data?.x402;
+}
+async function callX402ToolWithAutoPayment(opts) {
+	let paymentRequired;
+	try {
+		const result = await opts.remoteClient.callTool({
+			name: opts.name,
+			arguments: opts.args
+		});
+		paymentRequired = extractPaymentRequiredFromResult(result);
+		if (!paymentRequired) return result;
+	} catch (error) {
+		paymentRequired = extractPaymentRequiredFromError(error);
+		if (!paymentRequired) throw error;
+	}
+	opts.onPaymentRequested(paymentRequired, opts.name);
+	const paymentPayload = await opts.x402PaymentClient.createPaymentPayload(paymentRequired);
+	const paidResult = await opts.remoteClient.callTool({
+		name: opts.name,
+		arguments: opts.args,
+		_meta: { [X402_PAYMENT_META_KEY]: paymentPayload }
+	});
+	opts.onPaymentSettled({
+		toolName: opts.name,
+		paymentPayload,
+		settleResponse: paidResult._meta?.[X402_PAYMENT_RESPONSE_META_KEY]
+	});
+	return paidResult;
+}
 const mcpCommand = buildCommand({
 	docs: {
 		brief: "Start MCP stdio proxy with automatic payment",
@@ -1876,7 +2262,7 @@ Wallet is auto-generated on first run. No env vars needed.`
 		});
 		if (wallet.source === "none") {
 			dim("No wallet found. Auto-generating...");
-			const { runSetup } = await import("../setup-DTIxPe58.js");
+			const { runSetup } = await import("../setup-wMOAgrsN.js");
 			await runSetup({ nonInteractive: true });
 			const fresh = resolveWallet({
 				evmKey: flags.evmKey,
@@ -1893,12 +2279,12 @@ Wallet is auto-generated on first run. No env vars needed.`
 		if (wallet.solanaAddress) dim(`  Solana: ${wallet.solanaAddress}`);
 		const config = loadConfig();
 		const resolvedProtocol = flags.protocol ?? config?.preferredProtocol ?? "x402";
-		const { Client } = await import("@modelcontextprotocol/sdk/client/index.js");
-		const { SSEClientTransport } = await import("@modelcontextprotocol/sdk/client/sse.js");
-		const { StreamableHTTPClientTransport } = await import("@modelcontextprotocol/sdk/client/streamableHttp.js");
-		const { Server } = await import("@modelcontextprotocol/sdk/server/index.js");
-		const { StdioServerTransport } = await import("@modelcontextprotocol/sdk/server/stdio.js");
-		const { ListToolsRequestSchema, CallToolRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, ToolListChangedNotificationSchema, ResourceListChangedNotificationSchema, McpError } = await import("@modelcontextprotocol/sdk/types.js");
+		const { Client } = await import("../client-Blw2V7LF.js");
+		const { SSEClientTransport } = await import("../sse-B4LLqBQm.js");
+		const { StreamableHTTPClientTransport } = await import("../streamableHttp-BHkJypcI.js");
+		const { Server } = await import("../server-CSq0IuUq.js");
+		const { StdioServerTransport } = await import("../stdio-BADqxZdZ.js");
+		const { ListToolsRequestSchema, CallToolRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, ToolListChangedNotificationSchema, ResourceListChangedNotificationSchema } = await import("../types-DatK5vR5.js");
 		async function connectTransport(target) {
 			try {
 				const transport = new StreamableHTTPClientTransport(new URL(remoteUrl));
@@ -1920,7 +2306,7 @@ Wallet is auto-generated on first run. No env vars needed.`
 		async function startX402Proxy() {
 			let preferredNetwork = config?.defaultNetwork;
 			if (!preferredNetwork && wallet.evmAddress && wallet.solanaAddress) {
-				const { fetchAllBalances } = await import("../wallet-DBrVZJqe.js");
+				const { fetchAllBalances } = await import("../wallet-DKVlrR1S.js");
 				const balances = await fetchAllBalances(wallet.evmAddress, wallet.solanaAddress);
 				const evmUsdc = balances.evm ? Number(balances.evm.usdc) : 0;
 				const solUsdc = balances.sol ? Number(balances.sol.usdc) : 0;
@@ -1933,23 +2319,16 @@ Wallet is auto-generated on first run. No env vars needed.`
 				spendLimitDaily: config?.spendLimitDaily,
 				spendLimitPerTx: config?.spendLimitPerTx
 			});
-			const { x402MCPClient } = await import("@x402/mcp");
 			function warnPayment(accepts, toolName) {
 				const accept = accepts?.[0];
 				if (accept) warn(`  Payment: ${accept.amount ? formatAmount(Number(accept.amount) / 1e6, "USDC") : "? USDC"} on ${displayNetwork(accept.network)} for tool "${toolName}"`);
 			}
 			const remoteClient = new Client({
 				name: "x402-proxy",
-				version: "0.10.7"
+				version: "0.10.9"
 			});
-			const x402Mcp = new x402MCPClient(remoteClient, x402PaymentClient, {
-				autoPayment: true,
-				onPaymentRequested: (ctx) => {
-					warnPayment(ctx.paymentRequired.accepts, ctx.toolName);
-					return true;
-				}
-			});
-			x402Mcp.onAfterPayment(async (ctx) => {
+			await connectTransport(remoteClient);
+			function recordX402Payment(ctx) {
 				const accepted = ctx.paymentPayload.accepted;
 				const tx = ctx.settleResponse?.transaction;
 				const record = {
@@ -1965,73 +2344,50 @@ Wallet is auto-generated on first run. No env vars needed.`
 					label: `mcp:${ctx.toolName}`
 				};
 				appendHistory(getHistoryPath(), record);
-			});
-			await connectTransport(x402Mcp);
-			let { tools } = await x402Mcp.listTools();
+			}
+			let { tools } = await remoteClient.listTools();
 			dim(`  ${tools.length} tools available`);
 			let remoteResources = [];
 			try {
-				remoteResources = (await x402Mcp.listResources()).resources;
+				remoteResources = (await remoteClient.listResources()).resources;
 				if (remoteResources.length > 0) dim(`  ${remoteResources.length} resources available`);
 			} catch {
 				dim("  Resources not available from remote");
 			}
 			const localServer = new Server({
 				name: "x402-proxy",
-				version: "0.10.7"
+				version: "0.10.9"
 			}, { capabilities: {
 				tools: tools.length > 0 ? {} : void 0,
 				resources: remoteResources.length > 0 ? {} : void 0
 			} });
-			localServer.setRequestHandler(ListToolsRequestSchema, async () => ({ tools: tools.map((t) => ({
-				name: t.name,
-				description: t.description,
-				inputSchema: t.inputSchema,
-				annotations: t.annotations
-			})) }));
+			localServer.setRequestHandler(ListToolsRequestSchema, async () => ({ tools: tools.map((t) => cloneTool(t)) }));
 			localServer.setRequestHandler(CallToolRequestSchema, async (request) => {
 				const { name, arguments: args } = request.params;
-				try {
-					const result = await x402Mcp.callTool(name, args ?? {});
-					return {
-						content: result.content,
-						isError: result.isError
-					};
-				} catch (err) {
-					if (err instanceof McpError && err.code === -32042) {
-						const x402PaymentRequired = err.data?.x402;
-						if (x402PaymentRequired) {
-							const accepts = x402PaymentRequired.accepts;
-							warnPayment(accepts, name);
-							const paymentPayload = await x402PaymentClient.createPaymentPayload(x402PaymentRequired);
-							const result = await x402Mcp.callToolWithPayment(name, args ?? {}, paymentPayload);
-							return {
-								content: result.content,
-								isError: result.isError
-							};
-						}
-					}
-					throw err;
-				}
+				return normalizeCallToolResult(await callX402ToolWithAutoPayment({
+					remoteClient,
+					name,
+					args: args ?? {},
+					x402PaymentClient,
+					onPaymentRequested: (paymentRequired, toolName) => {
+						warnPayment(paymentRequired.accepts, toolName);
+					},
+					onPaymentSettled: recordX402Payment
+				}));
 			});
 			if (remoteResources.length > 0) {
-				localServer.setRequestHandler(ListResourcesRequestSchema, async () => ({ resources: remoteResources.map((r) => ({
-					name: r.name,
-					uri: r.uri,
-					description: r.description,
-					mimeType: r.mimeType
-				})) }));
+				localServer.setRequestHandler(ListResourcesRequestSchema, async () => ({ resources: remoteResources.map((r) => cloneResource(r)) }));
 				localServer.setRequestHandler(ReadResourceRequestSchema, async (request) => {
-					return { contents: (await x402Mcp.readResource({ uri: request.params.uri })).contents.map((c) => ({ ...c })) };
+					return { contents: (await remoteClient.readResource({ uri: request.params.uri })).contents.map((c) => ({ ...c })) };
 				});
 			}
 			remoteClient.setNotificationHandler(ToolListChangedNotificationSchema, async () => {
-				tools = (await x402Mcp.listTools()).tools;
+				tools = (await remoteClient.listTools()).tools;
 				dim(`  Tools updated: ${tools.length} available`);
 				await localServer.notification({ method: "notifications/tools/list_changed" });
 			});
 			if (remoteResources.length > 0) remoteClient.setNotificationHandler(ResourceListChangedNotificationSchema, async () => {
-				remoteResources = (await x402Mcp.listResources()).resources;
+				remoteResources = (await remoteClient.listResources()).resources;
 				dim(`  Resources updated: ${remoteResources.length} available`);
 				await localServer.notification({ method: "notifications/resources/list_changed" });
 			});
@@ -2042,7 +2398,7 @@ Wallet is auto-generated on first run. No env vars needed.`
 			const cleanup = async () => {
 				if (closing) return;
 				closing = true;
-				await x402Mcp.close();
+				await remoteClient.close();
 				process.exit(0);
 			};
 			process.stdin.on("end", cleanup);
@@ -2054,9 +2410,9 @@ Wallet is auto-generated on first run. No env vars needed.`
 				error("MPP requires an EVM wallet. Configure one with: npx x402-proxy setup");
 				process.exit(1);
 			}
-			const { tempo } = await import("mppx/client");
-			const { McpClient } = await import("mppx/mcp-sdk/client");
-			const { privateKeyToAccount } = await import("viem/accounts");
+			const { tempo } = await import("../client-CVDTUY0l.js");
+			const { McpClient } = await import("../client-C37gWJOZ.js");
+			const { privateKeyToAccount } = await import("../accounts-DzvAlQRn.js");
 			const account = privateKeyToAccount(wallet.evmKey);
 			const maxDeposit = config?.mppSessionBudget ?? "1";
 			let lastChallengeAmount;
@@ -2073,7 +2429,7 @@ Wallet is auto-generated on first run. No env vars needed.`
 			}));
 			const remoteClient = new Client({
 				name: "x402-proxy",
-				version: "0.10.7"
+				version: "0.10.9"
 			});
 			await connectTransport(remoteClient);
 			const mppClient = McpClient.wrap(remoteClient, { methods: wrappedMethods });
@@ -2088,17 +2444,12 @@ Wallet is auto-generated on first run. No env vars needed.`
 			}
 			const localServer = new Server({
 				name: "x402-proxy",
-				version: "0.10.7"
+				version: "0.10.9"
 			}, { capabilities: {
 				tools: tools.length > 0 ? {} : void 0,
 				resources: remoteResources.length > 0 ? {} : void 0
 			} });
-			localServer.setRequestHandler(ListToolsRequestSchema, async () => ({ tools: tools.map((t) => ({
-				name: t.name,
-				description: t.description,
-				inputSchema: t.inputSchema,
-				annotations: t.annotations
-			})) }));
+			localServer.setRequestHandler(ListToolsRequestSchema, async () => ({ tools: tools.map((t) => cloneTool(t)) }));
 			localServer.setRequestHandler(CallToolRequestSchema, async (request) => {
 				const { name, arguments: args } = request.params;
 				const result = await mppClient.callTool({
@@ -2122,18 +2473,10 @@ Wallet is auto-generated on first run. No env vars needed.`
 					warn(`  MPP payment for tool "${name}" (Tempo)${amountStr ? ` \u00b7 ${amountStr}` : ""}`);
 					lastChallengeAmount = void 0;
 				}
-				return {
-					content: result.content,
-					isError: result.isError
-				};
+				return normalizeCallToolResult(result);
 			});
 			if (remoteResources.length > 0) {
-				localServer.setRequestHandler(ListResourcesRequestSchema, async () => ({ resources: remoteResources.map((r) => ({
-					name: r.name,
-					uri: r.uri,
-					description: r.description,
-					mimeType: r.mimeType
-				})) }));
+				localServer.setRequestHandler(ListResourcesRequestSchema, async () => ({ resources: remoteResources.map((r) => cloneResource(r)) }));
 				localServer.setRequestHandler(ReadResourceRequestSchema, async (request) => {
 					return { contents: (await remoteClient.readResource({ uri: request.params.uri })).contents.map((c) => ({ ...c })) };
 				});
@@ -2165,7 +2508,7 @@ Wallet is auto-generated on first run. No env vars needed.`
 	}
 });
 //#endregion
-//#region src/commands/mcp-add.ts
+//#region packages/x402-proxy/src/commands/mcp-add.ts
 function resolvePlatformPath(raw) {
 	let p = raw;
 	if (p.startsWith("~/")) p = join(homedir(), p.slice(2));
@@ -2215,45 +2558,45 @@ const mcpAddCommand = buildCommand({
 		}
 	},
 	async func(flags, name, url) {
-		prompts.intro(pc.cyan("Add MCP server"));
+		Wt(import_picocolors.default.cyan("Add MCP server"));
 		try {
 			new URL(url);
 		} catch {
-			prompts.log.error(`Invalid URL: ${url}`);
-			prompts.cancel("Aborted.");
+			R.error(`Invalid URL: ${url}`);
+			Nt("Aborted.");
 			process.exit(1);
 		}
 		const serverName = name;
 		if (!isConfigured()) {
-			prompts.log.warn("No wallet configured. Let's set one up first.\n");
+			R.warn("No wallet configured. Let's set one up first.\n");
 			await runSetup();
 			console.log();
-			prompts.log.step(pc.cyan("Continuing MCP setup..."));
+			R.step(import_picocolors.default.cyan("Continuing MCP setup..."));
 		}
-		const { generators, getAppIds, generateConfig, deepMerge } = await import("@getmcp/generators");
+		const { generators, getAppIds, generateConfig, deepMerge } = await import("../dist-DxJCYyL5.js");
 		let clientId;
 		if (flags.client) {
 			const appIds = getAppIds();
 			if (!appIds.includes(flags.client)) {
-				prompts.log.error(`Unknown client: ${flags.client}`);
-				prompts.log.info(`Supported: ${appIds.join(", ")}`);
-				prompts.cancel("Aborted.");
+				R.error(`Unknown client: ${flags.client}`);
+				R.info(`Supported: ${appIds.join(", ")}`);
+				Nt("Aborted.");
 				process.exit(1);
 			}
 			clientId = flags.client;
 		} else {
 			const appIds = getAppIds();
 			const detected = appIds.filter((id) => generators[id].detectInstalled());
-			const selected = await prompts.select({
+			const selected = await Jt({
 				message: "Where would you like to install the MCP server?",
 				options: appIds.map((id) => ({
 					value: id,
-					label: `${generators[id].app.name}${detected.includes(id) ? pc.dim(" (detected)") : ""}`
+					label: `${generators[id].app.name}${detected.includes(id) ? import_picocolors.default.dim(" (detected)") : ""}`
 				})),
 				initialValue: detected.includes("claude-code") ? "claude-code" : detected[0] ?? "claude-code"
 			});
-			if (prompts.isCancel(selected)) {
-				prompts.cancel("Cancelled.");
+			if (Ct(selected)) {
+				Nt("Cancelled.");
 				process.exit(0);
 			}
 			clientId = selected;
@@ -2263,8 +2606,8 @@ const mcpAddCommand = buildCommand({
 		const platform = process.platform;
 		const rawPath = globalPaths?.[platform];
 		if (!rawPath) {
-			prompts.log.error(`No global config path for ${generator.app.name} on ${platform}`);
-			prompts.cancel("Aborted.");
+			R.error(`No global config path for ${generator.app.name} on ${platform}`);
+			Nt("Aborted.");
 			process.exit(1);
 		}
 		const configPath = resolvePlatformPath(rawPath);
@@ -2283,7 +2626,7 @@ const mcpAddCommand = buildCommand({
 		});
 		let existing;
 		if (configFormat === "yaml") {
-			const { default: YAML } = await import("yaml");
+			const { default: YAML } = await import("../dist-DM5_F3r5.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
 			if (existsSync(configPath)) {
 				const raw = readFileSync(configPath, "utf-8").trim();
 				existing = raw ? YAML.parse(raw) ?? {} : {};
@@ -2292,27 +2635,27 @@ const mcpAddCommand = buildCommand({
 		const rootKey = Object.keys(generated)[0] ?? "mcpServers";
 		const existingServers = existing[rootKey] ?? {};
 		if (existingServers[serverName]) {
-			prompts.log.warn(`Server ${pc.bold(serverName)} already exists in config`);
-			prompts.log.message(pc.dim(JSON.stringify({ [serverName]: existingServers[serverName] }, null, 2)));
-			const overwrite = await prompts.confirm({ message: "Overwrite?" });
-			if (prompts.isCancel(overwrite) || !overwrite) {
-				prompts.cancel("Cancelled.");
+			R.warn(`Server ${import_picocolors.default.bold(serverName)} already exists in config`);
+			R.message(import_picocolors.default.dim(JSON.stringify({ [serverName]: existingServers[serverName] }, null, 2)));
+			const overwrite = await Rt({ message: "Overwrite?" });
+			if (Ct(overwrite) || !overwrite) {
+				Nt("Cancelled.");
 				process.exit(0);
 			}
 		}
-		prompts.log.info(`Config will be added to ${pc.dim(configPath)}`);
+		R.info(`Config will be added to ${import_picocolors.default.dim(configPath)}`);
 		const previewLines = generator.serialize(generated).split("\n");
 		const formatted = previewLines.map((line, i) => {
 			if (i === 0 || i === previewLines.length - 1) return line;
 			const trimmed = line.trimStart();
 			if (trimmed.startsWith(`"${rootKey}"`) || trimmed.startsWith(`${rootKey}:`)) return line;
-			return `${pc.green("+")} ${line}`;
+			return `${import_picocolors.default.green("+")} ${line}`;
 		}).join("\n");
-		prompts.log.message(formatted);
+		R.message(formatted);
 		if (!flags.yes) {
-			const proceed = await prompts.confirm({ message: "Would you like to proceed?" });
-			if (prompts.isCancel(proceed) || !proceed) {
-				prompts.cancel("Cancelled.");
+			const proceed = await Rt({ message: "Would you like to proceed?" });
+			if (Ct(proceed) || !proceed) {
+				Nt("Cancelled.");
 				process.exit(0);
 			}
 		}
@@ -2321,7 +2664,7 @@ const mcpAddCommand = buildCommand({
 		if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
 		const serialized = generator.serialize(merged);
 		writeFileSync(configPath, serialized.endsWith("\n") ? serialized : `${serialized}\n`);
-		prompts.log.success(`Added ${pc.bold(serverName)} MCP to ${pc.bold(generator.app.name)}`);
+		R.success(`Added ${import_picocolors.default.bold(serverName)} MCP to ${import_picocolors.default.bold(generator.app.name)}`);
 		const wallet = resolveWallet();
 		if (wallet.source !== "none") {
 			const balances = await fetchAllBalances(wallet.evmAddress, wallet.solanaAddress);
@@ -2329,26 +2672,26 @@ const mcpAddCommand = buildCommand({
 			const solUsdc = balances.sol ? Number(balances.sol.usdc) : 0;
 			const tempoUsdc = balances.tempo ? Number(balances.tempo.usdc) : 0;
 			if (evmUsdc === 0 && solUsdc === 0 && tempoUsdc === 0) {
-				prompts.log.warn("Balance: 0 USDC");
-				prompts.log.info("To use paid MCP tools, send USDC to your wallet:");
-				if (wallet.evmAddress) prompts.log.message(`  Base:   ${pc.cyan(wallet.evmAddress)}`);
-				if (wallet.solanaAddress) prompts.log.message(`  Solana: ${pc.cyan(wallet.solanaAddress)}`);
+				R.warn("Balance: 0 USDC");
+				R.info("To use paid MCP tools, send USDC to your wallet:");
+				if (wallet.evmAddress) R.message(`  Base:   ${import_picocolors.default.cyan(wallet.evmAddress)}`);
+				if (wallet.solanaAddress) R.message(`  Solana: ${import_picocolors.default.cyan(wallet.solanaAddress)}`);
 			} else {
 				const parts = [];
 				if (balances.evm) parts.push(`Base: ${balances.evm.usdc} USDC`);
 				if (balances.sol) parts.push(`Solana: ${balances.sol.usdc} USDC`);
 				if (balances.tempo) parts.push(`Tempo: ${balances.tempo.usdc} USDC`);
-				prompts.log.success(`Balance: ${parts.join(" | ")}`);
+				R.success(`Balance: ${parts.join(" | ")}`);
 			}
 		}
-		prompts.log.step("Try your first request:");
-		prompts.log.message(`  ${pc.cyan(`$ npx x402-proxy -X POST -d '{"ref":"CoinbaseDev"}' https://surf.cascade.fyi/api/v1/twitter/user`)}`);
-		prompts.log.message(`  ${pc.dim("Run")} ${pc.cyan("npx x402-proxy")} ${pc.dim("to see your wallet and balance")}`);
-		prompts.outro(pc.green(`MCP server ${pc.bold(serverName)} is ready to use!`));
+		R.step("Try your first request:");
+		R.message(`  ${import_picocolors.default.cyan(`$ npx x402-proxy -X POST -d '{"ref":"CoinbaseDev"}' https://surf.cascade.fyi/api/v1/twitter/user`)}`);
+		R.message(`  ${import_picocolors.default.dim("Run")} ${import_picocolors.default.cyan("npx x402-proxy")} ${import_picocolors.default.dim("to see your wallet and balance")}`);
+		Gt(import_picocolors.default.green(`MCP server ${import_picocolors.default.bold(serverName)} is ready to use!`));
 	}
 });
 //#endregion
-//#region src/commands/wallet-export.ts
+//#region packages/x402-proxy/src/commands/wallet-export.ts
 const walletExportCommand = buildCommand({
 	docs: { brief: "Export private key or mnemonic to stdout (pipe-safe)" },
 	parameters: {
@@ -2373,8 +2716,8 @@ const walletExportCommand = buildCommand({
 				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);
+				const confirmed = await Rt({ message: "This will print your mnemonic to the terminal. Continue?" });
+				if (Ct(confirmed) || !confirmed) process.exit(0);
 			} else warn("Warning: mnemonic will be printed to stdout.");
 			process.stdout.write(mnemonic);
 			return;
@@ -2393,15 +2736,15 @@ const walletExportCommand = buildCommand({
 			process.exit(1);
 		}
 		if (process.stdout.isTTY) {
-			const confirmed = await prompts.confirm({ message: "This will print your private key to the terminal. Continue?" });
-			if (prompts.isCancel(confirmed) || !confirmed) process.exit(0);
+			const confirmed = await Rt({ message: "This will print your private key to the terminal. Continue?" });
+			if (Ct(confirmed) || !confirmed) process.exit(0);
 		} else warn("Warning: private key will be printed to stdout.");
 		if (chain === "evm") process.stdout.write(wallet.evmKey);
 		else process.stdout.write(base58.encode(wallet.solanaKey.slice(0, 32)));
 	}
 });
 //#endregion
-//#region src/app.ts
+//#region packages/x402-proxy/src/app.ts
 const walletRoutes = buildRouteMap({
 	routes: {
 		info: walletInfoCommand,
@@ -2429,7 +2772,7 @@ const walletRoutes = buildRouteMap({
 			func(flags) {
 				const records = readHistory(getHistoryPath());
 				if (records.length === 0) {
-					console.log(pc.dim("No payment history yet."));
+					console.log(import_picocolors.default.dim("No payment history yet."));
 					return;
 				}
 				if (flags.json) {
@@ -2447,7 +2790,7 @@ const walletRoutes = buildRouteMap({
 					console.log(line);
 				}
 				console.log();
-				console.log(pc.dim(`  Today: ${formatAmount(spend.today, "USDC")} | Total: ${formatAmount(spend.total, "USDC")} | ${spend.count} transactions`));
+				console.log(import_picocolors.default.dim(`  Today: ${formatAmount(spend.today, "USDC")} | Total: ${formatAmount(spend.total, "USDC")} | ${spend.count} transactions`));
 				console.log();
 			}
 		}),
@@ -2487,16 +2830,16 @@ const app = buildApplication(buildRouteMap({
 	docs: { brief: "curl for x402 paid APIs" }
 }), {
 	name: "x402-proxy",
-	versionInfo: { currentVersion: "0.10.7" },
+	versionInfo: { currentVersion: "0.10.9" },
 	scanner: { caseStyle: "allow-kebab-for-camel" }
 });
 //#endregion
-//#region src/context.ts
+//#region packages/x402-proxy/src/context.ts
 function buildContext(process) {
 	return { process };
 }
 //#endregion
-//#region src/bin/cli.ts
+//#region packages/x402-proxy/src/bin/cli.ts
 const rawArgs = process.argv.slice(2);
 const args = [];
 for (let i = 0; i < rawArgs.length; i++) {