@bankr/cli 0.3.13 → 0.3.32

package/README.md

@@ -73,6 +73,12 @@ bankr agent -c "compare them"
 
 # Continue a specific thread
 bankr agent --thread thr_ABC123 "tell me more"
+
+# Max Mode: pick the model. Only the two newest releases of each line, and
+# only frontier / flagship / balanced lines, are accepted (the same set the
+# web picker shows); anything else is rejected and the error lists every
+# valid id.
+bankr agent --model claude-opus-5 "audit this contract"
 ```
 
 ### Token Launch
@@ -108,26 +114,44 @@ bankr agent cancel job_ABC123DEF456
 Launch Claude Code / OpenCode routed through the Bankr gateway:
 
 ```bash
-# Claude Code (auto-translates dotted model IDs to the Anthropic wire format)
-bankr llm claude --model claude-opus-4-8
+# Claude Code — `bankr claude` is a top-level alias for `bankr llm claude`
+# (auto-translates dotted model IDs to the Anthropic wire format)
+bankr claude --model claude-opus-5
+
+# Or use dotted form — bankr claude rewrites it to claude-opus-4-8
+bankr claude --model claude-opus-4.8
 
-# Or use dotted form — bankr llm claude rewrites it to claude-opus-4-8
-bankr llm claude --model claude-opus-4.8
+# The [1m] suffix is optional via the gateway, but MUST be quoted if used
+# (zsh reads [1m] as a glob)
+bankr claude --model "claude-opus-5[1m]"
 
 # OpenCode (use the bankr/ prefix with the gateway-canonical dotted form)
 bankr llm opencode -m bankr/claude-opus-4.8
 ```
 
-**Claude Code model format**: Claude Code's `--model` flag expects
-Anthropic-style dashed IDs (`claude-opus-4-8`, `claude-sonnet-4-6`,
-`claude-haiku-4-5`). If you pass the gateway-canonical dotted form
-(`claude-opus-4.8`), Claude Code silently falls back to its default —
-the flag appears honored but the real request is a different model.
+Because `claude` is a command, it shadows the default prompt fallthrough:
+`bankr claude ...` launches Claude Code rather than prompting the agent. Use
+`bankr agent "..."` to send the agent a prompt starting with that word.
 
-`bankr llm claude` translates dotted → dashed for you. If you use older
+**Claude Code model format**: Claude Code's `--model` flag expects Anthropic
+wire IDs, which use dashes rather than dots in the version (`claude-opus-5`,
+`claude-sonnet-5`, `claude-opus-4-8`, `claude-haiku-4-5`). If you pass the
+gateway-canonical dotted form (`claude-opus-4.8`), Claude Code silently falls
+back to its default — the flag appears honored but the real request is a
+different model.
+
+`bankr claude` translates dotted → dashed for you. If you use older
 versions of the CLI (or invoke `claude` directly via `ANTHROPIC_BASE_URL`),
 pass the dashed form explicitly.
 
+**1M context tier**: the gateway strips Claude Code's `[1m]` suffix and enables
+the 1M beta from the model's own context window, so it's **optional here** —
+`claude-opus-5` and `claude-opus-5[1m]` send an identical upstream request. If
+you do use it, **quote it**: in zsh (the macOS default) `[1m]` is a glob
+character class, so an unquoted id aborts with `zsh: no matches found:
+claude-opus-5[1m]` before the CLI ever runs. Bash passes it through literally,
+so the same command can work on one machine and fail on another.
+
 ### Configuration
 
 ```bash

package/dist/cli.js

@@ -10,6 +10,8 @@ import { skillsCommand } from "./commands/capabilities.js";
 import { cancelCommand } from "./commands/cancel.js";
 import { configGetCommand, configSetCommand } from "./commands/config.js";
 import { setConfigPath } from "./lib/config.js";
+import { getErrorMessage } from "./lib/errors.js";
+import { passthroughArgs } from "./lib/passthrough.js";
 import { claudeCommand, creditsCommand, creditsAddCommand, creditsAutoCommand, modelsCommand, opencodeCommand, setupClaudeCodeCommand, setupCursorCommand, setupOpenclawCommand, setupOpenCodeCommand, } from "./commands/llm.js";
 import { feesCommand, feesClaimCommand, feesClaimWalletCommand, } from "./commands/fees.js";
 import { launchCommand } from "./commands/launch.js";
@@ -44,14 +46,12 @@ async function readPromptInput() {
         }
         const text = Buffer.concat(chunks).toString().trim();
         if (!text) {
-            output.error("No input received from stdin");
-            process.exit(1);
+            output.fatal("No input received from stdin");
         }
         return text;
     }
     if (output.isNonInteractive()) {
-        output.error('No prompt provided. Pass it as an argument: bankr agent "your prompt"');
-        process.exit(1);
+        output.fatal('No prompt provided. Pass it as an argument: bankr agent "your prompt"');
     }
     // Interactive input — shell expansion does not apply here
     const text = await input({
@@ -304,8 +304,7 @@ const agentCmd = program
     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);
+            output.fatal('No prompt provided. Pass it as an argument: bankr agent "your prompt"');
         }
         agentCmd.help();
         return;
@@ -340,18 +339,20 @@ agentCmd
 program.commandsGroup("Tokens");
 program
     .command("launch")
-    .description("Launch a token on Base or Robinhood Chain (interactive wizard)")
+    .description("Launch a token on Base, Robinhood Chain or Arbitrum (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")
-    .option("--chain <chain>", "Chain to launch on: base, robinhood (default: base)")
+    .option("--chain <chain>", "Chain to launch on: base, robinhood, arbitrum (default: base)")
+    .option("--no-vesting", "Turn off the default 15% creator vesting (sell 100% of supply into the pool)")
     .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)")
+    .option("--quote-only-fees", "Collect all creator fees in the pool's quote token (e.g. WETH) instead of a mix of your token and the quote token")
     .optionsGroup("")
     .option("-y, --yes", "Skip confirmation prompt")
     .option("--simulate", "Simulate the deploy without broadcasting a transaction")
@@ -361,10 +362,12 @@ program
         symbol: opts.symbol,
         image: opts.image,
         chain: opts.chain,
+        vesting: opts.vesting,
         tweet: opts.tweet,
         website: opts.website,
         fee: opts.fee,
         feeType: opts.feeType,
+        quoteOnlyFees: opts.quoteOnlyFees,
         yes: opts.yes,
         simulate: opts.simulate,
     });
@@ -471,6 +474,7 @@ llmCmd
     .command("models")
     .description("List available models")
     .option("--private", "Show only models that support private (:private) inference")
+    .option("--zdr", "Show only models that support zero data retention (:zdr)")
     .action(modelsCommand);
 const llmCreditsCmd = llmCmd
     .command("credits")
@@ -498,6 +502,7 @@ llmSetupCmd
     .command("openclaw")
     .description("OpenClaw config")
     .option("--install", "Write config to ~/.openclaw/openclaw.json")
+    .option("--images", "Also route image generation (gpt-image-2) through the gateway — takes over OpenClaw's 'openai' provider slot")
     .action(setupOpenclawCommand);
 llmSetupCmd
     .command("opencode")
@@ -512,25 +517,38 @@ llmSetupCmd
     .command("claude")
     .description("Claude Code config")
     .action(setupClaudeCodeCommand);
+// `helpOption(false)` forwards `-h`/`--help` to the spawned tool instead of
+// letting commander print ours — on a pure passthrough launcher the user
+// almost always wants the tool's help. Use `bankr llm --help` for ours.
 llmCmd
     .command("claude")
     .description("Run Claude Code via gateway")
     .allowUnknownOption()
     .allowExcessArguments()
+    .helpOption(false)
     .action(async () => {
-    const idx = process.argv.indexOf("claude");
-    const args = idx >= 0 ? process.argv.slice(idx + 1) : [];
-    await claudeCommand(args);
+    await claudeCommand(passthroughArgs("claude"));
 });
 llmCmd
     .command("opencode")
     .description("Run OpenCode via gateway")
     .allowUnknownOption()
     .allowExcessArguments()
+    .helpOption(false)
     .action(async () => {
-    const idx = process.argv.indexOf("opencode");
-    const args = idx >= 0 ? process.argv.slice(idx + 1) : [];
-    await opencodeCommand(args);
+    await opencodeCommand(passthroughArgs("opencode"));
+});
+// Top-level shorthand for the most-used launcher. This shadows the default
+// prompt fallthrough, so `bankr claude ...` launches Claude Code rather than
+// prompting the agent about Claude — ask the agent via `bankr agent "..."`.
+program
+    .command("claude")
+    .description("Run Claude Code via gateway (alias for `bankr llm claude`)")
+    .allowUnknownOption()
+    .allowExcessArguments()
+    .helpOption(false)
+    .action(async () => {
+    await claudeCommand(passthroughArgs("claude"));
 });
 // Token search and info
 program.commandsGroup("Tokens");
@@ -1030,8 +1048,7 @@ program
     .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);
+            output.fatal('No prompt provided. Pass it as an argument: bankr "your prompt"');
         }
         program.help();
         return;
@@ -1048,8 +1065,7 @@ async function main() {
             console.log();
             process.exit(0);
         }
-        output.error(err.message);
-        process.exit(1);
+        output.fatal(getErrorMessage(err));
     }
     await checkForUpdate(pkg.version);
 }

package/dist/commands/balances.js

@@ -2,6 +2,7 @@ import chalk from "chalk";
 import { getBalances, } 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;
@@ -42,8 +43,7 @@ export async function balancesCommand(opts) {
     if (chains) {
         const invalid = chains.filter((c) => !VALID_CHAINS.has(c));
         if (invalid.length > 0) {
-            output.error(`Invalid chain${invalid.length > 1 ? "s" : ""}: ${invalid.join(", ")}. Valid chains: ${[...VALID_CHAINS].join(", ")}`);
-            process.exit(1);
+            output.fatal(`Invalid chain${invalid.length > 1 ? "s" : ""}: ${invalid.join(", ")}. Valid chains: ${[...VALID_CHAINS].join(", ")}`);
         }
     }
     const spin = output.spinner("Fetching balances...");
@@ -53,7 +53,7 @@ export async function balancesCommand(opts) {
         spin.succeed("Balances loaded");
     }
     catch (err) {
-        spin.fail(`Failed to fetch balances: ${err.message}`);
+        spin.fail(`Failed to fetch balances: ${getErrorMessage(err)}`);
         process.exit(1);
     }
     // JSON output mode

package/dist/commands/cancel.js

@@ -17,9 +17,7 @@ export async function cancelCommand(jobId) {
         }
     }
     catch (err) {
-        spin.fail("Failed to cancel job");
-        output.error(err.message);
-        process.exit(1);
+        output.failWith(spin, "Failed to cancel job", err);
     }
 }
 //# sourceMappingURL=cancel.js.map

package/dist/commands/club.js

@@ -1,14 +1,8 @@
 import { confirm } from "@inquirer/prompts";
-import { CLI_USER_AGENT, getApiUrl, requireApiKey } from "../lib/config.js";
+import { getApiUrl } from "../lib/config.js";
+import { authHeaders } from "../lib/api.js";
 import * as output from "../lib/output.js";
 import { getErrorMessage } from "../lib/errors.js";
-function authHeaders() {
-    return {
-        "X-API-Key": requireApiKey(),
-        "Content-Type": "application/json",
-        "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
@@ -79,8 +73,7 @@ export async function clubStatusCommand() {
     }
     catch (err) {
         spinner.stop();
-        output.error(getErrorMessage(err));
-        process.exit(1);
+        output.fatal(getErrorMessage(err));
     }
 }
 // ── Sign up ─────────────────────────────────────────────────────────────
@@ -95,8 +88,7 @@ export async function clubSignupCommand(opts) {
         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);
+                output.fatal(`Unknown token "${opts.token}". Use one of USDC, BNKR, ETH, or pass a 0x-prefixed Base address.`);
             }
             tokenAddress = resolved;
         }
@@ -143,8 +135,7 @@ export async function clubSignupCommand(opts) {
         output.dim("Run `bankr club` to see your status.");
     }
     catch (err) {
-        output.error(getErrorMessage(err));
-        process.exit(1);
+        output.fatal(getErrorMessage(err));
     }
 }
 // ── Cancel ──────────────────────────────────────────────────────────────
@@ -187,8 +178,7 @@ export async function clubCancelCommand(opts) {
         output.dim("You'll keep Bankr Club access until the end of the current billing period.");
     }
     catch (err) {
-        output.error(getErrorMessage(err));
-        process.exit(1);
+        output.fatal(getErrorMessage(err));
     }
 }
 //# sourceMappingURL=club.js.map

package/dist/commands/config.js

@@ -12,8 +12,7 @@ function isValidKey(key) {
 }
 function requireValidKey(key) {
     if (!isValidKey(key)) {
-        output.error(`Unknown config key "${key}". Valid keys: ${ALLOWED_KEYS.join(", ")}`);
-        process.exit(1);
+        output.fatal(`Unknown config key "${key}". Valid keys: ${ALLOWED_KEYS.join(", ")}`);
     }
 }
 function displayValue(key, value) {

package/dist/commands/fees.js

@@ -6,6 +6,7 @@ import { emitCESP } from "../lib/cesp/engine.js";
 import { requireApiKey } from "../lib/config.js";
 import { txExplorer } from "../lib/explorer.js";
 import * as output from "../lib/output.js";
+import { getErrorMessage } from "../lib/errors.js";
 // ---------------------------------------------------------------------------
 // Constants
 // ---------------------------------------------------------------------------
@@ -214,8 +215,13 @@ function renderDashboard(data) {
     }
     console.log(`${DIM(`  Wallet: ${data.address}`)}`);
     // Tokens can span launch chains ("chain" absent on pre-multichain rows).
+    const launchChainLabel = {
+        base: "Base",
+        robinhood: "Robinhood",
+        arbitrum: "Arbitrum",
+    };
     const chainNames = [
-        ...new Set(data.tokens.map((t) => (t.chain ?? "base") === "robinhood" ? "Robinhood" : "Base")),
+        ...new Set(data.tokens.map((t) => launchChainLabel[t.chain ?? "base"] ?? "Base")),
     ].join(" + ") || "Base";
     console.log(`${DIM(`  Chain:  ${chainNames} \u00b7 Tokens: ${data.tokens.length} \u00b7 Period: ${data.days} days`)}`);
     if (data.tokens.length === 0) {
@@ -283,28 +289,33 @@ function renderDashboard(data) {
     console.log(`  ${BRAND_BOLD("\u2550".repeat(62))}`);
     console.log("");
     for (const token of data.tokens) {
-        const wethIsToken0 = token.token0Label === "WETH";
-        const claimableWeth = wethIsToken0
-            ? token.claimable.token0
-            : token.claimable.token1;
-        const claimableToken = wethIsToken0
+        // Numeraire leg = the side whose label differs from the launched token's
+        // symbol \u2014 stock-paired launches label it with the stock ticker, not WETH.
+        const tokenIsToken0 = token.token0Label === token.symbol;
+        const numeraireLabel = tokenIsToken0
+            ? token.token1Label
+            : token.token0Label;
+        const claimableNumeraire = tokenIsToken0
             ? token.claimable.token1
             : token.claimable.token0;
-        const claimedWeth = wethIsToken0
-            ? token.claimed.token0
-            : token.claimed.token1;
-        const claimedToken = wethIsToken0
+        const claimableToken = tokenIsToken0
+            ? token.claimable.token0
+            : token.claimable.token1;
+        const claimedNumeraire = tokenIsToken0
             ? token.claimed.token1
             : token.claimed.token0;
-        const tokenSymbol = wethIsToken0 ? token.token1Label : token.token0Label;
+        const claimedToken = tokenIsToken0
+            ? token.claimed.token0
+            : token.claimed.token1;
+        const tokenSymbol = tokenIsToken0 ? token.token0Label : token.token1Label;
         const sourceLabel = token.source === "clanker" ? DIM(" [Clanker]") : DIM(" [Doppler]");
         console.log(`  ${BOLD(WHITE(token.name))} ${DIM("($" + token.symbol + ")")}${sourceLabel}`);
         const shareInfo = token.source === "clanker"
             ? `${DIM("Creator")} ${DIM("\u00b7 Token:")} ${DIM(token.tokenAddress)}`
             : `${DIM("Share:")} ${token.share} ${DIM("\u00b7 Token:")} ${DIM(token.tokenAddress)}`;
         console.log(`  ${shareInfo}`);
-        console.log(`  ${DIM("Claimable:")}  ${BRIGHT_GREEN(claimableWeth.padStart(12))} WETH  ${DIM("|")}  ${BRIGHT_GREEN(claimableToken.padStart(18))} ${tokenSymbol}`);
-        console.log(`  ${DIM("Claimed:")}    ${WHITE(claimedWeth.padStart(12))} WETH  ${DIM("|")}  ${WHITE(claimedToken.padStart(18))} ${tokenSymbol}  ${DIM(`(${token.claimed.count} claims)`)}`);
+        console.log(`  ${DIM("Claimable:")}  ${BRIGHT_GREEN(claimableNumeraire.padStart(12))} ${numeraireLabel}  ${DIM("|")}  ${BRIGHT_GREEN(claimableToken.padStart(18))} ${tokenSymbol}`);
+        console.log(`  ${DIM("Claimed:")}    ${WHITE(claimedNumeraire.padStart(12))} ${numeraireLabel}  ${DIM("|")}  ${WHITE(claimedToken.padStart(18))} ${tokenSymbol}  ${DIM(`(${token.claimed.count} claims)`)}`);
         console.log("");
     }
     console.log(`  ${BRAND_BOLD("\u2550".repeat(62))}`);
@@ -323,8 +334,7 @@ export async function feesCommand(address, opts) {
     if (opts.days) {
         days = parseInt(opts.days, 10);
         if (isNaN(days) || days < MIN_DAYS || days > MAX_DAYS) {
-            output.error(`Days must be between ${MIN_DAYS} and ${MAX_DAYS}`);
-            process.exit(1);
+            output.fatal(`Days must be between ${MIN_DAYS} and ${MAX_DAYS}`);
         }
     }
     // --token flag: look up fees by token address (no wallet needed)
@@ -343,8 +353,7 @@ export async function feesCommand(address, opts) {
         catch (err) {
             spin.fail("Failed to fetch token fee data");
             emitCESP("task.error");
-            output.error(err.message);
-            process.exit(1);
+            output.fatal(getErrorMessage(err));
         }
         return;
     }
@@ -364,9 +373,7 @@ export async function feesCommand(address, opts) {
             spin.succeed(`Wallet: ${walletAddress}`);
         }
         catch (err) {
-            spin.fail("Failed to fetch wallet info");
-            output.error(err.message);
-            process.exit(1);
+            output.failWith(spin, "Failed to fetch wallet info", err);
         }
     }
     // Fetch data
@@ -384,8 +391,7 @@ export async function feesCommand(address, opts) {
     catch (err) {
         spin.fail("Failed to fetch fee data");
         emitCESP("task.error");
-        output.error(err.message);
-        process.exit(1);
+        output.fatal(getErrorMessage(err));
     }
 }
 export async function feesClaimCommand(tokenAddress, opts) {
@@ -445,8 +451,7 @@ export async function feesClaimCommand(tokenAddress, opts) {
     catch (err) {
         spin.fail("Claim submission failed");
         emitCESP("task.error");
-        output.error(err.message);
-        process.exit(1);
+        output.fatal(getErrorMessage(err));
     }
 }
 // ---------------------------------------------------------------------------
@@ -459,8 +464,7 @@ export async function feesClaimWalletCommand(address, opts) {
         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);
+        output.fatal("Use --all to select all tokens in non-interactive mode, or run interactively to choose");
     }
     // Load .env from cwd if present (no dependency needed)
     try {
@@ -498,13 +502,11 @@ export async function feesClaimWalletCommand(address, opts) {
         privateKey = process.env.BANKR_PRIVATE_KEY.trim();
     }
     else if (!address) {
-        output.error("Address required when no private key is available. Provide an address argument or set BANKR_PRIVATE_KEY in .env");
-        process.exit(1);
+        output.fatal("Address required when no private key is available. Provide an address argument or set BANKR_PRIVATE_KEY in .env");
     }
     else {
         if (output.isNonInteractive()) {
-            output.error("Private key required in non-interactive mode. Use --private-key or set BANKR_PRIVATE_KEY");
-            process.exit(1);
+            output.fatal("Private key required in non-interactive mode. Use --private-key or set BANKR_PRIVATE_KEY");
         }
         privateKey = await password({
             message: "Enter private key for this wallet (0x...):",
@@ -523,8 +525,7 @@ export async function feesClaimWalletCommand(address, opts) {
         account = privateKeyToAccount(privateKey);
     }
     catch {
-        output.error("Invalid private key format");
-        process.exit(1);
+        output.fatal("Invalid private key format");
     }
     // Step 3: Resolve address — derive from key if not provided, verify match if provided
     if (!address) {
@@ -533,12 +534,10 @@ export async function feesClaimWalletCommand(address, opts) {
     }
     else {
         if (!isAddress(address)) {
-            output.error("Invalid EVM address");
-            process.exit(1);
+            output.fatal("Invalid EVM address");
         }
         if (account.address.toLowerCase() !== address.toLowerCase()) {
-            output.error(`Private key does not match address ${address}. Derived: ${account.address}`);
-            process.exit(1);
+            output.fatal(`Private key does not match address ${address}. Derived: ${account.address}`);
         }
     }
     console.log();
@@ -550,42 +549,62 @@ export async function feesClaimWalletCommand(address, opts) {
         const result = await getBeneficiaryFeesStreaming(address, (progress) => {
             fetchSpin.text = `Scanning pools... ${progress.scanned}/${progress.total} (${progress.found ?? 0} with claimable fees)`;
         });
-        fetchSpin.succeed(`Scanned ${result.totalLaunches} launches — ${result.poolsWithShares} pools with shares, ${result.tokens.length} with claimable fees`);
+        // A time-budget stop leaves `scanned` below `totalLaunches`; report the
+        // number actually scanned so this line can't contradict the warning below.
+        const scanned = result.scanned ?? result.totalLaunches;
+        fetchSpin.succeed(`Scanned ${scanned} launches — ${result.poolsWithShares} pools with shares, ${result.tokens.length} with claimable fees`);
+        if (result.truncated) {
+            output.warn(`Scan stopped early at ${scanned} launches — this wallet has more than the server scans in one request. Claimable fees beyond that are not listed.`);
+        }
         allTokens = result.tokens;
     }
     catch (err) {
-        fetchSpin.fail("Failed to fetch fee data");
-        output.error(err.message);
-        process.exit(1);
+        output.failWith(fetchSpin, "Failed to fetch fee data", err);
     }
     // Step 5: Filter to tokens with claimable fees (API already filters, but
     // double-check for any rounding edge cases)
     const parseAmount = (s) => parseFloat(s.replace(/^[<>]/, "")) || 0;
+    // Numeraire leg = the side whose label differs from the launched token's
+    // symbol — stock-paired launches label it with the stock ticker, not WETH.
+    const numeraireLegOf = (token) => {
+        const tokenIsToken0 = token.token0Label === token.symbol;
+        return {
+            label: tokenIsToken0 ? token.token1Label : token.token0Label,
+            claimable: tokenIsToken0
+                ? token.claimable.token1
+                : token.claimable.token0,
+            tokenClaimable: tokenIsToken0
+                ? token.claimable.token0
+                : token.claimable.token1,
+        };
+    };
     const claimableTokens = allTokens.filter((token) => {
-        const wethIsToken0 = token.token0Label === "WETH";
-        const claimableWeth = wethIsToken0
-            ? token.claimable.token0
-            : token.claimable.token1;
-        const claimableToken = wethIsToken0
-            ? token.claimable.token1
-            : token.claimable.token0;
-        return parseAmount(claimableWeth) > 0 || parseAmount(claimableToken) > 0;
+        const leg = numeraireLegOf(token);
+        return (parseAmount(leg.claimable) > 0 || parseAmount(leg.tokenClaimable) > 0);
     });
     if (claimableTokens.length === 0) {
         console.log();
         output.dim("No claimable fees found for this wallet.");
         return;
     }
-    // Show total claimable WETH
+    // Show total claimable WETH — WETH legs only; stock-paired numeraires are a
+    // different unit and get their own per-ticker lines.
     const totalWeth = claimableTokens.reduce((sum, token) => {
-        const wethIsToken0 = token.token0Label === "WETH";
-        const wethStr = wethIsToken0
-            ? token.claimable.token0
-            : token.claimable.token1;
-        return sum + parseAmount(wethStr);
+        const leg = numeraireLegOf(token);
+        return leg.label === "WETH" ? sum + parseAmount(leg.claimable) : sum;
     }, 0);
+    const nonWethTotals = new Map();
+    for (const token of claimableTokens) {
+        const leg = numeraireLegOf(token);
+        if (leg.label !== "WETH" && parseAmount(leg.claimable) > 0) {
+            nonWethTotals.set(leg.label, (nonWethTotals.get(leg.label) ?? 0) + parseAmount(leg.claimable));
+        }
+    }
     console.log();
     output.keyValue("Total claimable", `${totalWeth.toFixed(6)} WETH across ${claimableTokens.length} token${claimableTokens.length !== 1 ? "s" : ""}`);
+    for (const [label, amount] of nonWethTotals) {
+        output.keyValue("", `${amount.toFixed(6)} ${label} (stock-paired)`);
+    }
     // Step 6: Select tokens
     let selectedTokens;
     if (opts.all) {
@@ -593,12 +612,9 @@ export async function feesClaimWalletCommand(address, opts) {
     }
     else {
         const choices = claimableTokens.map((token) => {
-            const wethIsToken0 = token.token0Label === "WETH";
-            const claimableWeth = wethIsToken0
-                ? token.claimable.token0
-                : token.claimable.token1;
+            const leg = numeraireLegOf(token);
             return {
-                name: `${token.name} ($${token.symbol}) - ${claimableWeth} WETH`,
+                name: `${token.name} ($${token.symbol}) - ${leg.claimable} ${leg.label}`,
                 value: token.tokenAddress,
                 checked: true,
             };
@@ -650,8 +666,7 @@ export async function feesClaimWalletCommand(address, opts) {
         output.warn(`${baseChainTokens.length - buildableTokens.length} token(s) missing initializer data — skipped`);
     }
     if (buildableTokens.length === 0) {
-        output.error("No transactions could be built");
-        process.exit(1);
+        output.fatal("No transactions could be built");
     }
     // Encode calldata locally (instant, no RPC)
     const txData = buildableTokens.map((t) => ({
@@ -676,7 +691,7 @@ export async function feesClaimWalletCommand(address, opts) {
             return (gas * GAS_BUFFER) / 100n;
         }
         catch (err) {
-            output.warn(`${token.symbol}: gas estimate failed — ${err.message}`);
+            output.warn(`${token.symbol}: gas estimate failed — ${getErrorMessage(err)}`);
             return null;
         }
     }));
@@ -737,7 +752,7 @@ export async function feesClaimWalletCommand(address, opts) {
             pendingTxs.push({ token: tx.token, hash });
         }
         catch (err) {
-            sendSpin.fail(`${tx.token.symbol}: Send failed — ${err.message}`);
+            sendSpin.fail(`${tx.token.symbol}: Send failed — ${getErrorMessage(err)}`);
             emitCESP("task.error");
             failCount++;
             if (readyTxs.indexOf(tx) < readyTxs.length - 1) {
@@ -767,7 +782,7 @@ export async function feesClaimWalletCommand(address, opts) {
                     token,
                     hash,
                     status: "failed",
-                    error: err.message,
+                    error: getErrorMessage(err),
                 };
             }
         }));