httpcat-cli 0.0.25 → 0.0.27-rc.1

package/dist/index.js

@@ -2,9 +2,10 @@
 import { Command } from "commander";
 import chalk from "chalk";
 import { privateKeyToAccount } from "viem/accounts";
+import { createRequire } from "module";
 import { config } from "./config.js";
-import { formatAddress } from "./utils/formatting.js";
-import { HttpcatClient } from "./client.js";
+import { formatAddress, formatCurrency } from "./utils/formatting.js";
+import { HttpcatClient, HttpcatError } from "./client.js";
 import { handleError, getExitCode } from "./utils/errors.js";
 import { startInteractiveShell } from "./interactive/shell.js";
 import { outputJson, outputError } from "./headless/json-output.js";
@@ -18,26 +19,29 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const packageJson = JSON.parse(readFileSync(join(__dirname, "../package.json"), "utf-8"));
 const VERSION = packageJson.version;
+const require = createRequire(import.meta.url);
+const { version: PACKAGE_VERSION } = require("../package.json");
 // Import commands
 import { createToken, displayCreateResult } from "./commands/create.js";
-import { buyToken, displayBuyResult, } from "./commands/buy.js";
+import { buyToken, displayBuyResult, displayBuyResultCompact, } from "./commands/buy.js";
 import { sellToken, displaySellResult, parseTokenAmount, } from "./commands/sell.js";
 import { getTokenInfo, displayTokenInfo } from "./commands/info.js";
 import { listTokens, displayTokenList } from "./commands/list.js";
 import { getPositions, displayPositions } from "./commands/positions.js";
 import { getTransactions, displayTransactions, } from "./commands/transactions.js";
 import { checkHealth, displayHealthStatus } from "./commands/health.js";
-import { checkBalance, displayBalance } from "./commands/balance.js";
+import { checkBalance, displayBalance } from "./commands/balances.js";
 import { startChatStream } from "./commands/chat.js";
 import { runMcpServer } from "./commands/mcp-server.js";
-import { getAccountInfo, displayAccountInfo, listAccounts, switchAccount, addAccount } from "./commands/account.js";
+import { getAccountInfo, displayAccountInfo, listAccounts, switchAccount, addAccount, } from "./commands/account.js";
+import { viewFees, claimFees, displayFees, displayClaimResult, } from "./commands/claim.js";
 // Check for --version --json before parsing
 const args = process.argv;
 if (args.includes("--version") || args.includes("-V")) {
     if (args.includes("--json")) {
         console.log(JSON.stringify({
             name: "httpcat-cli",
-            version: VERSION,
+            version: PACKAGE_VERSION,
         }, null, 2));
         process.exit(0);
     }
@@ -46,13 +50,13 @@ const program = new Command();
 program
     .name("httpcat")
     .description("CLI tool for interacting with httpcat agent")
-    .version(VERSION)
-    .option("--json", "Output in JSON format")
-    .option("--quiet", "Minimal output (exit codes only)")
-    .option("--verbose", "Verbose error messages")
+    .version(PACKAGE_VERSION)
+    .option("-j, --json", "Output in JSON format")
+    .option("-q, --quiet", "Minimal output (exit codes only)")
+    .option("-v, --verbose", "Verbose error messages")
     .option("--no-art", "Disable ASCII art")
-    .option("--private-key <key>", "Private key (overrides config and env var)")
-    .option("--account <index>", "Account index to use (overrides active account)", (value) => parseInt(value, 10));
+    .option("-k, --private-key <key>", "Private key (overrides config and env var)")
+    .option("-a, --account <index>", "Account index to use (overrides active account)", (value) => parseInt(value, 10));
 // Helper function to get private key with priority: CLI flag > env var > config
 function getPrivateKey(cliPrivateKey, accountIndex) {
     if (cliPrivateKey)
@@ -62,7 +66,9 @@ function getPrivateKey(cliPrivateKey, accountIndex) {
         return envKey;
     // Use account system
     try {
-        const index = accountIndex !== undefined ? accountIndex : config.getActiveAccountIndex();
+        const index = accountIndex !== undefined
+            ? accountIndex
+            : config.getActiveAccountIndex();
         return config.getAccountPrivateKey(index);
     }
     catch (error) {
@@ -186,7 +192,7 @@ envCommand
     .description("Add a custom environment")
     .argument("<name>", "Environment name")
     .argument("<agentUrl>", "Agent URL (e.g., http://localhost:8787)")
-    .option("--network <network>", "Network (default: base-sepolia)", "base-sepolia")
+    .option("-n, --network <network>", "Network (default: base-sepolia)", "base-sepolia")
     .action((name, agentUrl, options) => {
     try {
         config.addEnvironment(name, agentUrl, options.network);
@@ -207,7 +213,7 @@ envCommand
     .description("Update an existing environment")
     .argument("<name>", "Environment name")
     .argument("<agentUrl>", "Agent URL (e.g., http://localhost:8787)")
-    .option("--network <network>", "Network (default: base-sepolia)", "base-sepolia")
+    .option("-n, --network <network>", "Network (default: base-sepolia)", "base-sepolia")
     .action((name, agentUrl, options) => {
     try {
         config.updateEnvironment(name, agentUrl, options.network);
@@ -225,9 +231,9 @@ envCommand
 program
     .command("config")
     .description("Configure httpcat")
-    .option("--show", "Show current configuration")
-    .option("--set <key=value>", "Set configuration value")
-    .option("--reset", "Reset configuration")
+    .option("-s, --show", "Show current configuration")
+    .option("-S, --set <key=value>", "Set configuration value")
+    .option("-r, --reset", "Reset configuration")
     .addHelpText("after", `
 Examples:
   httpcat config                           # Run setup wizard
@@ -239,17 +245,21 @@ Examples:
     try {
         if (options.show) {
             console.log(JSON.stringify(config.getAll(), null, 2));
+            process.exit(0);
         }
         else if (options.set) {
             const [key, value] = options.set.split("=");
             config.set(key, value);
             console.log(`✅ ${key} set to ${value}`);
+            process.exit(0);
         }
         else if (options.reset) {
             await config.runSetupWizard();
+            process.exit(0);
         }
         else {
             await config.runSetupWizard();
+            process.exit(0);
         }
     }
     catch (error) {
@@ -263,9 +273,9 @@ program
     .description("Create a new token")
     .argument("<name>", 'Token name (e.g., "My Token")')
     .argument("<symbol>", 'Token symbol/ticker (e.g., "MTK", 3-10 characters)')
-    .option("--photo <url>", "Photo URL for token logo")
-    .option("--banner <url>", "Banner image URL")
-    .option("--website <url>", "Website URL")
+    .option("-p, --photo <url>", "Photo URL for token logo")
+    .option("-b, --banner <url>", "Banner image URL")
+    .option("-w, --website <url>", "Website URL")
     .addHelpText("after", `
 Examples:
   httpcat create "My Token" "MTK"
@@ -324,21 +334,29 @@ Examples:
 // Buy command
 program
     .command("buy")
-    .description("Buy tokens from the bonding curve")
-    .argument("<identifier>", 'Token ID (UUID), name, or symbol (e.g., abc123-..., "My Token", or MTK)')
-    .argument("<amount>", "Amount in USDC: 0.05, 0.10, or 0.20 (testnet) | 50, 100, or 200 (mainnet)")
+    .description("Buy tokens (auto-routes to bonding curve or Uniswap V2)")
+    .argument("<identifier>", 'Address, name, or symbol (e.g., 0x1234..., "My Token", or MTK)')
+    .argument("<amount>", "Amount in USDC or percentage: 0.05, 0.10, 0.20, 10, 50% (% of your USDC balance)")
+    .option("-r, --repeat <count>", "Number of times to repeat the buy operation", (value) => parseInt(value, 10))
+    .option("-d, --delay <ms>", "Delay in milliseconds between repeat operations (default: 0)", (value) => parseInt(value, 10), 0)
     .addHelpText("after", `
 Examples:
   httpcat buy abc123-4567-89ab-cdef-0123456789ab 0.20
   httpcat buy "My Token" 0.10
-  httpcat buy MTK 0.05
+  httpcat buy MTK 10          # Buy with $10 USDC
+  httpcat buy MTK 50%         # Buy with 50% of your USDC balance
+  httpcat buy MTK 0.05 --repeat 10
   httpcat --json buy abc123-4567-89ab-cdef-0123456789ab 0.10
   httpcat --private-key 0x... buy "PurrfecTT" 0.20
+  httpcat buy MTK 0.10 --repeat 10
+  httpcat buy MTK 0.10 --repeat 10 --delay 500
   `)
-    .action(async (tokenId, amount, command) => {
+    .action(async (tokenId, amount, options, command) => {
     try {
         const globalOpts = command.parent?.opts() || {};
         const accountIndex = globalOpts.account;
+        const repeatCount = options.repeat;
+        const delayMs = options.delay || 0;
         // Ensure wallet is unlocked
         await ensureWalletUnlocked();
         let privateKey = getPrivateKey(globalOpts.privateKey, accountIndex);
@@ -354,19 +372,122 @@ Examples:
         const client = await HttpcatClient.create(privateKey);
         const isTestMode = client.getNetwork().includes("sepolia");
         const silent = globalOpts.json || globalOpts.quiet;
-        const result = await withLoading(() => buyToken(client, tokenId, amount, isTestMode, silent), {
-            message: "Buying tokens...",
-            json: globalOpts.json,
-            quiet: globalOpts.quiet,
-            spinner: "cat",
-        });
-        if (globalOpts.json) {
-            outputJson("token_buy", result);
+        // Handle percentage amounts for graduated tokens
+        let finalAmount = amount;
+        if (amount.endsWith("%")) {
+            if (!silent) {
+                console.log("💰 Checking USDC balance for percentage buy...");
+            }
+            const balance = await checkBalance(privateKey);
+            const usdcBalance = parseFloat(balance.usdcFormatted.replace("$", "").replace(",", ""));
+            const percentage = parseFloat(amount.replace("%", ""));
+            if (isNaN(percentage) || percentage <= 0 || percentage > 100) {
+                throw new Error("Percentage must be between 0 and 100");
+            }
+            finalAmount = ((usdcBalance * percentage) / 100).toFixed(6);
+            if (!silent) {
+                console.log(`💵 USDC Balance: $${usdcBalance}`);
+                console.log(`📊 Using ${percentage}% = $${finalAmount}`);
+            }
+            if (parseFloat(finalAmount) === 0) {
+                throw new Error("Insufficient USDC balance");
+            }
         }
-        else if (!globalOpts.quiet) {
-            displayBuyResult(result);
+        // If repeat is specified, execute multiple buys
+        if (repeatCount && repeatCount > 0) {
+            const results = [];
+            let totalSpent = 0;
+            let stoppedEarly = false;
+            let stopReason = "";
+            for (let i = 1; i <= repeatCount; i++) {
+                try {
+                    // Show progress for non-JSON mode
+                    if (!globalOpts.json && !globalOpts.quiet) {
+                        console.log(chalk.dim(`Buy ${i}/${repeatCount}...`));
+                    }
+                    const result = await withLoading(() => buyToken(client, tokenId, finalAmount, isTestMode, silent || i > 1, privateKey), {
+                        message: `Buying tokens (${i}/${repeatCount})...`,
+                        json: globalOpts.json,
+                        quiet: globalOpts.quiet || i > 1,
+                        spinner: "cat",
+                    });
+                    results.push(result);
+                    totalSpent += parseFloat(result.amountSpent);
+                    // Display compact result for each buy
+                    if (globalOpts.json) {
+                        // In JSON mode, output each result
+                        outputJson("token_buy", result);
+                    }
+                    else if (!globalOpts.quiet) {
+                        displayBuyResultCompact(result, i, repeatCount);
+                    }
+                    // Check if token graduated
+                    if (result.graduationReached) {
+                        stoppedEarly = true;
+                        stopReason = "Token graduated";
+                        if (!globalOpts.json && !globalOpts.quiet) {
+                            console.log();
+                            console.log(chalk.green("🎓 Token has graduated! Stopping buy loop."));
+                        }
+                        break;
+                    }
+                    // Apply delay between iterations (except after the last one)
+                    if (i < repeatCount && delayMs > 0) {
+                        await new Promise((resolve) => setTimeout(resolve, delayMs));
+                    }
+                }
+                catch (error) {
+                    // Handle insufficient funds (402) gracefully
+                    if (error instanceof HttpcatError && error.status === 402) {
+                        stoppedEarly = true;
+                        stopReason = "Insufficient funds";
+                        if (!globalOpts.json && !globalOpts.quiet) {
+                            console.log();
+                            console.log(chalk.yellow("💡 Insufficient funds. Stopping buy loop."));
+                        }
+                        break;
+                    }
+                    // For other errors, re-throw to be handled by outer catch
+                    throw error;
+                }
+            }
+            // Show final summary
+            if (!globalOpts.json && !globalOpts.quiet && results.length > 0) {
+                const lastResult = results[results.length - 1];
+                const graduationStatus = lastResult.graduationReached
+                    ? "✅ GRADUATED!"
+                    : `${(lastResult.graduationProgress || 0).toFixed(2)}%`;
+                console.log();
+                console.log(chalk.cyan.bold("📊 Repeat Buy Summary"));
+                console.log(chalk.dim("─".repeat(50)));
+                console.log(`Total buys completed: ${chalk.bold(results.length)}${repeatCount ? `/${repeatCount}` : ""}`);
+                console.log(`Total amount spent: ${chalk.bold(formatCurrency(totalSpent.toString()))}`);
+                console.log(`Final token price: ${chalk.bold(formatCurrency(lastResult.newPrice))}`);
+                console.log(`Final graduation: ${chalk.bold(graduationStatus)}`);
+                if (stoppedEarly) {
+                    console.log(`Stopped early: ${chalk.yellow(stopReason)}`);
+                }
+                console.log();
+            }
+            // Exit with success code (0) even if stopped early due to graduation or insufficient funds
+            process.exit(0);
+        }
+        else {
+            // Normal single buy execution
+            const result = await withLoading(() => buyToken(client, tokenId, finalAmount, isTestMode, silent, privateKey), {
+                message: "Buying tokens...",
+                json: globalOpts.json,
+                quiet: globalOpts.quiet,
+                spinner: "cat",
+            });
+            if (globalOpts.json) {
+                outputJson("token_buy", result);
+            }
+            else if (!globalOpts.quiet) {
+                displayBuyResult(result);
+            }
+            process.exit(0);
         }
-        process.exit(0);
     }
     catch (error) {
         const globalOpts = command.parent?.opts() || {};
@@ -382,8 +503,8 @@ Examples:
 // Sell command
 program
     .command("sell")
-    .description("Sell tokens back to the bonding curve")
-    .argument("<identifier>", 'Token ID (UUID), name, or symbol (e.g., abc123-..., "My Token", or MTK)')
+    .description("Sell tokens (auto-routes to bonding curve or Uniswap V2)")
+    .argument("<identifier>", 'Address, name, or symbol (e.g., 0x1234..., "My Token", or MTK)')
     .argument("<amount>", 'Amount: number (e.g., 1000), percentage (e.g., 50%), or "all"')
     .addHelpText("after", `
 Examples:
@@ -413,23 +534,99 @@ Examples:
         // Derive user address from private key
         const account = privateKeyToAccount(privateKey);
         const userAddress = account.address;
-        // Get current holdings (this also resolves the identifier to tokenId)
-        const info = await withLoading(() => getTokenInfo(client, tokenId, userAddress, silent), {
-            message: "Checking token info...",
-            json: globalOpts.json,
-            quiet: globalOpts.quiet,
-            spinner: "cat",
-        });
-        if (!info.userPosition || info.userPosition.tokensOwned === "0") {
-            throw new Error("You do not own any of this token");
+        // Check if it's a contract address
+        const addressRegex = /^0x[0-9a-f]{40}$/i;
+        const isContractAddress = addressRegex.test(tokenId);
+        let actualBalance = "0";
+        let info = null;
+        // If it's a contract address, try to look it up in database first
+        if (isContractAddress) {
+            try {
+                // Try to get token info - if it exists in our DB, use normal flow
+                info = await withLoading(() => getTokenInfo(client, tokenId, userAddress, silent), {
+                    message: "Checking token info...",
+                    json: globalOpts.json,
+                    quiet: globalOpts.quiet,
+                    spinner: "cat",
+                });
+                // Found in database! Continue with normal flow below
+                actualBalance = info.userPosition?.tokensOwned || "0";
+            }
+            catch (error) {
+                // Not in database - treat as external token
+                if (error.message?.includes("not found") ||
+                    error.message?.includes("Invalid UUID")) {
+                    if (!silent) {
+                        console.log("📊 Checking on-chain balance for external token...");
+                    }
+                    const { createPublicClient, http, parseAbi } = await import("viem");
+                    const { baseSepolia } = await import("viem/chains");
+                    const publicClient = createPublicClient({
+                        chain: baseSepolia,
+                        transport: http(),
+                    });
+                    const ERC20_ABI = parseAbi([
+                        "function balanceOf(address owner) view returns (uint256)",
+                    ]);
+                    const balance = await publicClient.readContract({
+                        address: tokenId,
+                        abi: ERC20_ABI,
+                        functionName: "balanceOf",
+                        args: [userAddress],
+                    });
+                    actualBalance = balance.toString();
+                    if (!silent) {
+                        const { formatUnits } = await import("viem");
+                        console.log(`💼 On-chain balance: ${formatUnits(balance, 18)} tokens`);
+                    }
+                }
+                else {
+                    // Some other error - rethrow
+                    throw error;
+                }
+            }
         }
-        // Use the resolved tokenId from info instead of resolving again
-        const resolvedTokenId = info.tokenId;
-        if (!resolvedTokenId) {
-            throw new Error(`Failed to get token ID from token info. Original identifier: ${tokenId}`);
+        else {
+            // UUID token - get token info
+            info = await withLoading(() => getTokenInfo(client, tokenId, userAddress, silent), {
+                message: "Checking token info...",
+                json: globalOpts.json,
+                quiet: globalOpts.quiet,
+                spinner: "cat",
+            });
+            actualBalance = info.userPosition?.tokensOwned || "0";
+            // For graduated tokens, check actual on-chain balance
+            if (info && info.status === "graduated") {
+                if (!silent) {
+                    console.log("📊 Checking on-chain balance for graduated token...");
+                }
+                const { createPublicClient, http, parseAbi } = await import("viem");
+                const { baseSepolia } = await import("viem/chains");
+                const publicClient = createPublicClient({
+                    chain: baseSepolia,
+                    transport: http(),
+                });
+                const ERC20_ABI = parseAbi([
+                    "function balanceOf(address owner) view returns (uint256)",
+                ]);
+                const balance = await publicClient.readContract({
+                    address: info.address,
+                    abi: ERC20_ABI,
+                    functionName: "balanceOf",
+                    args: [userAddress],
+                });
+                actualBalance = balance.toString();
+                if (!silent) {
+                    const { formatUnits } = await import("viem");
+                    console.log(`💼 On-chain balance: ${formatUnits(balance, 18)} tokens`);
+                }
+            }
         }
-        const tokenAmount = parseTokenAmount(amountInput, info.userPosition.tokensOwned);
-        const result = await withLoading(() => sellToken(client, resolvedTokenId, tokenAmount, silent), {
+        if (actualBalance === "0") {
+            throw new Error("You do not own any of this token");
+        }
+        const tokenAmount = parseTokenAmount(amountInput, actualBalance);
+        const result = await withLoading(() => sellToken(client, tokenId, tokenAmount, silent, privateKey), {
             message: "Selling tokens...",
             json: globalOpts.json,
             quiet: globalOpts.quiet,
@@ -454,11 +651,89 @@ Examples:
         process.exit(getExitCode(error));
     }
 });
+// Claim command
+program
+    .command("claim")
+    .description("View and claim accumulated LP fees for graduated tokens")
+    .argument("<identifier>", 'Address, name, or symbol (e.g., 0x1234..., "My Token", or MTK)')
+    .option("-e, --execute", "Execute the claim (default: view only)")
+    .option("-A, --address <address>", "Caller address (defaults to wallet address)")
+    .addHelpText("after", `
+Examples:
+  httpcat claim "MyToken"                    # View accumulated fees
+  httpcat claim MTK --execute                # Claim fees
+  httpcat claim 0x4C64... --execute          # Claim using contract address
+  httpcat --json claim "MyToken"
+  `)
+    .action(async (identifier, options, command) => {
+    try {
+        const globalOpts = command.parent?.opts() || {};
+        const accountIndex = globalOpts.account;
+        // Ensure wallet is unlocked
+        await ensureWalletUnlocked();
+        let privateKey = getPrivateKey(globalOpts.privateKey, accountIndex);
+        // If not configured and not in JSON mode, prompt interactively
+        if (!isConfigured(globalOpts.privateKey)) {
+            if (globalOpts.json) {
+                console.error('❌ Not configured. Run "httpcat config" first or use --private-key flag.');
+                process.exit(2);
+            }
+            // Interactive prompt for private key
+            privateKey = await promptForPrivateKey();
+        }
+        const client = await HttpcatClient.create(privateKey);
+        const silent = globalOpts.json || globalOpts.quiet;
+        if (options.execute) {
+            // Claim fees
+            // Derive caller address from private key if not provided
+            const account = privateKeyToAccount(privateKey);
+            const callerAddress = options.address || account.address;
+            const result = await withLoading(() => claimFees(client, identifier, callerAddress, silent), {
+                message: "Claiming fees...",
+                json: globalOpts.json,
+                quiet: globalOpts.quiet,
+                spinner: "cat",
+            });
+            if (globalOpts.json) {
+                outputJson("claim_fees", result);
+            }
+            else if (!globalOpts.quiet) {
+                displayClaimResult(result);
+            }
+        }
+        else {
+            // View fees only
+            const result = await withLoading(() => viewFees(client, identifier, silent), {
+                message: "Fetching fee information...",
+                json: globalOpts.json,
+                quiet: globalOpts.quiet,
+                spinner: "cat",
+            });
+            if (globalOpts.json) {
+                outputJson("view_fees", result);
+            }
+            else if (!globalOpts.quiet) {
+                displayFees(result);
+            }
+        }
+        process.exit(0);
+    }
+    catch (error) {
+        const globalOpts = command.parent?.opts() || {};
+        if (globalOpts.json) {
+            outputError("claim", error, getExitCode(error));
+        }
+        else {
+            handleError(error, globalOpts.verbose);
+        }
+        process.exit(getExitCode(error));
+    }
+});
 // Info command
 program
     .command("info")
     .description("Get detailed information about a token")
-    .argument("<identifier>", 'Token ID (UUID), name, or symbol (e.g., abc123-..., "My Token", or MTK)')
+    .argument("<identifier>", 'Address, name, or symbol (e.g., 0x1234..., "My Token", or MTK)')
     .addHelpText("after", `
 Examples:
   httpcat info abc123-4567-89ab-cdef-0123456789ab
@@ -497,7 +772,7 @@ Examples:
             outputJson("token_info", result);
         }
         else if (!globalOpts.quiet) {
-            displayTokenInfo(result);
+            await displayTokenInfo(result, userAddress);
         }
         process.exit(0);
     }
@@ -516,9 +791,9 @@ Examples:
 program
     .command("list")
     .description("List all tokens with pagination and sorting")
-    .option("--page <number>", "Page number (default: 1)", "1")
-    .option("--limit <number>", "Items per page (default: 20, max: 100)", "20")
-    .option("--sort <field>", "Sort by: mcap (market cap), created (date), or name (alphabetical)", "mcap")
+    .option("-p, --page <number>", "Page number (default: 1)", "1")
+    .option("-l, --limit <number>", "Items per page (default: 20, max: 100)", "20")
+    .option("-s, --sort <field>", "Sort by: mcap (market cap), created (date), or name (alphabetical)", "mcap")
     .addHelpText("after", `
 Examples:
   httpcat list
@@ -571,18 +846,18 @@ Examples:
 // Transactions command
 program
     .command("transactions")
-    .description("Get paginated list of transactions with optional filtering")
-    .option("--user <address>", "Filter by user address")
-    .option("--token <tokenId>", "Filter by token ID")
-    .option("--type <type>", "Filter by type: buy, sell, or airdrop")
-    .option("--limit <number>", "Number of results (default: 50, max: 100)", "50")
-    .option("--offset <number>", "Pagination offset (default: 0)", "0")
+    .description("Get paginated list of transactions (defaults to selected account)")
+    .option("-u, --user <address>", "Filter by user address (defaults to selected account if not provided)")
+    .option("-t, --token <tokenId>", "Filter by token ID")
+    .option("-T, --type <type>", "Filter by type: buy, sell, or airdrop")
+    .option("-l, --limit <number>", "Number of results (default: 50, max: 100)", "50")
+    .option("-o, --offset <number>", "Pagination offset (default: 0)", "0")
     .addHelpText("after", `
 Examples:
-  httpcat transactions
-  httpcat transactions --user 0x1234...
-  httpcat transactions --token abc123-...
-  httpcat transactions --type buy --limit 20
+  httpcat transactions                                    # Get transactions for selected account
+  httpcat transactions --user 0x1234...                  # Get transactions for specific address
+  httpcat transactions --token abc123-...                # Get transactions for a token
+  httpcat transactions --type buy --limit 20             # Get buy transactions for selected account
   httpcat --json transactions --user 0x1234... --offset 50
   `)
     .action(async (options, command) => {
@@ -602,9 +877,37 @@ Examples:
             privateKey = await promptForPrivateKey();
         }
         const client = await HttpcatClient.create(privateKey);
+        // Derive user address from private key (default to selected account if no --user option)
+        const account = privateKeyToAccount(privateKey);
+        const userAddress = account.address;
+        // Show which account is being used (if not quiet and not json)
+        if (!globalOpts.quiet && !globalOpts.json) {
+            const activeIndex = accountIndex !== undefined
+                ? accountIndex
+                : config.getActiveAccountIndex();
+            const accounts = config.getAllAccounts();
+            const accountInfo = accounts.find((acc) => acc.index === activeIndex);
+            if (accountInfo) {
+                // Verify the address matches
+                if (accountInfo.address.toLowerCase() !== userAddress.toLowerCase()) {
+                    console.log(chalk.red(`⚠️  Warning: Account address mismatch!`));
+                    console.log(chalk.red(`   Expected: ${accountInfo.address}`));
+                    console.log(chalk.red(`   Got: ${userAddress}`));
+                    console.log();
+                }
+                console.log(chalk.dim(`Using account ${activeIndex} (${accountInfo.type === "custom" ? "Custom" : "Seed-Derived"}): ${formatAddress(userAddress, 12)}`));
+                console.log();
+            }
+        }
         const input = {};
-        if (options.user)
+        // Use selected account's address by default, unless --user is explicitly provided
+        if (options.user) {
             input.userAddress = options.user;
+        }
+        else {
+            // Default to selected account's address
+            input.userAddress = userAddress;
+        }
         if (options.token)
             input.tokenId = options.token;
         if (options.type) {
@@ -646,9 +949,13 @@ Examples:
 program
     .command("positions")
     .description("Get all your positions with comprehensive information")
+    .option("-a, --active", "Show only active (non-graduated) positions")
+    .option("-g, --graduated", "Show only graduated positions")
     .addHelpText("after", `
 Examples:
   httpcat positions
+  httpcat positions --active
+  httpcat positions --graduated
   httpcat --json positions
   httpcat --private-key 0x... positions
   `)
@@ -674,7 +981,9 @@ Examples:
         const userAddress = account.address;
         // Show which account is being used and verify it matches (if not quiet and not json)
         if (!globalOpts.quiet && !globalOpts.json) {
-            const activeIndex = accountIndex !== undefined ? accountIndex : config.getActiveAccountIndex();
+            const activeIndex = accountIndex !== undefined
+                ? accountIndex
+                : config.getActiveAccountIndex();
             const accounts = config.getAllAccounts();
             const accountInfo = accounts.find((acc) => acc.index === activeIndex);
             if (accountInfo) {
@@ -689,17 +998,33 @@ Examples:
                 console.log();
             }
         }
-        const result = await withLoading(() => getPositions(client, userAddress), {
+        let result = await withLoading(() => getPositions(client, userAddress), {
             message: "Fetching positions...",
             json: globalOpts.json,
             quiet: globalOpts.quiet,
             spinner: "cat",
         });
+        const filter = command.active
+            ? "active"
+            : command.graduated
+                ? "graduated"
+                : "all";
         if (globalOpts.json) {
+            // For JSON output, filter the positions
+            if (filter !== "all") {
+                const filteredPositions = result.positions.filter((p) => filter === "active"
+                    ? p.token.status !== "graduated"
+                    : p.token.status === "graduated");
+                result = {
+                    ...result,
+                    positions: filteredPositions,
+                    total: filteredPositions.length,
+                };
+            }
             outputJson("positions", result);
         }
         else if (!globalOpts.quiet) {
-            displayPositions(result);
+            displayPositions(result, filter);
         }
         process.exit(0);
     }
@@ -758,15 +1083,15 @@ Examples:
         process.exit(getExitCode(error));
     }
 });
-// Balance command
+// Balances command
 program
-    .command("balance")
-    .description("Check wallet balance (ETH and USDC)")
+    .command("balances")
+    .description("Check wallet balances (ETH and USDC)")
     .addHelpText("after", `
 Examples:
-  httpcat balance
-  httpcat balance --private-key 0x...
-  httpcat --json balance
+  httpcat balances
+  httpcat balances --private-key 0x...
+  httpcat --json balances
   `)
     .action(async (command) => {
     try {
@@ -785,13 +1110,13 @@ Examples:
             privateKey = undefined;
         }
         const result = await withLoading(() => checkBalance(privateKey), {
-            message: "Checking balance...",
+            message: "Checking balances...",
             json: globalOpts.json,
             quiet: globalOpts.quiet,
             spinner: "cat",
         });
         if (globalOpts.json) {
-            outputJson("balance", result);
+            outputJson("balances", result);
         }
         else if (!globalOpts.quiet) {
             displayBalance(result);
@@ -801,7 +1126,7 @@ Examples:
     catch (error) {
         const globalOpts = command.parent?.opts() || {};
         if (globalOpts.json) {
-            outputError("balance", error, getExitCode(error));
+            outputError("balances", error, getExitCode(error));
         }
         else {
             handleError(error, globalOpts.verbose);
@@ -837,7 +1162,7 @@ Examples:
             outputJson("account", result);
         }
         else if (!globalOpts.quiet) {
-            displayAccountInfo(result);
+            await displayAccountInfo(result);
         }
         process.exit(0);
     }
@@ -891,31 +1216,6 @@ accountCommand
         process.exit(getExitCode(error));
     }
 });
-accountCommand
-    .command("add")
-    .description("Add a new seed-derived account")
-    .addHelpText("after", `
-Examples:
-  httpcat account add                    # Add a new account from existing seed phrase
-  httpcat account add                    # If no seed phrase, prompts to generate/import one
-  `)
-    .action(async () => {
-    try {
-        const { addAccount } = await import("./commands/account.js");
-        await addAccount();
-        process.exit(0);
-    }
-    catch (error) {
-        const globalOpts = accountCommand.parent?.opts() || {};
-        if (globalOpts.json) {
-            outputError("account_add", error, getExitCode(error));
-        }
-        else {
-            handleError(error, globalOpts.verbose);
-        }
-        process.exit(getExitCode(error));
-    }
-});
 accountCommand
     .command("add")
     .description("Add a new seed-derived account")
@@ -945,7 +1245,7 @@ program
     .command("chat")
     .description("Start streaming chat ($0.01 to join, $0.0001 per message, 10 min lease)")
     .argument("[token]", "Optional: Token symbol, name, or address for token-specific chat")
-    .option("--input-format <format>", 'Input format (only works with --json): "text" (default), or "stream-json" (realtime streaming input)', "text")
+    .option("-f, --input-format <format>", 'Input format (only works with --json): "text" (default), or "stream-json" (realtime streaming input)', "text")
     .addHelpText("after", `
 Examples:
   httpcat chat                    # Join general chat
@@ -1019,6 +1319,14 @@ Configuration:
     .action(async () => {
     await runMcpServer();
 });
+// Help command
+program
+    .command("help")
+    .description("Display help for httpcat")
+    .action(() => {
+    program.outputHelp();
+    process.exit(0);
+});
 // Interactive shell (default when no command)
 program.action(async (options) => {
     try {