@bankr/cli 0.3.13 → 0.3.32

package/dist/commands/x402.js

@@ -19,14 +19,20 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import chalk from "chalk";
 import { input, select, confirm } from "@inquirer/prompts";
+import { authHeaders, handleResponse } from "../lib/api.js";
 import * as output from "../lib/output.js";
-import { getErrorMessage } from "../lib/errors.js";
-import { getApiUrl, requireApiKey, CLI_USER_AGENT } from "../lib/config.js";
+import { getApiUrl } from "../lib/config.js";
 // ── Config file helpers ─────────────────────────────────────────────────
 const CONFIG_FILENAME = "bankr.x402.json";
 function findProjectRoot() {
     return process.cwd();
 }
+// Config values come from user-edited JSON cast without validation, so fields
+// feeding select() defaults are plain strings; narrow them to the offered
+// choices (select's default must match the literal union of choice values).
+function pickDefault(value, allowed) {
+    return allowed.find((v) => v === value);
+}
 function loadConfigFile(projectRoot) {
     const candidates = [
         join(projectRoot, CONFIG_FILENAME),
@@ -38,8 +44,7 @@ function loadConfigFile(projectRoot) {
                 return JSON.parse(readFileSync(p, "utf-8"));
             }
             catch {
-                output.error(`Failed to parse ${p}. Check that it is valid JSON.`);
-                process.exit(1);
+                output.fatal(`Failed to parse ${p}. Check that it is valid JSON.`);
             }
         }
     }
@@ -49,24 +54,6 @@ function saveConfigFile(projectRoot, config) {
     const configPath = join(projectRoot, CONFIG_FILENAME);
     writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
 }
-// ── API helpers ─────────────────────────────────────────────────────────
-function authHeaders() {
-    return {
-        "X-API-Key": requireApiKey(),
-        "Content-Type": "application/json",
-        "User-Agent": CLI_USER_AGENT,
-    };
-}
-async function handleResponse(res) {
-    if (!res.ok) {
-        const body = (await res
-            .json()
-            .catch(() => ({ message: res.statusText })));
-        const msg = body.message || body.error || res.statusText;
-        throw new Error(`API error (${res.status}): ${msg}`);
-    }
-    return res.json();
-}
 // ── Default handler template ────────────────────────────────────────────
 const HANDLER_TEMPLATE = `/**
  * x402 service handler.
@@ -138,19 +125,16 @@ function validateServiceName(name) {
 export async function x402AddCommand(name) {
     const nameError = validateServiceName(name);
     if (nameError) {
-        output.error(nameError);
-        process.exit(1);
+        output.fatal(nameError);
     }
     const root = findProjectRoot();
     const x402Dir = join(root, "x402");
     if (!existsSync(x402Dir)) {
-        output.error("No x402/ directory found. Run 'bankr x402 init' first.");
-        process.exit(1);
+        output.fatal("No x402/ directory found. Run 'bankr x402 init' first.");
     }
     const serviceDir = join(x402Dir, name);
     if (existsSync(serviceDir)) {
-        output.error(`Service "${name}" already exists at x402/${name}/`);
-        process.exit(1);
+        output.fatal(`Service "${name}" already exists at x402/${name}/`);
     }
     // Ask for method
     const method = await select({
@@ -238,9 +222,7 @@ export default async function handler(req: Request): Promise<Response> {
     };
     // Add to config
     let config = loadConfigFile(root);
-    if (!config) {
-        config = { services: {} };
-    }
+    config || (config = { services: {} });
     config.services[name] = {
         price: "0.001",
         description: `${name} service`,
@@ -258,9 +240,7 @@ export default async function handler(req: Request): Promise<Response> {
 export async function x402ConfigureCommand(name) {
     const root = findProjectRoot();
     let config = loadConfigFile(root);
-    if (!config) {
-        config = { services: {} };
-    }
+    config || (config = { services: {} });
     const existing = config.services[name] ?? { price: "0.001" };
     const description = await input({
         message: "Service description:",
@@ -273,12 +253,14 @@ export async function x402ConfigureCommand(name) {
         theme: output.bankrTheme,
     });
     const currency = "USDC";
+    const networkDefault = pickDefault(existing.network, ["base"]) ?? "base";
     const network = await select({
         message: "Network:",
         choices: [{ name: "Base", value: "base" }],
-        default: existing.network ?? "base",
+        default: networkDefault,
         theme: output.bankrTheme,
     });
+    const methodDefault = pickDefault(existing.methods?.[0], ["GET", "POST", "*"]) ?? "GET";
     const method = await select({
         message: "HTTP method:",
         choices: [
@@ -286,7 +268,7 @@ export async function x402ConfigureCommand(name) {
             { name: "POST — JSON body", value: "POST" },
             { name: "Any — accept all methods", value: "*" },
         ],
-        default: existing.methods?.[0] ?? "GET",
+        default: methodDefault,
         theme: output.bankrTheme,
     });
     const paymentScheme = await select({
@@ -323,14 +305,11 @@ export async function x402DeployCommand(name) {
     const root = findProjectRoot();
     const x402Dir = join(root, "x402");
     if (!existsSync(x402Dir)) {
-        output.error("No x402/ directory found. Run 'bankr x402 init' first.");
-        process.exit(1);
+        output.fatal("No x402/ directory found. Run 'bankr x402 init' first.");
     }
     // Load or bootstrap config
     let config = loadConfigFile(root);
-    if (!config) {
-        config = { services: {} };
-    }
+    config || (config = { services: {} });
     // Discover services
     const { readdirSync, statSync } = await import("node:fs");
     const entries = readdirSync(x402Dir);
@@ -343,21 +322,18 @@ export async function x402DeployCommand(name) {
         }
     }
     if (services.length === 0) {
-        output.error("No services found. Run 'bankr x402 add <name>' first.");
-        process.exit(1);
+        output.fatal("No services found. Run 'bankr x402 add <name>' first.");
     }
     // Filter to single service if name provided
     const toDeploy = name ? services.filter((s) => s === name) : services;
     if (name && toDeploy.length === 0) {
-        output.error(`Service "${name}" not found in x402/`);
-        process.exit(1);
+        output.fatal(`Service "${name}" not found in x402/`);
     }
     // Validate service names and ensure config entries
     for (const svc of toDeploy) {
         const nameError = validateServiceName(svc);
         if (nameError) {
-            output.error(nameError);
-            process.exit(1);
+            output.fatal(nameError);
         }
         if (!config.services[svc]) {
             config.services[svc] = {
@@ -422,9 +398,7 @@ export async function x402DeployCommand(name) {
         }
     }
     catch (err) {
-        spin.fail("Deploy failed");
-        output.error(getErrorMessage(err));
-        process.exit(1);
+        output.failWith(spin, "Deploy failed", err);
     }
 }
 /**
@@ -452,9 +426,7 @@ export async function x402ListCommand() {
         }
     }
     catch (err) {
-        spin.fail("Failed to list endpoints");
-        output.error(getErrorMessage(err));
-        process.exit(1);
+        output.failWith(spin, "Failed to list endpoints", err);
     }
 }
 /**
@@ -473,9 +445,7 @@ export async function x402PauseResumeCommand(name, action) {
         spin.succeed(`${name} ${action === "pause" ? "paused" : "resumed"}`);
     }
     catch (err) {
-        spin.fail(`Failed to ${action} ${name}`);
-        output.error(getErrorMessage(err));
-        process.exit(1);
+        output.failWith(spin, `Failed to ${action} ${name}`, err);
     }
 }
 /**
@@ -499,9 +469,7 @@ export async function x402DeleteCommand(name) {
         spin.succeed(`${name} deleted`);
     }
     catch (err) {
-        spin.fail(`Failed to delete ${name}`);
-        output.error(getErrorMessage(err));
-        process.exit(1);
+        output.failWith(spin, `Failed to delete ${name}`, err);
     }
 }
 /**
@@ -533,9 +501,7 @@ export async function x402RevenueCommand(name) {
         console.log();
     }
     catch (err) {
-        spin.fail("Failed to fetch revenue");
-        output.error(getErrorMessage(err));
-        process.exit(1);
+        output.failWith(spin, "Failed to fetch revenue", err);
     }
 }
 /**
@@ -544,14 +510,12 @@ export async function x402RevenueCommand(name) {
 export async function x402EnvSetCommand(keyValue) {
     const eqIdx = keyValue.indexOf("=");
     if (eqIdx === -1) {
-        output.error("Usage: bankr x402 env set KEY=VALUE");
-        process.exit(1);
+        output.fatal("Usage: bankr x402 env set KEY=VALUE");
     }
     const key = keyValue.slice(0, eqIdx);
     const value = keyValue.slice(eqIdx + 1);
     if (!key) {
-        output.error("Key cannot be empty");
-        process.exit(1);
+        output.fatal("Key cannot be empty");
     }
     const spin = output.spinner(`Setting ${key}...`);
     try {
@@ -564,9 +528,7 @@ export async function x402EnvSetCommand(keyValue) {
         spin.succeed(`Set ${key}`);
     }
     catch (err) {
-        spin.fail(`Failed to set ${key}`);
-        output.error(getErrorMessage(err));
-        process.exit(1);
+        output.failWith(spin, `Failed to set ${key}`, err);
     }
 }
 /**
@@ -589,9 +551,7 @@ export async function x402EnvListCommand() {
         }
     }
     catch (err) {
-        spin.fail("Failed to list env vars");
-        output.error(getErrorMessage(err));
-        process.exit(1);
+        output.failWith(spin, "Failed to list env vars", err);
     }
 }
 /**
@@ -608,9 +568,7 @@ export async function x402EnvUnsetCommand(key) {
         spin.succeed(`Removed ${key}`);
     }
     catch (err) {
-        spin.fail(`Failed to remove ${key}`);
-        output.error(getErrorMessage(err));
-        process.exit(1);
+        output.failWith(spin, `Failed to remove ${key}`, err);
     }
 }
 // ── Schema display helpers ──────────────────────────────────────────────
@@ -766,34 +724,28 @@ function printServiceFormatted(svc, rank, total) {
 // ── Schema ────────────────────────────────────────────────────────────
 export async function x402SchemaCommand(url, opts = {}) {
     if (!url) {
-        output.error("Usage: bankr x402 schema <url>\n  Example: bankr x402 schema https://x402.bankr.bot/0xabc.../my-service");
-        process.exit(1);
+        output.fatal("Usage: bankr x402 schema <url>\n  Example: bankr x402 schema https://x402.bankr.bot/0xabc.../my-service");
     }
     let parsed;
     try {
         parsed = new URL(url);
     }
     catch {
-        output.error("Invalid URL");
-        process.exit(1);
-        return; // unreachable but makes TS happy
+        output.fatal("Invalid URL");
     }
     if (!parsed.hostname.endsWith("x402.bankr.bot")) {
-        output.error("Schema lookup is only available for Bankr-hosted endpoints (x402.bankr.bot).");
-        process.exit(1);
+        output.fatal("Schema lookup is only available for Bankr-hosted endpoints (x402.bankr.bot).");
     }
     const parts = parsed.pathname.split("/").filter(Boolean);
     if (parts.length < 2) {
-        output.error("Invalid Bankr x402 URL. Expected: https://x402.bankr.bot/<address>/<service>");
-        process.exit(1);
+        output.fatal("Invalid Bankr x402 URL. Expected: https://x402.bankr.bot/<address>/<service>");
     }
     const spin = output.spinner("Fetching endpoint schema...");
     try {
         const res = await fetch(`${getApiUrl()}/x402/endpoints/schema/${parts[0]}/${parts[1]}`);
         if (res.status === 404) {
             spin.fail("Endpoint not found");
-            output.error(`No active endpoint found for ${parts[0]}/${parts[1]}`);
-            process.exit(1);
+            output.fatal(`No active endpoint found for ${parts[0]}/${parts[1]}`);
         }
         const result = await handleResponse(res);
         spin.stop();
@@ -875,9 +827,7 @@ export async function x402SchemaCommand(url, opts = {}) {
         console.log();
     }
     catch (err) {
-        spin.fail("Schema lookup failed");
-        output.error(getErrorMessage(err));
-        process.exit(1);
+        output.failWith(spin, "Schema lookup failed", err);
     }
 }
 async function fetchSchemaForInteractive(url) {
@@ -999,19 +949,44 @@ async function fetchSchemaForInteractive(url) {
     return null;
 }
 // ── Call ──────────────────────────────────────────────────────────────
+// The caller's --max-payment is the only value ever sent as the payment cap;
+// an endpoint-advertised price may never raise it — fail closed instead.
+// Exported for tests.
+export function checkAdvertisedPrice(advertisedUsd, callerCapUsd) {
+    if (advertisedUsd !== null && advertisedUsd > callerCapUsd) {
+        return `Endpoint requires $${advertisedUsd} but --max-payment is $${callerCapUsd}. Re-run with a higher --max-payment (up to 10) to allow it.`;
+    }
+    return null;
+}
+// Advertised prices that are non-positive, unparseable, or token-denominated
+// (non-USD currency) are treated as unknown: only a USD value can safely feed
+// the USD cap clamp or the fail-closed comparison. Exported for tests.
+export function parseAdvertisedPrice(price, currency) {
+    const upper = currency.toUpperCase();
+    if (upper !== "USDC" && upper !== "USD")
+        return null;
+    const parsed = parseFloat(price);
+    return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
+}
+// The cap we send: never above the caller's --max-payment, and never above the
+// advertised price the user was shown and confirmed. Exported for tests.
+export function outboundMaxPayment(callerCapUsd, advertisedUsd) {
+    return advertisedUsd !== null
+        ? Math.min(advertisedUsd, callerCapUsd)
+        : callerCapUsd;
+}
 export async function x402CallCommand(url, opts = {}) {
     if (!url) {
-        output.error("Usage: bankr x402 call <url> [--method POST] [--body '{}']");
-        process.exit(1);
+        output.fatal("Usage: bankr x402 call <url> [--method POST] [--body '{}']");
     }
     let method = opts.method?.toUpperCase() ?? "GET";
     const maxPaymentUsd = opts.maxPayment ? parseFloat(opts.maxPayment) : 1;
     let requestBody = opts.body;
     if (isNaN(maxPaymentUsd) || maxPaymentUsd <= 0 || maxPaymentUsd > 10) {
-        output.error("--max-payment must be between 0 and 10 (USD)");
-        process.exit(1);
+        output.fatal("--max-payment must be between 0 and 10 (USD)");
     }
-    // Interactive mode: fetch schema and prompt for input values
+    // Endpoint-advertised price. Shown at confirm time; the outbound cap is
+    // clamped to min(advertised, caller's maxPaymentUsd) — see outboundMaxPayment.
     let resolvedPrice = null;
     if (opts.interactive) {
         const schema = await fetchSchemaForInteractive(url);
@@ -1025,7 +1000,11 @@ export async function x402CallCommand(url, opts = {}) {
             console.log(`  ${chalk.dim("Price")}  ${chalk.green(`$${schema.price} ${schema.currency}`)}`);
             console.log();
             // Use the endpoint's actual price and preferred method
-            resolvedPrice = parseFloat(schema.price);
+            resolvedPrice = parseAdvertisedPrice(schema.price, schema.currency);
+            const capError = checkAdvertisedPrice(resolvedPrice, maxPaymentUsd);
+            if (capError) {
+                output.fatal(capError);
+            }
             if (schema.methods.length > 0) {
                 method = schema.methods.includes("POST") ? "POST" : schema.methods[0];
             }
@@ -1041,7 +1020,7 @@ export async function x402CallCommand(url, opts = {}) {
                         : `${key} ${chalk.dim(`(${typedProp.type}, optional)`)}`;
                     const hint = typedProp.description ?? "";
                     // Enum fields → select prompt
-                    if (typedProp.enum && typedProp.enum.length > 0) {
+                    if (typedProp.enum?.length) {
                         const selected = await select({
                             message: `${label}${hint ? ` — ${chalk.dim(hint)}` : ""}`,
                             choices: typedProp.enum.map((v) => ({
@@ -1066,8 +1045,7 @@ export async function x402CallCommand(url, opts = {}) {
                         if (typedProp.type === "number" || typedProp.type === "integer") {
                             const num = Number(answer);
                             if (isNaN(num)) {
-                                output.error(`Invalid number for ${key}: "${answer}"`);
-                                process.exit(1);
+                                output.fatal(`Invalid number for ${key}: "${answer}"`);
                             }
                             values[key] = num;
                         }
@@ -1098,6 +1076,7 @@ export async function x402CallCommand(url, opts = {}) {
             // No schema available — fallback: prompt for method and body
             output.warn("No schema found for this endpoint. Falling back to manual input.");
             console.log();
+            const manualMethodDefault = pickDefault(method, ["GET", "POST", "PUT", "DELETE"]) ?? "GET";
             method = await select({
                 message: "HTTP method",
                 choices: [
@@ -1106,7 +1085,7 @@ export async function x402CallCommand(url, opts = {}) {
                     { name: "PUT", value: "PUT" },
                     { name: "DELETE", value: "DELETE" },
                 ],
-                default: method,
+                default: manualMethodDefault,
                 theme: output.bankrTheme,
             });
             if (method === "POST" || method === "PUT") {
@@ -1120,8 +1099,7 @@ export async function x402CallCommand(url, opts = {}) {
                         requestBody = bodyInput;
                     }
                     catch {
-                        output.error("Invalid JSON body");
-                        process.exit(1);
+                        output.fatal("Invalid JSON body");
                     }
                 }
             }
@@ -1144,13 +1122,21 @@ export async function x402CallCommand(url, opts = {}) {
         }
         console.log();
     }
-    // Non-interactive: probe the endpoint to show the actual price before confirming
-    if (!opts.interactive && !opts.yes && resolvedPrice === null) {
+    // Probe the endpoint to show the actual price before confirming. Skipped in
+    // non-interactive mode, where the confirm is suppressed — --ni matches --yes.
+    if (!opts.interactive &&
+        !opts.yes &&
+        !output.isNonInteractive() &&
+        resolvedPrice === null) {
         const spin = output.spinner("Checking endpoint price...");
         const schema = await fetchSchemaForInteractive(url);
         spin.stop();
         if (schema) {
-            resolvedPrice = parseFloat(schema.price);
+            resolvedPrice = parseAdvertisedPrice(schema.price, schema.currency);
+            const capError = checkAdvertisedPrice(resolvedPrice, maxPaymentUsd);
+            if (capError) {
+                output.fatal(capError);
+            }
         }
     }
     if (!opts.yes && !opts.interactive && !output.isNonInteractive()) {
@@ -1185,7 +1171,7 @@ export async function x402CallCommand(url, opts = {}) {
                 url,
                 method,
                 body: requestBody,
-                maxPaymentUsd: resolvedPrice ?? maxPaymentUsd,
+                maxPaymentUsd: outboundMaxPayment(maxPaymentUsd, resolvedPrice),
             }),
         });
         const result = await handleResponse(res);
@@ -1195,8 +1181,7 @@ export async function x402CallCommand(url, opts = {}) {
             return;
         }
         if (!result.success) {
-            output.error(result.error ?? "Call failed");
-            process.exit(1);
+            output.fatal(result.error ?? "Call failed");
         }
         // Show endpoint schema info (Bankr-hosted endpoints only)
         if (result.endpointSchema) {
@@ -1229,17 +1214,14 @@ export async function x402CallCommand(url, opts = {}) {
         console.log();
     }
     catch (err) {
-        spin.fail("Call failed");
-        output.error(getErrorMessage(err));
-        process.exit(1);
+        output.failWith(spin, "Call failed", err);
     }
 }
 // ── Search ────────────────────────────────────────────────────────────
 export async function x402SearchCommand(queryParts, opts = {}) {
     const query = queryParts.join(" ").trim();
     if (!query) {
-        output.error("Usage: bankr x402 search <query>");
-        process.exit(1);
+        output.fatal("Usage: bankr x402 search <query>");
     }
     const spin = output.spinner("Searching services...");
     try {
@@ -1276,9 +1258,7 @@ export async function x402SearchCommand(queryParts, opts = {}) {
         }
     }
     catch (err) {
-        spin.fail("Search failed");
-        output.error(getErrorMessage(err));
-        process.exit(1);
+        output.failWith(spin, "Search failed", err);
     }
 }
 //# sourceMappingURL=x402.js.map

package/dist/lib/api.d.ts

@@ -43,6 +43,8 @@ export interface JobStatusResponse {
     richData?: unknown[];
     cancellable?: boolean;
 }
+export declare function authHeaders(): Record<string, string>;
+export declare function handleResponse<T>(res: Response): Promise<T>;
 export interface ApiErrorBody {
     error: string;
     message: string;
@@ -69,7 +71,11 @@ export declare function getUserInfo(): Promise<UserInfoResponse>;
 export interface TokenBalanceInfo {
     network: string;
     token: {
-        balance: number;
+        /**
+         * Wire shape of `GET /wallet/portfolio`: an exact decimal string.
+         * Coerce with `Number(...)` before arithmetic or comparison.
+         */
+        balance: string;
         balanceUSD: number;
         baseToken: {
             name: string;
@@ -192,7 +198,7 @@ export interface SubmitResponse {
 export declare function submit(request: SubmitRequest): Promise<SubmitResponse>;
 export type FeeRecipientType = "wallet" | "x" | "farcaster" | "ens";
 /** Chains the deploy endpoint accepts (mirrors the API's zod enum). */
-export type LaunchChain = "base" | "robinhood";
+export type LaunchChain = "base" | "robinhood" | "arbitrum";
 export interface DeployTokenRequest {
     tokenName: string;
     tokenSymbol?: string;
@@ -206,6 +212,11 @@ export interface DeployTokenRequest {
         value: string;
     };
     simulateOnly?: boolean;
+    /** Turn off the default 15% creator vesting (100% of supply sold into the pool). */
+    disableVesting?: boolean;
+    /** Collect all creator fees in the pool's quote token (e.g. WETH) instead of
+     *  a mix of the launched token and the quote token. */
+    quoteOnlyFees?: boolean;
 }
 export interface DeployTokenResponse {
     success: boolean;
@@ -225,7 +236,7 @@ export interface CreatorFeesTokenResult {
     tokenAddress: string;
     name: string;
     symbol: string;
-    /** Launch chain ("base" | "robinhood"); absent on older API versions → base. */
+    /** Launch chain ("base" | "robinhood" | "arbitrum"); absent on older API versions → base. */
     chain?: string;
     poolId: string;
     initializer?: string;
@@ -264,6 +275,9 @@ export interface BeneficiaryFeesResponse {
     totalLaunches: number;
     poolsWithShares: number;
     tokens: CreatorFeesTokenResult[];
+    /** Server stopped the scan early — more claimable fees may exist. */
+    truncated?: boolean;
+    scanned?: number;
 }
 export interface DopplerClaimTxResponse {
     to: string;