httpcat-cli 0.2.13 → 0.3.0-rc.2

package/dist/index.js

@@ -1,8 +1,28 @@
 #!/usr/bin/env node
+// Handle SIGINT (Ctrl+C) gracefully
+let isExiting = false;
+process.on("SIGINT", () => {
+    if (isExiting) {
+        // Force exit if already exiting
+        process.exit(130);
+    }
+    isExiting = true;
+    console.log("\n\nInterrupted by user. Exiting...");
+    process.exit(130);
+});
+process.on("SIGTERM", () => {
+    if (isExiting) {
+        process.exit(143);
+    }
+    isExiting = true;
+    console.log("\n\nTerminated. Exiting...");
+    process.exit(143);
+});
 import { Command } from "commander";
 import chalk from "chalk";
 import { privateKeyToAccount } from "viem/accounts";
 import { createRequire } from "module";
+import { randomUUID } from "crypto";
 import { config } from "./config.js";
 import { formatAddress, formatCurrency } from "./utils/formatting.js";
 import { HttpcatClient, HttpcatError } from "./client.js";
@@ -12,7 +32,8 @@ import { runCatSpinAnimation } from "./interactive/cat-spin.js";
 import { outputJson, outputError } from "./headless/json-output.js";
 import { promptForPrivateKey } from "./utils/privateKeyPrompt.js";
 import { withLoading } from "./utils/loading.js";
-import { readFileSync, writeFileSync, existsSync, statSync, unlinkSync, readlinkSync } from "fs";
+import { writeStatusLine, clearStatusLine, formatRetryMessage, } from "./utils/status.js";
+import { readFileSync, writeFileSync, existsSync, statSync, unlinkSync, readlinkSync, } from "fs";
 import { fileURLToPath } from "url";
 import { dirname, join } from "path";
 import { tmpdir } from "os";
@@ -24,9 +45,10 @@ const VERSION = packageJson.version;
 const require = createRequire(import.meta.url);
 const { version: PACKAGE_VERSION } = require("../package.json");
 // Import commands
-import { createToken, displayCreateResult, processPhotoUrl, isFilePath } from "./commands/create.js";
+import { createToken, displayCreateResult, processPhotoUrl, isFilePath, } from "./commands/create.js";
 import { buyToken, displayBuyResult, displayBuyResultCompact, } from "./commands/buy.js";
 import { sellToken, displaySellResult, parseTokenAmount, } from "./commands/sell.js";
+import { swap, displaySwapResult } from "./commands/swap.js";
 import { getTokenInfo, displayTokenInfo } from "./commands/info.js";
 import { listTokens, displayTokenList } from "./commands/list.js";
 import { getPositions, displayPositions } from "./commands/positions.js";
@@ -35,6 +57,7 @@ import { checkHealth, displayHealthStatus } from "./commands/health.js";
 import { checkBalance, displayBalance } from "./commands/balances.js";
 import { startChatStream } from "./commands/chat.js";
 import { runMcpServer } from "./commands/mcp-server.js";
+import { setupAgentCommands } from "./commands/agent.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
@@ -84,6 +107,11 @@ function isConfigured(cliPrivateKey) {
         return true;
     return config.isConfigured();
 }
+// Helper function to get global options properly
+// IMPORTANT: Always use this instead of command.parent?.opts() to ensure global flags work
+function getGlobalOpts() {
+    return program.opts();
+}
 // Helper to ensure wallet is unlocked
 async function ensureWalletUnlocked() {
     const password = config.getPassword();
@@ -194,7 +222,7 @@ envCommand
     .description("Add a custom environment")
     .argument("<name>", "Environment name")
     .argument("<agentUrl>", "Agent URL (e.g., http://localhost:8787)")
-    .option("-n, --network <network>", "Network (default: base-sepolia)", "base-sepolia")
+    .option("-n, --network <network>", "Network: base-sepolia (eip155:84532) or base (eip155:8453) (default: base-sepolia)", "base-sepolia")
     .action((name, agentUrl, options) => {
     try {
         config.addEnvironment(name, agentUrl, options.network);
@@ -215,7 +243,7 @@ envCommand
     .description("Update an existing environment")
     .argument("<name>", "Environment name")
     .argument("<agentUrl>", "Agent URL (e.g., http://localhost:8787)")
-    .option("-n, --network <network>", "Network (default: base-sepolia)", "base-sepolia")
+    .option("-n, --network <network>", "Network: base-sepolia (eip155:84532) or base (eip155:8453) (default: base-sepolia)", "base-sepolia")
     .action((name, agentUrl, options) => {
     try {
         config.updateEnvironment(name, agentUrl, options.network);
@@ -287,7 +315,20 @@ Examples:
   `)
     .action(async (name, symbol, options, command) => {
     try {
-        const globalOpts = command.parent?.opts() || {};
+        // Fallback: get arguments from command object if not provided as parameters
+        // This handles cases where Commander.js doesn't parse arguments correctly
+        // In Commander.js v9+, use processedArgs; fallback to args for older versions
+        const args = command.processedArgs || command.args || [];
+        const actualName = name || args[0];
+        const actualSymbol = symbol || args[1];
+        // Validate required arguments
+        if (!actualName || typeof actualName !== "string") {
+            throw new Error("Token name is required. Usage: httpcat create <name> <symbol> [options]");
+        }
+        if (!actualSymbol || typeof actualSymbol !== "string") {
+            throw new Error("Token symbol is required. Usage: httpcat create <name> <symbol> [options]");
+        }
+        const globalOpts = getGlobalOpts();
         const accountIndex = globalOpts.account;
         // Ensure wallet is unlocked
         await ensureWalletUnlocked();
@@ -302,20 +343,27 @@ Examples:
             privateKey = await promptForPrivateKey();
         }
         const client = await HttpcatClient.create(privateKey);
+        // Generate default robohash URL if no photo provided
+        let photoToUse = options.photo;
+        if (!photoToUse) {
+            const uuid = randomUUID();
+            photoToUse = `https://robohash.org/${uuid}?set=set4`;
+        }
         // Process photo if it's a file path (show loading state)
-        let processedPhotoUrl = options.photo;
-        if (options.photo && isFilePath(options.photo)) {
-            processedPhotoUrl = await withLoading(async () => processPhotoUrl(options.photo), {
+        let processedPhotoUrl = photoToUse;
+        if (photoToUse && isFilePath(photoToUse)) {
+            processedPhotoUrl = await withLoading(async () => processPhotoUrl(photoToUse), {
                 message: "Uploading image...",
                 json: globalOpts.json,
                 quiet: globalOpts.quiet,
                 spinner: "cat",
+                clearOnSuccess: true,
             });
         }
         // Create token (show loading state)
         const result = await withLoading(() => createToken(client, {
-            name,
-            symbol,
+            name: actualName.trim(),
+            symbol: actualSymbol.trim(),
             photoUrl: processedPhotoUrl,
             websiteUrl: options.website,
         }), {
@@ -323,6 +371,7 @@ Examples:
             json: globalOpts.json,
             quiet: globalOpts.quiet,
             spinner: "cat",
+            clearOnSuccess: true,
         });
         if (globalOpts.json) {
             outputJson("create_token", result);
@@ -333,7 +382,26 @@ Examples:
         process.exit(0);
     }
     catch (error) {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
+        // Check if platform hasn't graduated - if so, provide a clearer error message
+        try {
+            const agentInfo = await config.getAgentInfo();
+            if (agentInfo.catGraduated !== true) {
+                const graduationError = new Error("Token creation is currently disabled. The platform token must graduate before new tokens can be created. Please try again later.");
+                if (globalOpts.json) {
+                    outputError("create_token", graduationError, getExitCode(graduationError));
+                }
+                else {
+                    handleError(graduationError, globalOpts.verbose);
+                }
+                process.exit(getExitCode(graduationError));
+                return;
+            }
+        }
+        catch (infoError) {
+            // If we can't fetch agent info, fall through to normal error handling
+        }
+        // Handle other errors normally
         if (globalOpts.json) {
             outputError("create_token", error, getExitCode(error));
         }
@@ -365,7 +433,7 @@ Examples:
   `)
     .action(async (tokenId, amount, options, command) => {
     try {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         const accountIndex = globalOpts.account;
         const repeatCount = options.repeat;
         const delayMs = options.delay || 0;
@@ -382,15 +450,19 @@ Examples:
             privateKey = await promptForPrivateKey();
         }
         const client = await HttpcatClient.create(privateKey);
-        const isTestMode = client.getNetwork().includes("sepolia");
+        const network = client.getNetwork();
+        const isTestMode = network === "eip155:84532" || network === "eip155:11155111" || network.includes("sepolia");
         const silent = globalOpts.json || globalOpts.quiet;
         // Handle percentage amounts for graduated tokens
         let finalAmount = amount;
         if (amount.endsWith("%")) {
-            if (!silent) {
-                console.log("💰 Checking USDC balance for percentage buy...");
+            if (!silent && !globalOpts.json && !globalOpts.quiet) {
+                writeStatusLine(chalk.dim("💰 Checking USDC balance for percentage buy..."));
             }
             const balance = await checkBalance(privateKey);
+            if (!silent && !globalOpts.json && !globalOpts.quiet) {
+                clearStatusLine();
+            }
             const usdcBalance = parseFloat(balance.usdcFormatted.replace("$", "").replace(",", ""));
             const percentage = parseFloat(amount.replace("%", ""));
             if (isNaN(percentage) || percentage <= 0 || percentage > 100) {
@@ -413,18 +485,83 @@ Examples:
             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}...`));
+                    // Retry logic: try up to 10 times with exponential backoff on 402 errors
+                    // Client is recreated on each attempt to ensure fresh signature for new nonce
+                    let result = null;
+                    let lastError = null;
+                    const maxRetries = 10;
+                    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+                        try {
+                            // Show progress for non-JSON mode
+                            if (!globalOpts.json && !globalOpts.quiet) {
+                                if (attempt === 1) {
+                                    console.log(chalk.dim(`Buy ${i}/${repeatCount}...`));
+                                }
+                                else {
+                                    console.log(chalk.yellow(`  Retrying buy ${i}/${repeatCount} (attempt ${attempt}/${maxRetries})...`));
+                                }
+                            }
+                            // Recreate client inside the operation function to ensure fresh signature
+                            // for each attempt (including retries). This fixes the issue where x402-fetch
+                            // generates a new nonce but reuses the same signature, causing subsequent buys to fail
+                            result = await withLoading(async () => {
+                                // Recreate client for each attempt to ensure fresh signature for new nonce
+                                const client = await HttpcatClient.create(privateKey);
+                                return buyToken(client, tokenId, finalAmount, isTestMode, silent || i > 1, privateKey);
+                            }, {
+                                message: `Buying tokens (${i}/${repeatCount})...`,
+                                json: globalOpts.json,
+                                quiet: globalOpts.quiet || i > 1,
+                                spinner: "cat",
+                                clearOnSuccess: true,
+                            });
+                            // Success! Break out of retry loop
+                            break;
+                        }
+                        catch (error) {
+                            lastError = error;
+                            // Only retry on 402 errors (payment required)
+                            const is402Error = error instanceof HttpcatError && error.status === 402;
+                            if (is402Error && attempt < maxRetries) {
+                                // Exponential backoff: 1s, 2s, 4s, 8s, 16s, 32s, 64s, 128s, 256s, 512s (capped at 10s)
+                                const backoffMs = Math.min(Math.pow(2, attempt - 1) * 1000, 10000);
+                                const backoffSeconds = backoffMs / 1000;
+                                if (!globalOpts.json && !globalOpts.quiet) {
+                                    // Write status on same line (overwrites previous)
+                                    const statusMessage = formatRetryMessage(attempt, maxRetries, backoffSeconds);
+                                    writeStatusLine(statusMessage);
+                                }
+                                await new Promise((resolve) => setTimeout(resolve, backoffMs));
+                                continue; // Retry
+                            }
+                            else {
+                                // Not a 402 error, or max retries reached - clear status and throw
+                                if (!globalOpts.json && !globalOpts.quiet) {
+                                    clearStatusLine();
+                                }
+                                throw error;
+                            }
+                        }
+                    }
+                    // If we exhausted retries, throw the last error
+                    if (!result) {
+                        // Clear status line before throwing
+                        if (!globalOpts.json && !globalOpts.quiet) {
+                            clearStatusLine();
+                        }
+                        if (lastError) {
+                            throw lastError;
+                        }
+                        else {
+                            throw new Error(`Failed to complete buy ${i}/${repeatCount} after ${maxRetries} attempts`);
+                        }
                     }
-                    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);
+                    // Clear status line before showing result
+                    if (!globalOpts.json && !globalOpts.quiet) {
+                        clearStatusLine();
+                    }
                     // Display compact result for each buy
                     if (globalOpts.json) {
                         // In JSON mode, output each result
@@ -443,58 +580,79 @@ Examples:
                         }
                         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."));
-                            console.log();
-                            // Show current balance to help diagnose the issue
+                    // Wait for transaction confirmations if present
+                    // This ensures both the buy transaction and payment transaction are confirmed
+                    // before the next buy, preventing nonce/signature conflicts
+                    if (i < repeatCount) {
+                        const { createPublicClient, http } = await import("viem");
+                        const { baseSepolia } = await import("viem/chains");
+                        const publicClient = createPublicClient({
+                            chain: baseSepolia,
+                            transport: http(config.getRpcUrl()),
+                        });
+                        // Wait for payment transaction first (if present)
+                        // This is critical to ensure the payment nonce is consumed before next request
+                        if (result.paymentTxHash) {
+                            if (!globalOpts.json && !globalOpts.quiet) {
+                                console.log(chalk.dim(`  Waiting for payment transaction confirmation...`));
+                            }
                             try {
-                                const balance = await checkBalance(privateKey, true);
-                                console.log(chalk.cyan("💰 Current Wallet Balances:"));
-                                console.log(chalk.dim(`   ETH:  ${balance.ethFormatted}`));
-                                console.log(chalk.dim(`   USDC: ${balance.usdcFormatted}`));
-                                if (balance.cat402Formatted) {
-                                    console.log(chalk.dim(`   CAT:  ${balance.cat402Formatted}`));
+                                await publicClient.waitForTransactionReceipt({
+                                    hash: result.paymentTxHash,
+                                });
+                                if (!globalOpts.json && !globalOpts.quiet) {
+                                    console.log(chalk.dim(`  ✅ Payment transaction confirmed`));
                                 }
-                                console.log();
-                                // Provide guidance based on what might be insufficient
-                                const usdcBalance = parseFloat(balance.usdcFormatted.replace("$", "").replace(",", ""));
-                                const ethBalance = parseFloat(balance.ethFormatted.replace(" ETH", "").replace(",", ""));
-                                const buyAmount = parseFloat(finalAmount);
-                                console.log(chalk.yellow("💡 Possible issues:"));
-                                if (usdcBalance < buyAmount) {
-                                    console.log(chalk.dim(`   • Insufficient USDC for purchase: Need $${buyAmount.toFixed(6)}, have $${usdcBalance.toFixed(6)}`));
-                                }
-                                if (usdcBalance < 0.01) {
-                                    console.log(chalk.dim(`   • Low USDC for API payments: x402 protocol requires USDC for API calls`));
+                            }
+                            catch (txError) {
+                                // If we can't wait for confirmation, log but continue
+                                if (!globalOpts.json && !globalOpts.quiet) {
+                                    console.log(chalk.yellow(`  ⚠️  Could not confirm payment transaction, proceeding...`));
                                 }
-                                if (ethBalance < 0.001) {
-                                    console.log(chalk.dim(`   • Low ETH for gas: Need ETH to pay for transaction fees`));
+                            }
+                        }
+                        // Wait for buy transaction (if present)
+                        if (result.txHash) {
+                            if (!globalOpts.json && !globalOpts.quiet) {
+                                console.log(chalk.dim(`  Waiting for buy transaction confirmation...`));
+                            }
+                            try {
+                                await publicClient.waitForTransactionReceipt({
+                                    hash: result.txHash,
+                                });
+                                if (!globalOpts.json && !globalOpts.quiet) {
+                                    console.log(chalk.dim(`  ✅ Buy transaction confirmed`));
                                 }
-                                console.log();
-                                console.log(chalk.dim("   Check your balance with: httpcat balances"));
                             }
-                            catch (balanceError) {
-                                // If we can't fetch balance, just show generic message
-                                console.log(chalk.dim("   Check your balance with: httpcat balances"));
+                            catch (txError) {
+                                // If we can't wait for confirmation, log but continue
+                                if (!globalOpts.json && !globalOpts.quiet) {
+                                    console.log(chalk.yellow(`  ⚠️  Could not confirm buy transaction, proceeding...`));
+                                }
                             }
                         }
-                        break;
                     }
-                    // For other errors, re-throw to be handled by outer catch
+                    // Apply delay between iterations (except after the last one)
+                    if (i < repeatCount && delayMs > 0) {
+                        await new Promise((resolve) => setTimeout(resolve, delayMs));
+                    }
+                }
+                catch (error) {
+                    // Clear status line before throwing
+                    if (!globalOpts.json && !globalOpts.quiet) {
+                        clearStatusLine();
+                    }
+                    // Don't catch 402 errors - x402-fetch handles payment automatically
+                    // 402 is the normal payment flow on first call, not an error
+                    // Let withLoading and x402-fetch handle payment retries
+                    // Only re-throw to let outer handler deal with persistent errors
                     throw error;
                 }
             }
+            // Clear status line before showing summary
+            if (!globalOpts.json && !globalOpts.quiet) {
+                clearStatusLine();
+            }
             // Show final summary
             if (!globalOpts.json && !globalOpts.quiet && results.length > 0) {
                 const lastResult = results[results.length - 1];
@@ -517,13 +675,60 @@ Examples:
             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",
-            });
+            // Normal single buy execution with retry logic
+            let result = null;
+            let lastError = null;
+            let attempt = 0;
+            const maxRetries = null; // Retry indefinitely for single buys
+            while (!result) {
+                attempt++;
+                try {
+                    // Show initial attempt message only on first try
+                    if (attempt === 1 && !globalOpts.json && !globalOpts.quiet) {
+                        writeStatusLine(chalk.dim("Buying tokens..."));
+                    }
+                    // Recreate client for each attempt to ensure fresh signature
+                    const freshClient = await HttpcatClient.create(privateKey);
+                    result = await buyToken(freshClient, tokenId, finalAmount, isTestMode, silent, privateKey);
+                    // Success! Clear any status line and break
+                    if (!globalOpts.json && !globalOpts.quiet) {
+                        clearStatusLine();
+                    }
+                    break;
+                }
+                catch (error) {
+                    lastError = error;
+                    // Only retry on 402 errors (payment required)
+                    const is402Error = error instanceof HttpcatError && error.status === 402;
+                    if (is402Error) {
+                        // Exponential backoff: 1s, 2s, 4s, 8s, 16s, 32s, 64s, 128s, 256s, 512s (capped at 10s)
+                        const backoffMs = Math.min(Math.pow(2, attempt - 1) * 1000, 10000);
+                        const backoffSeconds = backoffMs / 1000;
+                        if (!globalOpts.json && !globalOpts.quiet) {
+                            // Write status on same line (overwrites previous)
+                            const statusMessage = formatRetryMessage(attempt, maxRetries, backoffSeconds);
+                            writeStatusLine(statusMessage);
+                        }
+                        await new Promise((resolve) => setTimeout(resolve, backoffMs));
+                        continue; // Retry
+                    }
+                    else {
+                        // Not a 402 error - throw immediately
+                        if (!globalOpts.json && !globalOpts.quiet) {
+                            clearStatusLine();
+                        }
+                        throw error;
+                    }
+                }
+            }
+            if (!result) {
+                if (lastError) {
+                    throw lastError;
+                }
+                else {
+                    throw new Error("Failed to complete buy");
+                }
+            }
             if (globalOpts.json) {
                 outputJson("token_buy", result);
             }
@@ -534,7 +739,11 @@ Examples:
         }
     }
     catch (error) {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
+        // Clear status line before showing error
+        if (!globalOpts.json && !globalOpts.quiet) {
+            clearStatusLine();
+        }
         if (globalOpts.json) {
             outputError("token_buy", error, getExitCode(error));
         }
@@ -559,15 +768,13 @@ Examples:
   `)
     .action(async (tokenId, amountInput, command) => {
     try {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         const accountIndex = globalOpts.account;
         // Ensure wallet is unlocked
         await ensureWalletUnlocked();
-        // Use program.opts() directly since command.parent?.opts() doesn't include global options
-        const programOpts = program.opts();
-        let privateKey = getPrivateKey(programOpts.privateKey || globalOpts.privateKey, accountIndex);
+        let privateKey = getPrivateKey(globalOpts.privateKey, accountIndex);
         // If not configured and not in JSON mode, prompt interactively
-        if (!isConfigured(programOpts.privateKey || globalOpts.privateKey)) {
+        if (!isConfigured(globalOpts.privateKey)) {
             if (globalOpts.json) {
                 console.error('❌ Not configured. Run "httpcat config" first or use --private-key flag.');
                 process.exit(2);
@@ -594,6 +801,7 @@ Examples:
                     json: globalOpts.json,
                     quiet: globalOpts.quiet,
                     spinner: "cat",
+                    clearOnSuccess: true,
                 });
                 // Found in database! Continue with normal flow below
                 actualBalance = info.userPosition?.tokensOwned || "0";
@@ -602,14 +810,14 @@ Examples:
                 // 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...");
+                    if (!silent && !globalOpts.json && !globalOpts.quiet) {
+                        writeStatusLine(chalk.dim("📊 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(),
+                        transport: http(config.getRpcUrl()),
                     });
                     const ERC20_ABI = parseAbi([
                         "function balanceOf(address owner) view returns (uint256)",
@@ -621,6 +829,9 @@ Examples:
                         args: [userAddress],
                     });
                     actualBalance = balance.toString();
+                    if (!silent && !globalOpts.json && !globalOpts.quiet) {
+                        clearStatusLine();
+                    }
                     if (!silent) {
                         const { formatUnits } = await import("viem");
                         console.log(`💼 On-chain balance: ${formatUnits(balance, 18)} tokens`);
@@ -643,14 +854,14 @@ Examples:
             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...");
+                if (!silent && !globalOpts.json && !globalOpts.quiet) {
+                    writeStatusLine(chalk.dim("📊 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(),
+                    transport: http(config.getRpcUrl()),
                 });
                 const ERC20_ABI = parseAbi([
                     "function balanceOf(address owner) view returns (uint256)",
@@ -662,6 +873,9 @@ Examples:
                     args: [userAddress],
                 });
                 actualBalance = balance.toString();
+                if (!silent && !globalOpts.json && !globalOpts.quiet) {
+                    clearStatusLine();
+                }
                 if (!silent) {
                     const { formatUnits } = await import("viem");
                     console.log(`💼 On-chain balance: ${formatUnits(balance, 18)} tokens`);
@@ -677,6 +891,7 @@ Examples:
             json: globalOpts.json,
             quiet: globalOpts.quiet,
             spinner: "cat",
+            clearOnSuccess: true,
         });
         if (globalOpts.json) {
             outputJson("token_sell", result);
@@ -687,7 +902,7 @@ Examples:
         process.exit(0);
     }
     catch (error) {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         if (globalOpts.json) {
             outputError("token_sell", error, getExitCode(error));
         }
@@ -697,6 +912,72 @@ Examples:
         process.exit(getExitCode(error));
     }
 });
+// Swap command (Pro - any token to any token via DEX aggregation)
+program
+    .command("swap")
+    .description("Swap any token to any token ($0.10 - pro DEX aggregation)")
+    .argument("<tokenIn>", "Token to sell (address)")
+    .argument("<tokenOut>", "Token to buy (address)")
+    .argument("<amount>", "Amount to sell (in smallest unit, e.g., wei)")
+    .option("-s, --slippage <bps>", "Slippage tolerance in basis points (default: 50 = 0.5%)", "50")
+    .addHelpText("after", `
+Examples:
+  # Swap 1 USDC for WETH
+  httpcat swap 0x036cbd53842c5426634e7929541ec2318f3dcf7e 0x4200000000000000000000000000000000000006 1000000
+
+  # Swap with 1% slippage
+  httpcat swap 0x036c... 0x4200... 1000000 --slippage 100
+  `)
+    .action(async (tokenIn, tokenOut, amount, options, command) => {
+    try {
+        const globalOpts = getGlobalOpts();
+        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);
+            }
+            privateKey = await promptForPrivateKey();
+        }
+        const client = await HttpcatClient.create(privateKey);
+        const silent = globalOpts.json || globalOpts.quiet;
+        const slippageBps = parseInt(options.slippage, 10) || 50;
+        if (!silent && !globalOpts.json && !globalOpts.quiet) {
+            writeStatusLine(chalk.dim("Swapping tokens..."));
+        }
+        const result = await withLoading(() => swap(client, tokenIn, tokenOut, amount, slippageBps, silent, privateKey), {
+            message: "Processing swap...",
+            json: globalOpts.json,
+            quiet: globalOpts.quiet,
+            spinner: "cat",
+            clearOnSuccess: true,
+        });
+        if (!silent && !globalOpts.json && !globalOpts.quiet) {
+            clearStatusLine();
+        }
+        if (globalOpts.json) {
+            console.log(JSON.stringify(result, null, 2));
+        }
+        else if (!globalOpts.quiet) {
+            displaySwapResult(result);
+        }
+        process.exit(0);
+    }
+    catch (error) {
+        const globalOpts = getGlobalOpts();
+        if (globalOpts.json) {
+            console.log(JSON.stringify({ error: error.message }, null, 2));
+        }
+        else if (!globalOpts.quiet) {
+            handleError(error, globalOpts.verbose);
+        }
+        process.exit(getExitCode(error));
+    }
+});
 // Claim command
 program
     .command("claim")
@@ -713,7 +994,7 @@ Examples:
   `)
     .action(async (identifier, options, command) => {
     try {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         const accountIndex = globalOpts.account;
         // Ensure wallet is unlocked
         await ensureWalletUnlocked();
@@ -739,6 +1020,7 @@ Examples:
                 json: globalOpts.json,
                 quiet: globalOpts.quiet,
                 spinner: "cat",
+                clearOnSuccess: true,
             });
             if (globalOpts.json) {
                 outputJson("claim_fees", result);
@@ -754,6 +1036,7 @@ Examples:
                 json: globalOpts.json,
                 quiet: globalOpts.quiet,
                 spinner: "cat",
+                clearOnSuccess: true,
             });
             if (globalOpts.json) {
                 outputJson("view_fees", result);
@@ -765,7 +1048,7 @@ Examples:
         process.exit(0);
     }
     catch (error) {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         if (globalOpts.json) {
             outputError("claim", error, getExitCode(error));
         }
@@ -789,7 +1072,7 @@ Examples:
   `)
     .action(async (tokenId, command) => {
     try {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         const accountIndex = globalOpts.account;
         // Ensure wallet is unlocked
         await ensureWalletUnlocked();
@@ -813,17 +1096,19 @@ Examples:
             json: globalOpts.json,
             quiet: globalOpts.quiet,
             spinner: "cat",
+            clearOnSuccess: true,
         });
         if (globalOpts.json) {
             outputJson("token_info", result);
         }
         else if (!globalOpts.quiet) {
-            await displayTokenInfo(result, userAddress);
+            const client = await HttpcatClient.create(privateKey);
+            await displayTokenInfo(result, userAddress, client.getNetwork());
         }
         process.exit(0);
     }
     catch (error) {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         if (globalOpts.json) {
             outputError("token_info", error, getExitCode(error));
         }
@@ -849,7 +1134,7 @@ Examples:
   `)
     .action(async (options, command) => {
     try {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         const accountIndex = globalOpts.account;
         // Ensure wallet is unlocked
         await ensureWalletUnlocked();
@@ -869,6 +1154,7 @@ Examples:
             json: globalOpts.json,
             quiet: globalOpts.quiet,
             spinner: "cat",
+            clearOnSuccess: true,
         });
         if (globalOpts.json) {
             outputJson("list_tokens", result);
@@ -879,7 +1165,7 @@ Examples:
         process.exit(0);
     }
     catch (error) {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         if (globalOpts.json) {
             outputError("list_tokens", error, getExitCode(error));
         }
@@ -908,7 +1194,7 @@ Examples:
   `)
     .action(async (options, command) => {
     try {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         const accountIndex = globalOpts.account;
         // Ensure wallet is unlocked
         await ensureWalletUnlocked();
@@ -971,6 +1257,7 @@ Examples:
             json: globalOpts.json,
             quiet: globalOpts.quiet,
             spinner: "cat",
+            clearOnSuccess: true,
         });
         if (globalOpts.json) {
             outputJson("transactions", result);
@@ -981,7 +1268,7 @@ Examples:
         process.exit(0);
     }
     catch (error) {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         if (globalOpts.json) {
             outputError("transactions", error, getExitCode(error));
         }
@@ -1007,7 +1294,7 @@ Examples:
   `)
     .action(async (command) => {
     try {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         const accountIndex = globalOpts.account;
         // Ensure wallet is unlocked
         await ensureWalletUnlocked();
@@ -1049,6 +1336,7 @@ Examples:
             json: globalOpts.json,
             quiet: globalOpts.quiet,
             spinner: "cat",
+            clearOnSuccess: true,
         });
         const filter = command.active
             ? "active"
@@ -1075,7 +1363,7 @@ Examples:
         process.exit(0);
     }
     catch (error) {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         if (globalOpts.json) {
             outputError("positions", error, getExitCode(error));
         }
@@ -1097,7 +1385,7 @@ Examples:
   `)
     .action(async (command) => {
     try {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         const privateKey = getPrivateKey(globalOpts.privateKey);
         if (!isConfigured(globalOpts.privateKey)) {
             console.error('❌ Not configured. Run "httpcat config" first or use --private-key flag.');
@@ -1109,6 +1397,7 @@ Examples:
             json: globalOpts.json,
             quiet: globalOpts.quiet,
             spinner: "cat",
+            clearOnSuccess: true,
         });
         if (globalOpts.json) {
             outputJson("health", result);
@@ -1119,7 +1408,7 @@ Examples:
         process.exit(result.status === "ok" ? 0 : 1);
     }
     catch (error) {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         if (globalOpts.json) {
             outputError("health", error, getExitCode(error));
         }
@@ -1141,14 +1430,15 @@ Examples:
   `)
     .action(async (command) => {
     try {
-        const globalOpts = command.parent?.opts() || {};
-        const accountIndex = globalOpts.account;
+        // Use program.opts() directly since command.parent?.opts() doesn't include global options
+        const programOpts = program.opts();
+        const accountIndex = programOpts.account;
         // Ensure wallet is unlocked
         await ensureWalletUnlocked();
-        let privateKey = getPrivateKey(globalOpts.privateKey, accountIndex);
+        let privateKey = getPrivateKey(programOpts.privateKey, accountIndex);
         // If not configured and not in JSON mode, prompt interactively
-        if (!isConfigured(globalOpts.privateKey)) {
-            if (globalOpts.json) {
+        if (!isConfigured(programOpts.privateKey)) {
+            if (programOpts.json) {
                 console.error('❌ Not configured. Run "httpcat config" first or use --private-key flag.');
                 process.exit(2);
             }
@@ -1157,25 +1447,26 @@ Examples:
         }
         const result = await withLoading(() => checkBalance(privateKey), {
             message: "Checking balances...",
-            json: globalOpts.json,
-            quiet: globalOpts.quiet,
+            json: programOpts.json,
+            quiet: programOpts.quiet,
             spinner: "cat",
+            clearOnSuccess: true,
         });
-        if (globalOpts.json) {
+        if (programOpts.json) {
             outputJson("balances", result);
         }
-        else if (!globalOpts.quiet) {
+        else if (!programOpts.quiet) {
             displayBalance(result);
         }
         process.exit(0);
     }
     catch (error) {
-        const globalOpts = command.parent?.opts() || {};
-        if (globalOpts.json) {
+        const programOpts = program.opts();
+        if (programOpts.json) {
             outputError("balances", error, getExitCode(error));
         }
         else {
-            handleError(error, globalOpts.verbose);
+            handleError(error, programOpts.verbose);
         }
         process.exit(getExitCode(error));
     }
@@ -1203,6 +1494,7 @@ Examples:
             json: globalOpts.json,
             quiet: globalOpts.quiet,
             spinner: "cat",
+            clearOnSuccess: true,
         });
         if (globalOpts.json) {
             outputJson("account", result);
@@ -1304,7 +1596,7 @@ Examples:
   `)
     .action(async (tokenIdentifier, options, command) => {
     try {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         const chatOpts = options;
         const accountIndex = globalOpts.account;
         // Ensure wallet is unlocked
@@ -1324,15 +1616,18 @@ Examples:
         if (globalOpts.json) {
             const inputFormat = chatOpts.inputFormat || "text";
             await startChatStream(client, true, // jsonMode
-            tokenIdentifier || undefined, inputFormat);
+            tokenIdentifier || undefined, inputFormat, false // returnToShell
+            );
         }
         else {
-            // Interactive mode: launch shell and auto-enter chat
-            await startInteractiveShell(client, tokenIdentifier || undefined);
+            // Interactive mode: use Ink-based chat UI
+            await startChatStream(client, false, // jsonMode
+            tokenIdentifier || undefined, "text", false // returnToShell (not from shell, so exit on quit)
+            );
         }
     }
     catch (error) {
-        const globalOpts = command.parent?.opts() || {};
+        const globalOpts = getGlobalOpts();
         if (globalOpts.json) {
             outputError("chat", error, getExitCode(error));
         }
@@ -1342,16 +1637,13 @@ Examples:
         process.exit(getExitCode(error));
     }
 });
-// Agent command
+// Cat command - starts agent interactive mode
 program
-    .command("agent")
-    .alias("cat")
-    .description("Configure AI agent for trading assistance")
-    .option("-s, --setup", "Run setup wizard to configure API key")
+    .command("cat")
+    .description("Start interactive AI agent mode")
     .addHelpText("after", `
 Examples:
-  httpcat agent --setup               # Configure AI agent
-  httpcat cat --setup                 # Same, using 'cat' alias
+  httpcat cat                        # Start interactive agent mode
 
 The AI agent helps you:
   • Trade tokens using natural language
@@ -1359,37 +1651,53 @@ The AI agent helps you:
   • Get market information
   • Execute commands hands-free
 
-You can use 'agent' or 'cat' interchangeably.
+Type /exit to quit agent mode.
   `)
-    .action(async (options) => {
+    .action(async (options, command) => {
     try {
-        const { setupAIAgentWizard } = await import("./agent/setup-wizard.js");
-        if (options.setup) {
-            await setupAIAgentWizard();
-            process.exit(0);
+        const globalOpts = getGlobalOpts();
+        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();
         }
-        else {
-            // Show help for agent command
-            console.log();
-            console.log(chalk.cyan.bold("🐱 AI Agent"));
+        const client = await HttpcatClient.create(privateKey);
+        // Check if agent is configured
+        const agentConfig = config.getAIAgentConfig();
+        if (!agentConfig) {
             console.log();
-            console.log(chalk.yellow("The AI agent feature is currently available only in interactive mode."));
+            console.log(chalk.yellow("⚠️  Agent not configured"));
+            console.log(chalk.dim("Run 'httpcat agent --setup' to configure the AI agent."));
             console.log();
-            console.log(chalk.bold("To configure:"));
-            console.log(chalk.dim("  httpcat agent --setup"));
+            process.exit(1);
+        }
+        const apiKey = config.getAIAgentApiKey();
+        if (!apiKey) {
             console.log();
-            console.log(chalk.bold("Note:"));
-            console.log(chalk.dim("  The agent command has been temporarily disabled in interactive mode."));
-            console.log(chalk.dim("  Use the CLI setup above to configure your API keys for future use."));
+            console.log(chalk.red("❌ Failed to get API key"));
+            console.log(chalk.dim("Run 'httpcat agent --setup' to configure the API key."));
             console.log();
-            process.exit(0);
+            process.exit(1);
         }
+        // Start agent interactive mode
+        const { startAgentInteractiveMode } = await import("./interactive/shell.js");
+        await startAgentInteractiveMode(client);
     }
     catch (error) {
         handleError(error, program.opts().verbose);
         process.exit(getExitCode(error));
     }
 });
+// Autonomous Trading Agent commands
+setupAgentCommands(program);
 // MCP Server command
 program
     .command("mcp-server")
@@ -1436,12 +1744,12 @@ function displayGroupedHelp(program) {
     console.log();
     // Group commands
     const commandGroups = {
-        "Token Operations": ["create", "buy", "sell", "claim"],
+        "Token Operations": ["create", "buy", "sell", "swap", "claim"],
         "Token Information": ["info", "list"],
-        "Portfolio": ["positions", "transactions", "balances"],
+        Portfolio: ["positions", "transactions", "balances"],
         "Account Management": ["account", "env"],
-        "AI & Social": ["agent", "chat"],
-        "System": ["health", "config", "mcp-server"],
+        "AI & Social": ["agent", "cat", "chat"],
+        System: ["health", "config", "mcp-server"],
     };
     // Display grouped commands
     for (const [groupName, commandNames] of Object.entries(commandGroups)) {
@@ -1545,9 +1853,9 @@ function getTerminalSessionId() {
         // Fall through to other methods (e.g., on macOS or if /proc doesn't exist)
     }
     // Fall back to environment variables or user/term combination
-    return process.env.TERM_SESSION_ID ||
+    return (process.env.TERM_SESSION_ID ||
         process.env.SESSION_ID ||
-        `${process.env.USER || "default"}-${process.env.TERM || "unknown"}`;
+        `${process.env.USER || "default"}-${process.env.TERM || "unknown"}`);
 }
 // Helper function to check if animation has been shown in this terminal session
 function hasAnimationBeenShown() {