@bankr/cli 0.2.15 → 0.3.8

package/README.md

@@ -159,7 +159,7 @@ Environment variables override stored values:
 
 ## API Key
 
-Generate an API key at [bankr.bot/api](https://bankr.bot/api). Keys start with `bk_` and require Agent API access to be enabled.
+Generate an API key at [bankr.bot/api-keys](https://bankr.bot/api-keys). Keys start with `bk_` and require Agent API access to be enabled.
 
 ## License
 

package/dist/cli.js

@@ -5,6 +5,7 @@ import { input } from "@inquirer/prompts";
 import { balancesCommand } from "./commands/balances.js";
 import { portfolioCommand } from "./commands/portfolio.js";
 import { transferCommand } from "./commands/transfer.js";
+import { swapCommand } from "./commands/swap.js";
 import { skillsCommand } from "./commands/capabilities.js";
 import { cancelCommand } from "./commands/cancel.js";
 import { configGetCommand, configSetCommand } from "./commands/config.js";
@@ -48,6 +49,10 @@ async function readPromptInput() {
         }
         return text;
     }
+    if (output.isNonInteractive()) {
+        output.error('No prompt provided. Pass it as an argument: bankr agent "your prompt"');
+        process.exit(1);
+    }
     // Interactive input — shell expansion does not apply here
     const text = await input({
         message: "Enter your prompt:",
@@ -61,15 +66,6 @@ function colorizeHelp(text) {
     return text
         .split("\n")
         .map((line) => {
-        // "Usage: ..." line
-        if (line.startsWith("Usage:"))
-            return output.fmt.brandBold(line);
-        // Section headers: "Options:" and "Commands:"
-        if (/^(Options|Commands):/.test(line))
-            return output.fmt.brandBold(line);
-        // Description line (standalone, no leading whitespace, no colon)
-        if (line === "Bankr AI agent CLI")
-            return output.fmt.brandBold(line);
         // Command/option rows: leading whitespace then content
         if (/^\s{2,}\S/.test(line)) {
             const match = line.match(/^(\s+)([\w<>[\].\-,/ ]+?)(\s{2,}.+)$/);
@@ -83,22 +79,30 @@ function colorizeHelp(text) {
 }
 program
     .name("bankr")
-    .description("Bankr AI agent CLI\n\n  Docs:   https://docs.bankr.bot\n  Skills: https://docs.bankr.bot/openclaw/installation")
+    .description("Bankr AI agent CLI\n\n  Docs:   https://docs.bankr.bot\n  Skills: https://docs.bankr.bot/skills/overview")
     .version(pkg.version, "-v, --version", "Show CLI version")
     .helpOption("-h, --help", "Display help")
-    .addHelpCommand("help [command]", "Display help for command")
+    .helpCommand(false)
     .option("--config <path>", "Path to config file (default: ~/.bankr/config.json)")
+    .option("--ni, --not-interactive", "Non-interactive mode: skip confirmation prompts (implies --yes) and fail fast on required input. Also enabled by BANKR_NOT_INTERACTIVE=1")
+    .configureHelp({
+    styleTitle: (str) => output.fmt.brandBold(str),
+})
     .configureOutput({
     writeOut: (str) => process.stdout.write(colorizeHelp(str)),
     writeErr: (str) => process.stderr.write(colorizeHelp(str)),
 })
     .hook("preAction", (thisCommand) => {
-    const configPath = thisCommand.opts().config;
-    if (configPath) {
-        setConfigPath(configPath);
+    const opts = thisCommand.opts();
+    if (opts.notInteractive) {
+        process.env.BANKR_NOT_INTERACTIVE = "1";
+    }
+    if (opts.config) {
+        setConfigPath(opts.config);
     }
 });
 // ── Core commands ───────────────────────────────────────────────────────
+program.commandsGroup("Account");
 const loginCmd = program
     .command("login")
     .description("Authenticate with the Bankr API")
@@ -120,10 +124,12 @@ loginCmd
     .option("--code <otp>", "OTP code (step 2 of headless login)")
     .option("--accept-terms", "Accept Terms of Service (skips prompt)")
     .option("--key-name <name>", "API key name (default: CLI)")
+    .optionsGroup("API Permissions")
     .option("--read-write", "Disable read-only mode (allow transactions)")
     .option("--no-wallet-api", "Disable Wallet API (enabled by default)")
     .option("--no-token-launch", "Disable Token Launch API (enabled by default)")
     .option("--llm", "Enable LLM gateway on the API key")
+    .optionsGroup("Security")
     .option("--allowed-ips <ips>", "Comma-separated IP/CIDR allowlist, e.g. 1.2.3.4,10.0.0.0/24")
     .option("--allowed-recipients <addresses>", "Comma-separated EVM/Solana addresses (agent will only send funds to these)")
     .action(async (address, opts, cmd) => {
@@ -147,11 +153,12 @@ loginCmd
     .command("siwe")
     .description("Sign in with Ethereum wallet (SIWE, for headless agents)")
     .requiredOption("--private-key <key>", "Ethereum private key (0x...)")
-    .option("--partner-key <key>", "Partner API key for fee attribution")
     .option("--key-name <name>", "API key name (default: SIWE-<date>)")
+    .optionsGroup("API Permissions")
     .option("--read-write", "Disable read-only mode (allow transactions)")
     .option("--no-wallet-api", "Disable Wallet API (enabled by default)")
     .option("--no-token-launch", "Disable Token Launch API (enabled by default)")
+    .optionsGroup("Security")
     .option("--allowed-ips <ips>", "Comma-separated IP/CIDR allowlist, e.g. 1.2.3.4,10.0.0.0/24")
     .option("--allowed-recipients <addresses>", "Comma-separated EVM/Solana addresses (agent will only send funds to these)")
     .action(async (opts, cmd) => {
@@ -160,7 +167,6 @@ loginCmd
         apiUrl: parentOpts.apiUrl,
         siwe: true,
         privateKey: opts.privateKey,
-        partnerKey: opts.partnerKey,
         keyName: opts.keyName,
         readWrite: opts.readWrite,
         walletApi: opts.walletApi,
@@ -174,6 +180,7 @@ program
     .description("Show wallet info and account details")
     .action(whoamiCommand);
 // Wallet commands (non-agentic operations)
+program.commandsGroup("Wallet");
 const walletCmd = program
     .command("wallet")
     .description("Wallet info, portfolio, transfer, sign, and submit")
@@ -209,6 +216,23 @@ walletCmd
         chain: opts.chain,
     });
 });
+walletCmd
+    .command("swap")
+    .description("Swap tokens on an EVM chain (same-chain)")
+    .requiredOption("--from <symbol or address>", "Token to sell: symbol (ETH, USDC) or contract address")
+    .requiredOption("--to <symbol or address>", "Token to buy: symbol (ETH, USDC) or contract address")
+    .requiredOption("--amount <amount>", "Amount of --from to sell (human-readable)")
+    .option("--chain <chain>", "EVM chain: base, polygon, mainnet, unichain, worldchain, arbitrum, bnb (default: base)")
+    .option("--quote-only", "Print the quote without executing the swap")
+    .action(async (opts) => {
+    await swapCommand({
+        from: opts.from,
+        to: opts.to,
+        amount: opts.amount,
+        chain: opts.chain,
+        quoteOnly: opts.quoteOnly,
+    });
+});
 walletCmd
     .command("sign")
     .description("Sign messages, typed data, or transactions")
@@ -268,6 +292,7 @@ walletSubmitCmd
     });
 });
 // Agent commands (agentic operations that use LLM)
+program.commandsGroup("Agent");
 const agentCmd = program
     .command("agent [text...]")
     .description("AI agent commands (prompt, status, cancel, profile, skills)")
@@ -278,10 +303,14 @@ const agentCmd = program
     opts.model ?? (opts.model = cmd.parent?.opts()?.model);
     const joined = text.join(" ").trim();
     if (!joined) {
+        if (output.isNonInteractive()) {
+            output.error('No prompt provided. Pass it as an argument: bankr agent "your prompt"');
+            process.exit(1);
+        }
         agentCmd.help();
         return;
     }
-    await promptCommand(joined || (await readPromptInput()), opts);
+    await promptCommand(joined, opts);
 });
 agentCmd
     .command("prompt [text...]")
@@ -308,16 +337,21 @@ agentCmd
     .command("skills")
     .description("Show all Bankr AI agent skills with examples")
     .action(skillsCommand);
+program.commandsGroup("Tokens");
 program
     .command("launch")
     .description("Launch a token on Base (interactive wizard)")
+    .optionsGroup("Token")
     .option("--name <name>", "Token name")
     .option("--symbol <symbol>", "Token symbol (default: auto-generated from name)")
     .option("--image <url>", "Token image URL")
+    .optionsGroup("Links")
     .option("--tweet <url>", "Associated tweet URL")
     .option("--website <url>", "Project website URL")
+    .optionsGroup("Fees")
     .option("--fee <recipient>", "Fee recipient (username, ENS, or address)")
     .option("--fee-type <type>", "Fee recipient type: x, farcaster, ens, wallet (default: x)")
+    .optionsGroup("")
     .option("-y, --yes", "Skip confirmation prompt")
     .option("--simulate", "Simulate the deploy without broadcasting a transaction")
     .action(async (opts) => {
@@ -333,6 +367,7 @@ program
         simulate: opts.simulate,
     });
 });
+program.commandsGroup("Tokens");
 const feesCmd = program
     .command("fees [address]")
     .description("View and claim creator token fee earnings")
@@ -416,6 +451,7 @@ profileCmd
         json: opts.json,
     });
 });
+program.commandsGroup("LLM");
 const llmCmd = program
     .command("llm")
     .description("LLM Gateway tools")
@@ -487,6 +523,7 @@ llmCmd
     await opencodeCommand(args);
 });
 // Token search and info
+program.commandsGroup("Tokens");
 const tokensCmd = program
     .command("tokens")
     .description("Token search and info")
@@ -507,62 +544,7 @@ tokensCmd
     .action(async (address, opts) => {
     await tokensInfoCommand(address, opts);
 });
-// ── Utility commands ────────────────────────────────────────────────────
-const configCmd = program
-    .command("config")
-    .description("Manage CLI configuration");
-configCmd
-    .command("get [key]")
-    .description("Get config value(s). Keys: apiKey, apiUrl, llmKey, llmUrl")
-    .action(configGetCommand);
-configCmd
-    .command("set <key> <value>")
-    .description("Set a config value. Keys: apiKey, apiUrl, llmKey, llmUrl")
-    .action(configSetCommand);
-const soundsCmd = program
-    .command("sounds")
-    .description("Manage CESP sound packs")
-    .action(soundsStatusCommand);
-soundsCmd
-    .command("enable")
-    .description("Enable sounds")
-    .action(soundsEnableCommand);
-soundsCmd
-    .command("disable")
-    .description("Disable sounds")
-    .action(soundsDisableCommand);
-soundsCmd
-    .command("install <pack>")
-    .description("Install a sound pack from the CESP registry")
-    .action(soundsInstallCommand);
-soundsCmd
-    .command("search [query]")
-    .description("Search available packs in the CESP registry")
-    .action(soundsSearchCommand);
-soundsCmd
-    .command("list")
-    .description("List installed sound packs")
-    .action(soundsListCommand);
-soundsCmd
-    .command("use <pack>")
-    .description("Set active sound pack")
-    .action(soundsUseCommand);
-soundsCmd
-    .command("volume [level]")
-    .description("Get or set volume (0.0-1.0)")
-    .action(soundsVolumeCommand);
-soundsCmd
-    .command("mute")
-    .description("Mute all sounds")
-    .action(soundsMuteCommand);
-soundsCmd
-    .command("unmute")
-    .description("Unmute sounds")
-    .action(soundsUnmuteCommand);
-soundsCmd
-    .command("test [category]")
-    .description("Play a test sound")
-    .action(soundsTestCommand);
+program.commandsGroup("Account");
 program
     .command("logout")
     .description("Clear stored credentials")
@@ -736,14 +718,8 @@ submitAliasCmd
         description: opts.description,
     });
 });
-program
-    .command("update")
-    .description("Update the Bankr CLI to the latest version")
-    .option("--check", "Check for updates without installing")
-    .action(async (opts) => {
-    await updateCommand({ check: opts.check });
-});
 // ── File Storage ────────────────────────────────────────────────────────
+program.commandsGroup("Protocol");
 const filesCmd = program
     .command("files")
     .description("Manage your file storage")
@@ -814,6 +790,7 @@ filesCmd
     .description("Show file metadata")
     .action(filesInfoCommand);
 // ── Bankr Club ────────────────────────────────────────────────────────
+program.commandsGroup("Account");
 const clubCmd = program
     .command("club")
     .description("View Bankr Club membership, sign up, or cancel")
@@ -824,8 +801,9 @@ clubCmd
     .action(clubStatusCommand);
 clubCmd
     .command("signup")
-    .description("Sign up for Bankr Club (pays in $BNKR from your wallet)")
+    .description("Sign up for Bankr Club (default: USDC; --token BNKR | ETH | <0x...>)")
     .option("--yearly", "Subscribe yearly instead of monthly")
+    .option("--token <symbolOrAddress>", "Payment token: USDC (default), BNKR, ETH, or a 0x... Base address")
     .option("-y, --yes", "Skip confirmation prompt")
     .action(clubSignupCommand);
 clubCmd
@@ -834,6 +812,7 @@ clubCmd
     .option("-y, --yes", "Skip confirmation prompt")
     .action(clubCancelCommand);
 // ── x402 Endpoint Hosting ─────────────────────────────────────────────
+program.commandsGroup("Protocol");
 const x402Cmd = program
     .command("x402")
     .description("Deploy and manage x402 paid API endpoints");
@@ -889,6 +868,7 @@ x402EnvCmd
     .description("Remove an env var")
     .action(x402EnvUnsetCommand);
 // ── User Webhooks ─────────────────────────────────────────────────────
+program.commandsGroup("Protocol");
 const webhooksCmd = program
     .command("webhooks")
     .description("Deploy and manage user webhooks that trigger the Bankr agent on external events");
@@ -960,6 +940,70 @@ x402Cmd
     .option("-y, --yes", "Skip payment confirmation")
     .option("--raw", "Output raw JSON (unformatted)")
     .action(async (url, opts) => x402CallCommand(url, opts));
+// ── Settings ────────────────────────────────────────────────────────────
+program.commandsGroup("Settings");
+const configCmd = program
+    .command("config")
+    .description("Manage CLI configuration");
+configCmd
+    .command("get [key]")
+    .description("Get config value(s). Keys: apiKey, apiUrl, llmKey, llmUrl")
+    .action(configGetCommand);
+configCmd
+    .command("set <key> <value>")
+    .description("Set a config value. Keys: apiKey, apiUrl, llmKey, llmUrl")
+    .action(configSetCommand);
+const soundsCmd = program
+    .command("sounds")
+    .description("Manage CESP sound packs")
+    .action(soundsStatusCommand);
+soundsCmd
+    .command("enable")
+    .description("Enable sounds")
+    .action(soundsEnableCommand);
+soundsCmd
+    .command("disable")
+    .description("Disable sounds")
+    .action(soundsDisableCommand);
+soundsCmd
+    .command("install <pack>")
+    .description("Install a sound pack from the CESP registry")
+    .action(soundsInstallCommand);
+soundsCmd
+    .command("search [query]")
+    .description("Search available packs in the CESP registry")
+    .action(soundsSearchCommand);
+soundsCmd
+    .command("list")
+    .description("List installed sound packs")
+    .action(soundsListCommand);
+soundsCmd
+    .command("use <pack>")
+    .description("Set active sound pack")
+    .action(soundsUseCommand);
+soundsCmd
+    .command("volume [level]")
+    .description("Get or set volume (0.0-1.0)")
+    .action(soundsVolumeCommand);
+soundsCmd
+    .command("mute")
+    .description("Mute all sounds")
+    .action(soundsMuteCommand);
+soundsCmd
+    .command("unmute")
+    .description("Unmute sounds")
+    .action(soundsUnmuteCommand);
+soundsCmd
+    .command("test [category]")
+    .description("Play a test sound")
+    .action(soundsTestCommand);
+program
+    .command("update")
+    .description("Update the Bankr CLI to the latest version")
+    .option("--check", "Check for updates without installing")
+    .action(async (opts) => {
+    await updateCommand({ check: opts.check });
+});
 // Default: treat unrecognized arguments as a prompt
 program
     .arguments("[text...]")
@@ -968,6 +1012,10 @@ program
     .option("-m, --model <model>", "Use Max Mode with a specific model (e.g. claude-opus-4.6)")
     .action(async (text, opts) => {
     if (text.length === 0) {
+        if (output.isNonInteractive()) {
+            output.error('No prompt provided. Pass it as an argument: bankr "your prompt"');
+            process.exit(1);
+        }
         program.help();
         return;
     }

package/dist/commands/club.d.ts

@@ -2,6 +2,7 @@ export declare function clubStatusCommand(): Promise<void>;
 export declare function clubSignupCommand(opts: {
     yearly?: boolean;
     yes?: boolean;
+    token?: string;
 }): Promise<void>;
 export declare function clubCancelCommand(opts: {
     yes?: boolean;

package/dist/commands/club.js

@@ -8,6 +8,33 @@ function authHeaders() {
         "User-Agent": CLI_USER_AGENT,
     };
 }
+// Common Base tokens accepted as `--token` shortcuts. Lowercase to bypass
+// viem's strict EIP-55 checksum on the API's isAddress() check; the route
+// resolves to lowercase server-side anyway. Inlined here (not imported
+// from the monorepo) because @bankr/cli is published standalone.
+const TOKEN_ALIASES = {
+    USDC: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+    BNKR: "0x22af33fe49fd1fa80c7149773dde5890d3c76f3b",
+    // Native-asset sentinel address used by 0x and most aggregators.
+    ETH: "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+};
+const ADDRESS_RE = /^0x[a-fA-F0-9]{40}$/;
+/**
+ * Resolve a user-supplied `--token` value to a Base ERC-20 address.
+ * Accepts a known symbol (USDC | BNKR | ETH, case-insensitive) or any
+ * 0x-prefixed 40-char address. Returns null for invalid input.
+ */
+function resolvePaymentToken(input) {
+    if (!input)
+        return null;
+    const normalized = input.trim();
+    const upper = normalized.toUpperCase();
+    if (TOKEN_ALIASES[upper])
+        return TOKEN_ALIASES[upper];
+    if (ADDRESS_RE.test(normalized))
+        return normalized;
+    return null;
+}
 async function fetchStatus() {
     const res = await fetch(`${getApiUrl()}/bankr-club/`, {
         headers: authHeaders(),
@@ -63,8 +90,20 @@ export async function clubSignupCommand(opts) {
             output.warn("You already have an active Bankr Club subscription.");
             return;
         }
+        let tokenAddress;
+        if (opts.token) {
+            const resolved = resolvePaymentToken(opts.token);
+            if (!resolved) {
+                output.error(`Unknown token "${opts.token}". Use one of USDC, BNKR, ETH, or pass a 0x-prefixed Base address.`);
+                process.exit(1);
+            }
+            tokenAddress = resolved;
+        }
         const yearly = !!opts.yearly;
-        const quoteRes = await fetch(`${getApiUrl()}/bankr-club/quote?yearly=${yearly}`, { headers: authHeaders() });
+        // Reused for /quote and /sign-up so both endpoints agree on the token.
+        // The API rejects sign-up with `quote-token-mismatch` if they diverge.
+        const tokenParam = tokenAddress ? `&token=${tokenAddress}` : "";
+        const quoteRes = await fetch(`${getApiUrl()}/bankr-club/quote?yearly=${yearly}${tokenParam}`, { headers: authHeaders() });
         if (!quoteRes.ok) {
             const body = await quoteRes
                 .json()
@@ -72,13 +111,15 @@ export async function clubSignupCommand(opts) {
             throw new Error(body.error || quoteRes.statusText);
         }
         const quote = (await quoteRes.json());
+        const symbol = quote.tokenSymbol ?? "USDC";
         output.label("Plan", yearly ? "Yearly" : "Monthly");
-        output.label("Price", `${output.formatUsd(quote.usdPrice)} (in $BNKR)`);
-        output.label("Cost", `${quote.priceInBankr} BNKR`);
+        output.label("Price", `${output.formatUsd(quote.usdPrice)} (in ${symbol})`);
+        output.label("Cost", `${quote.priceInToken} ${symbol}`);
         output.dim(`Quote expires ${new Date(quote.expiresAt * 1000).toLocaleString()}.`);
         output.blank();
-        output.dim("Payment is deducted from the $BNKR balance in your Bankr wallet.");
+        output.dim(`Payment is deducted from your ${symbol} balance in your Bankr wallet.`);
         const ok = opts.yes ||
+            output.isNonInteractive() ||
             (await confirm({
                 message: "Confirm subscription?",
                 default: false,
@@ -89,7 +130,7 @@ export async function clubSignupCommand(opts) {
             return;
         }
         const spinner = output.spinner("Signing up for Bankr Club...");
-        const signUpRes = await fetch(`${getApiUrl()}/bankr-club/sign-up?yearly=${yearly}`, { headers: authHeaders() });
+        const signUpRes = await fetch(`${getApiUrl()}/bankr-club/sign-up?yearly=${yearly}${tokenParam}`, { headers: authHeaders() });
         spinner.stop();
         if (!signUpRes.ok) {
             const body = await signUpRes
@@ -121,6 +162,7 @@ export async function clubCancelCommand(opts) {
             return;
         }
         const ok = opts.yes ||
+            output.isNonInteractive() ||
             (await confirm({
                 message: "Cancel Bankr Club? You'll keep access until the current billing period ends.",
                 default: false,

package/dist/commands/fees.js

@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import { confirm, password, checkbox } from "@inquirer/prompts";
 import { isAddress } from "viem";
-import { getCreatorFees, getBeneficiaryFeesStreaming, getTokenCreatorFees, getUserInfo, buildDopplerClaimTx, submit, } from "../lib/api.js";
+import { getCreatorFees, getBeneficiaryFeesStreaming, getTokenCreatorFees, getUserInfo, claimTokenLaunchFees, } from "../lib/api.js";
 import { emitCESP } from "../lib/cesp/engine.js";
 import { requireApiKey } from "../lib/config.js";
 import * as output from "../lib/output.js";
@@ -385,28 +385,14 @@ export async function feesCommand(address, opts) {
 }
 export async function feesClaimCommand(tokenAddress, opts) {
     requireApiKey();
-    // Step 1: Build claim transaction
-    const buildSpin = output.spinner("Building claim transaction...");
-    let claimTx;
-    try {
-        claimTx = await buildDopplerClaimTx(tokenAddress);
-        buildSpin.succeed(claimTx.description);
-    }
-    catch (err) {
-        buildSpin.fail("Failed to build claim transaction");
-        emitCESP("task.error");
-        output.error(err.message);
-        process.exit(1);
-    }
-    // Step 2: Confirm
-    if (!opts.yes) {
+    // Confirm — we send one request that builds, signs, and broadcasts.
+    if (!opts.yes && !output.isNonInteractive()) {
         console.log();
-        output.keyValue("To", claimTx.to);
-        output.keyValue("Chain ID", String(claimTx.chainId));
-        output.keyValue("Action", claimTx.description);
+        output.keyValue("Token", tokenAddress);
+        output.keyValue("Action", "Claim trading fees");
         console.log();
         const proceed = await confirm({
-            message: "Submit this claim transaction?",
+            message: "Submit claim transaction?",
             default: true,
             theme: output.bankrTheme,
         });
@@ -415,43 +401,43 @@ export async function feesClaimCommand(tokenAddress, opts) {
             return;
         }
     }
-    // Step 3: Submit via /agent/submit
-    const submitSpin = output.spinner("Submitting claim transaction...");
+    const spin = output.spinner("Claiming fees...");
     const startTime = Date.now();
     try {
-        const result = await submit({
-            transaction: {
-                to: claimTx.to,
-                chainId: claimTx.chainId,
-                data: claimTx.data,
-            },
-            description: claimTx.description,
-            waitForConfirmation: true,
-        });
+        const result = await claimTokenLaunchFees(tokenAddress);
         const elapsed = output.formatDuration(Date.now() - startTime);
-        if (result.success) {
-            submitSpin.succeed(`Fees claimed in ${elapsed}`);
+        const ok = result.status === "success";
+        if (ok) {
+            spin.succeed(`Fees claimed in ${elapsed}`);
             emitCESP("task.complete");
-            console.log();
-            if (result.transactionHash) {
-                output.keyValue("Transaction", result.transactionHash);
-            }
-            if (result.status) {
-                output.keyValue("Status", output.formatStatus(result.status === "success" ? "completed" : result.status));
-            }
-            output.keyValue("Signer", result.signer);
-            console.log();
-            output.dim(`View on Basescan: https://basescan.org/tx/${result.transactionHash}`);
         }
         else {
-            submitSpin.fail(`Claim failed after ${elapsed}`);
+            spin.fail(`Claim failed after ${elapsed}`);
             emitCESP("task.error");
-            output.error(result.error || "Transaction failed");
+        }
+        console.log();
+        if (result.description) {
+            output.keyValue("Action", result.description);
+        }
+        if (result.transactionHash) {
+            output.keyValue("Transaction", result.transactionHash);
+        }
+        if (result.status) {
+            output.keyValue("Status", output.formatStatus(result.status === "success" ? "completed" : result.status));
+        }
+        if (result.signer) {
+            output.keyValue("Signer", result.signer);
+        }
+        console.log();
+        if (result.transactionHash) {
+            output.dim(`View on Basescan: https://basescan.org/tx/${result.transactionHash}`);
+        }
+        if (!ok) {
             process.exit(1);
         }
     }
     catch (err) {
-        submitSpin.fail("Claim submission failed");
+        spin.fail("Claim submission failed");
         emitCESP("task.error");
         output.error(err.message);
         process.exit(1);
@@ -466,6 +452,10 @@ export async function feesClaimWalletCommand(address, opts) {
     if (address && !isAddress(address)) {
         address = undefined;
     }
+    if (output.isNonInteractive() && !opts.all) {
+        output.error("Use --all to select all tokens in non-interactive mode, or run interactively to choose");
+        process.exit(1);
+    }
     // Load .env from cwd if present (no dependency needed)
     try {
         const { readFileSync, existsSync } = await import("node:fs");
@@ -506,6 +496,10 @@ export async function feesClaimWalletCommand(address, opts) {
         process.exit(1);
     }
     else {
+        if (output.isNonInteractive()) {
+            output.error("Private key required in non-interactive mode. Use --private-key or set BANKR_PRIVATE_KEY");
+            process.exit(1);
+        }
         privateKey = await password({
             message: "Enter private key for this wallet (0x...):",
             mask: "*",
@@ -694,7 +688,7 @@ export async function feesClaimWalletCommand(address, opts) {
         console.log(`  ${DIM("To:")} ${tx.to}  ${DIM("Gas:")} ~${gasCostEth.toFixed(6)} ETH`);
         console.log();
     }
-    if (!opts.yes) {
+    if (!opts.yes && !output.isNonInteractive()) {
         const proceed = await confirm({
             message: `Submit ${readyTxs.length} claim transaction${readyTxs.length !== 1 ? "s" : ""}?`,
             default: true,