@bankr/cli 0.3.13 → 0.3.23

package/dist/commands/portfolio.js

@@ -2,6 +2,7 @@ import chalk from "chalk";
 import { getPortfolio, } from "../lib/api.js";
 import * as output from "../lib/output.js";
 import { formatUsd, formatBalance } from "../lib/output.js";
+import { getErrorMessage } from "../lib/errors.js";
 import { CHAIN_LABELS, VALID_CHAINS } from "../lib/chains.js";
 const BRAND = chalk.hex("#FF613D");
 const DIM = chalk.dim;
@@ -78,7 +79,7 @@ export async function portfolioCommand(opts) {
         spin.succeed("Portfolio loaded");
     }
     catch (err) {
-        spin.fail(`Failed to fetch portfolio: ${err.message}`);
+        spin.fail(`Failed to fetch portfolio: ${getErrorMessage(err)}`);
         process.exit(1);
     }
     // JSON output mode
@@ -109,7 +110,7 @@ export async function portfolioCommand(opts) {
         printChainBalances(chain, chainData, !!includePnl);
     }
     // Print NFTs
-    if (includeNfts && data.nfts && data.nfts.length > 0) {
+    if (includeNfts && data.nfts?.length) {
         console.log();
         console.log();
         console.log(`  ${BRAND.bold("NFTs")}  ${DIM(`${data.nfts.length} item(s)`)}`);

package/dist/commands/profile.js

@@ -2,6 +2,7 @@ import chalk from "chalk";
 import { input, confirm, select } from "@inquirer/prompts";
 import { getOwnProfiles, createProfile, updateProfile, deleteProfile, addProjectUpdate, } from "../lib/api.js";
 import * as output from "../lib/output.js";
+import { getErrorMessage } from "../lib/errors.js";
 const BRAND = chalk.hex("#FF613D");
 const DIM = chalk.dim;
 function printProfile(profile, json) {
@@ -74,7 +75,7 @@ export async function profileViewCommand(opts) {
         }
     }
     catch (err) {
-        const msg = err.message;
+        const msg = getErrorMessage(err);
         if (msg.includes("404")) {
             output.info("No profiles found. Create one with: bankr profile create");
         }
@@ -132,7 +133,7 @@ export async function profileCreateCommand(opts) {
         printProfile(profile, !!opts.json);
     }
     catch (err) {
-        output.error(err.message);
+        output.error(getErrorMessage(err));
     }
 }
 export async function profileUpdateCommand(opts) {
@@ -163,7 +164,7 @@ export async function profileUpdateCommand(opts) {
         printProfile(profile, !!opts.json);
     }
     catch (err) {
-        output.error(err.message);
+        output.error(getErrorMessage(err));
     }
 }
 export async function profileDeleteCommand(opts) {
@@ -187,7 +188,7 @@ export async function profileDeleteCommand(opts) {
         output.success("Profile deleted.");
     }
     catch (err) {
-        output.error(err.message);
+        output.error(getErrorMessage(err));
     }
 }
 export async function profileAddUpdateCommand(opts) {
@@ -221,7 +222,7 @@ export async function profileAddUpdateCommand(opts) {
         }
     }
     catch (err) {
-        output.error(err.message);
+        output.error(getErrorMessage(err));
     }
 }
 //# sourceMappingURL=profile.js.map

package/dist/commands/prompt.js

@@ -2,11 +2,13 @@ import { ApiError, pollJob, submitPrompt } from "../lib/api.js";
 import { emitCESP } from "../lib/cesp/engine.js";
 import { getLastThreadId, requireApiKey, setLastThreadId, } from "../lib/config.js";
 import * as output from "../lib/output.js";
+import { getErrorMessage } from "../lib/errors.js";
 /** Valid Max Mode model IDs — hardcoded because CLI is standalone (no monorepo imports).
  *  Must be manually kept in sync with models in the LLM gateway DB. */
 const VALID_MAX_MODE_MODELS = new Set([
     // Claude (Vertex AI)
     "claude-fable-5",
+    "claude-opus-5",
     "claude-opus-4.8",
     "claude-opus-4.7",
     "claude-opus-4.6",
@@ -15,28 +17,39 @@ const VALID_MAX_MODE_MODELS = new Set([
     "claude-sonnet-4.6",
     "claude-sonnet-4.5",
     "claude-haiku-4.5",
-    // Gemini (Vertex AI)
+    // Gemini (Vertex AI) — gemini-3-pro deliberately absent: removed 2026-03-09,
+    // both provider slugs retired. Don't re-add on a sync pass.
+    "gemini-3.6-flash",
+    "gemini-3.5-flash-lite",
     "gemini-3.1-pro",
-    "gemini-3-pro",
     "gemini-2.5-pro",
     // OpenAI (OpenRouter)
+    "gpt-5.6-sol",
+    "gpt-5.6-terra",
+    "gpt-5.6-luna",
+    "gpt-5.5",
     "gpt-5.4",
     "gpt-5.4-mini",
     "gpt-5.2",
     "gpt-5-mini",
     // Grok (OpenRouter)
-    "grok-4.1-fast",
+    "grok-4.6",
+    "grok-4.5",
+    "grok-4.3",
     // DeepSeek (OpenRouter)
     "deepseek-v3.2",
     // Qwen (OpenRouter)
     "qwen3-coder",
+    "qwen3.8-max",
     "qwen3.7-max",
     "qwen3.7-plus",
+    "qwen3.7-flash",
     "qwen3.5-plus",
     // MiniMax (direct)
     "minimax-m2.5",
     "minimax-m2.7",
     // Other (OpenRouter)
+    "kimi-k3",
     "kimi-k2.7-code",
     "kimi-k2.6",
     "kimi-k2.5",
@@ -95,7 +108,7 @@ export async function promptCommand(text, options = {}) {
             }
         }
         else {
-            output.error(err.message);
+            output.error(getErrorMessage(err));
         }
         process.exit(1);
     }
@@ -121,7 +134,7 @@ export async function promptCommand(text, options = {}) {
             if (result.response) {
                 console.log(result.response);
             }
-            if (result.transactions && result.transactions.length > 0) {
+            if (result.transactions?.length) {
                 console.log();
                 output.dim(`${result.transactions.length} transaction(s) returned. Use the web app to review and execute.`);
             }
@@ -141,7 +154,7 @@ export async function promptCommand(text, options = {}) {
     catch (err) {
         spin.fail("Error while polling");
         emitCESP("resource.limit");
-        output.error(err.message);
+        output.error(getErrorMessage(err));
         process.exit(1);
     }
 }

package/dist/commands/sign.js

@@ -1,6 +1,7 @@
 import { sign } from "../lib/api.js";
 import { emitCESP } from "../lib/cesp/engine.js";
 import * as output from "../lib/output.js";
+import { getErrorMessage } from "../lib/errors.js";
 export async function signCommand(opts) {
     const request = {
         signatureType: opts.type,
@@ -63,7 +64,7 @@ export async function signCommand(opts) {
     catch (err) {
         spinner.stop();
         emitCESP("task.error");
-        output.error(err.message);
+        output.error(getErrorMessage(err));
         process.exit(1);
     }
 }

package/dist/commands/sounds.js

@@ -6,6 +6,7 @@ import { tmpdir } from "node:os";
 import { readConfig, writeConfig } from "../lib/config.js";
 import { DEFAULT_SOUND_CONFIG, emitCESP, getPacksDir, listInstalledPacks, } from "../lib/cesp/engine.js";
 import * as output from "../lib/output.js";
+import { getErrorMessage } from "../lib/errors.js";
 const execFileAsync = promisify(execFile);
 const REGISTRY_URL = "https://peonping.github.io/registry/index.json";
 function getSoundConfig() {
@@ -164,7 +165,7 @@ export async function soundsInstallCommand(packName) {
     }
     catch (err) {
         spin.fail("Failed to fetch registry");
-        output.error(err.message);
+        output.error(getErrorMessage(err));
         process.exit(1);
     }
     // Download and extract
@@ -218,7 +219,7 @@ export async function soundsInstallCommand(packName) {
     }
     catch (err) {
         spin2.fail("Install failed");
-        output.error(err.message);
+        output.error(getErrorMessage(err));
         process.exit(1);
     }
 }
@@ -232,7 +233,7 @@ export async function soundsSearchCommand(query) {
     }
     catch (err) {
         spin.fail("Failed to fetch registry");
-        output.error(err.message);
+        output.error(getErrorMessage(err));
         process.exit(1);
     }
     // Filter by query if provided

package/dist/commands/status.js

@@ -1,6 +1,7 @@
 import { getJobStatus } from "../lib/api.js";
 import { requireApiKey } from "../lib/config.js";
 import * as output from "../lib/output.js";
+import { getErrorMessage } from "../lib/errors.js";
 export async function statusCommand(jobId) {
     requireApiKey();
     const spin = output.spinner("Fetching job status...");
@@ -31,14 +32,14 @@ export async function statusCommand(jobId) {
             console.log();
             output.error(status.error);
         }
-        if (status.transactions && status.transactions.length > 0) {
+        if (status.transactions?.length) {
             console.log();
             output.dim(`${status.transactions.length} transaction(s) attached.`);
         }
     }
     catch (err) {
         spin.fail("Failed to fetch job status");
-        output.error(err.message);
+        output.error(getErrorMessage(err));
         process.exit(1);
     }
 }

package/dist/commands/submit.js

@@ -1,6 +1,7 @@
 import { submit } from "../lib/api.js";
 import { emitCESP } from "../lib/cesp/engine.js";
 import * as output from "../lib/output.js";
+import { getErrorMessage } from "../lib/errors.js";
 function displayResult(result) {
     if (!result.success) {
         emitCESP("task.error");
@@ -73,7 +74,7 @@ export async function submitCommand(opts) {
     }
     catch (err) {
         spinner.stop();
-        output.error(err.message);
+        output.error(getErrorMessage(err));
         process.exit(1);
     }
 }
@@ -127,7 +128,7 @@ export async function submitJsonCommand(json, opts) {
     }
     catch (err) {
         spinner.stop();
-        output.error(err.message);
+        output.error(getErrorMessage(err));
         process.exit(1);
     }
 }

package/dist/commands/swap.js

@@ -1,7 +1,9 @@
 import { getSwapQuote, executeSwap } from "../lib/api.js";
 import * as output from "../lib/output.js";
+import { getErrorMessage } from "../lib/errors.js";
 import { NATIVE_SYMBOLS, VALID_CHAINS } from "../lib/chains.js";
-import { ZERO_ADDRESS, resolveTokenSymbol } from "../lib/tokens.js";
+import { zeroAddress } from "viem";
+import { resolveTokenSymbol } from "../lib/tokens.js";
 /**
  * Resolve a token symbol or address to a contract address for swapping.
  * - The chain's native ticker (ETH/POL/BNB) or the zero address → native, sent
@@ -12,10 +14,10 @@ async function resolveSwapToken(tokenInput, chain) {
     const input = tokenInput.trim();
     const nativeSymbol = NATIVE_SYMBOLS[chain] ?? "ETH";
     const upper = input.toUpperCase();
-    const isNative = upper === nativeSymbol.toUpperCase() ||
-        input.toLowerCase() === ZERO_ADDRESS;
+    // viem's zeroAddress is already lowercase, so compare against the lowercased input.
+    const isNative = upper === nativeSymbol.toUpperCase() || input.toLowerCase() === zeroAddress;
     if (isNative) {
-        return { address: ZERO_ADDRESS, symbol: nativeSymbol };
+        return { address: zeroAddress, symbol: nativeSymbol };
     }
     return resolveTokenSymbol(input, chain);
 }
@@ -45,7 +47,7 @@ export async function swapCommand(opts) {
         resolveSpin.stop();
     }
     catch (err) {
-        resolveSpin.fail(err.message);
+        resolveSpin.fail(getErrorMessage(err));
         process.exit(1);
     }
     // Quote
@@ -62,7 +64,7 @@ export async function swapCommand(opts) {
         quoteSpin.stop();
     }
     catch (err) {
-        quoteSpin.fail(`Quote failed: ${err.message}`);
+        quoteSpin.fail(`Quote failed: ${getErrorMessage(err)}`);
         process.exit(1);
     }
     output.blank();
@@ -100,7 +102,7 @@ export async function swapCommand(opts) {
         }
     }
     catch (err) {
-        swapSpin.fail(`Swap failed: ${err.message}`);
+        swapSpin.fail(`Swap failed: ${getErrorMessage(err)}`);
         process.exit(1);
     }
 }

package/dist/commands/tokens.js

@@ -1,5 +1,6 @@
 import { searchTokens } from "../lib/api.js";
 import * as output from "../lib/output.js";
+import { getErrorMessage } from "../lib/errors.js";
 export async function tokensSearchCommand(query, opts) {
     const spin = output.spinner(`Searching tokens for "${query}"...`);
     try {
@@ -22,7 +23,7 @@ export async function tokensSearchCommand(query, opts) {
         }
     }
     catch (err) {
-        spin.fail(`Search failed: ${err.message}`);
+        spin.fail(`Search failed: ${getErrorMessage(err)}`);
         process.exit(1);
     }
 }
@@ -53,7 +54,7 @@ export async function tokensInfoCommand(address, opts) {
         }
     }
     catch (err) {
-        spin.fail(`Failed to fetch token info: ${err.message}`);
+        spin.fail(`Failed to fetch token info: ${getErrorMessage(err)}`);
         process.exit(1);
     }
 }

package/dist/commands/transfer.js

@@ -1,8 +1,9 @@
 import { transfer, resolveRecipient } from "../lib/api.js";
 import * as output from "../lib/output.js";
+import { getErrorMessage } from "../lib/errors.js";
 import { NATIVE_SYMBOLS } from "../lib/chains.js";
-import { isAddress } from "viem";
-import { ZERO_ADDRESS, resolveTokenSymbol } from "../lib/tokens.js";
+import { isAddress, zeroAddress } from "viem";
+import { resolveTokenSymbol } from "../lib/tokens.js";
 function looksLikeEnsName(value) {
     const v = value.trim().toLowerCase();
     return v.endsWith(".eth") || v.endsWith(".cb.id");
@@ -30,7 +31,7 @@ async function resolveTransferRecipient(raw) {
         };
     }
     catch (err) {
-        spin.fail(`ENS resolution failed for "${value}": ${err.message}`);
+        spin.fail(`ENS resolution failed for "${value}": ${getErrorMessage(err)}`);
         process.exit(1);
     }
 }
@@ -47,7 +48,8 @@ export async function transferCommand(opts) {
     let tokenAddress;
     let tokenLabel;
     if (isNative) {
-        tokenAddress = ZERO_ADDRESS;
+        // Zero address = native-token sentinel; the API detects + sanitizes it.
+        tokenAddress = zeroAddress;
         tokenLabel = NATIVE_SYMBOLS[chain] ?? "ETH";
     }
     else {
@@ -64,7 +66,7 @@ export async function transferCommand(opts) {
             }
         }
         catch (err) {
-            spin.fail(err.message);
+            spin.fail(getErrorMessage(err));
             process.exit(1);
         }
     }
@@ -86,7 +88,7 @@ export async function transferCommand(opts) {
         output.label("Tx Hash", result.txHash ?? "unknown");
     }
     catch (err) {
-        spin.fail(`Transfer failed: ${err.message}`);
+        spin.fail(`Transfer failed: ${getErrorMessage(err)}`);
         process.exit(1);
     }
 }

package/dist/commands/update.js

@@ -1,6 +1,7 @@
 import { readFileSync } from "node:fs";
 import { execSync } from "node:child_process";
 import * as output from "../lib/output.js";
+import { getErrorMessage } from "../lib/errors.js";
 const PACKAGE_NAME = "@bankr/cli";
 /**
  * Compare two semver version strings.
@@ -79,7 +80,7 @@ export async function updateCommand(opts) {
     }
     catch (err) {
         spin.fail();
-        output.error(err.message);
+        output.error(getErrorMessage(err));
         process.exit(1);
     }
     const cmp = compareSemver(current, latest);

package/dist/commands/webhooks.js

@@ -508,7 +508,9 @@ export async function webhooksListCommand() {
             const status = w.status === "active"
                 ? output.fmt.success("active")
                 : output.fmt.warn(w.status);
-            const mode = w.readOnly ? output.fmt.dim("read-only") : output.fmt.warn("writes");
+            const mode = w.readOnly
+                ? output.fmt.dim("read-only")
+                : output.fmt.warn("writes");
             console.log(`  ${output.fmt.brand(w.name)} ${status}  v${w.version}  ${mode}  ${w.totalInvocations} invocations`);
             if (w.description)
                 output.dim(`    ${w.description}`);
@@ -564,7 +566,9 @@ export async function webhooksDeleteCommand(name) {
 export async function webhooksLogsCommand(name) {
     const spin = output.spinner(`Fetching invocations for ${name}...`);
     try {
-        const res = await fetch(`${getApiUrl()}/webhooks/${name}/logs?limit=25`, { headers: authHeaders() });
+        const res = await fetch(`${getApiUrl()}/webhooks/${name}/logs?limit=25`, {
+            headers: authHeaders(),
+        });
         const result = await handleResponse(res);
         spin.stop();
         if (result.logs.length === 0) {

package/dist/commands/whoami.js

@@ -2,6 +2,7 @@ import { existsSync } from "fs";
 import { getApiKey, getApiUrl, getConfigPath, isCustomApiUrl, } from "../lib/config.js";
 import { getUserInfo } from "../lib/api.js";
 import * as output from "../lib/output.js";
+import { getErrorMessage } from "../lib/errors.js";
 export async function whoamiCommand() {
     const apiKey = getApiKey();
     const apiUrl = getApiUrl();
@@ -35,7 +36,7 @@ export async function whoamiCommand() {
         }
     }
     catch (err) {
-        spin.fail(`Could not reach Bankr API: ${err.message}`);
+        spin.fail(`Could not reach Bankr API: ${getErrorMessage(err)}`);
         return;
     }
     // Fetch user profile info
@@ -69,7 +70,7 @@ export async function whoamiCommand() {
         output.label("Score", `${score}${rankStr}`);
     }
     catch (err) {
-        profileSpin.fail(`Could not fetch account info: ${err.message}`);
+        profileSpin.fail(`Could not fetch account info: ${getErrorMessage(err)}`);
     }
 }
 //# sourceMappingURL=whoami.js.map

package/dist/commands/x402.d.ts

@@ -62,6 +62,9 @@ export declare function x402EnvUnsetCommand(key: string): Promise<void>;
 export declare function x402SchemaCommand(url: string, opts?: {
     raw?: boolean;
 }): Promise<void>;
+export declare function checkAdvertisedPrice(advertisedUsd: number | null, callerCapUsd: number): string | null;
+export declare function parseAdvertisedPrice(price: string, currency: string): number | null;
+export declare function outboundMaxPayment(callerCapUsd: number, advertisedUsd: number | null): number;
 export declare function x402CallCommand(url: string, opts?: {
     method?: string;
     body?: string;

package/dist/commands/x402.js

@@ -27,6 +27,12 @@ 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),
@@ -238,9 +244,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 +262,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 +275,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 +290,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({
@@ -328,9 +332,7 @@ export async function x402DeployCommand(name) {
     }
     // 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);
@@ -999,6 +1001,32 @@ 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 '{}']");
@@ -1011,7 +1039,8 @@ export async function x402CallCommand(url, opts = {}) {
         output.error("--max-payment must be between 0 and 10 (USD)");
         process.exit(1);
     }
-    // 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 +1054,12 @@ 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.error(capError);
+                process.exit(1);
+            }
             if (schema.methods.length > 0) {
                 method = schema.methods.includes("POST") ? "POST" : schema.methods[0];
             }
@@ -1041,7 +1075,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) => ({
@@ -1098,6 +1132,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 +1141,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") {
@@ -1144,13 +1179,22 @@ 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.error(capError);
+                process.exit(1);
+            }
         }
     }
     if (!opts.yes && !opts.interactive && !output.isNonInteractive()) {
@@ -1185,7 +1229,7 @@ export async function x402CallCommand(url, opts = {}) {
                 url,
                 method,
                 body: requestBody,
-                maxPaymentUsd: resolvedPrice ?? maxPaymentUsd,
+                maxPaymentUsd: outboundMaxPayment(maxPaymentUsd, resolvedPrice),
             }),
         });
         const result = await handleResponse(res);